SF.net SVN: postfixadmin: [310] trunk/functions.inc.php

[<agr...@us...>]

Revision: 310
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=310&view=rev
Author:   agregc32
Date:     2008-03-07 10:38:22 -0800 (Fri, 07 Mar 2008)

Log Message:
-----------
simplification and (hopefully) bug free fix for POP/IMAP box marking

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2008-03-05 00:09:46 UTC (rev 309)
+++ trunk/functions.inc.php	2008-03-07 18:38:22 UTC (rev 310)
@@ -1984,9 +1984,7 @@
    if ( $CONF['show_popimap'] == 'YES' )
    {
       //if the address passed in appears in its own goto field, its POP/IMAP
-      if (preg_match ('/^' . $show_alias . '$/', $stat_goto) ||
-         preg_match ('/' . $show_alias . ',/', $stat_goto) ||
-         preg_match ('/,' . $show_alias . '$/', $stat_goto) )
+      if ( preg_match ('/,' . $show_alias . ',/', ',' . $stat_goto . ',') )
       {
          $stat_string .= "<span  style='background-color:" . $CONF['show_popimap_color'] .
             "'>" . $CONF['show_status_text'] . "</span>&nbsp;";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.