ソースを参照

Many last minute fixes

philippe_mingo 23 年 前
コミット
858bbb105b
6 ファイル変更763 行追加750 行削除
  1. 120 144
      plugins/bug_report/bug_report.php
  2. 38 44
      plugins/bug_report/setup.php
  3. 24 15
      plugins/sent_subfolders/setup.php
  4. 266 240
      po/squirrelmail.po
  5. 4 0
      po/xgetpo
  6. 311 307
      src/options_highlight.php

+ 120 - 144
plugins/bug_report/bug_report.php

@@ -15,145 +15,121 @@
  *
  * $Id$
  */
-                                       
-   chdir("..");
-
-   session_start();
-
-   if (!isset($config_php))
-      /* '_once' Added by ri_once */ include_once("../config/config.php");
-   if (!isset($strings_php))
-      /* '_once' Added by ri_once */ include_once("../functions/strings.php");
-   if (!isset($page_header_php))
-      /* '_once' Added by ri_once */ include_once("../functions/page_header.php");
-   if (!isset($display_messages_php))
-      /* '_once' Added by ri_once */ include_once("../functions/display_messages.php");
-   if (!isset($imap_php))
-      /* '_once' Added by ri_once */ include_once("../functions/imap.php");
-   if (!isset($array_php))
-      /* '_once' Added by ri_once */ include_once("../functions/array.php");
-   if (!isset($i18n_php))
-      /* '_once' Added by ri_once */ include_once("../functions/i18n.php");
-
-
-   /* '_once' Added by ri_once */ include_once("../src/load_prefs.php");
-   displayPageHeader($color, "None");
-
-
-   function Show_Array($array)
-   {
-      foreach ($array as $key => $value)
-      {
-         if ($key != 0 || $value != '')
-         {
-           $str .= "    * $key = $value\n";
-         }
-      }
-      if ($str == '')
-          return "    * Nothing listed\n";
-      return $str;
-   }
-   
-   $body_top .= "I subscribe to the squirrelmail-list mailing list.\n";
-   $body_top .= "  [ ]  True - No need to CC me when replying\n";
-   $body_top .= "  [ ]  False - Please CC me when replying\n";
-   $body_top .= "\n";
-   $body_top .= "This bug occurs when I ...\n";
-   $body_top .= "  ... view a particular message\n";
-   $body_top .= "  ... use a specific plugin/function\n";
-   $body_top .= "  ... try to do/view/use ....\n";
-   $body_top .= "\n\n\n";
-   $body_top .= "The description of the bug:\n\n\n";
-   $body_top .= "I can reproduce the bug by:\n\n\n";
-   $body_top .= "(Optional) I got bored and found the bug occurs in:\n\n\n";
-   $body_top .= "(Optional) I got really bored and here's a fix:\n\n\n";
-   $body_top .= "----------------------------------------------\n";
-
-
-   $body .= "\nMy browser information:\n";
-   $body .= "  $HTTP_USER_AGENT\n";
-   $body .= "  get_browser() information (List)\n";
-   $browser = get_browser();
-   $body .= Show_Array((array) $browser);
-
-   $body .= "\nMy web server information:\n";
-   $body .= "  PHP Version " . phpversion() . "\n";
-   $body .= "  PHP Extensions (List)\n";
-   $body .= Show_Array(get_loaded_extensions());
-   // Apache version?
-   
-   $body .= "\nSquirrelMail-specific information:\n";
-   $body .= "  Version:  $version\n";
-   $body .= "  Plugins (List)\n";
-   $body .= Show_Array($plugins);
-   if ($ldap_server[0] && ! extension_loaded('ldap'))
-   {
-       $warning = 1;
-       $warnings['ldap'] = "LDAP server defined in SquirrelMail config, " .
-           "but the module is not loaded in PHP";
-       $corrections['ldap'][] = "Reconfigure PHP with the option '--with-ldap'";
-       $corrections['ldap'][] = "Then recompile PHP and reinstall";
-       $corrections['ldap'][] = "-- OR --";
-       $corrections['ldap'][] = "Reconfigure SquirrelMail to not use LDAP";
-   }
-   
-   $body .= "\nMy IMAP server information:\n";
-   $body .= "  Server type:  $imap_server_type\n";
-   $imap_stream = fsockopen ($imapServerAddress, $imapPort, &$error_number, &$error_string);
-   $server_info = fgets ($imap_stream, 1024);
-   if ($imap_stream)
-   {
-       // SUPRESS HOST NAME
-       $list = explode(' ', $server_info);
-       $list[2] = '[HIDDEN]';
-       $server_info = implode(' ', $list);
-       $body .=  "  Server info:  $server_info";
-       fputs ($imap_stream, "a001 CAPABILITY\r\n");
-       $read = fgets($imap_stream, 1024);
-       $list = explode(' ', $read);
-       array_shift($list);
-       array_shift($list);
-       $read = implode(' ', $list);
-       $body .= "  Cabailities:  $read";
-       fputs ($imap_stream, "a002 LOGOUT\r\n");
-       fclose($imap_stream);
-   }
-   else
-   {
-     $body .= "  Unable to connect to IMAP server to get information.\n";
-     $warning = 1;
-     $warnings['imap'] = "Unable to connect to IMAP server";
-     $corrections['imap'][] = "Make sure you specified the correct mail server";
-     $corrections['imap'][] = "Make sure the mail server is running IMAP, not POP";
-     $corrections['imap'][] = "Make sure the server responds to port $imapPort";
-   }
-   
-   $warning_num = 0;
-   if ($warning)
-   {
-       foreach ($warnings as $key => $value)
-       {
-           if ($warning_num == 0)
-           {
-               $body_top .= "WARNINGS WERE REPORTED WITH YOUR SETUP:\n";
-               $body_top = "WARNINGS WERE REPORTED WITH YOUR SETUP -- SEE BELOW\n\n$body_top";
-               $warning_html = "<h1>Warnings were reported with your setup:</h1>\n<dl>\n";
-           }
-           $warning_num ++;
-           $warning_html .= "<dt><b>$value</b></dt>\n";
-           $body_top .= "\n$value\n";
-           foreach ($corrections[$key] as $corr_val)
-           {
-               $body_top .= "  * $corr_val\n";
-               $warning_html .= "<dd>* $corr_val</dd>\n";
-           }
-       }
-       $warning_html .= "</dl>\n<p>$warning_num warning(s) reported.</p>\n<hr>\n";
-       $body_top .= "\n$warning_num warning(s) reported.\n";
-       $body_top .= "----------------------------------------------\n";
-   }
-   
-   $body = htmlspecialchars($body_top . $body);
+
+chdir('..');
+
+session_start();
+
+require_once('../config/config.php');
+require_once('../functions/strings.php');
+require_once('../functions/page_header.php');
+require_once('../functions/display_messages.php');
+require_once('../functions/imap.php');
+require_once('../functions/array.php');
+require_once('../functions/i18n.php');
+require_once('../src/load_prefs.php');
+displayPageHeader($color, "None");
+
+
+function Show_Array($array) {
+    foreach ($array as $key => $value) {
+        if ($key != 0 || $value != '') {
+        $str .= "    * $key = $value\n";
+        }
+    }
+    if ($str == '') {
+        return "    * Nothing listed\n";
+    }
+    return $str;
+}
+
+$browser = get_browser();
+$body_top .= "I subscribe to the squirrelmail-list mailing list.\n" .
+                "  [ ]  True - No need to CC me when replying\n" .
+                "  [ ]  False - Please CC me when replying\n" .
+                "\n" .
+                "This bug occurs when I ...\n" .
+                "  ... view a particular message\n" .
+                "  ... use a specific plugin/function\n" .
+                "  ... try to do/view/use ....\n" .
+                "\n\n\n" .
+                "The description of the bug:\n\n\n" .
+                "I can reproduce the bug by:\n\n\n" .
+                "(Optional) I got bored and found the bug occurs in:\n\n\n" .
+                "(Optional) I got really bored and here's a fix:\n\n\n" .
+                "----------------------------------------------\n" .
+            "\nMy browser information:\n" .
+            "  $HTTP_USER_AGENT\n" .
+            "  get_browser() information (List)\n" .
+            Show_Array((array) $browser) .
+            "\nMy web server information:\n" .
+            "  PHP Version " . phpversion() . "\n" .
+            "  PHP Extensions (List)\n" .
+            Show_Array(get_loaded_extensions()) .
+            "\nSquirrelMail-specific information:\n" .
+            "  Version:  $version\n" .
+            "  Plugins (List)\n" .
+            Show_Array($plugins);
+if ($ldap_server[0] && ! extension_loaded('ldap')) {
+    $warning = 1;
+    $warnings['ldap'] = "LDAP server defined in SquirrelMail config, " .
+        "but the module is not loaded in PHP";
+    $corrections['ldap'][] = "Reconfigure PHP with the option '--with-ldap'";
+    $corrections['ldap'][] = "Then recompile PHP and reinstall";
+    $corrections['ldap'][] = "-- OR --";
+    $corrections['ldap'][] = "Reconfigure SquirrelMail to not use LDAP";
+}
+
+$body .= "\nMy IMAP server information:\n" .
+            "  Server type:  $imap_server_type\n";
+$imap_stream = fsockopen ($imapServerAddress, $imapPort, &$error_number, &$error_string);
+$server_info = fgets ($imap_stream, 1024);
+if ($imap_stream) {
+    // SUPRESS HOST NAME
+    $list = explode(' ', $server_info);
+    $list[2] = '[HIDDEN]';
+    $server_info = implode(' ', $list);
+    $body .=  "  Server info:  $server_info";
+    fputs ($imap_stream, "a001 CAPABILITY\r\n");
+    $read = fgets($imap_stream, 1024);
+    $list = explode(' ', $read);
+    array_shift($list);
+    array_shift($list);
+    $read = implode(' ', $list);
+    $body .= "  Cabailities:  $read";
+    fputs ($imap_stream, "a002 LOGOUT\r\n");
+    fclose($imap_stream);
+} else {
+    $body .= "  Unable to connect to IMAP server to get information.\n";
+    $warning = 1;
+    $warnings['imap'] = "Unable to connect to IMAP server";
+    $corrections['imap'][] = "Make sure you specified the correct mail server";
+    $corrections['imap'][] = "Make sure the mail server is running IMAP, not POP";
+    $corrections['imap'][] = "Make sure the server responds to port $imapPort";
+}
+
+$warning_num = 0;
+if ($warning) {
+    foreach ($warnings as $key => $value) {
+        if ($warning_num == 0) {
+            $body_top .= "WARNINGS WERE REPORTED WITH YOUR SETUP:\n";
+            $body_top = "WARNINGS WERE REPORTED WITH YOUR SETUP -- SEE BELOW\n\n$body_top";
+            $warning_html = "<h1>Warnings were reported with your setup:</h1>\n<dl>\n";
+        }
+        $warning_num ++;
+        $warning_html .= "<dt><b>$value</b></dt>\n";
+        $body_top .= "\n$value\n";
+        foreach ($corrections[$key] as $corr_val) {
+            $body_top .= "  * $corr_val\n";
+            $warning_html .= "<dd>* $corr_val</dd>\n";
+        }
+    }
+    $warning_html .= "</dl>\n<p>$warning_num warning(s) reported.</p>\n<hr>\n";
+    $body_top .= "\n$warning_num warning(s) reported.\n";
+    $body_top .= "----------------------------------------------\n";
+}
+
+$body = htmlspecialchars($body_top . $body);
 
 ?>
    <br>
