X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=167169f071be3dea502cb86fb0bec16c8e10bd98;hb=df6daca8f6ed0c99f8a67e0568f4305f6d57c180;hp=efc66d1fd35f04d1cde152a2031150b4a97b51b1;hpb=39bfea8fa9fd939da9766a79381f68ea4b725c23;p=squirrelmail.git

diff --git a/src/options_highlight.php b/src/options_highlight.php
index efc66d1f..167169f0 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -3,13 +3,13 @@
 /**
  * options_highlight.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Displays message highlighting options
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**
@@ -19,13 +19,13 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'functions/imap.php');
+include_once(SM_PATH . 'functions/plugin.php');
+include_once(SM_PATH . 'functions/strings.php');
+include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
 
 /* get globals */
 sqGetGlobalVar('action', $action);
@@ -38,11 +38,11 @@ sqGetGlobalVar('match_type', $match_type);
 sqGetGlobalVar('value', $value);
 
 /* end of get globals */
- 
+
 function oh_opt( $val, $sel, $tit ) {
     echo "<option value=\"$val\"";
     if ( $sel )
-        echo ' selected';
+        echo ' selected="selected"';
     echo  ">$tit</option>\n";
 }
 
@@ -82,7 +82,7 @@ if (isset($theid) && ($action == 'delete') ||
             $new_rules = $message_highlight_list;
             break;
     }
-    $message_highlight_list = $new_rules;    
+    $message_highlight_list = $new_rules;
 
     setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));
 
@@ -100,11 +100,11 @@ if (isset($theid) && ($action == 'delete') ||
     $value = str_replace(',', ' ', $value);
 
     if(isset($theid)) {
-        $message_highlight_list[$theid] = 
+        $message_highlight_list[$theid] =
             array( 'name' => $identname, 'color' => $newcolor,
                    'value' => $value, 'match_type' => $match_type );
     } else {
-        $message_highlight_list[] = 
+        $message_highlight_list[] =
             array( 'name' => $identname, 'color' => $newcolor,
                    'value' => $value, 'match_type' => $match_type );
     }
@@ -116,15 +116,15 @@ displayPageHeader($color, 'None');
 echo
 html_tag( 'table', "\n" .
     html_tag( 'tr', "\n" .
-        html_tag( 'td', '<center><b>' . _("Options") . ' - ' . _("Message Highlighting") . '</b></center>', 'left')
+        html_tag( 'td', '<div style="text-align: center;"><b>' . _("Options") . ' - ' . _("Message Highlighting") . '</b></div>', 'left')
     ),
     'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "<br />\n" .
-html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) . 
+html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) .
      html_tag( 'tr' ) . "\n" .
          html_tag( 'td', '', 'left' );
 
