Correct references trimming: array_walk can't in all PHP versions use

a callback function that is a member function. Moving the function out
of the class seems the best solution.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11107 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index f22b5f877e05d11b819bd7f13058e82bccf4a2f4..824086aae96b47ec63e641cd1eef2d55474b1cb9 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -742,7 +742,7 @@ class Deliver {
         $aReferences[] = $message_id;
 
         // sanitize the array: trim whitespace, remove dupes
         $aReferences[] = $message_id;
 
         // sanitize the array: trim whitespace, remove dupes

-        array_walk($aReferences, 'trim_value');
+        array_walk($aReferences, 'sq_trim_value');

         $aReferences = array_unique($aReferences);
 
         while ( count($aReferences) > 4 && strlen(implode(' ', $aReferences)) >= 986 ) {
         $aReferences = array_unique($aReferences);
 
         while ( count($aReferences) > 4 && strlen(implode(' ', $aReferences)) >= 986 ) {


@@ -751,13 +751,6 @@ class Deliver {
         return implode(' ', $aReferences);
     }
 
         return implode(' ', $aReferences);
     }
 

-    /**
-     * Callback function to trim whitespace from a value, to be used in array_walk
-     */
-    function trim_value ( &$value ) {
-        $value = trim($value);
-    }
-

     /**
      * Converts ip address to hexadecimal string
      *
     /**
      * Converts ip address to hexadecimal string
      *

diff --git a/functions/strings.php b/functions/strings.php
index a6e3852a065f467f28d5d24adbabe5f07ac63a03..5f99b3858ae5c01653d317c51e4d3ffe0c8de2ad 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1280,4 +1280,13 @@ function sq_count8bit($string) {
     return $count;
 }
 
     return $count;
 }
 

+/**
+ * Callback function to trim whitespace from a value, to be used in array_walk
+ * @param string $value value to trim
+ * @since 1.5.2 and 1.4.7
+ */
+function sq_trim_value ( &$value ) {
+    $value = trim($value);
+}
+

 ?>
 ?>