Enroll some for loops

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12836 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_divlist.inc b/gosa-core/include/class_divlist.inc
index 2cfbdb1f8ad3c92559810b2b84b23973d071ff4a..9a3f6999154c4d686f136d41646feaf3a06464ac 100644 (file)
--- a/gosa-core/include/class_divlist.inc
+++ b/gosa-core/include/class_divlist.inc
@@ -298,7 +298,7 @@ class divlist {
                        for($i = 0 ; $i < $nums ; $i ++ ){
                                $s_return.="<tr>";
                                $cnt=0;
-                               for($a = 0 ; $a < (count($this->a_header[0])) ; $a ++ ) {
+                               for($a = 0, $l= count($this->a_header[0]); $a < $l ; $a ++ ) {
                                        if($a ==(count($this->a_header[0])-1)){
                                                $s_return.="\n<td class='list1' style='border:0px;height:26px;'>&nbsp;</td>";
                                        } else {

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index e5123cf93f9f59bdb5c48f98defcb420289cb4d8..94337ae6f1b94e19e4af9e0e3f32a3550cfd655a 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -596,7 +596,7 @@ class userinfo
             /* Skip objectClass '0' (e.g. users/0) get_permissions will ever return '' ??  */
             if($oc == "0") continue;
             $tmp =  $this->get_permissions($dn, $category."/".$oc);
-            for($i = 0 ; $i < strlen($types); $i++) {
+            for($i = 0, $l= strlen($types); $i < $l; $i++) {
               if(!preg_match("/".$types[$i]."/",$tmp)){ 
                 $acl = preg_replace("/".$types[$i]."/","",$acl);
               }

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index ca6b487f5607320c299bf5ca827bedfd9ae69746..604c7b5a5183ac2030e7a2b50cac740cb0db20b1 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1088,7 +1088,7 @@ function getMenuCache()
       if(session::is_set('maxC')){
         $b= session::get('maxC');
         $q= "";
-        for ($m=0;$m<strlen($b);$m++) {
+        for ($m=0, $l= strlen($b);$m<$l;$m++) {
           $q.= $b[$m++];
         }
         msg_dialog::display(_("Internal error"), base64_decode($q), ERROR_DIALOG);
@@ -1667,7 +1667,7 @@ function gen_uids($rule, $attributes)
   $stripped= "";
   $variables= array();
 
-  for ($pos= 0; $pos < strlen($rule); $pos++){
+  for ($pos= 0, $l= strlen($rule); $pos < $l; $pos++){
 
     if ($rule[$pos] == "{" ){
       $trigger= true;
@@ -1710,7 +1710,7 @@ function gen_uids($rule, $attributes)
     if(preg_match('/\{id:\d+}/',$uid)){
       $size= preg_replace('/^.*{id:(\d+)}.*$/', '\\1', $uid);
 
-      for ($i= 0; $i < pow(10,$size); $i++){
+      for ($i= 0, $p= pow(10,$size); $i < $p; $i++){
         $number= sprintf("%0".$size."d", $i);
         $res= preg_replace('/{id:(\d+)}/', $number, $uid);
         if (!in_array($res, $used)){
@@ -1783,7 +1783,7 @@ function generate_alphabet($count= 10)
   $c= 0;
 
   /* Fill cells with charaters */
-  for ($i= 0; $i<mb_strlen($characters, 'UTF8'); $i++){
+  for ($i= 0, $l= mb_strlen($characters, 'UTF8'); $i<$l; $i++){
     if ($c == 0){
       $alphabet.= "<tr>";
     }

diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index 17118698f01a29f3320023dac1a2d6f22c756afb..f7b8d075fdd8aff862f382b158bd37e624889b80 100644 (file)
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -123,7 +123,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     $error_collector_mailto .= prepare4mailbody("=== Trace ===");
 
     /* Generate trace history */
-    for ($index= 0; $index<count($trace); $index++){
+    for ($index= 0, $c= count($trace); $index<$c; $index++){
 
 
       $ct= $trace[$index];