@@ -165,9 +141,9 @@
 
    <p><font size="+1">Before you send your bug report</font>, please make sure to
    check this checklist for any common problems.</p>
-   
+
    <ul>
-   <li>Make sure that you are running the most recent copy of 
+   <li>Make sure that you are running the most recent copy of
      <a href="http://www.squirrelmail.org/">SquirrelMail</a>.  You are currently
      using version <?PHP echo $version ?>.</li>
    <li>Check to see if you bug is already listed in the
@@ -175,20 +151,20 @@
    If it is, we already know about it and are trying to fix it.</li>
    <li>Try to make sure that you can repeat it.  If the bug happens
      sporatically, try to document what you did when it happened.  If it
-     always occurs when you view a specific message, keep that message around 
+     always occurs when you view a specific message, keep that message around
      so maybe we can see it.</li>
    <li>If there were warnings displayed above, try to resolve them yourself.
      Read the guides in the <tt>doc/</tt> directory where SquirrelMail was
      installed.</li>
    </ul>
-   
+
    <p>Pressing the button below will start a mail message to the developers
    of SquirrelMail that will contain a lot of information about your system,
    your browser, how SquirrelMail is set up, and your IMAP server.  It will
    also prompt you for information.  Just fill out the sections at the top.
    If you like, you can scroll down in the message to see what else is being
    sent.</p>
-   
+
    <p>Please make sure to fill out as much information as you possibly can to
    give everyone a good chance of finding and removing the bug.  Submitting
    your bug like this will not have it automatically added to the bug list on

