From e1db998a699ae5f71d48f4be60f17b2c4ac2c6d5 Mon Sep 17 00:00:00 2001 From: lbergman Date: Fri, 9 Feb 2001 20:08:58 +0000 Subject: [PATCH] "me" to 'you', made attempt to be more carfull for the sake of Tyler's sanity. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1098 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/options_highlight.php | 188 +++++++++++++++++++------------------- src/options_order.php | 80 ++++++++-------- src/options_personal.php | 36 ++++---- 3 files changed, 152 insertions(+), 152 deletions(-) diff --git a/src/options_highlight.php b/src/options_highlight.php index 44335ba9..3cc2ea7d 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -13,147 +13,147 @@ session_start(); if (!isset($strings_php)) - include("../functions/strings.php"); + include('../functions/strings.php'); if (!isset($config_php)) - include("../config/config.php"); + include('../config/config.php'); if (!isset($page_header_php)) - include("../functions/page_header.php"); + include('../functions/page_header.php'); if (!isset($display_messages_php)) - include("../functions/display_messages.php"); + include('../functions/display_messages.php'); if (!isset($imap_php)) - include("../functions/imap.php"); + include('../functions/imap.php'); if (!isset($array_php)) - include("../functions/array.php"); + include('../functions/array.php'); if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.php'); if (!isset($plugin_php)) - include("../functions/plugin.php"); + include('../functions/plugin.php'); if (! isset($action)) $action = ''; if (! isset($message_highlight_list)) $message_highlight_list = array(); - if ($action == "delete" && isset($theid)) { + if ($action == 'delete' && isset($theid)) { removePref($data_dir, $username, "highlight$theid"); - } else if ($action == "save") { + } else if ($action == 'save') { if (!$theid) $theid = 0; - $identname = ereg_replace(",", " ", $identname); + $identname = ereg_replace(',', ' ', $identname); $identname = str_replace("\\\\", "\\", $identname); - $identname = str_replace("\\\"", "\"", $identname); - $identname = str_replace("\"", """, $identname); + $identname = str_replace("\\\"", '"', $identname); + $identname = str_replace('"', '"', $identname); if ($color_type == 1) $newcolor = $newcolor_choose; else $newcolor = $newcolor_input; - $newcolor = ereg_replace(",", "", $newcolor); - $newcolor = ereg_replace("#", "", $newcolor); + $newcolor = ereg_replace(',', '', $newcolor); + $newcolor = ereg_replace('#', '', $newcolor); $newcolor = "$newcolor"; - $value = ereg_replace(",", " ", $value); + $value = ereg_replace(',', ' ', $value); $value = str_replace("\\\\", "\\", $value); - $value = str_replace("\\\"", "\"", $value); - $value = str_replace("\"", """, $value); + $value = str_replace("\\\"", '"', $value); + $value = str_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; + 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; } - include("../src/load_prefs.php"); - displayPageHeader($color, "None"); + include('../src/load_prefs.php'); + displayPageHeader($color, 'None'); ?>
- @@ -86,5 +86,5 @@
-
+
+
[" . _("New") . "]"; - echo " - ["._("Done")."]

\n"; + echo '
[' . _("New") . ']'; + echo ' - ['._("Done").']

'."\n"; if (count($message_highlight_list) >= 1) { - echo "\n"; + echo '
'."\n"; for ($i=0; $i < count($message_highlight_list); $i++) { echo "\n"; - echo " "; - echo " '; + echo ' \n"; - echo " \n"; echo "\n"; } echo "
\n"; + echo ' \n"; echo "[" . _("Edit") . "] ["._("Delete")."]\n"; - echo " \n"; - echo " " . $message_highlight_list[$i]["name"]; + echo ' \n"; + echo ' ' . $message_highlight_list[$i]['name']; echo " \n"; - echo " ".$message_highlight_list[$i]["match_type"]." = " . $message_highlight_list[$i]["value"]; + echo ' \n"; + echo ' '.$message_highlight_list[$i]['match_type'].' = ' . $message_highlight_list[$i]['value']; echo "
\n"; echo "
\n"; } else { - echo "
" . _("No highlighting is defined") . "

\n"; + echo '
' . _("No highlighting is defined") . "

\n"; echo "
\n"; } - if ($action == "edit" || $action == "add") { + 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"; + $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'; - $selected_input = ""; + $selected_input = ''; for ($i=0; $i < 14; $i++) { - ${"selected".$i} = ""; + ${"selected".$i} = ''; } - if (isset($message_highlight_list[$theid]["color"])) { + 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"; + if ($color_list[$i] == $message_highlight_list[$theid]['color']) { + $selected_choose = ' checked'; + ${"selected".$i} = ' selected'; continue; } } } - if (!isset($message_highlight_list[$theid]["color"])) - $selected_choose = " checked"; + if (!isset($message_highlight_list[$theid]['color'])) + $selected_choose = ' checked'; else if (!isset($selected_choose)) - $selected_input = " checked"; + $selected_input = ' checked'; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '
' . "\n"; echo " \n"; - echo " \n"; - echo " ' . "\n"; + echo ' \n"; echo " \n"; - echo " \n"; + echo ' ' . "\n"; echo " \n"; - echo " \n"; - echo " \n"; echo " \n"; - echo " \n"; + echo ' ' . "\n"; echo " \n"; - echo " \n"; - echo " \n"; echo " \n"; echo "
\n"; + echo " \n"; echo _("Identifying name") . ":"; - echo " \n"; - if (isset($message_highlight_list[$theid]["name"])) - $disp = $message_highlight_list[$theid]["name"]; + echo ' ' . "\n"; + if (isset($message_highlight_list[$theid]['name'])) + $disp = $message_highlight_list[$theid]['name']; else - $disp = ""; + $disp = ''; $disp = str_replace("\\\\", "\\", $disp); - $disp = str_replace("\\\"", "\"", $disp); - $disp = str_replace("\"", """, $disp); + $disp = str_replace("\\\"", '"', $disp); + $disp = str_replace('"', '"', $disp); echo " "; echo "
 
 
\n"; - echo _("Color") . ":"; + echo ' ' . "\n"; + echo _("Color") . ':'; echo " \n"; + echo ' ' . "\n"; echo "  
\n"; echo "  ". _("Other:") ." "._("Ex: 63aa7f")."
\n"; + echo '" name="newcolor_input" size="7"> '._("Ex: 63aa7f")."
\n"; echo "
 
 
\n"; - echo _("Match") . ":"; + echo ' ' . "\n"; + echo _("Match") . ':'; echo " \n"; + echo ' ' . "\n"; echo " \n"; - if (isset($message_highlight_list[$theid]["value"])) - $disp = $message_highlight_list[$theid]["value"]; + if (isset($message_highlight_list[$theid]['value'])) + $disp = $message_highlight_list[$theid]['value']; else $disp = ''; $disp = str_replace("\\\\", "\\", $disp); - $disp = str_replace("\\\"", "\"", $disp); - $disp = str_replace("\"", """, $disp); - echo " "; + $disp = str_replace("\\\"", '"', $disp); + $disp = str_replace('"', '"', $disp); + echo ' '; echo "
\n"; - echo "
\n"; + echo '
\n"; echo "
\n"; - do_hook("options_highlight_bottom"); + do_hook('options_highlight_bottom'); } ?> diff --git a/src/options_order.php b/src/options_order.php index 66aedee8..ffa70ac1 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -13,30 +13,30 @@ session_start(); if (!isset($strings_php)) - include("../functions/strings.php"); + include('../functions/strings.php'); if (!isset($config_php)) - include("../config/config.php"); + include('../config/config.php'); if (!isset($page_header_php)) - include("../functions/page_header.php"); + include('../functions/page_header.php'); if (!isset($display_messages_php)) - include("../functions/display_messages.php"); + include('../functions/display_messages.php'); if (!isset($imap_php)) - include("../functions/imap.php"); + include('../functions/imap.php'); if (!isset($array_php)) - include("../functions/array.php"); + include('../functions/array.php'); if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.php'); if (!isset($plugin_php)) - include("../functions/plugin.php"); + include('../functions/plugin.php'); - if (! isset($action)) { $action = ""; } - if ($action == "delete" && isset($theid)) { + if (! isset($action)) { $action = ''; } + if ($action == 'delete' && isset($theid)) { removePref($data_dir, $username, "highlight$theid"); - } else if ($action == "save") { + } else if ($action == 'save') { } - include("../src/load_prefs.php"); - displayPageHeader($color, "None"); + include('../src/load_prefs.php'); + displayPageHeader($color, 'None'); ?>
@@ -53,19 +53,19 @@ $available[5] = _("Flags"); $available[6] = _("Size"); - if (! isset($method)) { $method = ""; } + if (! isset($method)) { $method = ''; } - if ($method == "up" && $num > 1) { + if ($method == 'up' && $num > 1) { $prev = $num-1; $tmp = $index_order[$prev]; $index_order[$prev] = $index_order[$num]; $index_order[$num] = $tmp; - } else if ($method == "down" && $num < count($index_order)) { + } else if ($method == 'down' && $num < count($index_order)) { $next = $num++; $tmp = $index_order[$next]; $index_order[$next] = $index_order[$num]; $index_order[$num] = $tmp; - } else if ($method == "remove" && $num) { + } else if ($method == 'remove' && $num) { for ($i=1; $i < 8; $i++) { removePref($data_dir, $username, "order$i"); } @@ -78,9 +78,9 @@ $index_order = array(); $index_order = $new_ary; if (count($index_order) < 1) { - include "../src/load_prefs.php"; + include ('../src/load_prefs.php'); } - } else if ($method == "add" && $add) { + } else if ($method == 'add' && $add) { $index_order[count($index_order)+1] = $add; } @@ -89,38 +89,38 @@ setPref($data_dir, $username, "order$i", $index_order[$i]); } } - echo "
"; - echo "
\n"; + echo '
'; + echo '
' . "\n"; echo _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs."); - echo "

