From 91dc6e4e1605dc5aee40e3cae9f11d79f785b834 Mon Sep 17 00:00:00 2001 From: lbergman Date: Fri, 9 Feb 2001 00:26:02 +0000 Subject: [PATCH 1/1] replaced "foo" with 'foo' while doing other git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1078 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/redirect.php | 38 +++++++++++----------- src/right_main.php | 62 ++++++++++++++++++------------------ src/search.php | 78 +++++++++++++++++++++++----------------------- src/signout.php | 62 ++++++++++++++++++------------------ 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/src/redirect.php b/src/redirect.php index b99ad2e0..4a4097a4 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -14,8 +14,8 @@ **/ if (!isset($strings_php)) - include ("../functions/strings.php"); - include("../config/config.php"); + include ('../functions/strings.php'); + include('../config/config.php'); // Before starting the session, the base URI must be known. // Assuming that this file is in the src/ subdirectory (or @@ -23,13 +23,13 @@ ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); $base_uri = $regs[1]; - header("Pragma: no-cache"); + header('Pragma: no-cache'); $location = get_location(); session_set_cookie_params (0, $base_uri); session_start(); - session_register ("base_uri"); + session_register ('base_uri'); if(!isset($login_username)) { exit; @@ -37,26 +37,26 @@ // Refresh the language cookie. if (isset($squirrelmail_language)) { - setcookie("squirrelmail_language", $squirrelmail_language, time()+2592000); + setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000); } - include ("../config/config.php"); - include ("../functions/prefs.php"); - include ("../functions/imap.php"); + include ('../config/config.php'); + include ('../functions/prefs.php'); + include ('../functions/imap.php'); if (!isset($plugin_php)) - include ("../functions/plugin.php"); + include ('../functions/plugin.php'); if (!isset($auth_php)) - include ("../functions/auth.php"); + include ('../functions/auth.php'); if (!isset($strings_php)) - include ("../functions/strings.php"); + include ('../functions/strings.php'); - if (!session_is_registered("user_is_logged_in") || $logged_in != 1) { - do_hook ("login_before"); + if (!session_is_registered('user_is_logged_in') || $logged_in != 1) { + do_hook ('login_before'); $onetimepad = OneTimePadCreate(strlen($secretkey)); $key = OneTimePadEncrypt($secretkey, $onetimepad); - session_register("onetimepad"); + session_register('onetimepad'); // verify that username and password are correct if ($force_username_lowercase) $login_username = strtolower($login_username); @@ -66,13 +66,13 @@ } sqimap_logout($imapConnection); - setcookie("username", $login_username, 0, $base_uri); - setcookie("key", $key, 0, $base_uri); - setcookie("logged_in", 1, 0, $base_uri); - do_hook ("login_verified"); + setcookie('username', $login_username, 0, $base_uri); + setcookie('key', $key, 0, $base_uri); + setcookie('logged_in', 1, 0, $base_uri); + do_hook ('login_verified'); } - session_register ("user_is_logged_in"); + session_register ('user_is_logged_in'); $user_is_logged_in = true; header("Location: $location/webmail.php"); diff --git a/src/right_main.php b/src/right_main.php index 11d09a53..e4b569cc 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -12,40 +12,40 @@ **/ if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.php'); session_start(); if(!isset($logged_in) || !isset($username) || !isset($key)) { - include ("../themes/default_theme.php"); - include ("../functions/display_messages.php"); + include ('../themes/default_theme.php'); + include ('../functions/display_messages.php'); printf('', $color[8], $color[4], $color[7], $color[7], $color[7]); plain_error_message(_("You need a valid user and password to access this page!") - . "
" + . '
' . _("Click here to log back in.") . ".", $color); - echo ""; + echo ''; exit; } 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($imap_php)) - include("../functions/imap.php"); + include('../functions/imap.php'); if (!isset($date_php)) - include("../functions/date.php"); + include('../functions/date.php'); if (!isset($page_header_php)) - include("../functions/page_header.php"); + include('../functions/page_header.php'); if (!isset($array_php)) - include("../functions/array.php"); + include('../functions/array.php'); if (!isset($mime_php)) - include("../functions/mime.php"); + include('../functions/mime.php'); if (!isset($mailbox_display_php)) - include("../functions/mailbox_display.php"); + include('../functions/mailbox_display.php'); if (!isset($display_messages_php)) - include("../functions/display_messages.php"); + include('../functions/display_messages.php'); ?> 0) { @@ -103,7 +103,7 @@ if (isset($newsort)) { $sort = $newsort; - session_register("sort"); + session_register('sort'); } // Check to see if we can use cache or not. Currently the only time when you wont use it is @@ -111,28 +111,28 @@ // array in the registered session data. :) if (! isset($use_mailbox_cache)) $use_mailbox_cache = 0; - if ($use_mailbox_cache && session_is_registered("msgs")) { + if ($use_mailbox_cache && session_is_registered('msgs')) { showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache); } else { - if (session_is_registered("msgs")) + if (session_is_registered('msgs')) unset($msgs); - if (session_is_registered("msort")) + if (session_is_registered('msort')) unset($msort); - if (session_is_registered("numMessages")) + if (session_is_registered('numMessages')) unset($numMessages); $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox); showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache); - if (session_is_registered("msgs") && isset($msgs)) - session_register("msgs"); - if (session_is_registered("msort") && isset($msort)) - session_register("msort"); - session_register("numMessages"); + if (session_is_registered('msgs') && isset($msgs)) + session_register('msgs'); + if (session_is_registered('msort') && isset($msort)) + session_register('msort'); + session_register('numMessages'); } - do_hook("right_main_bottom"); + do_hook('ight_main_bottom'); sqimap_logout ($imapConnection); ?> diff --git a/src/search.php b/src/search.php index e7e9f8d2..79da86ac 100644 --- a/src/search.php +++ b/src/search.php @@ -10,93 +10,93 @@ exit; } if(!isset($username) || !isset($key)) { - include ("../themes/default_theme.php"); - include ("../functions/display_messages.php"); + include ('../themes/default_theme.php'); + include ('../functions/display_messages.php'); printf('', $color[8], $color[4], $color[7], $color[7], $color[7]); plain_error_message(_("You need a valid user and password to access this page!") - . "
" - . _("Click here to log back in.") . ".", $color); - echo ""; + . '
' + . _("Click here to log back in.") . '.', $color); + echo ''; exit; } if (!isset($strings_php)) - include("../functions/strings.php"); + include('../functions/strings.php'); if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.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($imap_php)) - include("../functions/imap.php"); + include('../functions/imap.php'); if (!isset($imap_search_php)) - include("../functions/imap_search.php"); + include('../functions/imap_search.php'); if (!isset($array_php)) - include("../functions/array.php"); + include('../functions/array.php'); - include("../src/load_prefs.php"); + include('../src/load_prefs.php'); displayPageHeader($color, $mailbox); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - do_hook("search_before_form"); + do_hook('search_before_form'); echo "
\n"; echo " \n"; echo " \n"; - echo " '; + echo ' '; + echo '
\n"; echo "
"._("Search")."
\n"; echo "
"; + echo '
'; echo "
\n"; echo " \n"; echo " \n"; echo " \n"; echo " "; + echo ' '; echo " \n"; diff --git a/src/signout.php b/src/signout.php index d77db43b..179cfb0f 100644 --- a/src/signout.php +++ b/src/signout.php @@ -14,20 +14,20 @@ session_start(); if (!isset($strings_php)) - include("../functions/strings.php"); + include('../functions/strings.php'); - include ("../src/load_prefs.php"); + include ('../src/load_prefs.php'); if (!isset($config_php)) - include("../config/config.php"); + include('../config/config.php'); if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.php'); if (!isset($prefs_php)) - include ("../functions/prefs.php"); + include ('../functions/prefs.php'); if (!isset($plugin_php)) - include ("../functions/plugin.php"); + include ('../functions/plugin.php'); - set_up_language(getPref($data_dir, $username, "language")); + set_up_language(getPref($data_dir, $username, 'language')); // If a user hits reload on the last page, $base_uri isn't set // because it was deleted with the session. @@ -37,16 +37,16 @@ $base_uri = $regs[1]; } - do_hook("logout"); - setcookie("username", "", 0, $base_uri); - setcookie("key", "", 0, $base_uri); - setcookie("logged_in", "", 0, $base_uri); + do_hook('logout'); + setcookie('username', '', 0, $base_uri); + setcookie('key', '', 0, $base_uri); + setcookie('logged_in', '', 0, $base_uri); session_destroy(); ?> ', $theme_css); echo "\n"; @@ -54,31 +54,31 @@ echo "$org_title - Signout\n"; echo "\n"; - echo "

