Added refreshing of left folder list using META tags. Editeded HTML for

compose.php a little bit.

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

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 60bc167f909b53bb8cc43a9fe84ef64a468266d4..5f2e74488d7a8a2353a8093ea0e09249a8df9539 100644 (file)
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-13 22:35+0100\n"
+"POT-Creation-Date: 2000-02-08 07:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,59 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: squirrelmail/src/compose.php:33 squirrelmail/src/compose.php:69
+#: squirrelmail/src/compose.php:48 squirrelmail/src/compose.php:84
 msgid "No Message"
 msgstr ""
 
-#: squirrelmail/src/compose.php:39
+#: squirrelmail/src/compose.php:54
 msgid "-------- Original Message ---------\n"
 msgstr ""
 
-#: squirrelmail/src/compose.php:132 squirrelmail/src/compose_send.php:27
-#: squirrelmail/src/read_body.php:155
+#: squirrelmail/src/compose.php:154 squirrelmail/src/read_body.php:155
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:161 squirrelmail/src/compose_send.php:45
-#: squirrelmail/src/read_body.php:125
-msgid "Subject:"
+#: squirrelmail/src/compose.php:165
+msgid "CC"
 msgstr ""
 
-#: squirrelmail/src/compose.php:184 squirrelmail/src/compose.php:198
-#: squirrelmail/src/compose_send.php:31
-msgid "Send"
+#: squirrelmail/src/compose.php:186 squirrelmail/src/read_body.php:125
+msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:15
-msgid "You have not entered a message body."
+#: squirrelmail/src/compose.php:215
+msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:20
-msgid "You have not filled in the \"To:\" field."
+#: squirrelmail/src/compose.php:221
+msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:39
-msgid "You have not entered a subject."
+#: squirrelmail/src/compose.php:233
+msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:47
-msgid "(no subject)"
+#: squirrelmail/src/compose.php:247
+msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:72
-msgid "Message Sent!"
+#: squirrelmail/src/compose.php:264
+msgid "You have not entered a message body."
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:74
-msgid "You will be automatically forwarded."
+#: squirrelmail/src/compose.php:268
+msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:76
-msgid "If not,"
+#: squirrelmail/src/compose.php:271
+msgid "You have not entered a subject."
 msgstr ""
 
-#: squirrelmail/src/compose_send.php:78
-msgid "click here"
+#: squirrelmail/src/compose.php:292
+msgid "Could not move/copy file. File not attached"
 msgstr ""
 
 #: squirrelmail/src/download.php:18
@@ -77,22 +74,6 @@ msgstr ""
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/src/dupa.php:1
-msgid "Dupa:"
-msgstr ""
-
-#: squirrelmail/src/folders_create.php:20
-msgid ""
-"Illegal folder name.  Please select a different name.<BR><A "
-"HREF=\"../src/folders.php\">Click here to go back</A>."
-msgstr ""
-
-#: squirrelmail/src/folders_create.php:35
-#: squirrelmail/src/folders_delete.php:77
-#: squirrelmail/src/folders_rename_do.php:67
-msgid "Return"
-msgstr ""
-
 #: squirrelmail/functions/page_header.php:24 squirrelmail/src/folders.php:18
 msgid "Folders"
 msgstr ""
@@ -101,7 +82,7 @@ msgstr ""
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:214
+#: squirrelmail/functions/mailbox_display.php:218
 #: squirrelmail/src/folders.php:52 squirrelmail/src/read_body.php:100
 msgid "Delete"
 msgstr ""
@@ -126,6 +107,18 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
+#: squirrelmail/src/folders_create.php:20
+msgid ""
+"Illegal folder name.  Please select a different name.<BR><A "
+"HREF=\"../src/folders.php\">Click here to go back</A>."
+msgstr ""
+
+#: squirrelmail/src/folders_create.php:35
+#: squirrelmail/src/folders_delete.php:77
+#: squirrelmail/src/folders_rename_do.php:67
+msgid "Return"
+msgstr ""
+
 #: squirrelmail/src/folders_rename_getname.php:26
 msgid "Rename a folder"
 msgstr ""
