Added options for draft folder.

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

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 01f25663a94d47245a712267c75e3d12617d1fdc..b73a39c35e648697eb2cecfe0874a836a8faec53 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -78,12 +78,15 @@
    $use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book);
 
    /** Load the user's sent folder preferences **/
    $use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book);
 
    /** Load the user's sent folder preferences **/

-   global $move_to_sent, $move_to_trash;
+   global $move_to_sent, $move_to_trash, $save_as_draft;

    $move_to_sent = getPref($data_dir, $username, 'move_to_sent', $default_move_to_sent);
 
    /** Load the user's trash folder preferences **/
    $move_to_trash = getPref($data_dir, $username, 'move_to_trash', $default_move_to_trash);
 
    $move_to_sent = getPref($data_dir, $username, 'move_to_sent', $default_move_to_sent);
 
    /** Load the user's trash folder preferences **/
    $move_to_trash = getPref($data_dir, $username, 'move_to_trash', $default_move_to_trash);
 

+   /** Load the user's draft folder preferences **/
+   $save_as_draft = getPref($data_dir, $username, 'save_as_draft', TRUE);
+

    global $unseen_type, $unseen_notify;
    if ($default_unseen_type == '')
       $default_unseen_type = 1;
    global $unseen_type, $unseen_notify;
    if ($default_unseen_type == '')
       $default_unseen_type = 1;


@@ -96,7 +99,7 @@
    $folder_prefix = getPref($data_dir, $username, 'folder_prefix', $default_folder_prefix);
 
    /** Load special folders **/
    $folder_prefix = getPref($data_dir, $username, 'folder_prefix', $default_folder_prefix);
 
    /** Load special folders **/

-   global $trash_folder, $sent_folder;
+   global $trash_folder, $sent_folder, $draft_folder;

    $new_trash_folder = getPref($data_dir, $username, 'trash_folder');
    if ( ( $new_trash_folder == '' ) && ( $move_to_trash ) ) {
       $trash_folder = $folder_prefix . $trash_folder;
    $new_trash_folder = getPref($data_dir, $username, 'trash_folder');
    if ( ( $new_trash_folder == '' ) && ( $move_to_trash ) ) {
       $trash_folder = $folder_prefix . $trash_folder;


@@ -112,6 +115,14 @@
       $sent_folder = $new_sent_folder;
    }
 
       $sent_folder = $new_sent_folder;
    }
 

+  /** Load special folders **/
+   $new_drafts_folder = getPref($data_dir, $username, 'draft_folder');
+   if ( ($new_drafts_folder == '') && ($save_as_draft ) ) {
+      $draft_folder = $folder_prefix . $draft_folder;
+   } else {
+      $draft_folder = $new_drafts_folder;
+   }
+

    global $show_num, $wrap_at, $left_size;
    $show_num = getPref($data_dir, $username, 'show_num', 15 );
 
    global $show_num, $wrap_at, $left_size;
    $show_num = getPref($data_dir, $username, 'show_num', 15 );
 


@@ -198,4 +209,4 @@
 
    do_hook("loading_prefs");
 
 
    do_hook("loading_prefs");
 

-?>
\ No newline at end of file
+?>

diff --git a/src/options.php b/src/options.php
index 651c3ca8f16270547eecd119a9c8999b7d83823e..c6e4b77ddc616876ccdc0e1595ba7fe5b073dd6c 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -142,6 +142,13 @@
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       }
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       }

+      if ($draft != 'none') {
+         setPref($data_dir, $username, 'save_as_draft', true);
+         setPref($data_dir, $username, 'draft_folder', $draft);
+      } else {
+         setPref($data_dir, $username, 'save_as_draft', '0');
+         setPref($data_dir, $username, 'draft_folder', 'none');
+      }

       if (isset($folderprefix)) {
          setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       } else {
       if (isset($folderprefix)) {
          setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       } else {


@@ -240,4 +247,4 @@
 </td></tr>
 </table>
 
 </td></tr>
 </table>
 

-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/src/options_folder.php b/src/options_folder.php
index 2d72f349a0a889086d0d7b2f4d36d6d762c58038..31f8c2466434fe74eb44ff0011ec7e950f3a1637 100644 (file)
--- a/src/options_folder.php
+++ b/src/options_folder.php
@@ -102,6 +102,35 @@
       }
       echo "</SELECT></TT>\n";
    echo '</td></tr>';  
       }
       echo "</SELECT></TT>\n";
    echo '</td></tr>';  

+
+   // Drafts Folder
+   echo '<tr><td nowrap align="right">';
+   echo _("Drafts Folder:");
+   echo '</td><td>';
+   echo '<TT><SELECT NAME="draft">';
+   if ($save_as_draft == true)
+      echo '<option value="none">' . _("Don't use drafts");
+   else
+      echo '<option value="none selected">' . _("Do not use Drafts");
+
+   for ($i = 0; $i < count($boxes); $i++) {
+      $use_folder = true;
+      if (strtolower($boxes[$i]['unformatted']) == 'inbox') {
+         $use_folder = false;
+      }
+      if ($use_folder == true) {
+         $box = $boxes[$i]['unformatted-dm'];
+         $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
+         $select_draft_value = rtrim($boxes[$i]['unformatted']);
+         if (($select_draft_value == $draft_folder) && ($save_as_draft == true)) {
+            echo "         <OPTION SELECTED VALUE=\"$box\">$box2\n";
+         } else {
+            echo "         <OPTION VALUE=\"$box\">$box2\n";
+         }
+      }
+   }
+   echo "</SELECT></TT>\n";
+   echo '</td></tr>';

 ?>
          <tr>
             <td valign=top align=right>
 ?>
          <tr>
             <td valign=top align=right>


@@ -148,4 +177,4 @@
 
 </td></tr>
 </table>
 
 </td></tr>
 </table>

-</body></html>
\ No newline at end of file
+</body></html>