richard: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.7, 1.8

cvs at intevation.de cvs at intevation.de
Wed Mar 22 20:34:31 CET 2006


Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv11363/www/admin/user

Modified Files:
	user.php.in 
Log Message:
replaced $kolab_prefix/etc by @sysconfidir@



Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- user.php.in	9 Mar 2006 21:27:22 -0000	1.7
+++ user.php.in	22 Mar 2006 19:34:29 -0000	1.8
@@ -486,11 +486,11 @@
 		 */
 		 if( false && isset( $_POST['accttype'] ) && $_POST['accttype'] > 1 ) {
 		   // We have a group or resource, create encrypted pw
-		   $pubkeydata=file_get_contents("$kolab_prefix/etc/kolab/res_pub.pem" );		   
+		   $pubkeydata=file_get_contents("@sysconfdir@/kolab/res_pub.pem" );		   
 		   $pkey = openssl_pkey_get_public( $pubkeydata );
 		   if( $pkey === false ) {
-			 $sslerr = sprintf(_("Could not read resource encryption public key file://%s/etc/kolab/res_pub.pem: "), 
-							   $kolab_prefix);
+			 $sslerr = "Could not read resource encryption public key file://@sysconfdir@/kolab/res_pub.pem: "; 
+							   
 			 while( $msg = openssl_error_string() )
 			   $sslerr .= $msg.' ';
 			 $errors[] = $sslerr;





More information about the commits mailing list