From 38c4c88b5f1aa90b6b6cbe9a02fd292fd3e87cdf Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 6 Nov 2011 10:00:45 +0100
Subject: [PATCH] Fix: Avoid function calls in a FOR loop test part

---
 htdocs/core/lib/functions.lib.php  | 8 ++++----
 htdocs/core/lib/functions2.lib.php | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 272b106faf0..4c822b7aa64 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -100,7 +100,8 @@ if (! function_exists('json_decode'))
 	{
 		$comment = false;
 		
-		for ($i=0; $i<strlen($json); $i++)
+		$strLength = dol_strlen($json);
+		for ($i=0; $i<$strLength; $i++)
 		{
 			if (! $comment)
 			{
@@ -1466,8 +1467,6 @@ function isValidPhone($address)
  */
 function dol_strlen($string,$stringencoding='UTF-8')
 {
-    //    print $stringencoding."xxx";
-    //    $stringencoding='rrr';
     if (function_exists('mb_strlen')) return mb_strlen($string,$stringencoding);
     else return strlen($string);
 }
@@ -4205,7 +4204,8 @@ function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensiti
 function utf8_check($str)
 {
     // We must use here a binary strlen function (so not dol_strlen)
-    for ($i=0; $i<strlen($str); $i++)
+    $strLength = dol_strlen($str);
+    for ($i=0; $i<$strLength; $i++)
     {
         if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
         elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n=1; // 110bbbbb
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4af19179e25..1788d56308b 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -767,7 +767,8 @@ function binhex($bin, $pad=false, $upper=false)
 function hexbin($hexa)
 {
     $bin='';
-    for($i=0;$i<dol_strlen($hexa);$i++)
+    $strLength = dol_strlen($hexa);
+    for($i=0;$i<$strLength;$i++)
     {
         $bin.=str_pad(decbin(hexdec($hexa{$i})),4,'0',STR_PAD_LEFT);
     }