@@ -135,11 +128,11 @@ msgid "New name:"
 msgstr ""
 
 #: squirrelmail/src/folders_rename_getname.php:34
-#: squirrelmail/src/options.php:163
+#: squirrelmail/src/options.php:259
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:82
+#: squirrelmail/src/left_main.php:85
 msgid "refresh folder list"
 msgstr ""
 
@@ -155,19 +148,19 @@ msgstr ""
 msgid "Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/src/login.php:22
+#: squirrelmail/src/login.php:29
 msgid "SquirrelMail version $version<BR>By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:35
+#: squirrelmail/src/login.php:42
 msgid "Name:"
 msgstr ""
 
-#: squirrelmail/src/login.php:43
+#: squirrelmail/src/login.php:50
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/login.php:53
+#: squirrelmail/src/login.php:60
 msgid "Login"
 msgstr ""
 
@@ -203,23 +196,27 @@ msgstr ""
 msgid "         Size of editor window (in characters):"
 msgstr ""
 
-#: squirrelmail/src/options.php:149
+#: squirrelmail/src/options.php:147
+msgid "         Time between auto refresh of folder list:"
+msgstr ""
+
+#: squirrelmail/src/options.php:245
 msgid "Use a signature?"
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:28
+#: squirrelmail/src/options_submit.php:29
 msgid "Options Saved!"
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:30
+#: squirrelmail/src/options_submit.php:31
 msgid "Your options have been saved."
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:32
+#: squirrelmail/src/options_submit.php:33
 msgid "Click here"
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:34
+#: squirrelmail/src/options_submit.php:35
 msgid "to continue."
 msgstr ""
 
@@ -271,7 +268,7 @@ msgstr ""
 msgid "You need a valid user and password to access this page!"
 msgstr ""
 
-#: squirrelmail/src/signout.php:24
+#: squirrelmail/functions/page_header.php:15 squirrelmail/src/signout.php:24
 msgid "Sign Out"
 msgstr ""
 
@@ -326,70 +323,73 @@ msgid "The selected messages were moved successfully."
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:90
+#: squirrelmail/functions/display_messages.php:106
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:158
+#: squirrelmail/functions/mailbox.php:52
+msgid "Error in message header fetching.  Start message: "
+msgstr ""
+
+#: squirrelmail/functions/mailbox.php:52
+msgid "End message: "
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:162
 msgid "Viewing messages "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:158
+#: squirrelmail/functions/mailbox_display.php:162
 msgid " to "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:162
+#: squirrelmail/functions/mailbox_display.php:166
 msgid "Viewing message "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:162
+#: squirrelmail/functions/mailbox_display.php:166
 msgid "total"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:168
 #: squirrelmail/functions/mailbox_display.php:172
-#: squirrelmail/functions/mailbox_display.php:271
+#: squirrelmail/functions/mailbox_display.php:176
 #: squirrelmail/functions/mailbox_display.php:275
+#: squirrelmail/functions/mailbox_display.php:279
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:169
-#: squirrelmail/functions/mailbox_display.php:177
+#: squirrelmail/functions/mailbox_display.php:173
+#: squirrelmail/functions/mailbox_display.php:181
+#: squirrelmail/functions/mailbox_display.php:276
 #: squirrelmail/functions/mailbox_display.php:280
+#: squirrelmail/functions/mailbox_display.php:284
 msgid "Next"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:188
+#: squirrelmail/functions/mailbox_display.php:192
 msgid "Move selected to:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:210
+#: squirrelmail/functions/mailbox_display.php:214
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:214
+#: squirrelmail/functions/mailbox_display.php:218
 msgid "checked messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:226
+#: squirrelmail/functions/mailbox_display.php:230
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:234
+#: squirrelmail/functions/mailbox_display.php:238
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:242
+#: squirrelmail/functions/mailbox_display.php:246
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/mailbox.php:52
-msgid "Error in message header fetching.  Start message: "
-msgstr ""
-
-#: squirrelmail/functions/mailbox.php:52
-msgid "End message: "
-msgstr ""
-
 #: squirrelmail/functions/page_header.php:17
 msgid "Current Folder: "
 msgstr ""

