changed <? to <?php in a few places in options_*

added dark_grey_theme from Justin Miller <lordpaco@sanguinis.net>

config/config_default.php

@@ -172,35 +172,38 @@
     $theme[0]["PATH"] = "../config/default_theme.php";
     $theme[0]["NAME"] = "Default";
 
-    $theme[1]["PATH"] = "../config/sandstorm_theme.php";
-    $theme[1]["NAME"] = "Sand Storm";
+    $theme[1]["PATH"] = "../config/plain_blue_theme.php";
+    $theme[1]["NAME"] = "Plain Blue";
 
-    $theme[2]["PATH"] = "../config/deepocean_theme.php";
-    $theme[2]["NAME"] = "Deep Ocean";
+    $theme[2]["PATH"] = "../config/sandstorm_theme.php";
+    $theme[2]["NAME"] = "Sand Storm";
 
-    $theme[3]["PATH"] = "../config/slashdot_theme.php";
-    $theme[3]["NAME"] = "Slashdot";
+    $theme[3]["PATH"] = "../config/deepocean_theme.php";
+    $theme[3]["NAME"] = "Deep Ocean";
 
-    $theme[4]["PATH"] = "../config/purple_theme.php";
-    $theme[4]["NAME"] = "Purple";
+    $theme[4]["PATH"] = "../config/slashdot_theme.php";
+    $theme[4]["NAME"] = "Slashdot";
 
-    $theme[5]["PATH"] = "../config/forest_theme.php";
-    $theme[5]["NAME"] = "Forest";
+    $theme[5]["PATH"] = "../config/purple_theme.php";
+    $theme[5]["NAME"] = "Purple";
 
-    $theme[6]["PATH"] = "../config/ice_theme.php";
-    $theme[6]["NAME"] = "Ice";
+    $theme[6]["PATH"] = "../config/forest_theme.php";
+    $theme[6]["NAME"] = "Forest";
 
-    $theme[7]["PATH"] = "../config/seaspray_theme.php";
-    $theme[7]["NAME"] = "Sea Spray";
+    $theme[7]["PATH"] = "../config/ice_theme.php";
+    $theme[7]["NAME"] = "Ice";
 
-    $theme[8]["PATH"] = "../config/plain_blue_theme.php";
-    $theme[8]["NAME"] = "Plain Blue";
+    $theme[8]["PATH"] = "../config/seaspray_theme.php";
+    $theme[8]["NAME"] = "Sea Spray";
 
     $theme[9]["PATH"] = "../config/bluesteel_theme.php";
     $theme[9]["NAME"] = "Blue Steel";
 
-    $theme[10]["PATH"] = "../config/high_contrast_theme.php";
-    $theme[10]["NAME"] = "High Contrast";
+    $theme[10]["PATH"] = "../config/dark_grey_theme.php";
+    $theme[10]["NAME"] = "Dark Grey";
+
+    $theme[11]["PATH"] = "../config/high_contrast_theme.php";
+    $theme[11]["NAME"] = "High Contrast";
 
 //  LDAP server(s)
 //

config/dark_grey_theme.php

@@ -0,0 +1,19 @@
+<?php
+   /** Author:       Justin Miller 
+       Date:         July 24, 2000
+       Theme Name:   "Dark Grey"
+    **/
+
+    $color[0]   = "#B2B2B2"; // (gray)           TitleBar
+    $color[1]   = "#800000"; // (red)
+    $color[2]   = "#CC0000"; // (light red)      Warning/Error Messages
+    $color[3]   = "#929292"; // (light gray)     Left Bar Background
+    $color[4]   = "#FFFFFF"; // (white)          Normal Background
+    $color[5]   = "#C0C0C0"; // (lighter grey)   Table Headers
+    $color[6]   = "#000000"; // (black)          Text on left bar
+    $color[7]   = "#303030"; // (dark gray)      Links
+    $color[8]   = "#000000"; // (black)          Normal text
+    $color[9]   = "#929292"; // (mid-gray)       Darker version of #0
+    $color[10]  = "#505050"; // (dark gray)      Darker version of #9
+    $color[11]  = "#770010"; // (dark red)       Special Folders color
+?>

src/options.php

@@ -41,11 +41,11 @@
 
 <br>
 <table width=95% align=center cellpadding=2 cellspacing=2 border=0>
-<tr><td bgcolor="<? echo $color[0] ?>">
-   <center><b><? echo _("Options") ?></b></center>
+<tr><td bgcolor="<?php echo $color[0] ?>">
+   <center><b><?php echo _("Options") ?></b></center>
 </td></tr></table>
 