"; + echo '

'; if (count($index_order)) { - echo "
"; - echo "\n"; + echo '
'; + echo '
' . "\n"; for ($i=1; $i <= count($index_order); $i++) { $tmp = $index_order[$i]; - echo ""; + echo ''; echo "\n"; - echo "\n"; + echo '' . "\n"; echo "\n"; - echo "\n"; - echo "' . "\n"; + echo '\n"; - echo "\n"; - echo "\n"; + echo '' . "\n"; + echo '\n"; echo "\n"; } echo "
". _("up") ." |  | ". _("down") . " | "; + echo ' | '; // Always show the subject if ($tmp != 4) - echo "" . _("remove") . ""; + echo "" . _("remove") . ''; echo " - " . $available[$tmp] . " - ' . $available[$tmp] . "
\n"; - echo "
"; + echo ''; } if (count($index_order) != count($available)) { - echo "
"; - echo "'; for ($i=1; $i <= count($available); $i++) { $found = false; for ($j=1; $j <= count($index_order); $j++) { @@ -129,16 +129,16 @@ } } if (!$found) { - echo ""; + echo ""; } } - echo ""; - echo ""; - echo ""; - echo "
"; + echo ''; + echo ''; + echo ''; + echo ''; } - echo "
" . _("Return to options page") . "
"; + echo '
' . _("Return to options page") . '
'; ?>
diff --git a/src/options_personal.php b/src/options_personal.php index 7db053d0..415f997f 100644 --- a/src/options_personal.php +++ b/src/options_personal.php @@ -13,28 +13,28 @@ session_start(); if (!isset($strings_php)) - include("../functions/strings.php"); + include('../functions/strings.php'); if (!isset($config_php)) - include("../config/config.php"); + include('../config/config.php'); if (!isset($page_header_php)) - include("../functions/page_header.php"); + include('../functions/page_header.php'); if (!isset($display_messages_php)) - include("../functions/display_messages.php"); + include('../functions/display_messages.php'); if (!isset($imap_php)) - include("../functions/imap.php"); + include('../functions/imap.php'); if (!isset($array_php)) - include("../functions/array.php"); + include('../functions/array.php'); if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.php'); if (!isset($plugin_php)) - include("../functions/plugin.php"); + include('../functions/plugin.php'); - include("../src/load_prefs.php"); - displayPageHeader($color, "None"); + include('../src/load_prefs.php'); + displayPageHeader($color, 'None'); - $fullname = getPref($data_dir, $username, "full_name"); - $replyto = getPref($data_dir, $username, "reply_to"); - $email_address = getPref($data_dir, $username, "email_address"); + $fullname = getPref($data_dir, $username, 'full_name'); + $replyto = getPref($data_dir, $username, 'reply_to'); + $email_address = getPref($data_dir, $username, 'email_address'); ?>
@@ -67,13 +67,13 @@ 		  " . _("Use a signature") . "?
"; + echo '  ' . _("Use a signature") . "?
"; else { - echo "  "; + echo '  '; echo _("Use a signature?"); - echo "
"; + echo '
'; } - echo "\n
"; + echo "\n
"; ?>
- + -- 2.25.1