steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php, 1.5, 1.6 user.php, 1.24, 1.25

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php user.php 
Log Message:
*sigh* mixed case ldap attribute names are broken in php -- ldap_get_entries() returns them in all lowercase and ldap_get_attributes() returns them in mixed case!

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php	12 Aug 2004 10:55:39 -0000	1.5
+++ index.php	13 Aug 2004 01:04:16 -0000	1.6
@@ -62,7 +62,7 @@
 	}
   }
   $filter = "(&($userfilter)(objectclass=inetOrgPerson)(uid=*)(mail=*)(sn=*))";
-  $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabdeleteflag' ));
+  $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabDeleteflag' ));
 
   if( $result ) {
 	$count = ldap_count_entries($ldap->connection, $result);
@@ -85,7 +85,7 @@
 	  while( $entry ) {
 		$attrs = ldap_get_attributes($ldap->connection, $entry);
 		$dn = ldap_get_dn($ldap->connection,$entry);
-		$deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
+		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
         $uid = $attrs['uid'][0];
         $mail = $attrs['mail'][0];
         $sn = $attrs['sn'][0];

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- user.php	12 Aug 2004 10:55:39 -0000	1.24
+++ user.php	13 Aug 2004 01:04:16 -0000	1.25
@@ -73,7 +73,6 @@
 }
 
 function checkuid( $form, $key, $value ) {
-  print "checkuid";
   global $ldap;
   global $action;
   global $dn;
@@ -82,7 +81,6 @@
   $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
   $str = '';
   foreach( $lst as $uid ) {
-    print ("looking at uid = $uid, exluding $dn" );
     if( $ldap->countMail( $_SESSION['base_dn'], $uid, $excludedn ) > 0 ) {
       $str .= _('UID ').htmlentities($uid)._(' collision <br />');
     }
@@ -187,8 +185,8 @@
   $form->entries['alias']['value'] = $v;
 
   // kolabdelegate
-  if (is_array($ldap_object['kolabdelegate'])) {
-	$arr = $ldap_object['kolabdelegate'];
+  if (is_array($ldap_object['kolabDelegate'])) {
+	$arr = $ldap_object['kolabDelegate'];
 	unset( $arr['count'] );
 	$v = join("\n", $arr );
   }
@@ -196,8 +194,8 @@
   $form->entries['kolabdelegate']['value'] = $v;
 
   // kolabhomeserver
-  if( is_array($ldap_object['kolabhomeserver']) ) {
-	$form->entries['kolabhomeserver']['value'] = $ldap_object['kolabhomeserver'][0];
+  if( is_array($ldap_object['kolabHomeServer']) ) {
+	$form->entries['kolabhomeserver']['value'] = $ldap_object['kolabHomeServer'][0];
   }
   $form->entries['kolabhomeserver']['attrs'] = 'readonly';
 
@@ -292,10 +290,10 @@
 						   'type' => 'textarea',
 						   'validation' => 'checkuniquealias',
 						   'comment' => _('One address per line') );
-$entries['kolabdelegate'] =array( 'name' => _('kolabdelegates'),
+$entries['kolabdelegate'] =array( 'name' => _('Delegates'),
 							 'type' => 'textarea',
-							 'validation' => 'checkkolabdelegate',
-							 'comment' => _('One UID per line') );
+							 'validation' => 'checkdelegate',
+							 'comment' => _('One Email address per line') );
 $entries['o_0'] = array( 'name' => _('Organisation') );
 $entries['ou_0'] = array( 'name' => _('Organisational Unit') );
 $entries['roomNumber_0'] = array( 'name' => _('Room Number') );
@@ -342,7 +340,7 @@
        $content = $form->outputForm();
      } else {
        $ldap_object = array();
-       $ldap_object['objectClass'] = array('inetorgperson','kolabinetorgperson');
+       $ldap_object['objectClass'] = array('top', 'inetOrgPerson','kolabInetOrgPerson');
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
 	   $ldap_object['givenName'] = trim($_POST['firstname']);
@@ -365,7 +363,7 @@
 				 $sslerr .= $msg.' ';
 			   $errors[] = $sslerr;
 			 } else {
-			   $ldap_object['kolabencryptedpassword'] = base64_encode( $encpw );
+			   $ldap_object['kolabEncryptedPassword'] = base64_encode( $encpw );
 			 }
 			 openssl_free_key( $pkey );
 		   }
@@ -375,7 +373,7 @@
        $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
        if( $action == 'firstsave' ) {
                  if ($ldap_object['uid'] == "") $ldap_object['uid'] = $ldap_object['mail'];
-		 $ldap_object['kolabhomeserver'] = trim($_POST['kolabhomeserver']);
+		 $ldap_object['kolabHomeServer'] = trim($_POST['kolabhomeserver']);
 	   }
        foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 'postOfficeBox',
 		       'postalCode', 'l', 'c', 'telephoneNumber',
@@ -396,9 +394,9 @@
 	   $dn_add = "";
 
 	   // kolabdelegate
-	   $ldap_object['kolabdelegate'] = array_unique( array_filter( array_map( 'trim', 
+	   $ldap_object['kolabDelegate'] = array_unique( array_filter( array_map( 'trim', 
 												preg_split( '/\n/', $_POST['kolabdelegate'] ) ), 'strlen') );
-	   if( !$ldap_object['kolabdelegate'] && $action == 'firstsave' ) unset($ldap_object['kolabdelegate']);
+	   if( !$ldap_object['kolabDelegate'] && $action == 'firstsave' ) unset($ldap_object['kolabDelegate']);
 
 
        if ($auth->group() == "maintainer" || $auth->group() == "admin") {