Changeset 4827 in subversion

Timestamp:

Jun 2, 2011 2:19:27 AM (2 years ago)

Author:

alec

Message:

• Replace preg_match() with faster strpos()

File:

• trunk/roundcubemail/program/include/main.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -1353 +1353 @@
 
     // 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
@@ -1371 +1371 @@
       $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;