[SM-CVS] SF.net SVN: squirrelmail: [12670] trunk/squirrelmail

[<ki...@us...>]

Revision: 12670
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12670&view=rev
Author:   kink
Date:     2007-09-03 04:51:57 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
Bring defaults for the folder selection pref in line.
Create constants for their values, not use the semantically irrelevant
SMPREF_{ON,OFF}

Modified Paths:
--------------
    trunk/squirrelmail/functions/imap_mailbox.php
    trunk/squirrelmail/include/constants.php
    trunk/squirrelmail/include/load_prefs.php
    trunk/squirrelmail/include/options/folder.php

Modified: trunk/squirrelmail/functions/imap_mailbox.php
===================================================================
--- trunk/squirrelmail/functions/imap_mailbox.php	2007-09-03 11:37:39 UTC (rev 12669)
+++ trunk/squirrelmail/functions/imap_mailbox.php	2007-09-03 11:51:57 UTC (rev 12670)
@@ -685,7 +685,7 @@
     if ( $use_long_format ) {
         $shorten_box_names = 0;
     } else {
-        $shorten_box_names = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_OFF);
+        $shorten_box_names = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_MAILBOX_SELECT_INDENTED);
     }
 
     if ($boxes == 0) {
@@ -710,7 +710,7 @@
             } else {
                 switch ($shorten_box_names)
                 {
-                  case 2:   /* delimited, style = 2 */
+                  case SMPREF_MAILBOX_SELECT_DELIMITED:
                       if ($translate_special_folders && $boxes_part['unformatted-dm']==$sent_folder) {
                           /*
                            * calculate pad level from number of delimiters. do it inside if control in order 
@@ -731,7 +731,7 @@
                           $box2 = str_replace('  ', '. ', htmlspecialchars($boxes_part['formatted']));
                       }
                     break;
-                  case 1:   /* indent, style = 1 */
+                  case SMPREF_MAILBOX_SELECT_INDENTED:
                       if ($translate_special_folders && $boxes_part['unformatted-dm']==$sent_folder) {
                           $pad = str_pad('',12 * (count(explode($delimiter,$boxes_part['unformatted-dm']))-1),'  ');
                           $box2 = $pad . _("Sent");

Modified: trunk/squirrelmail/include/constants.php
===================================================================
--- trunk/squirrelmail/include/constants.php	2007-09-03 11:37:39 UTC (rev 12669)
+++ trunk/squirrelmail/include/constants.php	2007-09-03 11:51:57 UTC (rev 12670)
@@ -57,6 +57,10 @@
 define('SMPREF_UNSEEN_ONLY', 1);
 define('SMPREF_UNSEEN_TOTAL', 2);
 
+define('SMPREF_MAILBOX_SELECT_LONG', 0);
+define('SMPREF_MAILBOX_SELECT_INDENTED', 1);
+define('SMPREF_MAILBOX_SELECT_DELIMITED', 2);
+
 /**
  * Define constants for time/date display preferences.
  * @since 1.2.0

Modified: trunk/squirrelmail/include/load_prefs.php
===================================================================
--- trunk/squirrelmail/include/load_prefs.php	2007-09-03 11:37:39 UTC (rev 12669)
+++ trunk/squirrelmail/include/load_prefs.php	2007-09-03 11:51:57 UTC (rev 12670)
@@ -321,7 +321,7 @@
 
 /* How are mailbox select lists displayed: 0. full names, 1. indented (default),
  * 3. delimited) */
-$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_ON);
+$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_MAILBOX_SELECT_INDENTED);
 
 /* Allow user to customize, and display the full date, instead of day, or time based
    on time distance from date of message */

Modified: trunk/squirrelmail/include/options/folder.php
===================================================================
--- trunk/squirrelmail/include/options/folder.php	2007-09-03 11:37:39 UTC (rev 12669)
+++ trunk/squirrelmail/include/options/folder.php	2007-09-03 11:51:57 UTC (rev 12670)
@@ -234,9 +234,13 @@
         'caption' => _("Selection List Style"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'posvals' => array( 0 => _("Long:") . ' "' . _("Folder") . $delim . _("Subfolder") . '"',
-                            1 => _("Indented:") . " \"$nbsp$nbsp$nbsp$nbsp" . _("Subfolder") . '"',
-                            2 => _("Delimited:") . " \".$nbsp" . _("Subfolder") . '"'),
+        'posvals' => array(
+            SMPREF_MAILBOX_SELECT_LONG =>
+                _("Long:") . ' "' . _("Folder") . $delim . _("Subfolder") . '"',
+            SMPREF_MAILBOX_SELECT_INDENTED =>
+                _("Indented:") . " \"$nbsp$nbsp$nbsp$nbsp" . _("Subfolder") . '"',
+            SMPREF_MAILBOX_SELECT_DELIMITED =>
+                _("Delimited:") . " \".$nbsp" . _("Subfolder") . '"'),
         'htmlencoded' => true
     );
 


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