thomas: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.26, 1.27

cvs at kolab.org cvs at kolab.org
Mon Dec 3 12:27:22 CET 2007


Author: thomas

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

Modified Files:
	user.php.in 
Log Message:
Removed resource password handling which is unused since server 2.1.


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- user.php.in	21 Nov 2007 18:11:37 -0000	1.26
+++ user.php.in	3 Dec 2007 11:27:19 -0000	1.27
@@ -501,34 +501,6 @@
 		   // We are editing our own password, let's update the session!
 		   $auth->setPassword($_POST['password_0']);
 		 }
-
-		 /* The code below is disabled for now because we're
-			not going to use that encrypted password anyway.
-			
-			TODO: Clean it up once we're sure we don't want it
-		 */
-		 if( false && isset( $_POST['accttype'] ) && $_POST['accttype'] > 1 ) {
-		   // We have a group or resource, create encrypted pw
-		   $pubkeydata=file_get_contents("@sysconfdir@/kolab/res_pub.pem" );		   
-		   $pkey = openssl_pkey_get_public( $pubkeydata );
-		   if( $pkey === false ) {
-			 $sslerr = "Could not read resource encryption public key file://@sysconfdir@/kolab/res_pub.pem: "; 
-							   
-			 while( $msg = openssl_error_string() )
-			   $sslerr .= $msg.' ';
-			 $errors[] = $sslerr;
-		   } else {
-			 if( !openssl_public_encrypt( $_POST['password_0'], $encpw, $pkey ) ) {
-			   $sslerr = _("Could not encrypt password: ");
-			   while( $msg = openssl_error_string() )
-				 $sslerr .= $msg.' ';
-			   $errors[] = $sslerr;
-			 } else {
-			   $ldap_object['kolabEncryptedPassword'] = base64_encode( $encpw );
-			 }
-			 openssl_free_key( $pkey );
-		   }
-		 }
        }
        $ldap_object['mail'] = trim( strtolower( $_POST['user_mail'] ) ).'@'.trim( strtolower( $_POST['domain_mail'] ) );
        $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );





More information about the commits mailing list