projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a037624)
added css theme stuff to signout.php
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 3 Aug 2000 10:13:36 +0000 (10:13 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 3 Aug 2000 10:13:36 +0000 (10:13 +0000)
made message highlighting NOT a regexp

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

functions/mailbox_display.php patch | blob | blame | history
src/options_highlight.php patch | blob | blame | history
src/signout.php patch | blob | blame | history

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 2a85413642b930c2da511fc50b419b7d9fc517a9..d83111f781fdc90bbe60996bca7c7303b2dccdd7 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -28,11 +28,11 @@
       
       for ($i=0; $i < count($message_highlight_list); $i++) {
          if ($message_highlight_list[$i]["match_type"] == "to_cc") {
-            if (eregi($message_highlight_list[$i]["value"],$msg["TO"]) || eregi($message_highlight_list[$i]["value"],$msg["CC"])) {
+            if (strpos("^^".$msg["TO"], strtolower($message_highlight_list[$i]["value"])) || strpos("^^".$msg["CC"], strtolower($message_highlight_list[$i]["value"]))) {
                $hlt_color = $message_highlight_list[$i]["color"];
                continue;
             }
-         } else if (eregi($message_highlight_list[$i]["value"],$msg[strtoupper($message_highlight_list[$i]["match_type"])])) {
+         } else if (strpos("^^".strtolower($msg[strtoupper($message_highlight_list[$i]["match_type"])]),$message_highlight_list[$i]["value"])) {
             $hlt_color = $message_highlight_list[$i]["color"];
             continue;
          }   
diff --git a/src/options_highlight.php b/src/options_highlight.php
index c007c668cfc229e30c2c8ec6aba6b1f897703551..1a4a8fcb09e14ad1465c636e308a2cf4164edcd8 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -163,9 +163,8 @@
       if ($message_highlight_list[$theid]["match_type"] == "subject") echo "            <option value=\"subject\" selected>Subject\n";
       else                                                         echo "            <option value=\"subject\">Subject\n";
       echo "         </select>\n";
-      echo "         <nobr><input type=\"text\" value=\"".$message_highlight_list[$theid]["value"]."\" name=\"value\"> &nbsp;(";
-      echo _("Regular Expression");
-      echo ")\n      <nobr></td>\n";
+      echo "         <nobr><input type=\"text\" value=\"".$message_highlight_list[$theid]["value"]."\" name=\"value\">";
+      echo "        <nobr></td>\n";
       echo "   </tr>\n";
       echo "</table>\n";
       echo "<center><input type=\"submit\" value=\"" . _("Submit") . "\"></center>\n";
diff --git a/src/signout.php b/src/signout.php
index e3275c4dcd172800cc91b66d7243385f227ab318..a3eb90ea545298d2cde382db5684c3c4ab0517da 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -14,6 +14,8 @@
 
    include ("../src/load_prefs.php");
 
+   if (!isset($config_php))
+      include("../config/config.php");
    if (!isset($i18n_php))
       include("../functions/i18n.php");
    if (!isset($prefs_php))
@@ -51,8 +53,15 @@
    session_destroy();
 ?>
 <HTML>
+   <HEAD>
 <?php
-   echo "<BODY TEXT=000000 BGCOLOR=$color[4] LINK=$color[7] VLINK=$color[7] ALINK=$color[7]>\n";
+   if ($theme_css != "") {
+      printf ('<LINK REL="stylesheet" TYPE="text/css" HREF="%s">', 
+               $theme_css);
+      echo "\n";
+   }
+   echo "<TITLE>$title - Signout</TITLE>\n";
+   echo "</HEAD><BODY TEXT=000000 BGCOLOR=$color[4] LINK=$color[7] VLINK=$color[7] ALINK=$color[7]>\n";
    echo "<BR><BR><TABLE BGCOLOR=FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
    echo "   <TR BGCOLOR=$color[0] WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
Unnamed repository; edit this file 'description' to name the repository.