[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[13270]
From:       pdontthink () users ! sourceforge ! net
Date:       2008-09-09 5:49:20
Message-ID: E1Kcw6K-00084n-FV () 74yxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 13270
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13270&view=rev
Author:   pdontthink
Date:     2008-09-09 05:49:20 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
Clean up delimiter usage

Modified Paths:
--------------
    trunk/squirrelmail/plugins/sent_subfolders/setup.php

Modified: trunk/squirrelmail/plugins/sent_subfolders/setup.php
===================================================================
--- trunk/squirrelmail/plugins/sent_subfolders/setup.php	2008-08-26 06:40:25 UTC (rev \
                13269)
+++ trunk/squirrelmail/plugins/sent_subfolders/setup.php	2008-09-09 05:49:20 UTC (rev \
13270) @@ -206,28 +206,27 @@
          * Multiple year holders with messages in it. level 1.
          * Multiple year folders with holders in it. level 2.
          */
-        $cnd_delimiter = $delimiter;
 
         switch ($sent_subfolders_setting) {
         case SMPREF_SENT_SUBFOLDERS_YEARLY:
             $level = 1;
-            $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
+            $sent_subfolder = $sent_subfolders_base . $delimiter
                             . $year;
             break;
         case SMPREF_SENT_SUBFOLDERS_QUARTERLY:
             $level = 2;
-            $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
+            $sent_subfolder = $sent_subfolders_base . $delimiter
                             . $year
                             . $delimiter . $quarter;
-            $year_folder = $sent_subfolders_base . $cnd_delimiter
+            $year_folder = $sent_subfolders_base . $delimiter
                             . $year;
             break;
         case SMPREF_SENT_SUBFOLDERS_MONTHLY:
             $level = 2;
-            $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
+            $sent_subfolder = $sent_subfolders_base . $delimiter
                             . $year
                             . $delimiter . $month;
-            $year_folder = $sent_subfolders_base. $cnd_delimiter . $year;
+            $year_folder = $sent_subfolders_base. $delimiter . $year;
             break;
         case SMPREF_SENT_SUBFOLDERS_DISABLED:
         default:
@@ -328,8 +327,10 @@
  * @return boolean 1 - is part of sent_subfolders, 0 - is not part of \
                sent_subfolders
  */
 function sent_subfolders_special_mailbox($mb) {
-    global $data_dir, $username, $delimiter;
+    global $data_dir, $username;
 
+    sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+
     $use_sent_subfolders = getPref
         ($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF);
     $sent_subfolders_base = getPref($data_dir, $username, 'sent_subfolders_base', \
'na');


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

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]