-<?
+<?php
    if ($submit_personal) {
       # Save personal information
       if (isset($full_name)) setPref($data_dir, $username, "full_name", stripslashes($full_name));
@@ -98,25 +98,25 @@
    <td width=50% valign=top>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_personal.php"><? echo _("Personal Information"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_personal.php"><?php echo _("Personal Information"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("This contains personal information about yourself such as your name, your email address, etc.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("This contains personal information about yourself such as your name, your email address, etc.") ?>
             </td>
          </tr>   
       </table><br>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_highlight.php"><? echo _("Message Highlighting"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_highlight.php"><?php echo _("Message Highlighting"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("Based upon given criteria, incoming messages can have different background colors in the message list.  This helps to easily distinguish who the messages are from, especially for mailing lists.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("Based upon given criteria, incoming messages can have different background colors in the message list.  This helps to easily distinguish who the messages are from, especially for mailing lists.") ?>
             </td>
          </tr>   
       </table><br>
@@ -124,31 +124,29 @@
    <td valign=top width=50%>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_display.php"><? echo _("Display Preferences"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_display.php"><?php echo _("Display Preferences"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("You can change the way that SquirrelMail looks and displays information to you, such as the colors, the language, and other settings.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("You can change the way that SquirrelMail looks and displays information to you, such as the colors, the language, and other settings.") ?>
             </td>
          </tr>   
       </table><br>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_folder.php"><? echo _("Folder Preferences"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_folder.php"><?php echo _("Folder Preferences"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("These settings change the way your folders are displayed and manipulated.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("These settings change the way your folders are displayed and manipulated.") ?>
             </td>
          </tr>   
       </table><br>
    </td>
 </tr>
 </table>
-<?
-?>
 </body></html>

src/options_display.php

@@ -31,14 +31,14 @@
    $chosen_language = getPref($data_dir, $username, "language");  
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<? echo $color[0] ?>">
-      <center><b><? echo _("Options") . " - " . _("Display Preferences"); ?></b></center>
+   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
+      <center><b><?php echo _("Options") . " - " . _("Display Preferences"); ?></b></center>
    </td></tr></table>
 
    <form action="options.php" method=post>
       <table width=100% cellpadding=0 cellspacing=2 border=0>
          <tr>
-            <td align=right nowrap><? echo _("Theme"); ?>:
+            <td align=right nowrap><?php echo _("Theme"); ?>:
             </td><td>
 <?
    echo "         <tt><select name=chosentheme>\n";
@@ -53,7 +53,7 @@
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Language"); ?>:
+            <td align=right nowrap><?php echo _("Language"); ?>:
             </td><td>
 <?
    echo "         <tt><select name=language>\n";
@@ -71,7 +71,7 @@
          <tr>
             <td align=right nowrap>&nbsp;
             </td><td>
-               <? echo _("Use Javascript or HTML addressbook?") . "<br>"; 
+               <?php echo _("Use Javascript or HTML addressbook?") . "<br>"; 
                if ($use_javascript_addr_book == true) {
                   echo "         <input type=radio name=javascript_abook value=1 checked> " . _("JavaScript") . "&nbsp;&nbsp;&nbsp;&nbsp;";
                   echo "         <input type=radio name=javascript_abook value=0> " . _("HTML"); 
@@ -83,7 +83,7 @@
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Number of Messages to Index"); ?>:
+            <td align=right nowrap><?php echo _("Number of Messages to Index"); ?>:
             </td><td>
 <?
    if (isset($show_num))
@@ -94,7 +94,7 @@
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Wrap incoming text at"); ?>:
+            <td align=right nowrap><?php echo _("Wrap incoming text at"); ?>:
             </td><td>
 <?
    if (isset($wrap_at))
@@ -105,7 +105,7 @@
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Size of editor window"); ?>:
+            <td align=right nowrap><?php echo _("Size of editor window"); ?>:
             </td><td>
 <?
    if ($editor_size >= 10 && $editor_size <= 255)
@@ -116,7 +116,7 @@
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Width of left folder list"); ?>:
+            <td align=right nowrap><?php echo _("Width of left folder list"); ?>:
             </td><td>
 <?
    echo "         <select name=leftsize>\n";
@@ -170,7 +170,7 @@
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Auto refresh folder list"); ?>:
+            <td align=right nowrap><?php echo _("Auto refresh folder list"); ?>:
             </td><td>
 <?
    echo "               <SELECT name=leftrefresh>";

src/options_folder.php

@@ -34,25 +34,25 @@
    sqimap_logout($imapConnection);
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<? echo $color[0] ?>">
-      <center><b><? echo _("Options") . " - " . _("Folder Preferences"); ?></b></center>
+   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
+      <center><b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b></center>
    </td></tr></table>
 
    <form action="options.php" method=post>
       <table width=100% cellpadding=0 cellspacing=2 border=0>
 
-<? if ($show_prefix_option == true) {   ?>   
+<?php if ($show_prefix_option == true) {   ?>   
          <tr>
-            <td align=right nowrap><? echo _("Folder Path"); ?>:
+            <td align=right nowrap><?php echo _("Folder Path"); ?>:
             </td><td>
-<? if (isset ($folder_prefix))
+<?php if (isset ($folder_prefix))
       echo "         <input type=text name=folderprefix value=\"$folder_prefix\" size=35><br>";
    else
       echo "         <input type=text name=folderprefix value=\"$default_folder_prefix\" size=35><br>";
 ?>
             </td>
          </tr>
-<? }          
+<?php }          
 
    // TRASH FOLDER
    echo "<tr><td nowrap align=right>";
@@ -112,23 +112,23 @@
          <tr>
             <td valign=top align=right>
                <br>
-               <? echo _("Unseen message notification"); ?>:
+               <?php echo _("Unseen message notification"); ?>:
             </td>
             <td>
-               <input type=radio name=unseennotify value=1<? if ($unseen_notify == 1) echo " checked"; ?>> <? echo _("No notification") ?><br>
-               <input type=radio name=unseennotify value=2<? if ($unseen_notify != 1 && $unseen_notify != 3) echo " checked"; ?>> <? echo _("Only INBOX") ?><br>
-               <input type=radio name=unseennotify value=3<? if ($unseen_notify == 3) echo " checked"; ?>> <? echo _("All Folders") ?><br>
+               <input type=radio name=unseennotify value=1<?php if ($unseen_notify == 1) echo " checked"; ?>> <?php echo _("No notification") ?><br>
+               <input type=radio name=unseennotify value=2<?php if ($unseen_notify != 1 && $unseen_notify != 3) echo " checked"; ?>> <?php echo _("Only INBOX") ?><br>
+               <input type=radio name=unseennotify value=3<?php if ($unseen_notify == 3) echo " checked"; ?>> <?php echo _("All Folders") ?><br>
                <br>
             </td>
          </tr>
          <tr>
             <td valign=top align=right>
                <br>
-               <? echo _("Unseen message notification type"); ?>:
+               <?php echo _("Unseen message notification type"); ?>:
             </td>
             <td>
-               <input type=radio name=unseentype value=1<? if ($unseen_type < 2 || $unseen_type > 2) echo " checked"; ?>> <? echo _("Only unseen"); ?> - (4)<br> 
-               <input type=radio name=unseentype value=2<? if ($unseen_type == 2) echo " checked"; ?>> <? echo _("Unseen and Total"); ?> - (4/27)
+               <input type=radio name=unseentype value=1<?php if ($unseen_type < 2 || $unseen_type > 2) echo " checked"; ?>> <?php echo _("Only unseen"); ?> - (4)<br> 
+               <input type=radio name=unseentype value=2<?php if ($unseen_type == 2) echo " checked"; ?>> <?php echo _("Unseen and Total"); ?> - (4/27)
             </td>
          </tr>
          <tr>

src/options_highlight.php

@@ -49,8 +49,8 @@
    displayPageHeader($color, "None");
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<? echo $color[0] ?>">
-      <center><b><? echo _("Options") . " - " . _("Message Highlighting"); ?></b></center>
+   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
+      <center><b><?php echo _("Options") . " - " . _("Message Highlighting"); ?></b></center>
    </td></tr></table>
 
 <?

src/options_personal.php

@@ -35,32 +35,32 @@
 
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<? echo $color[0] ?>">
-      <center><b><? echo _("Options") . " - " . _("Personal Information"); ?></b></center>
+   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
+      <center><b><?php echo _("Options") . " - " . _("Personal Information"); ?></b></center>
    </td></tr></table>
 
    <form action="options.php" method=post>
       <table width=100% cellpadding=0 cellspacing=2 border=0>
          <tr>
-            <td align=right nowrap><? echo _("Full Name"); ?>:
+            <td align=right nowrap><?php echo _("Full Name"); ?>:
             </td><td>
-               <input size=50 type=text value="<? echo $fullname ?>" name=full_name> 
+               <input size=50 type=text value="<?php echo $fullname ?>" name=full_name> 
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("E-Mail Address"); ?>:
+            <td align=right nowrap><?php echo _("E-Mail Address"); ?>:
             </td><td>
-               <input size=50 type=text value="<? echo $email_address ?>" name=email_address> 
+               <input size=50 type=text value="<?php echo $email_address ?>" name=email_address> 
             </td>
          </tr>
          <tr>
-            <td align=right nowrap><? echo _("Reply To"); ?>:
+            <td align=right nowrap><?php echo _("Reply To"); ?>:
             </td><td>
-               <input size=50 type=text value="<? echo $replyto ?>" name=reply_to> 
+               <input size=50 type=text value="<?php echo $replyto ?>" name=reply_to> 
             </td>
          </tr>
          <tr>
-            <td align=right nowrap valign=top><br><? echo _("Signature"); ?>:
+            <td align=right nowrap valign=top><br><?php echo _("Signature"); ?>:
             </td><td>
 <?
    if ($use_signature == true)