steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php.in, 1.3, 1.4

cvs at kolab.org cvs at kolab.org
Mon Jul 31 04:03:13 CEST 2006


Author: steffen

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

Modified Files:
	index.php.in 
Log Message:
guard against large number of users

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	29 Mar 2006 10:52:14 -0000	1.3
+++ index.php.in	31 Jul 2006 02:03:10 -0000	1.4
@@ -78,9 +78,22 @@
 	}
   }
   $alphalimit = '';
-  if( isset( $_REQUEST['alphalimit']) ) {
+  $sublist = '';
+  $alphagroup = '';
+  // Disabled for now
+  if( false && isset($_REQUEST['alphalimit']) ) {
 	$ala='sn'; // alpha limit attibute
-	switch( $_REQUEST['alphalimit'] ) {
+	$a = $_REQUEST['alphalimit'];
+	if( $a == "other" ) {
+	  $alphalimit = "(|($ala=æ*)($ala=ø*)($ala=å*)($ala=ä*)($ala=ö*)($ala=ü*)($ala=0*)($ala=1*)($ala=2*)($ala=3*)($ala=4*)($ala=5*)($ala=6*)($ala=7*)($ala=8*)($ala=9*))";
+	} else if( !empty($a)) {
+	  $alphalimit ="($ala=$a*)";
+	  $sublist = $a[0];
+	}
+  } else if( isset( $_REQUEST['alphagroup']) ) {
+	$ala='sn'; // alpha limit attibute
+	$alphagroup = $_REQUEST['alphagroup'];
+	switch( $_REQUEST['alphagroup'] ) {
 	case 'a': $alphalimit = "(|($ala=a*)($ala=b*)($ala=c*)($ala=d*)($ala=e*)($ala=f*))"; break;
 	case 'g': $alphalimit = "(|($ala=g*)($ala=h*)($ala=i*)($ala=j*)($ala=k*)($ala=l*))"; break;
 	case 'm': $alphalimit = "(|($ala=m*)($ala=n*)($ala=o*)($ala=p*)($ala=q*)($ala=r*))"; break;
@@ -101,6 +114,7 @@
 	$domainfilter= "";
   }
   $filter = "(&($userfilter)$domainfilter$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))";
+  debug("filter is \"$filter\"");
   $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabDeleteflag' ));
 
   if( $result ) {
@@ -108,9 +122,10 @@
 	$title = sprintf(_("Manage Email User (%d Users)"), $count);
 	// if there are more than 2000 entries, split in 26 categories for every letter,
 	// or if more than 50, put in groups, or else just show all.
-	if (false && $count > 2000) {
+	if ( $count > 2000) {
 	  // ... TODO
-	  $template = 'userlistalpha.tpl';
+	  //$template = 'userlistalpha.tpl';
+	  $template = 'userlisterror.tpl';
 	} else if( false && $count > 50 ) {
 	  // ... TODO
 	  $template = 'userlistgroup.tpl';
@@ -166,7 +181,7 @@
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
 $smarty->assign( 'self_url', $_SERVER['PHP_SELF'] );
-
+$smarty->assign( 'alphagroup', $alphagroup );
 $smarty->assign( 'filterattrs', array( 'cn'   => _('Name'),
 									   'mail' => _('Email'),
 									   'uid'  => _('UID') ) );
@@ -178,6 +193,7 @@
 $smarty->assign( 'filtertype', $filtertype );
 $smarty->assign( 'filtervalue', $filtervalue );
 
+$smarty->assign( 'sublist', $sublist );
 $smarty->assign( 'entries', $entries );
 $smarty->assign( 'menuitems', $menuitems );
 $smarty->assign( 'submenuitems', 





More information about the commits mailing list