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

cvs at intevation.de cvs at intevation.de
Wed Mar 29 12:52:16 CEST 2006


Author: steffen

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

Modified Files:
	index.php.in 
Log Message:
Fix for issue848 + some cleanup

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	9 Mar 2006 21:27:22 -0000	1.2
+++ index.php.in	29 Mar 2006 10:52:14 -0000	1.3
@@ -22,6 +22,7 @@
 require_once('@kolab_php_module_prefix at admin/include/headers.php');
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
+require_once('@kolab_php_module_prefix at admin/include/form.class.php');
 
 $errors = array();
 
@@ -47,6 +48,7 @@
 else $page = "1";
 
 // Get all entries & dynamically split the letters with growing entries
+$entries = array();
 if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
@@ -55,9 +57,9 @@
 							  (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
 
   $userfilter = "cn=*";
-  $filterattr = $_REQUEST['filterattr'];
-  $filtertype = $_REQUEST['filtertype'];
-  $filtervalue = $_REQUEST['filtervalue'];
+  $filterattr = KolabForm::getRequestVar('filterattr');
+  $filtertype = KolabForm::getRequestVar('filtertype');
+  $filtervalue = KolabForm::getRequestVar('filtervalue');
   if( !in_array( $filterattr, array( 'cn', 'uid', 'mail' ) ) ) $filterattr = 'cn';
   if( isset( $filtervalue ) && !empty( $filtervalue ) ) {
 	switch( $filtertype ) {
@@ -79,11 +81,11 @@
   if( isset( $_REQUEST['alphalimit']) ) {
 	$ala='sn'; // alpha limit attibute
 	switch( $_REQUEST['alphalimit'] ) {
-	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;
-	case s: $alphalimit = "(|($ala=s*)($ala=t*)($ala=u*)($ala=v*)($ala=w*)($ala=x*)($ala=y*)($ala=z*))"; break;
-	case 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*))"; break;
+	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;
+	case 's': $alphalimit = "(|($ala=s*)($ala=t*)($ala=u*)($ala=v*)($ala=w*)($ala=x*)($ala=y*)($ala=z*))"; break;
+	case '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*))"; break;
 	default: $alphalimit = '';
 	}
   }





More information about the commits mailing list