SF.net SVN: postfixadmin:[471] trunk

[<chr...@us...>]

Revision: 471
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=471&view=rev
Author:   christian_boltz
Date:     2008-11-01 20:15:46 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
config.inc.php, functions.inc.php, templates/list-virtual.php:
- dropped $CONF['show_custom_count'], it can easily be calculated with
  count($CONF['show_custom_domains']). This fixes part (6) of
  https://sourceforge.net/tracker2/?func=detail&aid=1951926&group_id=191583&atid=937967

config.inc.php:
- added some comments explaining $CONF['show_undeliverable_exceptions'] 
  and $CONF['show_custom_domains']

Modified Paths:
--------------
    trunk/config.inc.php
    trunk/functions.inc.php
    trunk/templates/list-virtual.php

Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php	2008-10-31 13:37:49 UTC (rev 470)
+++ trunk/config.inc.php	2008-11-01 20:15:46 UTC (rev 471)
@@ -274,11 +274,13 @@
 // elsewhere, you will probably want to disable this.
 $CONF['show_undeliverable']='NO';
 $CONF['show_undeliverable_color']='tomato';
+// mails to these domains will never be flagged as undeliverable
 $CONF['show_undeliverable_exceptions']=array("unixmail.domain.ext","exchangeserver.domain.ext","gmail.com");
 $CONF['show_popimap']='NO';
 $CONF['show_popimap_color']='darkgrey';
-// set 'show_custom_count' to 0 to disable custom indicators
-$CONF['show_custom_count']=2;
+// you can assign special colors to some domains. To do this,
+// - add the domain to show_custom_domains
+// - add the corresponding color to show_custom_colors
 $CONF['show_custom_domains']=array("subdomain.domain.ext","domain2.ext");
 $CONF['show_custom_colors']=array("lightgreen","lightblue");
 

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2008-10-31 13:37:49 UTC (rev 470)
+++ trunk/functions.inc.php	2008-11-01 20:15:46 UTC (rev 471)
@@ -2061,7 +2061,7 @@
    }
 
    // CUSTOM DESTINATION CHECK
-   if ( $CONF['show_custom_count'] > 0 )
+   if ( count($CONF['show_custom_domains']) > 0 )
    {
       for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++)
       {

Modified: trunk/templates/list-virtual.php
===================================================================
--- trunk/templates/list-virtual.php	2008-10-31 13:37:49 UTC (rev 470)
+++ trunk/templates/list-virtual.php	2008-11-01 20:15:46 UTC (rev 471)
@@ -370,7 +370,7 @@
      print "&nbsp;<span style='background-color:" . $CONF['show_popimap_color'] .
                         "'>" . $CONF['show_status_text'] . "</span>=" . $PALANG['pStatus_popimap'] . "\n";
   }
-  if ( $CONF['show_custom_count'] > 0 )
+  if ( count($CONF['show_custom_domains']) > 0 )
   {
     for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++)
     {


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