\n"; - echo " '; $boxes = sqimap_mailbox_list($imapConnection); for ($i = 0; $i < count($boxes); $i++) { - if (!in_array("noselect", $boxes[$i]["flags"])) { - $box = $boxes[$i]["unformatted"]; - $box2 = replace_spaces($boxes[$i]["unformatted-disp"]); + if (!in_array('noselect', $boxes[$i]['flags'])) { + $box = $boxes[$i]['unformatted']; + $box2 = replace_spaces($boxes[$i]['unformatted-disp']); if ($mailbox == $box) echo " "; + echo ' '; echo " \n"; if (!isset($what)) - $what = ""; - $what_disp = ereg_replace(",", " ", $what); - $what_disp = str_replace("\\\\", "\\", $what_disp); - $what_disp = str_replace("\\\"", "\"", $what_disp); - $what_disp = str_replace("\"", """, $what_disp); + $what = ''; + $what_disp = ereg_replace(',', ' ', $what); + $what_disp = str_replace('\\', '\', $what_disp); + $what_disp = str_replace('\"', '"', $what_disp); + $what_disp = str_replace('"', '"', $what_disp); echo " \n"; - echo " \n"; - echo " '; - if (isset($where) && $where == "BODY") echo "
"; + echo '

'; echo " "; - echo " "; - echo " "; + echo ''; + echo ' '; + echo ' '; echo " "; - echo " "; - echo " "; + echo '

'; + echo ' '; + echo ' '; echo " "; - echo " "; - echo " "; - echo "
"; - echo " "; + echo ' '; + echo ' '; echo _("Sign Out"); - echo ""; - echo "
"; - echo "
"; + echo ' 		'; + echo '
'; echo _("You have been successfully signed out."); - echo "
"; - echo ""; + echo '
'; + echo ''; echo _("Click here to log back in."); - echo "

"; - echo "
"; - echo "
"; - echo "
"; - echo "

"; + echo '
; + echo '
'; + echo '
'; + echo '

'; ?> -- 2.25.1