From 625c8b787b79d07a1e53ba05213f66451d73651e Mon Sep 17 00:00:00 2001 From: kink Date: Sat, 26 Oct 2002 17:10:21 +0000 Subject: [PATCH] Obsolete array.php git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4032 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/array.php | 78 --------------------------------- functions/imap_mailbox.php | 6 +-- functions/imap_search.php | 1 - functions/mailbox_display.php | 13 ++++-- include/options/personal.php | 1 - plugins/newmail/newmail_opt.php | 1 - plugins/translate/options.php | 1 - src/addrbook_search.php | 1 - src/addressbook.php | 1 - src/empty_trash.php | 1 - src/folders.php | 1 - src/folders_delete.php | 1 - src/left_main.php | 1 - src/options.php | 1 - src/options_highlight.php | 1 - src/options_order.php | 1 - src/right_main.php | 1 - src/search.php | 1 - 18 files changed, 11 insertions(+), 101 deletions(-) delete mode 100644 functions/array.php diff --git a/functions/array.php b/functions/array.php deleted file mode 100644 index bd85eff2..00000000 --- a/functions/array.php +++ /dev/null @@ -1,78 +0,0 @@ -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 15322cd7..f8402f8c 100755 --- 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 d7b1924b..934bce16 100644 --- 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 9b55139c..0a4fc83e 100644 --- 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 ac0b0295..3ae6df42 100644 --- 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 976397df..ac7c0ea1 100644 --- 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 000c4afe..cae1482c 100644 --- 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 53f81c9b..7357e8d0 100644 --- 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 6745b429..6e17d228 100644 --- 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 6289fea8..7f389630 100644 --- 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 ebbfe5ba..07b636f4 100644 --- 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 0f4ac3e9..dbd915b2 100644 --- 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 c80d4a76..3330a5fe 100644 --- 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 abf23cc9..50f45037 100644 --- 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 b459b45f..bfb43cae 100644 --- 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 6d6e7e41..14a366ca 100644 --- 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 33a4cd5b..ef9be5e3 100644 --- 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 b21abf4a..28a78842 100644 --- 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; -- 2.25.1