- fixed some poorly formed HTML

- made conf.pl a bit smarter in detecting themes directory
- added "configure" which points to config/conf.pl

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

diff --git a/config/conf.pl b/config/conf.pl
index af2335262b1790f1de3574235e3e9b468e29a3db..1808c2b7837288a7532073cd0c400266bd70f654 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -139,6 +139,9 @@ while ($line = <FILE>) {
             $sub = $options[0];
             $sub =~ s/\]\["PATH"\]//;
             $sub =~ s/.*\[//; 
+            if (-e "../themes") {
+               $options[1] =~ s/^\.\.\/config/\.\.\/themes/;
+            }   
             $theme_path[$sub] = $options[1];
          } elsif ($options[0] =~ /^theme\[[0-9]+\]\["NAME"\]/) {
             $sub = $options[0];

diff --git a/configure b/configure
new file mode 100755 (executable)
index 0000000..e1236ce
--- /dev/null
+++ b/configure
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Redirects to the config directory and runs conf.pl
+
+cd config
+./conf.pl
+cd ..

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 010d2c05d8b3c93cb23dcfa3239148ec01f8068a..b40cb4f7d3bc92e67ef73d6665a5d117c3ae8467 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -125,7 +125,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
          echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what)."\">";
          echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0>\n";
          echo "   <TR>\n";
-         echo "      <TD WIDTH=60% ALIGN=LEFT>\n";
+         echo "      <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
          echo "         <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
          echo "         <TT><SMALL><SELECT NAME=\"targetMailbox\">";
    
@@ -149,7 +149,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
          echo "</TABLE>\n\n\n";
          echo "</TD></TR>";
          echo "<TR><TD BGCOLOR=\"$color[0]\">";
-         echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[4]\">";
+         echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">";
          echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
          echo "   <TD WIDTH=1%><B>&nbsp;</B></TD>";
          /** FROM HEADER **/

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index c485afee8cd99c4e00ee6831d424ab0d83939602..638529a20701de8394c47b07d92f0d325c69fac6 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -224,7 +224,7 @@
       echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage\">";
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0>\n";
       echo "   <TR>\n";
-      echo "      <TD WIDTH=60% ALIGN=LEFT>\n";
+      echo "      <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
       echo "         <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
       echo "         <TT><SMALL><SELECT NAME=\"targetMailbox\">";
 
@@ -249,7 +249,7 @@
       echo "</TD></TR>";
 
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
-      echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[4]\">";
+      echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">";
       echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
       echo "   <TD WIDTH=1%><B>&nbsp;</B></TD>";
       /** FROM HEADER **/

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 5979719e17a9f9dd82df12f1ddc4171adaa91282..94b05e35350afd723a4e0e2f2fecaf84971680c3 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -30,12 +30,24 @@
       if (file_exists($theme[0]["PATH"])) {
          require($theme[0]["PATH"]);
       } else {
-         echo _("Theme: ");
-         echo $theme[0]["PATH"];
-         echo _(" was not found.");
-         echo "<BR>";
-         echo _("Exiting abnormally");
-         exit;
+          #
+          #  I hard coded the theme as a last resort if no themes were
+          #  found.  It makes no sense to cause the whole thing to exit
+          #  just because themes weren't found.  This is the absolute
+          #  last resort.
+          #
+          $color[0]   = "#DCDCDC"; // (light gray)     TitleBar
+          $color[1]   = "#800000"; // (red)
+          $color[2]   = "#CC0000"; // (light red)      Warning/Error Messages
+          $color[3]   = "#A0B8C8"; // (green-blue)     Left Bar Background
+          $color[4]   = "#FFFFFF"; // (white)          Normal Background
+          $color[5]   = "#FFFFCC"; // (light yellow)   Table Headers
+          $color[6]   = "#000000"; // (black)          Text on left bar
+          $color[7]   = "#0000CC"; // (blue)           Links
+          $color[8]   = "#000000"; // (black)          Normal text
+          $color[9]   = "#ABABAB"; // (mid-gray)       Darker version of #0
+          $color[10]  = "#666666"; // (dark gray)      Darker version of #9
+          $color[11]  = "#770000"; // (dark red)       Special Folders color
       }
    }