Просмотр исходного кода

added css theme stuff to signout.php
made message highlighting NOT a regexp

Luke Ehresman 25 лет назад
Родитель
Сommit
83c798905b
3 измененных файлов с 14 добавлено и 6 удалено
  1. 2 2
      functions/mailbox_display.php
  2. 2 3
      src/options_highlight.php
  3. 10 1
      src/signout.php

+ 2 - 2
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;
          }   

+ 2 - 3
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";

+ 10 - 1
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>";