From 36dfb0c92fb666e3717f0adbccfbe4406d362012 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Sat, 24 Feb 2001 17:09:44 +0000 Subject: [PATCH] removed some regular expressions git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1158 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 1 + functions/imap_mailbox.php | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb0f2280..206372d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Version 1.0.3 -- DEVELOPMENT - Made folder drop-down list consistant in look to the other drop-downs - Fixed problem where some attachment filenames would not be displayed - Added Finnish help files by Teemu Junnila +- Removed some regular expressions to help speed folder listings up Version 1.0.2 -- February 8, 2001 --------------------------------- diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 8d6d72c6..22d4b916 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -137,9 +137,9 @@ // a parent. $boxesbyname[$mailbox] = $g; $parentfolder = readMailboxParent($mailbox, $dm); - if((eregi("^inbox".quotemeta($dm), $mailbox)) || - (ereg("^".$folder_prefix, $mailbox)) || - ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) { + if((strtolower(substr($mailbox, 0, 5)) == "inbox") || + (substr($mailbox, 0, strlen($folder_prefix)) == $folder_prefix) || + (isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) { $indent = $dm_count - (countCharInString($folder_prefix, $dm)); if ($indent > 0) $boxes[$g]["formatted"] = str_repeat("  ", $indent); @@ -154,11 +154,14 @@ if (substr($mailbox, -1) == $dm) $mailbox = substr($mailbox, 0, strlen($mailbox) - 1); $boxes[$g]['unformatted'] = $mailbox; - $boxes[$g]['unformatted-disp'] = ereg_replace('^' . $folder_prefix, '', $mailbox); + //$boxes[$g]['unformatted-disp'] = ereg_replace('^' . $folder_prefix, '', $mailbox); + if (substr($mailbox,0,strlen($folder_prefix))==$folder_prefix) { + $boxes[$g]['unformatted-disp'] = substr($mailbox, strlen($folder_prefix)+1); + } $boxes[$g]['id'] = $g; if (isset($line[$g])) - ereg("\(([^)]*)\)",$line[$g],$regs); + ereg("\(([^)]*)\)",$line[$g],$regs); $flags = trim(strtolower(str_replace('\\', '',$regs[1]))); if ($flags) { $boxes[$g]['flags'] = explode(' ', $flags); -- 2.25.1