Obsolete array.php

functions/array.php

@@ -1,78 +0,0 @@
-<?php
-
-/**
- * array.php
- *
- * Copyright (c) 1999-2002 The SquirrelMail Project 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$
- */
-
-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;
-}
-
-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) {
-            $newArray[$j] = $array[$i];
-            $j++;
-        }
-    }
-    return $newArray;
-}
-
-function array_cleave($array1, $column)
-{
-    $key=0;
-    $array2 = array();
-    while ($key < count($array1)) {
-        array_push($array2, $array1[$key][$column]);
-        $key++;
-    }
-    return ($array2);
-}
-
-?>

functions/imap_mailbox.php

@@ -500,7 +500,6 @@ function sqimap_mailbox_list($imap_stream) {
         $inbox_subscribed = false;
 
         require_once(SM_PATH . 'include/load_prefs.php');
-        require_once(SM_PATH . 'functions/array.php');
 
         if ($noselect_fix_enable) {
             $lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
@@ -658,8 +657,6 @@ function sqimap_mailbox_list($imap_stream) {
 function sqimap_mailbox_list_all($imap_stream) {
     global $list_special_folders_first, $folder_prefix, $delimiter;
 
-    require_once(SM_PATH . 'functions/array.php');
-
     $ssid = sqimap_session_id();
     $lsid = strlen( $ssid );
     fputs ($imap_stream, $ssid . " LIST \"$folder_prefix\" *\r\n");
@@ -739,7 +736,7 @@ function sqimap_mailbox_list_all($imap_stream) {
         $g++;
     }
     if(is_array($boxes)) {
-        $boxes = ary_sort ($boxes, 'unformatted', 1);
+        $boxes = sort ($boxes);
     }
 
     return $boxes;
@@ -757,7 +754,6 @@ function sqimap_mailbox_tree($imap_stream) {
         $inbox_subscribed = false;
 
         require_once(SM_PATH . 'include/load_prefs.php');
-        require_once(SM_PATH . 'functions/array.php');
 
         /* LSUB array */
         $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",

functions/imap_search.php

@@ -13,7 +13,6 @@
 
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/date.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
 require_once(SM_PATH . 'functions/mime.php');
 

functions/mailbox_display.php

@@ -455,12 +455,19 @@ function calc_msort($msgs, $sort) {
      * 4 = Subject (up)
      * 5 = Subject (dn)
      */
+
     if (($sort == 0) || ($sort == 1)) {
-        $msort = array_cleave ($msgs, 'TIME_STAMP');
+        foreach ($msgs as $item) {
+            $msort[] = $item['TIME_STAMP'];
+        }
     } elseif (($sort == 2) || ($sort == 3)) {
-        $msort = array_cleave ($msgs, 'FROM-SORT');
+        foreach ($msgs as $item) {
+            $msort[] = $item['FROM-SORT'];
+        }
     } elseif (($sort == 4) || ($sort == 5)) {
-        $msort = array_cleave ($msgs, 'SUBJECT-SORT');
+        foreach ($msgs as $item) {
+            $msort[] = $item['SUBJECT-SORT'];
+        }
     } else {
         $msort = $msgs;
     }

include/options/personal.php

@@ -13,7 +13,6 @@
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 
 /* Define the group constants for the personal options page. */
 define('SMOPT_GRP_CONTACT', 0);

plugins/newmail/newmail_opt.php

@@ -18,7 +18,6 @@ require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 
     displayPageHeader($color, 'None');

plugins/translate/options.php

@@ -20,7 +20,6 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 
     displayPageHeader($color, 'None');

src/addrbook_search.php

@@ -158,7 +158,6 @@ function display_result($res, $includesource = true) {
 
 /* ================= End of functions ================= */
     
-require_once('../functions/array.php');
 require_once('../functions/strings.php');
 require_once('../functions/addressbook.php');
     

src/addressbook.php

@@ -16,7 +16,6 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/addressbook.php');
 require_once(SM_PATH . 'functions/strings.php');

src/empty_trash.php

@@ -19,7 +19,6 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/tree.php');
 
 /* get those globals */

src/folders.php

@@ -20,7 +20,6 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
 

src/folders_delete.php

@@ -18,7 +18,6 @@ define('SM_PATH','../');
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/tree.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/html.php');

src/left_main.php

@@ -17,7 +17,6 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/page_header.php');

src/options.php

@@ -19,7 +19,6 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/options.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/html.php');

src/options_highlight.php

@@ -18,7 +18,6 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/html.php');

src/options_order.php

@@ -18,7 +18,6 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
 

src/right_main.php

@@ -19,7 +19,6 @@ define('SM_PATH','../');
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/date.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
 require_once(SM_PATH . 'functions/display_messages.php');

src/search.php

@@ -17,7 +17,6 @@ require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/imap_search.php');
 require_once(SM_PATH . 'functions/imap_mailbox.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/strings.php');
 
 global $allow_thread_sort;