thomas: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook index.php.in, 1.3, 1.4

cvs at kolab.org cvs at kolab.org
Tue Jan 22 19:36:22 CET 2008


Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	21 Nov 2007 18:11:37 -0000	1.3
+++ index.php.in	22 Jan 2008 18:36:20 -0000	1.4
@@ -19,7 +19,8 @@
 $sidx = 'addressbook';
 
 if( $auth->group() != 'maintainer' && $auth->group() != 'admin') {
-   array_push($errors, _("Error: You don't have Permissions to access this Menu") );
+  debug("auth->group=".$auth->group());
+  array_push($errors, _("Error: You don't have Permissions to access this Menu"));
 }
 
 require_once('@kolab_php_module_prefix at admin/include/menu.php');
@@ -93,11 +94,11 @@
 	  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";
 		$mail = $attrs['mail'][0];
 		$sn = $attrs['sn'][0];
 		$cn = $attrs['cn'][0];
 		$fn = KolabLDAP::getGivenName($cn, $sn);
-		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$entries[] = array( 'dn' => $dn,
 							'sn' => $sn,
 							'fn' => $fn,
@@ -109,9 +110,8 @@
   }
 }
 
-
 /**** Insert into template and output ***/
-$smarty =& new MySmarty();
+$smarty = new MySmarty();
 $smarty->assign( 'errors', $errors );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );





More information about the commits mailing list