X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Farray.php;h=bd85eff27932cc3d9d76647124e6d38ee22e80e4;hb=856b2ee25a1cd7e05dd5ccdbe9d0e4744673351a;hp=d17662bbdb22bba67612bf1abbe30a124b49dc8a;hpb=2d367c687f9813a45a3d2f1911036cfc0425fdd0;p=squirrelmail.git diff --git a/functions/array.php b/functions/array.php index d17662bb..bd85eff2 100644 --- a/functions/array.php +++ b/functions/array.php @@ -1,69 +1,78 @@ col and $this->dir in a class - // Would beat using globals - if(!is_array($col)){ - $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 +function ary_sort($ary,$col, $dir = 1) +{ + /* The globals are used because USORT determines what is passed to comp2 */ + /* These should be $this->col and $this->dir in a class */ + /* Would beat using globals */ + if (!is_array($col)) { + $col = array($col); + } + $GLOBALS['col'] = $col; /* Column or Columns as an array */ + if ($dir > 0) { + $dir = 1; + } + else { + $dir = -1; + } + /* Direction, a positive number for ascending a negative for descending */ + $GLOBALS['dir'] = $dir; - usort($ary,'array_comp2'); - return $ary; - } + usort($ary,'array_comp2'); + return $ary; +} - function array_comp2($a,$b,$i = 0) { - global $col; - global $dir; - $c = count($col) -1; - if ($a[$col[$i]] == $b[$col[$i]]){ - $r = 0; - while($i < $c && $r == 0){ - $i++; - $r = comp2($a,$b,$i); - } - } elseif($a[$col[$i]] < $b[$col[$i]]){ - return (- $dir); - } - return $dir; - } +function array_comp2($a,$b,$i = 0) +{ + global $col; + global $dir; + $c = count($col) -1; + if ($a[$col[$i]] == $b[$col[$i]]) { + $r = 0; + while ($i < $c && $r == 0) { + $i++; + $r = comp2($a,$b,$i); + } + } + elseif ($a[$col[$i]] < $b[$col[$i]]) { + return (- $dir); + } + return $dir; +} - function removeElement($array, $element) { - $j = 0; - for ($i = 0;$i < count($array);$i++) - if ($i != $element) { +function removeElement($array, $element) +{ + $j = 0; + for ($i = 0;$i < count($array);$i++) { + if ($i != $element) { $newArray[$j] = $array[$i]; $j++; - } - - return $newArray; - } + } + } + return $newArray; +} - function array_cleave($array1, $column) - { +function array_cleave($array1, $column) +{ $key=0; $array2 = array(); while ($key < count($array1)) { array_push($array2, $array1[$key][$column]); $key++; } - return ($array2); - } +} ?>