-echo '<center>[<a href="options_highlight.php?action=add">' . _("New") . '</a>]'.
-        ' - [<a href="options.php">'._("Done").'</a>]</center><br />'."\n";
+echo '<div style="text-align: center;">[<a href="options_highlight.php?action=add">' . _("New") . '</a>]'.
+        ' - [<a href="options.php">'._("Done").'</a>]</div><br />'."\n";
 $mhl_count = count($message_highlight_list);
 if ($mhl_count > 0) {
     echo html_tag( 'table', '', 'center', '', 'width="80%" border="0" cellpadding="3" cellspacing="0"' ) . "\n";
@@ -163,7 +163,7 @@ if ($mhl_count > 0) {
         echo html_tag( 'tr',
                     html_tag( 'td',
                         $links,
-                    'left', $color[4], 'width="20%" nowrap' ) .
+                    'left', $color[4], 'width="20%" style="white-space: nowrap;"' ) .
                     html_tag( 'td',
                         htmlspecialchars($message_highlight_list[$i]['name']) ,
                     'left' ) .
@@ -171,12 +171,12 @@ if ($mhl_count > 0) {
                         $match_type . ' = ' .
                         htmlspecialchars($message_highlight_list[$i]['value']) ,
                     'left' ) ,
-                '', $message_highlight_list[$i]['color'] ) . "\n";
+                '', '#'.$message_highlight_list[$i]['color'] ) . "\n";
     }
     echo "</table>\n".
         "<br />\n";
 } else {
-    echo '<center>' . _("No highlighting is defined") . "</center><br />\n".
+    echo '<div style="text-align: center;">' . _("No highlighting is defined") . "</div><br />\n".
         "<br />\n";
 }
 if ($action == 'edit' || $action == 'add') {
@@ -361,14 +361,14 @@ if ($action == 'edit' || $action == 'add') {
     else if ($selected_choose == '')
         $selected_input = TRUE;
 
-    echo addForm('options_highlight.php', 'POST', 'f').
+    echo addForm('options_highlight.php', 'post', 'f').
          addHidden('action', 'save');
     if($action == 'edit') {
         echo addHidden('theid', (isset($theid)?$theid:''));
     }
     echo html_tag( 'table', '', 'center', '', 'width="80%" cellpadding="3" cellspacing="0" border="0"' ) . "\n";
     echo html_tag( 'tr', '', '', $color[0] ) . "\n";
-    echo html_tag( 'td', '', 'right', '', 'nowrap' ) . "<b>\n";
+    echo html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . "<b>\n";
     echo _("Identifying name") . ":";
     echo '      </b></td>' . "\n";
     echo html_tag( 'td', '', 'left' ) . "\n";
@@ -386,29 +386,29 @@ if ($action == 'edit' || $action == 'add') {
     echo '         '.addRadioBox('color_type', $selected_choose, '1');
 
     $selops = array (
-    	$color_list[0] => _("Dark Blue"),
-	$color_list[1] => _("Dark Green"),
-	$color_list[2] => _("Dark Yellow"),
-	$color_list[3] => _("Dark Cyan"),
-	$color_list[4] => _("Dark Magenta"),
-	$color_list[5] => _("Light Blue"),
-	$color_list[6] => _("Light Green"),
-	$color_list[7] => _("Light Yellow"),
-	$color_list[8] => _("Light Cyan"),
-	$color_list[9] => _("Light Magenta"),
-	$color_list[10] => _("Dark Gray"),
-	$color_list[11] => _("Medium Gray"),
-	$color_list[12] => _("Light Gray"),
-	$color_list[13] => _("White") );
-	
+        $color_list[0] => _("Dark Blue"),
+        $color_list[1] => _("Dark Green"),
+        $color_list[2] => _("Dark Yellow"),
+        $color_list[3] => _("Dark Cyan"),
+        $color_list[4] => _("Dark Magenta"),
+        $color_list[5] => _("Light Blue"),
+        $color_list[6] => _("Light Green"),
+        $color_list[7] => _("Light Yellow"),
+        $color_list[8] => _("Light Cyan"),
+        $color_list[9] => _("Light Magenta"),
+        $color_list[10] => _("Dark Gray"),
+        $color_list[11] => _("Medium Gray"),
+        $color_list[12] => _("Light Gray"),
+        $color_list[13] => _("White") );
+
     echo addSelect('newcolor_choose', $selops, $selected_i, TRUE);
     echo "<br />\n";
 
     echo '         '.addRadioBox('color_type', $selected_input, 2).
         ' &nbsp;'. _("Other:") .
-	addInput('newcolor_input',
-	    (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
-	    '7');
+        addInput('newcolor_input',
+            (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
+            '7');
     echo _("Ex: 63aa7f")."<br />\n";
     echo "      </td>\n";
     echo "   </tr>\n";
@@ -424,7 +424,7 @@ if ($action == 'edit' || $action == 'add') {
         $gridindex = "$y,$x";
         $gridcolor = $new_color_list[$gridindex];
         echo html_tag( 'td', addRadioBox('color_type', ($gridcolor == $current_color), '#'.$gridcolor),
-	    'left', $gridcolor, 'colspan="2"' );
+            'left', '#'.$gridcolor, 'colspan="2"' );
         }
         echo "</tr>\n";
     }
@@ -460,9 +460,13 @@ if ($action == 'edit' || $action == 'add') {
     echo "        </td>\n";
     echo "   </tr>\n";
     echo "</table>\n";
-    echo '<center><input type="submit" value="' . _("Submit") . "\" /></center>\n";
+    echo '<div style="text-align: center;"><input type="submit" value="' . _("Submit") . "\" /></div>\n";
     echo "</form>\n";
 }
 do_hook('options_highlight_bottom');
+
 ?>
-</table></body></html>
+</table>
+<?php
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file