diff --git a/src/compose.php b/src/compose.php
index 07c85275ffa2c914f421885d8e5f2d85400d7ab6..8f578972f353781a92b70d311cc0623670eed56c 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -210,34 +210,31 @@
 
       // This code is for attachments
       echo "   <tr>\n";
-      echo "     <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+      echo "     <TD WIDTH=50 BGCOLOR=\"$color[4]\" VALIGN=TOP ALIGN=RIGHT>\n";
       echo "      <FONT FACE=\"Arial,Helvetica\">";
-      echo "      "._("Attach:")."</FONT>\n";
-      echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      <SMALL><BR></SMALL>"._("Attach:")."</FONT>\n";
+      echo "      </td><td width=% ALIGN=left>\n";
       //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
       //      echo "      value=\"10000\">\n";
       echo "      <INPUT NAME=\"attachfile\" TYPE=\"file\">\n";
-      echo "      &nbsp&nbsp<input type=\"submit\" name=\"attach\"\n";
+      echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"\n";
       echo "      value=\"" . _("Add") ."\">\n";
-      echo "      <br>";
+      echo "     </td>\n";
+      echo "     </font>\n";
+      echo "   </tr>\n";
       if (isset($attachments) && count($attachments)>0) {
+         echo "</tr><tr><td width=50 align=right>\n";
+         echo "</td><td width=% align=left>";
          while (list($localname, $remotename) = each($attachments)) {
             echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
             echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
          }
          
          echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
-
+         echo "</td></tr>";
       }
-      echo "     </td>\n";
-      echo "     </font>\n";
-      echo "   </tr>\n";
       // End of attachment code
 
-      echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
-      echo _("Send");
-      echo "\"></TD></TR>\n";
-
       echo "   <TR>\n";
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
       if ($use_signature == true)

diff --git a/src/left_main.php b/src/left_main.php
index 6941b7883b535c767ef6b48f4454cb77cc42052e..dfbbb7fc0f01cbdaf7b47786881a508e5ec8bd0c 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -70,6 +70,9 @@
 
    /** If it was a successful login, lets load their preferences **/
    include("../src/load_prefs.php");
+   if (isset($left_refresh) && ($left_refresh != "None")) {
+      echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">";
+   }
    echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">";
    echo "<FONT FACE=\"Arial,Helvetica\">";
 

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 8c692813244bd6bd688010b55c5900ccb29cd37a..69c74dec21fe1371999d6b6f6172d2c2c852a4f8 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -39,6 +39,10 @@
    if ($use_signature == "")
       $use_signature = false;
 
