Added newmail dropdowns, and preparing for special folders only count mails.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2326 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/constants.php b/functions/constants.php
index ed75631f4039d1ddb4ce03b582445e5f367cc5b8..10342589d8e6216bc0b965148ef9c9112d1b4625 100644 (file)
--- a/functions/constants.php
+++ b/functions/constants.php
@@ -37,6 +37,8 @@ define('SMPREF_LOC_RIGHT', 'right');
 define('SMPREF_UNSEEN_NONE', 1);
 define('SMPREF_UNSEEN_INBOX', 2);
 define('SMPREF_UNSEEN_ALL', 3);
+define('SMPREF_UNSEEN_SPECIAL', 4); // Only special folders
+define('SMPREF_UNSEEN_NORMAL', 5);  // Only normal folders
 define('SMPREF_UNSEEN_ONLY', 1);
 define('SMPREF_UNSEEN_TOTAL', 2);
 

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 677e58627977fcf74207636b3ef63e4f06fc2fea..c9abb7fbf03872f654cffe4a92981eee6a3b7111 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -11,6 +11,7 @@
  * $Id$
  */
 
+require_once( '../functions/constants.php' );
 
 /* Define constants for the various option types. */
 define('SMOPT_TYPE_UNDEFINED', -1);
@@ -140,9 +141,14 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$show_contain_subfolders_option' => array( 'name' => _("Show 'Contain Sub.' Option"),
                                                              'type' => SMOPT_TYPE_BOOLEAN ),
                  '$default_unseen_notify' => array( 'name' => _("Default Unseen Notify"),
-                                                    'type' => SMOPT_TYPE_INTEGER ),
+                                                    'type' => SMOPT_TYPE_NUMLIST,
+                                                    'posvals' => array( SMPREF_UNSEEN_NONE  => _("No Notification"),
+                                                                        SMPREF_UNSEEN_INBOX => _("Only INBOX"),
+                                                                        SMPREF_UNSEEN_ALL   => _("All Folders")) ),
                  '$default_unseen_type'  => array( 'name' => _("Default Unseen Type"),
-                                                   'type' => SMOPT_TYPE_INTEGER ),
+                                                   'type' => SMOPT_TYPE_NUMLIST ,
+                                                   'posvals' => array( SMPREF_UNSEEN_ONLY  => _("Only Unseen"),
+                                                                       SMPREF_UNSEEN_TOTAL => _("Unseen and Total") ) ),
                  '$auto_create_special' => array( 'name' => _("Auto Create Special Folders"),
                                                   'type' => SMOPT_TYPE_BOOLEAN ),
                  '$default_use_javascript_addr_book' => array( 'name' => _("Default Javascript Adrressbook"),