From fde361eb5827c1598404001cd26dee50aae3e037 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 2 Jun 2011 06:19:27 +0000 Subject: - Replace preg_match() with faster strpos() --- program/include/main.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/program/include/main.inc b/program/include/main.inc index d630628cc..c312df547 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1352,15 +1352,15 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $at $classes = array('mailbox'); // set special class for Sent, Drafts, Trash and Junk - if ($folder['id']==$CONFIG['sent_mbox']) + if ($folder['id'] == $CONFIG['sent_mbox']) $classes[] = 'sent'; - else if ($folder['id']==$CONFIG['drafts_mbox']) + else if ($folder['id'] == $CONFIG['drafts_mbox']) $classes[] = 'drafts'; - else if ($folder['id']==$CONFIG['trash_mbox']) + else if ($folder['id'] == $CONFIG['trash_mbox']) $classes[] = 'trash'; - else if ($folder['id']==$CONFIG['junk_mbox']) + else if ($folder['id'] == $CONFIG['junk_mbox']) $classes[] = 'junk'; - else if ($folder['id']=='INBOX') + else if ($folder['id'] == 'INBOX') $classes[] = 'inbox'; else $classes[] = '_'.asciiwords($folder_class ? $folder_class : strtolower($folder['id']), true); @@ -1370,7 +1370,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $at if ($folder['id'] == $mbox_name) $classes[] = 'selected'; - $collapsed = preg_match('/&'.rawurlencode($folder['id']).'&/', $RCMAIL->config->get('collapsed_folders')); + $collapsed = strpos($CONFIG['collapsed_folders'], '&'.rawurlencode($folder['id']).'&') !== false; $unread = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0; if ($folder['virtual']) -- cgit v1.2.3