+   $left_refresh = getPref($data_dir, $username, "left_refresh");
+   if ($left_refresh == "")
+      $left_refresh = false;
+   
    /** Load up the Signature file **/
    if ($use_signature == true) {
       $signature = getSig($data_dir, $username);

diff --git a/src/options.php b/src/options.php
index 399ca53b20d57c4c6cc71cff91adc1b3d3641371..8568973d44ffed84bd3b6026f18ef60f130aec61 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -140,6 +140,102 @@
    echo "   </TR>";
    echo "</TABLE>";
 
+   // LEFT_REFRESH
+   echo "   <TR>";
+   echo "      <TD WIDTH=60% ALIGN=RIGHT>";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo _("         Time between auto refresh of folder list:");
+   echo "         </FONT>";
+   echo "      </TD>";
+   echo "      <TD WIDTH=40% ALIGN=LEFT>";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo "               <SELECT name=leftrefresh>";
+   if (($left_refresh == "None") || ($left_refresh == "")) 
+      echo "                  <OPTION VALUE=None SELECTED>None";
+   else   
+      echo "                  <OPTION VALUE=None>None";
+   
+   if (($left_refresh == "10")) 
+      echo "                  <OPTION VALUE=10 SELECTED>10 Seconds";
+   else   
+      echo "                  <OPTION VALUE=10>10 Seconds";
+   
+   if (($left_refresh == "20")) 
+      echo "                  <OPTION VALUE=20 SELECTED>20 Seconds";
+   else   
+      echo "                  <OPTION VALUE=20>20 Seconds";
+   
+   if (($left_refresh == "30")) 
+      echo "                  <OPTION VALUE=30 SELECTED>30 Seconds";
+   else   
+      echo "                  <OPTION VALUE=30>30 Seconds";
+   
+   if (($left_refresh == "60")) 
+      echo "                  <OPTION VALUE=60 SELECTED>1 Minute";
+   else   
+      echo "                  <OPTION VALUE=60>1 Minute";
+   
+   if (($left_refresh == "120")) 
+      echo "                  <OPTION VALUE=120 SELECTED>2 Minutes";
+   else   
+      echo "                  <OPTION VALUE=120>2 Minutes";
+   
+   if (($left_refresh == "180")) 
+      echo "                  <OPTION VALUE=180 SELECTED>3 Minutes";
+   else   
+      echo "                  <OPTION VALUE=180>3 Minutes";
+   
+   if (($left_refresh == "240")) 
+      echo "                  <OPTION VALUE=240 SELECTED>4 Minutes";
+   else   
+      echo "                  <OPTION VALUE=240>4 Minutes";
+   
+   if (($left_refresh == "300")) 
+      echo "                  <OPTION VALUE=300 SELECTED>5 Minutes";
+   else   
+      echo "                  <OPTION VALUE=300>5 Minutes";
+   
+   if (($left_refresh == "420")) 
+      echo "                  <OPTION VALUE=420 SELECTED>7 Minutes";
+   else   
+      echo "                  <OPTION VALUE=420>7 Minutes";
+   
+   if (($left_refresh == "600")) 
+      echo "                  <OPTION VALUE=600 SELECTED>10 Minutes";
+   else   
+      echo "                  <OPTION VALUE=600>10 Minutes";
+   
+   if (($left_refresh == "720")) 
+      echo "                  <OPTION VALUE=720 SELECTED>12 Minutes";
+   else   
+      echo "                  <OPTION VALUE=720>12 Minutes";
+   
+   if (($left_refresh == "900")) 
+      echo "                  <OPTION VALUE=900 SELECTED>15 Minutes";
+   else   
+      echo "                  <OPTION VALUE=900>15 Minutes";
+   
+   if (($left_refresh == "1200")) 
+      echo "                  <OPTION VALUE=1200 SELECTED>20 Minutes";
+   else   
+      echo "                  <OPTION VALUE=1200>20 Minutes";
+   
+   if (($left_refresh == "1500")) 
+      echo "                  <OPTION VALUE=1500 SELECTED>25 Minutes";
+   else   
+      echo "                  <OPTION VALUE=1500>25 Minutes";
+   
+   if (($left_refresh == "1800")) 
+      echo "                  <OPTION VALUE=1800 SELECTED>30 Minutes";
+   else   
+      echo "                  <OPTION VALUE=1800>30 Minutes";
+   
+      echo "               </SELECT>";
+      echo "         </FONT>";
+      echo "      </TD>";
+      echo "   </TR>";
+      echo "</TABLE>";
+
    // SIGNATURE
    echo "<CENTER>";
    if ($use_signature == true)

diff --git a/src/options_submit.php b/src/options_submit.php
index b7c2f30d4ff52b8bf2c8a01327269e4a7def73c4..f57848a0729c60017fe04de4a12ac287c2611832 100644 (file)
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -20,6 +20,7 @@
    setPref($data_dir, $username, "wrap_at", $wrapat);
    setPref($data_dir, $username, "editor_size", $editorsize);
    setPref($data_dir, $username, "use_signature", $usesignature);
+   setPref($data_dir, $username, "left_refresh", $leftrefresh);
 
    setSig($data_dir, $username, stripslashes($signature_edit));