martin: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php.in, 1.1, 1.2 user.php.in, 1.6, 1.7 vacation.php.in, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Thu Mar 9 22:27:24 CET 2006


Author: martin

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

Modified Files:
	index.php.in user.php.in vacation.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -51,8 +51,8 @@
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
 
-  $privmembers = array_merge( $ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
-							  $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
+  $privmembers = array_merge( (array)$ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
+							  (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
 
   $userfilter = "cn=*";
   $filterattr = $_REQUEST['filterattr'];

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- user.php.in	7 Mar 2006 11:47:45 -0000	1.6
+++ user.php.in	9 Mar 2006 21:27:22 -0000	1.7
@@ -824,7 +824,7 @@
 
 $smarty = new MySmarty();
 $smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vacation.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ vacation.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -75,7 +75,7 @@
   } else $reacttospam = true;
   if( $addresses === false ) {
 	$object = $ldap->read( $auth->dn() );
-	$addresses = array_merge( $object['mail'], $object['alias'] );
+	$addresses = array_merge( (array)$object['mail'], (array)$object['alias'] );
   }
   if( $days === false ) $days = 7;
   if( $text === false ) {





More information about the commits mailing list