From e89806aa62c18254bf90b42e920fe3bbd7d5b358 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 20 Sep 2011 16:12:52 +0000 Subject: [PATCH] Fix: Avoid function calls in a FOR loop test part --- htdocs/core/class/cookie.class.php | 3 ++- htdocs/core/class/menubase.class.php | 3 ++- htdocs/core/class/vcard.class.php | 6 ++++-- htdocs/includes/login/functions_myopenid.php | 4 +++- htdocs/includes/menus/standard/auguria.lib.php | 5 +++-- htdocs/includes/menus/standard/eldy.lib.php | 5 +++-- .../includes/modules/livraison/pdf/pdf_typhon.modules.php | 8 +++++--- htdocs/lib/admin.lib.php | 6 ++++-- htdocs/lib/ldap.class.php | 3 ++- 9 files changed, 28 insertions(+), 15 deletions(-) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 6082e4d0d99..f4864c2635e 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -83,7 +83,8 @@ class DolCookie { $this->cookiearray = explode("|",$_COOKIE[$this->myCookie]); $this->myValue = "" ; - for ($f=0 ; $f<=count($this->cookiearray)-2; $f++) + $num = (count($this->cookiearray) - 2); + for ($f = 0; $f <= $num; $f++) { $this->myValue .= strval(chr($this->cookiearray[$f]/$this->myKey)); } diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 1fbdddff610..88698b61a6e 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -370,7 +370,8 @@ class Menubase $leftmenu = $myleftmenu; //ballayage du tableau - for ($x = 0; $x < count($tab); $x++) + $num = count($tab); + for ($x = 0; $x < $num; $x++) { //si un element a pour pere : $pere if ($tab[$x][1] == $pere) diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php index cccbb69ac31..433be9ace59 100755 --- a/htdocs/core/class/vcard.class.php +++ b/htdocs/core/class/vcard.class.php @@ -53,8 +53,10 @@ function dol_quoted_printable_encode($input, $line_max = 76) $linebreak = "=0D=0A"; $escape = "="; $output = ""; - - for ($j=0;$jmenuTopCharger($_SESSION['mainmenu'], '', $type_user, 'auguria'); print_start_menu_array_auguria(); - - for($i=0; $imenuTopCharger($_SESSION['mainmenu'],'',$type_user,'eldy'); - - for($i=0; $iCell($w[$i],7,$header[$i],1,0,'C'); } @@ -383,8 +384,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder $this->_pagehead($pdf, $object, 0, $outputlangs); $pdf-> SetY(40); - - for($i=0;$iCell($w[$i],7,$header[$i],1,0,'C'); } diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index a65a12cd957..00e62cc2ca5 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -700,7 +700,8 @@ function Activate($value,$withdeps=1) if (is_array($objMod->depends) && !empty($objMod->depends)) { // Activation des modules dont le module depend - for ($i = 0; $i < count($objMod->depends); $i++) + $num = count($objMod->depends); + for ($i = 0; $i < $num; $i++) { if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/".$objMod->depends[$i].".class.php")) { @@ -712,7 +713,8 @@ function Activate($value,$withdeps=1) if (isset($objMod->conflictwith) && is_array($objMod->conflictwith)) { // Desactivation des modules qui entrent en conflit - for ($i = 0; $i < count($objMod->conflictwith); $i++) + $num = count($objMod->conflictwith); + for ($i = 0; $i < $num; $i++) { if (file_exists(DOL_DOCUMENT_ROOT."/includes/modules/".$objMod->conflictwith[$i].".class.php")) { diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index 7ab3c0331fc..2175a2c3e55 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -954,7 +954,8 @@ class Ldap $fulllist[$recordid][$useridentifier]=$recordid; // Add to the array for each attribute in my list - for ($j = 0; $j < count($attributeArray); $j++) + $num = count($attributeArray); + for ($j = 0; $j < $num; $j++) { $keyattributelower=strtolower($attributeArray[$j]); //print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."
\n";