Warning removal.

[squirrelmail.git] / functions / array.php

diff --git a/functions/array.php b/functions/array.php
index 5d959fe1441d4a219b5d1daddb572b0714d4a85f..ead0d55f38e3d07abf485a772f0bae9b3218dbce 100644 (file)
--- a/functions/array.php
+++ b/functions/array.php
@@ -1,14 +1,16 @@
 <?php
    /**
-    **  array.php
+    ** array.php
     **
-    **  This contains functions that work with array manipulation.  They
-    **  will help sort, and do other types of things with arrays
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    ** This contains functions that work with array manipulation.  They
+    ** will help sort, and do other types of things with arrays
     **
     **  $Id$
     **/
 
-   $array_php = true;
 
    function ary_sort($ary,$col, $dir = 1){
       // The globals are used because USORT determines what is passed to comp2
@@ -18,13 +20,17 @@
          $col = array($col);
       }
       $GLOBALS['col'] = $col;  // Column or Columns as an array
+      if ($dir > 0)
+          $dir = 1;
+      else
+          $dir = -1;
       $GLOBALS['dir'] = $dir;  // Direction, a positive number for ascending a negative for descending
 
-      usort($ary,'comp2');
+      usort($ary,'array_comp2');
       return $ary;
   }
 
-  function comp2($a,$b,$i = 0) {
+  function array_comp2($a,$b,$i = 0) {
          global $col;
          global $dir;
          $c = count($col) -1;
@@ -35,11 +41,9 @@
                $r = comp2($a,$b,$i);
             }
          } elseif($a[$col[$i]] < $b[$col[$i]]){
-            $r = -1 * $dir; // Im not sure why you must * dir here, but it wont work just before the return...
-         } else {
-            $r = 1 * $dir;
-         }
-         return $r;
+            return (- $dir);
+         } 
+        return $dir;
       }
 
    function removeElement($array, $element) {