+ 38 - 44
plugins/bug_report/setup.php

@@ -16,64 +16,58 @@
 
 
 /* Initialize the bug report plugin */
-function squirrelmail_plugin_init_bug_report()
-{
-  global $squirrelmail_plugin_hooks;
-
-  $squirrelmail_plugin_hooks['menuline']['bug_report'] = 'bug_report_button';
-  $squirrelmail_plugin_hooks['options_display_inside']['bug_report'] = 'bug_report_options';
-  $squirrelmail_plugin_hooks['options_display_save']['bug_report'] = 'bug_report_save';
-  $squirrelmail_plugin_hooks['loading_prefs']['bug_report'] = 'bug_report_load';
+function squirrelmail_plugin_init_bug_report() {
+    global $squirrelmail_plugin_hooks;
+
+    $squirrelmail_plugin_hooks['menuline']['bug_report'] = 'bug_report_button';
+    $squirrelmail_plugin_hooks['options_display_inside']['bug_report'] = 'bug_report_options';
+    $squirrelmail_plugin_hooks['options_display_save']['bug_report'] = 'bug_report_save';
+    $squirrelmail_plugin_hooks['loading_prefs']['bug_report'] = 'bug_report_load';
 }
 
 
 /* Show the button in the main bar */
-function bug_report_button() 
-{
-  global $color, $bug_report_visible;
-
-  if (! $bug_report_visible) 
-    return;
-    
-  displayInternalLink('plugins/bug_report/bug_report.php', 'Bug', '');
-  echo "&nbsp;&nbsp;\n";
+function bug_report_button() {
+    global $color, $bug_report_visible;
+
+    if (! $bug_report_visible) {
+        return;
+    }
+
+    displayInternalLink('plugins/bug_report/bug_report.php', 'Bug', '');
+    echo "&nbsp;&nbsp;\n";
 }
 
 
-function bug_report_save() 
-{
-  global $username,$data_dir;
-  global $bug_report_bug_report_visible;
+function bug_report_save() {
+    global $username,$data_dir;
+    global $bug_report_bug_report_visible;
 
-  if (isset($bug_report_bug_report_visible)) 
-  {
-    setPref($data_dir, $username, 'bug_report_visible', '1');
-  } 
-  else 
-  {
-    setPref($data_dir, $username, 'bug_report_visible', '');
-  }
+    if (isset($bug_report_bug_report_visible)) {
+        setPref($data_dir, $username, 'bug_report_visible', '1');
+    } else {
+        setPref($data_dir, $username, 'bug_report_visible', '');
+    }
 }
 
 
-function bug_report_load()
-{ 
-  global $username, $data_dir;
-  global $bug_report_visible;
+function bug_report_load() {
+    global $username, $data_dir;
+    global $bug_report_visible;
 
-  $bug_report_visible = getPref($data_dir, $username, 'bug_report_visible');
+    $bug_report_visible = getPref($data_dir, $username, 'bug_report_visible');
 }
 
 
-function bug_report_options()
-{
-  global $bug_report_visible;
-  
-  echo "<tr><td align=right nowrap>Bug Reports:</td>\n";
-  echo "<td><input name=\"bug_report_bug_report_visible\" type=CHECKBOX";
-  if ($bug_report_visible)
-    echo " CHECKED";
-  echo "> Show button in toolbar</td></tr>\n";
+function bug_report_options() {
+    global $bug_report_visible;
+
+    echo '<tr><td align=right nowrap>' . _("Bug Reports:") . "</td>\n" .
+         '<td><input name="bug_report_bug_report_visible" type=CHECKBOX';
+    if ($bug_report_visible) {
+        echo ' CHECKED';
+    }
+    echo '> ' . _("Show button in toolbar") . "</td></tr>\n";
 }
 
-?>
+?>

+ 24 - 15
plugins/sent_subfolders/setup.php

@@ -61,8 +61,8 @@ function sent_subfolders_check_handleAsSent() {
         /* Perform the comparison. */
         $handleAsSent_result =
             ( $handleAsSent_result
-              || ($base_str == $mbox_str)
-              || ($sent_subfolders_base == $args[1])
+            || ($base_str == $mbox_str)
+            || ($sent_subfolders_base == $args[1])
             );
     }
 }
@@ -73,7 +73,7 @@ function sent_subfolders_load_prefs() {
 
     $use_sent_subfolders = getPref
     ($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF);
-    
+
     $sent_subfolders_setting = getPref
     ($data_dir, $username, 'sent_subfolders_setting', SMPREF_SENT_SUBFOLDERS_DISABLED);
 
@@ -100,9 +100,9 @@ function sent_subfolders_optpage_loadhook_folders() {
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_FOLDERLIST,
         'posvals' => array(SMPREF_SENT_SUBFOLDERS_DISABLED  => _("Disabled"),
-                           SMPREF_SENT_SUBFOLDERS_MONTHLY   => _("Monthly"),
-                           SMPREF_SENT_SUBFOLDERS_QUARTERLY => _("Quarterly"),
-                           SMPREF_SENT_SUBFOLDERS_YEARLY    => _("Yearly")),
+                        SMPREF_SENT_SUBFOLDERS_MONTHLY   => _("Monthly"),
+                        SMPREF_SENT_SUBFOLDERS_QUARTERLY => _("Quarterly"),
+                        SMPREF_SENT_SUBFOLDERS_YEARLY    => _("Yearly")),
         'save'    => 'save_option_sent_subfolders_setting'
     );
 
@@ -148,7 +148,7 @@ function sent_subfolders_update_sentfolder() {
     global $sent_subfolders_base, $sent_subfolders_setting;
     global $username, $data_dir, $key, $imapServerAddress, $imapPort;
     global $use_sent_subfolders, $move_to_sent;
-    
+
     if ($use_sent_subfolders && $move_to_sent) {
         $year = date('Y');
         $month = date('m');
@@ -156,7 +156,7 @@ function sent_subfolders_update_sentfolder() {
 
         switch ($sent_subfolders_setting) {
             case SMPREF_SENT_SUBFOLDERS_YEARLY:
-	            $sent_subfolder = $sent_subfolders_base
+                $sent_subfolder = $sent_subfolders_base
                                 . $delimiter . $year;
                 $year_folder = $sent_subfolder;
                 break;
@@ -193,14 +193,14 @@ function sent_subfolders_update_sentfolder() {
                 /* Create the imap connection. */
                 $ic = sqimap_login
                 ($username, $key, $imapServerAddress, $imapPort, 10);
-	    
+
                 /* Auto-create the year folder, if it does not yet exist. */
                 if (!sqimap_mailbox_exists($ic, $year_folder)) {
                     sqimap_mailbox_create($ic, $year_folder, '');
                 } else if (!sqimap_mailbox_is_subscribed($ic, $year_folder)) {
                     sqimap_subscribe($ic, $year_folder);
                 }
-	    
+
                 /* Auto-create the subfolder, if it does not yet exist. */
                 if (!sqimap_mailbox_exists($ic, $sent_folder)) {
                     sqimap_mailbox_create($ic, $sent_folder, '');
@@ -219,17 +219,26 @@ function sent_subfolder_getQuarter($month) {
     switch ($month) {
         case '01':
         case '02':
-        case '03': $result = '1'; break;
+        case '03':
+            $result = '1';
+            break;
         case '04':
         case '05':
-        case '06': $result = '2'; break;
+        case '06':
+            $result = '2';
+            break;
         case '07':
         case '08':
-        case '09': $result = '3'; break;
+        case '09':
+            $result = '3';
+            break;
         case '10':
         case '11':
-        case '12': $result = '4'; break;
-	default: $result = 'ERR';
+        case '12':
+            $result = '4';
+            break;
+        default:
+            $result = 'ERR';
     }
 
     /* Return the current quarter. */

ファイルの差分が大きいため隠しています
+ 266 - 240
po/squirrelmail.po


+ 4 - 0
po/xgetpo

@@ -28,5 +28,9 @@ xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/newmail/*.php --output-dir=squirrelmail/po/
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/mail_fetch/*.php --output-dir=squirrelmail/po/
+xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
+    -C squirrelmail/plugins/bug_report/*.php --output-dir=squirrelmail/po/
+xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
+    -C squirrelmail/plugins/sent_subfolders/*.php --output-dir=squirrelmail/po/
 
 cd squirrelmail/po

+ 311 - 307
src/options_highlight.php

@@ -18,330 +18,334 @@ require_once('../functions/array.php');
 require_once('../functions/plugin.php');
 
 function oh_opt( $val, $sel, $tit ) {
-    echo "            <option value=\"$val\"";
+    echo "<option value=\"$val\"";
     if ( $sel )
         echo 'selected';
     echo  ">$tit</option>\n";
 }
 
-   if (! isset($action))
-       $action = '';
-   if (! isset($message_highlight_list))
-       $message_highlight_list = array();
-
-   if ($action == 'delete' && isset($theid)) {
-      removePref($data_dir, $username, "highlight$theid");
-   } else if ($action == 'save') {
-      if (!$theid) $theid = 0;
-      $identname = ereg_replace(',', ' ', $identname);
-      if ($color_type == 1) $newcolor = $newcolor_choose;
-      elseif ($color_type == 2) $newcolor = $newcolor_input;
-      else $newcolor = $color_type;
-
-      $newcolor = ereg_replace(',', '', $newcolor);
-      $newcolor = ereg_replace('#', '', $newcolor);
-      $newcolor = ereg_replace('"', '', $newcolor);
-      $newcolor = ereg_replace('\'', '', $newcolor);
-      $value = ereg_replace(',', ' ', $value);
-
-      setPref($data_dir, $username, "highlight$theid", $identname.','.$newcolor.','.$value.','.$match_type);
-      $message_highlight_list[$theid]['name'] = $identname;
-      $message_highlight_list[$theid]['color'] = $newcolor;
-      $message_highlight_list[$theid]['value'] = $value;
-      $message_highlight_list[$theid]['match_type'] = $match_type;
-   }
-   displayPageHeader($color, 'None');
+if (! isset($action)) {
+    $action = '';
+}
+if (! isset($message_highlight_list)) {
+    $message_highlight_list = array();
+}
+
+if ($action == 'delete' && isset($theid)) {
+    removePref($data_dir, $username, "highlight$theid");
+    header( "Location: $PHP_SELF" );
+    exit;
+} else if ($action == 'save') {
+    if (!$theid) $theid = 0;
+    $identname = ereg_replace(',', ' ', $identname);
+    if ($color_type == 1) $newcolor = $newcolor_choose;
+    elseif ($color_type == 2) $newcolor = $newcolor_input;
+    else $newcolor = $color_type;
+
+    $newcolor = ereg_replace(',', '', $newcolor);
+    $newcolor = ereg_replace('#', '', $newcolor);
+    $newcolor = ereg_replace('"', '', $newcolor);
+    $newcolor = ereg_replace('\'', '', $newcolor);
+    $value = ereg_replace(',', ' ', $value);
+
+    setPref($data_dir, $username, "highlight$theid", $identname.','.$newcolor.','.$value.','.$match_type);
+    $message_highlight_list[$theid]['name'] = $identname;
+    $message_highlight_list[$theid]['color'] = $newcolor;
+    $message_highlight_list[$theid]['value'] = $value;
+    $message_highlight_list[$theid]['match_type'] = $match_type;
+}
+displayPageHeader($color, 'None');
 ?>
-   <br>
-   <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>
+<br>
+<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>
 
 <?php
-   echo '<br><center>[<a href="options_highlight.php?action=add">' . _("New") . '</a>]'.
+echo '<br><center>[<a href="options_highlight.php?action=add">' . _("New") . '</a>]'.
         ' - [<a href="options.php">'._("Done").'</a>]</center><br>'."\n";
-   if (count($message_highlight_list) >= 1) {
-      echo '<table border="0" cellpadding="3" cellspacing="0" align="center" width="80%">'."\n";
-      for ($i=0; $i < count($message_highlight_list); $i++) {
+if (count($message_highlight_list) >= 1) {
+    echo '<table border="0" cellpadding="3" cellspacing="0" align="center" width="80%">'."\n";
+    for ($i=0; $i < count($message_highlight_list); $i++) {
         echo '<tr bgcolor="' . $message_highlight_list[$i]['color'] . '">'.
-                "<td width=5% bgcolor=\"$color[4]\" nobr>".
-                   "<small>[<a href=\"options_highlight.php?action=edit&theid=$i\">".
-             _("Edit") .
-             '</a>]&nbsp;[<a href="options_highlight.php?action=delete&theid='.
-             $i . '">' . _("Delete") . '</a>]</small>'.
-             '</td><td>'.
-             htmlspecialchars($message_highlight_list[$i]['name']) .
-             '</td><td>'.
-             $message_highlight_list[$i]['match_type'] . ' = ' .
-             htmlspecialchars($message_highlight_list[$i]['value']).
-             '</td></tr>';
-      }
-      echo "</table>\n".
-           "<br>\n";
-   } else {
-      echo '<center>' . _("No highlighting is defined") . "</center><br>\n".
-           "<br>\n";
-   }
-   if ($action == 'edit' || $action == 'add') {
-      if (!isset($theid))
-      {
+                "<td width=20% bgcolor=\"$color[4]\" nobr>".
+                "<small>[<a href=\"options_highlight.php?action=edit&theid=$i\">".
+            _("Edit") .
+            '</a>]&nbsp;[<a href="options_highlight.php?action=delete&theid='.
+            $i . '">' . _("Delete") . '</a>]</small>'.
+            '</td><td>'.
+            htmlspecialchars($message_highlight_list[$i]['name']) .
+            '</td><td>'.
+            $message_highlight_list[$i]['match_type'] . ' = ' .
+            htmlspecialchars($message_highlight_list[$i]['value']).
+            '</td></tr>';
+    }
+    echo "</table>\n".
+        "<br>\n";
+} else {
+    echo '<center>' . _("No highlighting is defined") . "</center><br>\n".
+        "<br>\n";
+}
+if ($action == 'edit' || $action == 'add') {
+    if (!isset($theid))
+    {
         $theid = count($message_highlight_list);
         $message_highlight_list[$theid] = array();
-      }
-
-      $color_list[0] = '4444aa';
-      $color_list[1] = '44aa44';
-      $color_list[2] = 'aaaa44';
-      $color_list[3] = '44aaaa';
-      $color_list[4] = 'aa44aa';
-      $color_list[5] = 'aaaaff';
-      $color_list[6] = 'aaffaa';
-      $color_list[7] = 'ffffaa';
-      $color_list[8] = 'aaffff';
-      $color_list[9] = 'ffaaff';
-      $color_list[10] = 'aaaaaa';
-      $color_list[11] = 'bfbfbf';
-      $color_list[12] = 'dfdfdf';
-      $color_list[13] = 'ffffff';
-
-      # helpful color chart from http://www.visibone.com/colorlab/big.html
-      $new_color_list["0,0"] = 'cccccc';
-      $new_color_list["0,1"] = '999999';
-      $new_color_list["0,2"] = '666666';
-      $new_color_list["0,3"] = '333333';
-      $new_color_list["0,4"] = '000000';
-      
-      # red
-      $new_color_list["1,0"] = 'ff0000';
-      $new_color_list["1,1"] = 'cc0000';
-      $new_color_list["1,2"] = '990000';
-      $new_color_list["1,3"] = '660000';
-      $new_color_list["1,4"] = '330000';
-      
-      $new_color_list["2,0"] = 'ffcccc';
-      $new_color_list["2,1"] = 'cc9999';
-      $new_color_list["2,2"] = '996666';
-      $new_color_list["2,3"] = '663333';
-      $new_color_list["2,4"] = '330000';
-      
-      $new_color_list["3,0"] = 'ffcccc';
-      $new_color_list["3,1"] = 'ff9999';
-      $new_color_list["3,2"] = 'ff6666';
-      $new_color_list["3,3"] = 'ff3333';
-      $new_color_list["3,4"] = 'ff0000';
-      
-      # green
-      $new_color_list["4,0"] = '00ff00';
-      $new_color_list["4,1"] = '00cc00';
-      $new_color_list["4,2"] = '009900';
-      $new_color_list["4,3"] = '006600';
-      $new_color_list["4,4"] = '003300';
-      
-      $new_color_list["5,0"] = 'ccffcc';
-      $new_color_list["5,1"] = '99cc99';
-      $new_color_list["5,2"] = '669966';
-      $new_color_list["5,3"] = '336633';
-      $new_color_list["5,4"] = '003300';
-      
-      $new_color_list["6,0"] = 'ccffcc';
-      $new_color_list["6,1"] = '99ff99';
-      $new_color_list["6,2"] = '66ff66';
-      $new_color_list["6,3"] = '33ff33';
-      $new_color_list["6,4"] = '00ff00';
-
-      # blue
-      $new_color_list["7,0"] = '0000ff';
-      $new_color_list["7,1"] = '0000cc';
-      $new_color_list["7,2"] = '000099';
-      $new_color_list["7,3"] = '000066';
-      $new_color_list["7,4"] = '000033';
-      
-      $new_color_list["8,0"] = 'ccccff';
-      $new_color_list["8,1"] = '9999cc';
-      $new_color_list["8,2"] = '666699';
-      $new_color_list["8,3"] = '333366';
-      $new_color_list["8,4"] = '000033';
-      
-      $new_color_list["9,0"] = 'ccccff';
-      $new_color_list["9,1"] = '9999ff';
-      $new_color_list["9,2"] = '6666ff';
-      $new_color_list["9,3"] = '3333ff';
-      $new_color_list["9,4"] = '0000ff';
-      
-      # yellow
-      $new_color_list["10,0"] = 'ffff00';
-      $new_color_list["10,1"] = 'cccc00';
-      $new_color_list["10,2"] = '999900';
-      $new_color_list["10,3"] = '666600';
-      $new_color_list["10,4"] = '333300';
-                                     
-      $new_color_list["11,0"] = 'ffffcc';
-      $new_color_list["11,1"] = 'cccc99';
-      $new_color_list["11,2"] = '999966';
-      $new_color_list["11,3"] = '666633';
-      $new_color_list["11,4"] = '333300';
-                                     
-      $new_color_list["12,0"] = 'ffffcc';
-      $new_color_list["12,1"] = 'ffff99';
-      $new_color_list["12,2"] = 'ffff66';
-      $new_color_list["12,3"] = 'ffff33';
-      $new_color_list["12,4"] = 'ffff00';
-      
-      # cyan
-      $new_color_list["13,0"] = '00ffff';
-      $new_color_list["13,1"] = '00cccc';
-      $new_color_list["13,2"] = '009999';
-      $new_color_list["13,3"] = '006666';
-      $new_color_list["13,4"] = '003333';
-                                       
-      $new_color_list["14,0"] = 'ccffff';
-      $new_color_list["14,1"] = '99cccc';
-      $new_color_list["14,2"] = '669999';
-      $new_color_list["14,3"] = '336666';
-      $new_color_list["14,4"] = '003333';
-                                       
-      $new_color_list["15,0"] = 'ccffff';
-      $new_color_list["15,1"] = '99ffff';
-      $new_color_list["15,2"] = '66ffff';
-      $new_color_list["15,3"] = '33ffff';
-      $new_color_list["15,4"] = '00ffff';
-      
-      # magenta
-      $new_color_list["16,0"] = 'ff00ff';
-      $new_color_list["16,1"] = 'cc00cc';
-      $new_color_list["16,2"] = '990099';
-      $new_color_list["16,3"] = '660066';
-      $new_color_list["16,4"] = '330033';
-                                   
-      $new_color_list["17,0"] = 'ffccff';
-      $new_color_list["17,1"] = 'cc99cc';
-      $new_color_list["17,2"] = '996699';
-      $new_color_list["17,3"] = '663366';
-      $new_color_list["17,4"] = '330033';
-                                   
-      $new_color_list["18,0"] = 'ffccff';
-      $new_color_list["18,1"] = 'ff99ff';
-      $new_color_list["18,2"] = 'ff66ff';
-      $new_color_list["18,3"] = 'ff33ff';
-      $new_color_list["18,4"] = 'ff00ff';
-
-      $selected_input = '';
-      $selected_choose = '';
-
-      for ($i=0; $i < 14; $i++) {
-         ${"selected".$i} = '';
-      }
-      if (isset($message_highlight_list[$theid]['color'])) {
-         for ($i=0; $i < 14; $i++) {
+    }
+
+    $color_list[0] = '4444aa';
+    $color_list[1] = '44aa44';
+    $color_list[2] = 'aaaa44';
+    $color_list[3] = '44aaaa';
+    $color_list[4] = 'aa44aa';
+    $color_list[5] = 'aaaaff';
+    $color_list[6] = 'aaffaa';
+    $color_list[7] = 'ffffaa';
+    $color_list[8] = 'aaffff';
+    $color_list[9] = 'ffaaff';
+    $color_list[10] = 'aaaaaa';
+    $color_list[11] = 'bfbfbf';
+    $color_list[12] = 'dfdfdf';
+    $color_list[13] = 'ffffff';
+
+    # helpful color chart from http://www.visibone.com/colorlab/big.html
+    $new_color_list["0,0"] = 'cccccc';
+    $new_color_list["0,1"] = '999999';
+    $new_color_list["0,2"] = '666666';
+    $new_color_list["0,3"] = '333333';
+    $new_color_list["0,4"] = '000000';
+
+    # red
+    $new_color_list["1,0"] = 'ff0000';
+    $new_color_list["1,1"] = 'cc0000';
+    $new_color_list["1,2"] = '990000';
+    $new_color_list["1,3"] = '660000';
+    $new_color_list["1,4"] = '330000';
+
+    $new_color_list["2,0"] = 'ffcccc';
+    $new_color_list["2,1"] = 'cc9999';
+    $new_color_list["2,2"] = '996666';
+    $new_color_list["2,3"] = '663333';
+    $new_color_list["2,4"] = '330000';
+
+    $new_color_list["3,0"] = 'ffcccc';
+    $new_color_list["3,1"] = 'ff9999';
+    $new_color_list["3,2"] = 'ff6666';
+    $new_color_list["3,3"] = 'ff3333';
+    $new_color_list["3,4"] = 'ff0000';
+
+    # green
+    $new_color_list["4,0"] = '00ff00';
+    $new_color_list["4,1"] = '00cc00';
+    $new_color_list["4,2"] = '009900';
+    $new_color_list["4,3"] = '006600';
+    $new_color_list["4,4"] = '003300';
+
+    $new_color_list["5,0"] = 'ccffcc';
+    $new_color_list["5,1"] = '99cc99';
+    $new_color_list["5,2"] = '669966';
+    $new_color_list["5,3"] = '336633';
+    $new_color_list["5,4"] = '003300';
+
+    $new_color_list["6,0"] = 'ccffcc';
+    $new_color_list["6,1"] = '99ff99';
+    $new_color_list["6,2"] = '66ff66';
+    $new_color_list["6,3"] = '33ff33';
+    $new_color_list["6,4"] = '00ff00';
+
+    # blue
+    $new_color_list["7,0"] = '0000ff';
+    $new_color_list["7,1"] = '0000cc';
+    $new_color_list["7,2"] = '000099';
+    $new_color_list["7,3"] = '000066';
+    $new_color_list["7,4"] = '000033';
+
+    $new_color_list["8,0"] = 'ccccff';
+    $new_color_list["8,1"] = '9999cc';
+    $new_color_list["8,2"] = '666699';
+    $new_color_list["8,3"] = '333366';
+    $new_color_list["8,4"] = '000033';
+
+    $new_color_list["9,0"] = 'ccccff';
+    $new_color_list["9,1"] = '9999ff';
+    $new_color_list["9,2"] = '6666ff';
+    $new_color_list["9,3"] = '3333ff';
+    $new_color_list["9,4"] = '0000ff';
+
+    # yellow
+    $new_color_list["10,0"] = 'ffff00';
+    $new_color_list["10,1"] = 'cccc00';
+    $new_color_list["10,2"] = '999900';
+    $new_color_list["10,3"] = '666600';
+    $new_color_list["10,4"] = '333300';
+
+    $new_color_list["11,0"] = 'ffffcc';
+    $new_color_list["11,1"] = 'cccc99';
+    $new_color_list["11,2"] = '999966';
+    $new_color_list["11,3"] = '666633';
+    $new_color_list["11,4"] = '333300';
+
+    $new_color_list["12,0"] = 'ffffcc';
+    $new_color_list["12,1"] = 'ffff99';
+    $new_color_list["12,2"] = 'ffff66';
+    $new_color_list["12,3"] = 'ffff33';
+    $new_color_list["12,4"] = 'ffff00';
+
+    # cyan
+    $new_color_list["13,0"] = '00ffff';
+    $new_color_list["13,1"] = '00cccc';
+    $new_color_list["13,2"] = '009999';
+    $new_color_list["13,3"] = '006666';
+    $new_color_list["13,4"] = '003333';
+
+    $new_color_list["14,0"] = 'ccffff';
+    $new_color_list["14,1"] = '99cccc';
+    $new_color_list["14,2"] = '669999';
+    $new_color_list["14,3"] = '336666';
+    $new_color_list["14,4"] = '003333';
+
+    $new_color_list["15,0"] = 'ccffff';
+    $new_color_list["15,1"] = '99ffff';
+    $new_color_list["15,2"] = '66ffff';
+    $new_color_list["15,3"] = '33ffff';
+    $new_color_list["15,4"] = '00ffff';
+
+    # magenta
+    $new_color_list["16,0"] = 'ff00ff';
+    $new_color_list["16,1"] = 'cc00cc';
+    $new_color_list["16,2"] = '990099';
+    $new_color_list["16,3"] = '660066';
+    $new_color_list["16,4"] = '330033';
+
+    $new_color_list["17,0"] = 'ffccff';
+    $new_color_list["17,1"] = 'cc99cc';
+    $new_color_list["17,2"] = '996699';
+    $new_color_list["17,3"] = '663366';
+    $new_color_list["17,4"] = '330033';
+
+    $new_color_list["18,0"] = 'ffccff';
+    $new_color_list["18,1"] = 'ff99ff';
+    $new_color_list["18,2"] = 'ff66ff';
+    $new_color_list["18,3"] = 'ff33ff';
+    $new_color_list["18,4"] = 'ff00ff';
+
+    $selected_input = '';
+    $selected_choose = '';
+
+    for ($i=0; $i < 14; $i++) {
+        ${"selected".$i} = '';
+    }
+    if (isset($message_highlight_list[$theid]['color'])) {
+        for ($i=0; $i < 14; $i++) {
             if ($color_list[$i] == $message_highlight_list[$theid]['color']) {
-               $selected_choose = ' checked';
-               ${"selected".$i} = ' selected';
-               continue;
+            $selected_choose = ' checked';
+            ${"selected".$i} = ' selected';
+            continue;
             }
-      }
-      }
-      if (!isset($message_highlight_list[$theid]['color']))
-         $selected_choose = ' checked';
-      else if ($selected_choose == '')
-         $selected_input = ' checked';
- 
-      echo '<form name="f" action="options_highlight.php">' . "\n";
-      echo '<input type="hidden" value="save" name="action">' . "\n";
-      echo '<input type="hidden" value="'.$theid.'" name="theid">' . "\n";
-      echo '<table width="80%" align="center" cellpadding="3" cellspacing="0" border="0">' . "\n";
-      echo "   <tr bgcolor=\"$color[0]\">\n";
-      echo "      <td align=\"right\" nobr><b>\n";
-      echo _("Identifying name") . ":";
-      echo '      </b></td>' . "\n";
-      echo '      <td>' . "\n";
-      if (isset($message_highlight_list[$theid]['name']))
-          $disp = $message_highlight_list[$theid]['name'];
-      else
-          $disp = '';
-      $disp = htmlspecialchars($disp);
-      echo "         <input type=\"text\" value=\"".$disp."\" name=\"identname\">";
-      echo "      </td>\n";
-      echo "   </tr>\n";
-      echo '   <tr><td><small><small>&nbsp;</small></small></td></tr>' . "\n";
-      echo "   <tr bgcolor=\"$color[0]\">\n";
-      echo '      <td align="right"><b>' . "\n";
-      echo _("Color") . ':';
-      echo "      </b></td>\n";
-      echo '      <td>' . "\n";
-      echo "         <input type=\"radio\" name=color_type value=1$selected_choose> &nbsp;<select name=newcolor_choose>\n";
-      echo "            <option value=\"$color_list[0]\"$selected0>" . _("Dark Blue") . "\n";
-      echo "            <option value=\"$color_list[1]\"$selected1>" . _("Dark Green") . "\n";
-      echo "            <option value=\"$color_list[2]\"$selected2>" . _("Dark Yellow") . "\n";
-      echo "            <option value=\"$color_list[3]\"$selected3>" . _("Dark Cyan") . "\n";
-      echo "            <option value=\"$color_list[4]\"$selected4>" . _("Dark Magenta") . "\n";
-      echo "            <option value=\"$color_list[5]\"$selected5>" . _("Light Blue") . "\n";
-      echo "            <option value=\"$color_list[6]\"$selected6>" . _("Light Green") . "\n";
-      echo "            <option value=\"$color_list[7]\"$selected7>" . _("Light Yellow") . "\n";
-      echo "            <option value=\"$color_list[8]\"$selected8>" . _("Light Cyan") . "\n";
-      echo "            <option value=\"$color_list[9]\"$selected9>" . _("Light Magenta") . "\n";
-      echo "            <option value=\"$color_list[10]\"$selected10>" . _("Dark Gray") . "\n";
-      echo "            <option value=\"$color_list[11]\"$selected11>" . _("Medium Gray") . "\n";
-      echo "            <option value=\"$color_list[12]\"$selected12>" . _("Light Gray") . "\n";
-      echo "            <option value=\"$color_list[13]\"$selected13>" . _("White") . "\n";
-      echo "         </select><br>\n";
-      echo "         <input type=\"radio\" name=color_type value=2$selected_input> &nbsp;". _("Other:") ."<input type=\"text\" value=\"";
-      if ($selected_input) echo $message_highlight_list[$theid]["color"];
-      echo '" name="newcolor_input" size="7"> '._("Ex: 63aa7f")."<br>\n";
-      echo "      </td>\n";
-      echo "   </tr>\n";
-
-      # Show grid of color choices
-      echo "<tr bgcolor=$color[0]><td colspan='2'>\n";
-      echo "<table border=0 cellpadding=\"2\" align=\"center\" cellspacing=\"1\">\n";
-      $current_color = $message_highlight_list[$theid]['color'];
-      for($x = 0; $x < 5; $x++) {
+    }
+    }
+    if (!isset($message_highlight_list[$theid]['color']))
+        $selected_choose = ' checked';
+    else if ($selected_choose == '')
+        $selected_input = ' checked';
+
+    echo '<form name="f" action="options_highlight.php">' . "\n";
+    echo '<input type="hidden" value="save" name="action">' . "\n";
+    echo '<input type="hidden" value="'.$theid.'" name="theid">' . "\n";
+    echo '<table width="80%" align="center" cellpadding="3" cellspacing="0" border="0">' . "\n";
+    echo "   <tr bgcolor=\"$color[0]\">\n";
+    echo "      <td align=\"right\" nobr><b>\n";
+    echo _("Identifying name") . ":";
+    echo '      </b></td>' . "\n";
+    echo '      <td>' . "\n";
+    if (isset($message_highlight_list[$theid]['name']))
+        $disp = $message_highlight_list[$theid]['name'];
+    else
+        $disp = '';
+    $disp = htmlspecialchars($disp);
+    echo "         <input type=\"text\" value=\"".$disp."\" name=\"identname\">";
+    echo "      </td>\n";
+    echo "   </tr>\n";
+    echo '   <tr><td><small><small>&nbsp;</small></small></td></tr>' . "\n";
+    echo "   <tr bgcolor=\"$color[0]\">\n";
+    echo '      <td align="right"><b>' . "\n";
+    echo _("Color") . ':';
+    echo "      </b></td>\n";
+    echo '      <td>' . "\n";
+    echo "         <input type=\"radio\" name=color_type value=1$selected_choose> &nbsp;<select name=newcolor_choose>\n";
+    echo "            <option value=\"$color_list[0]\"$selected0>" . _("Dark Blue") . "\n";
+    echo "            <option value=\"$color_list[1]\"$selected1>" . _("Dark Green") . "\n";
+    echo "            <option value=\"$color_list[2]\"$selected2>" . _("Dark Yellow") . "\n";
+    echo "            <option value=\"$color_list[3]\"$selected3>" . _("Dark Cyan") . "\n";
+    echo "            <option value=\"$color_list[4]\"$selected4>" . _("Dark Magenta") . "\n";
+    echo "            <option value=\"$color_list[5]\"$selected5>" . _("Light Blue") . "\n";
+    echo "            <option value=\"$color_list[6]\"$selected6>" . _("Light Green") . "\n";
+    echo "            <option value=\"$color_list[7]\"$selected7>" . _("Light Yellow") . "\n";
+    echo "            <option value=\"$color_list[8]\"$selected8>" . _("Light Cyan") . "\n";
+    echo "            <option value=\"$color_list[9]\"$selected9>" . _("Light Magenta") . "\n";
+    echo "            <option value=\"$color_list[10]\"$selected10>" . _("Dark Gray") . "\n";
+    echo "            <option value=\"$color_list[11]\"$selected11>" . _("Medium Gray") . "\n";
+    echo "            <option value=\"$color_list[12]\"$selected12>" . _("Light Gray") . "\n";
+    echo "            <option value=\"$color_list[13]\"$selected13>" . _("White") . "\n";
+    echo "         </select><br>\n";
+    echo "         <input type=\"radio\" name=color_type value=2$selected_input> &nbsp;". _("Other:") ."<input type=\"text\" value=\"";
+    if ($selected_input) echo $message_highlight_list[$theid]["color"];
+    echo '" name="newcolor_input" size="7"> '._("Ex: 63aa7f")."<br>\n";
+    echo "      </td>\n";
+    echo "   </tr>\n";
+
+    # Show grid of color choices
+    echo "<tr bgcolor=$color[0]><td colspan='2'>\n";
+    echo "<table border=0 cellpadding=\"2\" align=\"center\" cellspacing=\"1\">\n";
+    $current_color = $message_highlight_list[$theid]['color'];
+    for($x = 0; $x < 5; $x++) {
         echo "<tr>\n";
         for($y = 0; $y < 19; $y++) {
-          $gridindex = "$y,$x";
-          $gridcolor = $new_color_list[$gridindex];
-          $selected = ($gridcolor == $current_color)?'SELECTED':'' ;
-          echo "<td bgcolor=#$gridcolor><input type='radio' name=color_type value='#$gridcolor' $selected>\n";
-          echo "</td>\n";
+        $gridindex = "$y,$x";
+        $gridcolor = $new_color_list[$gridindex];
+        $selected = ($gridcolor == $current_color)?'SELECTED':'' ;
+        echo "<td bgcolor=#$gridcolor><input type='radio' name=color_type value='#$gridcolor' $selected>\n";
+        echo "</td>\n";
         }
         echo "</tr>\n";
-      }
-      echo "</table>\n";
-      echo "</tr></td>\n";
-
-      echo '   <tr><td><small><small>&nbsp;</small></small></td></tr>' . "\n";
-      echo "   <tr bgcolor=\"$color[0]\">\n";
-      echo '      <td align="center" colspan=2>' . "\n";
-      echo "         <select name=match_type>\n";
-      oh_opt( 'from',
-              ($message_highlight_list[$theid]['match_type'] == 'from'),
-              _("From") );
-      oh_opt( 'to',
-              ($message_highlight_list[$theid]['match_type'] == 'to'),
-              _("To") );
-      oh_opt( 'cc',
-              ($message_highlight_list[$theid]['match_type'] == 'cc'),
-              _("Cc") );
-      oh_opt( 'to_cc',
-              ($message_highlight_list[$theid]['match_type'] == 'to_cc'),
-              _("To or Cc") );
-      oh_opt( 'subject',
-              ($message_highlight_list[$theid]['match_type'] == 'subject'),
-              _("Subject") );
-      echo "         </select>\n";
-      echo '<b>' . _("Matches") . ':</b> ';
-      if (isset($message_highlight_list[$theid]['value']))
-          $disp = $message_highlight_list[$theid]['value'];
-      else
-          $disp = '';
-      $disp = htmlspecialchars($disp);
-      echo '         <input type="text" value="' . $disp .
-         '" name="value" size=40>';
-      echo "        </td>\n";
-      echo "   </tr>\n";
-      echo "</table>\n";
-      echo '<center><input type="submit" value="' . _("Submit") . "\"></center>\n";
-      echo "</form>\n";
-   }
-   do_hook('options_highlight_bottom');
+    }
+    echo "</table>\n";
+    echo "</tr></td>\n";
+
+    echo '   <tr><td><small><small>&nbsp;</small></small></td></tr>' . "\n";
+    echo "   <tr bgcolor=\"$color[0]\">\n";
+    echo '      <td align="center" colspan=2>' . "\n";
+    echo "         <select name=match_type>\n";
+    oh_opt( 'from',
+            ($message_highlight_list[$theid]['match_type'] == 'from'),
+            _("From") );
+    oh_opt( 'to',
+            ($message_highlight_list[$theid]['match_type'] == 'to'),
+            _("To") );
+    oh_opt( 'cc',
+            ($message_highlight_list[$theid]['match_type'] == 'cc'),
+            _("Cc") );
+    oh_opt( 'to_cc',
+            ($message_highlight_list[$theid]['match_type'] == 'to_cc'),
+            _("To or Cc") );
+    oh_opt( 'subject',
+            ($message_highlight_list[$theid]['match_type'] == 'subject'),
+            _("Subject") );
+    echo "         </select>\n";
+    echo '<b>' . _("Matches") . ':</b> ';
+    if (isset($message_highlight_list[$theid]['value']))
+        $disp = $message_highlight_list[$theid]['value'];
+    else
+        $disp = '';
+    $disp = htmlspecialchars($disp);
+    echo '         <input type="text" value="' . $disp .
+        '" name="value" size=40>';
+    echo "        </td>\n";
+    echo "   </tr>\n";
+    echo "</table>\n";
+    echo '<center><input type="submit" value="' . _("Submit") . "\"></center>\n";
+    echo "</form>\n";
+}
+do_hook('options_highlight_bottom');
 ?>
 </body></html>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません