bugfixes

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 425311afb35cb13e020017f58773ac3de870b088..a6412655590ed52793cf5dee2b0385a080c8852b 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -1,4 +1,6 @@
-<?
+<?php
+   session_start();
+
    if (!isset($config_php))
       include("../config/config.php");
    if (!isset($strings_php))
@@ -65,6 +67,20 @@
    echo "         <INPUT TYPE=TEXT NAME=reply_to VALUE=\"$replyto\" SIZE=50><BR>";
    echo "      </TD>";
    echo "   </TR>";
+   // DEFAULT FOLDERS 
+       if ($show_prefix_option == true) {
+      echo "   <TR>";
+          echo "      <TD WIDTH=20% ALIGN=RIGHT>";
+          echo           _("Folder path:");
+          echo "      </TD>";
+          echo "      <TD WIDTH=80% ALIGN=LEFT>";
+          if (isset ($folder_prefix))
+             echo "         <INPUT TYPE=TEXT NAME=folderprefix VALUE=\"$folder_prefix\" SIZE=50><BR>";
+          else   
+             echo "         <INPUT TYPE=TEXT NAME=folderprefix VALUE=\"$default_folder_prefix\" SIZE=50><BR>";
+          echo "      </TD>";
+          echo "   </TR>";
+   }   
    // THEME
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
@@ -102,31 +118,82 @@
 
    echo "      </TD>";
    echo "   </TR>";
-   echo "</TABLE>";
 
 
+       // TRASH FOLDER
+
+       echo "<tr><td align=right>";
+       echo _("Trash Folder:");
+       echo "</td><td>";
+      echo "<TT><SELECT NAME=trash>\n";
+               if ($move_to_trash == true)
+                       echo "<option value=none>" . _("Don't use Trash");
+               else
+                       echo "<option value=none selected>" . _("Do not use Trash");
+
+      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 = replace_spaces($boxes[$i]["formatted"]);
+                               if (($boxes[$i]["unformatted"] == $trash_folder) && ($move_to_trash == true))
+               echo "         <OPTION SELECTED VALUE=\"$box\">$box2\n";
+                               else
+               echo "         <OPTION VALUE=\"$box\">$box2\n";
+         }
+      }
+      echo "</SELECT></TT>\n";
+       echo "</td></tr>";      
+
+       // SENT FOLDER
+
+       echo "<tr><td align=right>";
+       echo _("Sent Folder:");
+       echo "</td><td>";
+      echo "<TT><SELECT NAME=sent>\n";
+               if ($move_to_sent == true)
+                       echo "<option value=none>" . _("Don't use Sent");
+               else
+                       echo "<option value=none selected>" . _("Do not use Sent");
+
+      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 = replace_spaces($boxes[$i]["formatted"]);
+                               if (($boxes[$i]["unformatted"] == $sent_folder) && ($move_to_sent == true))
+               echo "         <OPTION SELECTED VALUE=\"$box\">$box2\n";
+                               else
+               echo "         <OPTION VALUE=\"$box\">$box2\n";
+         }
+      }
+      echo "</SELECT></TT>\n";
+       echo "</td></tr>";      
+
+
+   echo "</TABLE>";
 
    echo "<TABLE WIDTH=100% COLS=2 ALIGN=CENTER>\n";
-   // MOVE_TO_TRASH
+
+   // SHOW_NUM
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
-   echo           _("Move deleted messages to ");
-   echo "\"$trash_folder\"?";
+   echo           _("Number of Messages to Index:");
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
-   if ($move_to_trash == true)
-      echo "         <INPUT TYPE=RADIO NAME=movetotrash VALUE=1 CHECKED>&nbsp;True<BR>";
-   else
-      echo "         <INPUT TYPE=RADIO NAME=movetotrash VALUE=1>&nbsp;True<BR>";
-
-   if ($move_to_trash == false)
-      echo "         <INPUT TYPE=RADIO NAME=movetotrash VALUE=0 CHECKED>&nbsp;False";
+   if (isset($wrap_at))
+      echo "         <TT><INPUT TYPE=TEXT SIZE=5 NAME=shownum VALUE=\"$show_num\"></TT><BR>";
    else
-      echo "         <INPUT TYPE=RADIO NAME=movetotrash VALUE=0>&nbsp;False";
-
+      echo "         <TT><INPUT TYPE=TEXT SIZE=5 NAME=shownum VALUE=\"25\"></TT><BR>";
    echo "      </TD>";
    echo "   </TR>";
-
+   
    // WRAP_AT
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
@@ -306,10 +373,11 @@
    echo "<CENTER>";
    if ($use_signature == true)
       echo "<INPUT TYPE=CHECKBOX VALUE=\"1\" NAME=usesignature CHECKED>&nbsp;&nbsp;Use a signature?<BR>";
-   else
+   else {
       echo "<INPUT TYPE=CHECKBOX VALUE=\"1\" NAME=usesignature>&nbsp;&nbsp;";
       echo _("Use a signature?");
       echo "<BR>";
+   }
 
    if ($editor_size < 5)
       $sig_size = 76;