Obsolete array.php

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

diff --git a/functions/array.php b/functions/array.php
deleted file mode 100644 (file)
index bd85eff..0000000
--- a/functions/array.php
+++ /dev/null
@@ -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);
-}
-
-?>

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 15322cd77b7de389626da55261dda5a60a0946ea..f8402f8c7dd45ca6f69dc595a55acff89c99083e 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/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\" \"*\"",

diff --git a/functions/imap_search.php b/functions/imap_search.php
index d7b1924b46ceacdd9c11b85f7e433f5d73124c4f..934bce16bf4e3ba70887d02e9b7464ea7a1ffaa9 100644 (file)
--- a/functions/imap_search.php
+++ b/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');
 

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 9b55139ce092b9d664fa99e189ee308ba5b7d76a..0a4fc83e4d1e4ab54c1ffcd77cc9208bb69d8550 100644 (file)
--- a/functions/mailbox_display.php
+++ b/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;
     }

diff --git a/include/options/personal.php b/include/options/personal.php
index ac0b02959dc1f461d433703a80e349ac62846daf..3ae6df424f29c051e959558734bde431422c17c3 100644 (file)
--- a/include/options/personal.php
+++ b/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);

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 976397dfb0eef5c134d43fcf05515d63d283e099..ac7c0ea1189adba0cbf261d6595a49f5221608c7 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/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');

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 000c4afef4b48ccb86ffaa29f0e02eccacadf37a..cae1482cacccc4e622ee2bdac6b9e26661efd798 100644 (file)
--- a/plugins/translate/options.php
+++ b/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');

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 53f81c9bf3eb71c69976b1cd953896ad157403a3..7357e8d0044d076033cec38798d1c9c38ea91b83 100644 (file)
--- a/src/addrbook_search.php
+++ b/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');
     

diff --git a/src/addressbook.php b/src/addressbook.php
index 6745b429e17ed9f2a88230f0a5d798c0bb5523d4..6e17d228d7b07e71b0992e8270316ef8d54a14f0 100644 (file)
--- a/src/addressbook.php
+++ b/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');

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 6289fea80394e2999d25d2d98615b0ccdc6027d8..7f3896303b1c0142003b6d90ca887e8eb5148659 100644 (file)
--- a/src/empty_trash.php
+++ b/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 */

diff --git a/src/folders.php b/src/folders.php
index ebbfe5ba7f269ee707b3e6c88e30041aef1ab158..07b636f4af7ade79891dee1b5ccf8bca685fcf16 100644 (file)
--- a/src/folders.php
+++ b/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');
 

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 0f4ac3e98657a32a2bfdfcfef5ee88b38e41badb..dbd915b22f5dd637b1e523b4c9f7a41b71dafbbf 100644 (file)
--- a/src/folders_delete.php
+++ b/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');

diff --git a/src/left_main.php b/src/left_main.php
index c80d4a76263609bdf198b7430ce9eaf4cf881de9..3330a5fea1e86162effcc16bbc52e8247a0f5aa9 100644 (file)
--- a/src/left_main.php
+++ b/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');

diff --git a/src/options.php b/src/options.php
index abf23cc97abee2256a5bb4a7d87acca801893f67..50f45037d0cd42a7e10c7ded28c50ae87b35a963 100644 (file)
--- a/src/options.php
+++ b/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');

diff --git a/src/options_highlight.php b/src/options_highlight.php
index b459b45fcb2c61a345d8d95645abe8f0d3a6b50e..bfb43caed35dbf945a70c2e8225333a2ad7178a7 100644 (file)
--- a/src/options_highlight.php
+++ b/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');

diff --git a/src/options_order.php b/src/options_order.php
index 6d6e7e41bd6092c5d967c89be861f1fadd664984..14a366cae5c9b0d04a84e60db1b44f1b9658dd89 100644 (file)
--- a/src/options_order.php
+++ b/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');
 

diff --git a/src/right_main.php b/src/right_main.php
index 33a4cd5b5323872e44ee55bc4b18359830fda608..ef9be5e3f1a1f05de782ecd0db03869781a87638 100644 (file)
--- a/src/right_main.php
+++ b/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');

diff --git a/src/search.php b/src/search.php
index b21abf4ab1e13ebdc0e180ff8ffbebe333875df2..28a78842975ba1af5b282dc9e4976a162d773073 100644 (file)
--- a/src/search.php
+++ b/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;