steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	addr.php 
Log Message:
fix for issue484 (Cannot use all attributes of an external address)

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- addr.php	16 Aug 2004 12:51:25 -0000	1.3
+++ addr.php	21 Oct 2004 20:29:46 -0000	1.4
@@ -36,11 +36,11 @@
   $form->entries['lastname']['value'] = $lastname;
   $form->entries['mail']['value'] = $mail_0;
 
-  foreach( array( 'title', 'o', 'ou', 'street', 'postOfficeBox',
+  foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 'postOfficeBox',
                   'postalCode', 'l', 'c', 'telephoneNumber',
-                  'facsimileTelephoneNumber' ) as $attr ) {
-    if (is_array($ldap_object[$attr])) $v = $ldap_object[$attr][0];
-    else $v = $ldap_object[$attr];
+                  'facsimileTelephoneNumber' ) as $attr ) {	
+    if (is_array($ldap_object[strtolower($attr)])) $v = $ldap_object[strtolower($attr)][0];
+    else $v = $ldap_object[strtolower($attr)];
     $form->entries[$attr]['value'] = $v;
   }
   if (is_array($ldap_object['alias'])) {
@@ -48,7 +48,7 @@
 	unset( $arr['count'] );
 	$v = join("\n", $arr );
   }
-  else $v = $ldap_object[$attr];
+  else $v = $ldap_object['alias'];
   $form->entries['alias']['value'] = $v;
   $form->entries['action']['value'] = 'save';
 }
@@ -87,7 +87,7 @@
 									'comment' => _('One address per line')),
 				  'o' => array( 'name' => _('Organisation') ),
 				  'ou' => array( 'name' => _('Organisational Unit') ),
-				  'room' => array( 'name' => _('Room Number') ),
+				  'roomNumber' => array( 'name' => _('Room Number') ),
 				  'street' => array( 'name' => _('Street Address') ),
 				  'postOfficeBox' => array( 'name' => _('Post Box') ),
 				  'postalCode' => array( 'name' => _('Postal Code') ),