summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-12-03 11:27:19 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-12-03 11:27:19 (GMT)
commit139b38dcac0bc027edbe75aa6c6aaf051185bd19 (patch)
tree9601a81c886c3f72858416eb820f684566bee19c
parent688e2dab3f0c1d5bcbf690e9e0ab29f011f39abf (diff)
downloadkolab-webadmin-139b38dcac0bc027edbe75aa6c6aaf051185bd19.tar.gz
Removed resource password handling which is unused since server 2.1.
-rw-r--r--ChangeLog5
-rw-r--r--www/admin/user/user.php.in28
2 files changed, 5 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c3c866..fedcfc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-03 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * www/admin/user/user.php.in: Removed resource password handling
+ which is unused since server 2.1.
+
2007-11-21 Thomas Arendsen Hein <thomas@intevation.de>
* www/admin/user/user.php.in: Renamed "Free/Busy future" to
diff --git a/www/admin/user/user.php.in b/www/admin/user/user.php.in
index 0c5e575..70f72e8 100644
--- a/www/admin/user/user.php.in
+++ b/www/admin/user/user.php.in
@@ -501,34 +501,6 @@ switch( $action ) {
// 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'] ) );