gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.28, 1.28.2.1
cvs at kolab.org
cvs at kolab.org
Thu Dec 3 16:49:35 CET 2009
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv22253/kolab-webadmin/www/admin/user
Modified Files:
Tag: kolab_2_2_branch
user.php.in
Log Message:
kolab/issue3499 (Kolab web admin does not use LDAP escaping) - Partial fix: Remove the white screen of death.
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- user.php.in 4 Mar 2008 18:12:03 -0000 1.28
+++ user.php.in 3 Dec 2009 15:49:33 -0000 1.28.2.1
@@ -656,7 +656,7 @@
if( $ldap->countMail( $_SESSION['base_dn'], $alias, $dn ) > 0 ) {
// Ups!!!
$alias = $ldap_object['alias'][$i];
- $newalias = md5sum( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
+ $newalias = md5( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
$ldap_object['alias'][$i] = $newalias;
if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
$errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
@@ -693,7 +693,7 @@
if( $ldap->countMail( $_SESSION['base_dn'], $ldap_object['mail'], $dn ) > 0 ) {
// Ups!!!
$mail = $ldap_object['mail'];
- $newmail = md5sum( $dn.$mail ).'@'.substr( $mail, 0, strpos( $mail, '@' ) );
+ $newmail = md5( $dn.$mail ).'@'.substr( $mail, 0, strpos( $mail, '@' ) );
$ldap_object['uid'] = $ldap_object['mail'] = $newmail;
if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
$errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
@@ -708,7 +708,7 @@
if( $ldap->countMail( $_SESSION['base_dn'], $alias, $dn ) > 0 ) {
// Ups!!!
$alias = $ldap_object['alias'][$i];
- $newalias = md5sum( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
+ $newalias = md5( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
$ldap_object['alias'][$i] = $newalias;
if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
$errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
More information about the commits
mailing list