From c9e9b23cbdad092a5d0dc36ed6f5d6db72e1f037 Mon Sep 17 00:00:00 2001 From: lbergman Date: Tue, 30 Jan 2001 19:16:25 +0000 Subject: [PATCH] Took out cvs confusion git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@988 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addrbook_popup.php | 14 ++++----- src/addrbook_search.php | 52 +++++++++++++++---------------- src/addrbook_search_html.php | 58 +++++++++++++++++----------------- src/addressbook.php | 60 ++++++++++++++++++------------------ src/webmail.php | 45 +++++++++++++-------------- 5 files changed, 114 insertions(+), 115 deletions(-) diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php index caa69bd5..6ba634aa 100644 --- a/src/addrbook_popup.php +++ b/src/addrbook_popup.php @@ -13,21 +13,21 @@ session_start(); 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($auth_php)) - include("../functions/auth.php"); + include('../functions/auth.php'); if (!isset($addressbook_php)) - include("../functions/addressbook.php"); + include('../functions/addressbook.php'); is_logged_in(); - include("../src/load_prefs.php"); + include('../src/load_prefs.php'); - set_up_language(getPref($data_dir, $username, "language")); + set_up_language(getPref($data_dir, $username, 'language')); ?> diff --git a/src/addrbook_search.php b/src/addrbook_search.php index ed05ba99..cb2767ef 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -91,7 +91,7 @@ function bcc_address($addr) { insert_javascript(); $line = 0; - print ""; + print '
'; printf("\n"; $line++; } - print "
 ". " %s %s". " %s", @@ -121,7 +121,7 @@ function bcc_address($addr) { print "
"; + print ''; } /* ================= End of functions ================= */ @@ -129,42 +129,42 @@ function bcc_address($addr) { session_start(); if (!isset($i18n_php)) - include("../functions/i18n.php"); + include('../functions/i18n.php'); 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($config_php)) - include("../config/config.php"); + include('../config/config.php'); if (!isset($array_php)) - include("../functions/array.php"); + include('../functions/array.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 (!isset($page_header_php)) - include("../functions/page_header.php"); + include('../functions/page_header.php'); if (!isset($addressbook_php)) - include("../functions/addressbook.php"); + include('../functions/addressbook.php'); is_logged_in(); - include("../src/load_prefs.php"); + include('../src/load_prefs.php'); displayHtmlHeader(); // Choose correct colors for top and bottom frame - if($show == "form") { + if($show == 'form') { echo ""; + echo 'OnLoad="document.sform.query.focus();">'; } else { echo "\n"; @@ -181,11 +181,11 @@ function bcc_address($addr) { $abook = addressbook_init(); // Create search form - if($show == "form") { + if($show == 'form') { printf("
\n", $PHP_SELF); - printf(""); - printf("
\n"); + print(''); + print("
\n"); printf(" %s\n", _("Search for")); printf(" \n", htmlspecialchars($query)); @@ -199,26 +199,26 @@ function bcc_address($addr) { $ret = $abook->get_backend_list(); while(list($undef,$v) = each($ret)) printf("\n"); + print "\n"; printf("\n", _("Close window")); - printf("
\n"); + print "
\n"; } else // Show personal addressbook - if($show == "blank" || !empty($listall)) { + if($show == 'blank' || !empty($listall)) { - if($backend != -1 || $show == "blank") { - if($show == "blank") + if($backend != -1 || $show == 'blank') { + if($show == 'blank') $backend = $abook->localbackend; //printf("

%s

\n", $abook->backends[$backend]->sname); diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index d7407d8b..7dcc067c 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -19,42 +19,42 @@ session_start(); if (!isset($config_php)) - include("../config/config.php"); + include('../config/config.php'); if (!isset($strings_php)) - include("../functions/strings.php"); + include('../functions/strings.php'); if (!isset($auth_php)) - include("../functions/auth.php"); + include('../functions/auth.php'); if (!isset($page_header_php)) - include("../functions/page_header.php"); + include('../functions/page_header.php'); if (!isset($date_php)) - include("../functions/date.php"); + include('../functions/date.php'); if (!isset($smtp_php)) - include("../functions/smtp.php"); + include('../functions/smtp.php'); if (!isset($display_messages_php)) - include("../functions/display_messages.php"); + include('../functions/display_messages.php'); if (!isset($addressbook_php)) - include("../functions/addressbook.php"); + include('../functions/addressbook.php'); if (!isset($plugin_php)) - include("../functions/plugin.php"); + include('../functions/plugin.php'); - include("../src/load_prefs.php"); + include('../src/load_prefs.php'); // Insert hidden data function addr_insert_hidden() { global $body, $subject, $send_to, $send_to_cc, $send_to_bcc; - echo "\n"; - echo "\n"; - echo "\n"; + echo htmlspecialchars($body) . '" name=body>\n"'; + echo '\n"'; + echo '\n"'; echo "\n"; + . '" name=send_to_cc>\n"'; echo "\n"; + . '" name=send_to_bcc>\n"'; echo "\n"; } @@ -101,14 +101,14 @@ 'NAME="addr_search_done" VALUE="%s">', 4 + ($includesource ? 1 : 0), _("Use Addresses")); - print ""; + print ''; print ''; - print ""; + print ''; } // --- End functions --- - displayPageHeader($color, "None"); + displayPageHeader($color, 'None'); // Initialize addressbook $abook = addressbook_init(); @@ -131,7 +131,7 @@ // Search form print "
\n"; print "\n"; - printf("
\n"); + print "
\n"; printf('
'."\n", $PHP_SELF); print "
\n"; printf(" %s\n", _("Search for")); @@ -154,20 +154,20 @@ $v->bnum, ($backend == $v->bnum) ? "SELECTED" : "", $v->sname); - printf("\n"); + print "\n"; } else { - printf("\n"); + print "\n"; } printf("", _("Search")); printf(" | \n", _("List all")); - print "
"; + print ''; - printf("
\n"); + print "\n"; addr_insert_hidden(); print "
"; - do_hook("addrbook_html_search_below"); + do_hook('addrbook_html_search_below'); // End search form // Show personal addressbook @@ -221,8 +221,8 @@ printf('
'."\n", $PHP_SELF); addr_insert_hidden(); printf("\n", _("Return")); - printf('
'); - printf("
"); + print ''; + print ''; } ?> diff --git a/src/addressbook.php b/src/addressbook.php index f8a0e49a..2ad610ea 100644 --- a/src/addressbook.php +++ b/src/addressbook.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($array_php)) - include("../functions/array.php"); + include('../functions/array.php'); if (!isset($auth_php)) - include("../functions/auth.php"); + include('../functions/auth.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($addressbook_php)) - include("../functions/addressbook.php"); + include('../functions/addressbook.php'); is_logged_in(); // Sort array by the key "name" function alistcmp($a,$b) { - if($a["backend"] > $b["backend"]) + if($a['backend'] > $b['backend']) return 1; - else if($a["backend"] < $b["backend"]) + else if($a['backend'] < $b['backend']) return -1; - return (strtolower($a["name"]) > strtolower($b["name"])) ? 1 : -1; + return (strtolower($a['name']) > strtolower($b['name'])) ? 1 : -1; } // Output form to add and modify address data @@ -49,8 +49,8 @@ "". " %s\n", $color[4], $name, - (isset($values["nickname"]))? - htmlspecialchars($values["nickname"]):"", + (isset($values['nickname']))? + htmlspecialchars($values['nickname']):"", _("Must be unique")); printf("%s:", _("E-mail address")); @@ -89,7 +89,7 @@ } - include("../src/load_prefs.php"); + include('../src/load_prefs.php'); // Open addressbook, with error messages on but without LDAP (the // second "true"). Don't need LDAP here anyway @@ -99,23 +99,23 @@ exit(); } - displayPageHeader($color, "None"); + displayPageHeader($color, 'None'); $defdata = array(); - $formerror = ""; + $formerror = ''; $abortform = false; $showaddrlist = true; $defselected = array(); // Handle user's actions - if($REQUEST_METHOD == "POST") { + if($REQUEST_METHOD == 'POST') { // *********************************************** // Add new address // *********************************************** - if(!empty($addaddr["nickname"])) { + if(!empty($addaddr['nickname'])) { $r = $abook->add($addaddr, $abook->localbackend); @@ -123,7 +123,7 @@ if(!$r) { // Remove backend name from error string $errstr = $abook->error; - $errstr = ereg_replace("^\[.*\] *", "", $errstr); + $errstr = ereg_replace('^\[.*\] *', '', $errstr); $formerror = $errstr; $showaddrlist = false; @@ -148,7 +148,7 @@ $delfailed = false; for($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) { - list($sbackend, $snick) = split(":", $sel[$i]); + list($sbackend, $snick) = split(':', $sel[$i]); // When we get to a new backend, process addresses in // previous one. @@ -201,7 +201,7 @@ $olddata = $abook->lookup($enick, $ebackend); // Display the "new address" form - printf("
\n", $PHP_SELF); + print "\n"; print "\n"; print "
\n"; print _("Update address"); @@ -213,7 +213,7 @@ printf("\n", htmlspecialchars($olddata["backend"])); print "\n"; - print ""; + print ''; } } @@ -245,7 +245,7 @@ printf("\n", htmlspecialchars($backend)); print "\n"; - print ""; + print ''; $abortform = true; } @@ -303,7 +303,7 @@ // New table header for each backend if($prevbackend != $row["backend"]) { if($prevbackend >= 0) { - print "
"; + print '
'; print " 
\n"; } @@ -313,7 +313,7 @@ print "\n\n"; print "\n"; - print ''; + print '
'; printf('\n"; print "
 '. '%s%s'. '%s%s'. @@ -326,13 +326,13 @@ $headerprinted = true; } // End of header - $prevbackend = $row["backend"]; + $prevbackend = $row['backend']; // Check if this user is selected - if(in_array($row["backend"].":".$row["nickname"], $defselected)) - $selected = "CHECKED"; + if(in_array($row['backend'].':'.$row['nickname'], $defselected)) + $selected = 'CHECKED'; else - $selected = ""; + $selected = ''; // Print one row printf("", @@ -371,8 +371,8 @@ printf(_("Add to %s"), $abook->localbackendname); print "\n
\n"; - address_form("addaddr", _("Add address"), $defdata); - print ""; + address_form('addaddr', _("Add address"), $defdata); + print ''; // Add hook for anything that wants on the bottom do_hook("addressbook_bottom"); diff --git a/src/webmail.php b/src/webmail.php index c239a898..8ca5aa8e 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -16,41 +16,40 @@ session_start(); if (!isset($i18n_php)) - include ("../functions/i18n.php"); + include ('../functions/i18n.php'); if(!isset($username)) { set_up_language($squirrelmail_language); - 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 ("../config/config.php"); - include ("../functions/prefs.php"); - include ("../functions/imap.php"); + include ('../functions/strings.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'); - - include ("../src/load_prefs.php"); + include ('../src/load_prefs.php'); // We'll need this to later have a noframes version - set_up_language(getPref($data_dir, $username, "language")); + set_up_language(getPref($data_dir, $username, 'language')); echo "\n"; - echo ""; - echo "$org_title"; - echo ""; + echo ''; + echo $org_title; + echo ''; $bar_size = $left_size; @@ -73,13 +72,13 @@ This was done to create a pure HTML way of refreshing the folder list since we would like to use as little Javascript as possible. **/ - if ($right_frame == "right_main.php") { + if ($right_frame == 'right_main.php') { $urlMailbox = urlencode($mailbox); $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; - } else if ($right_frame == "options.php") { - $right_frame_url = "options.php"; - } else if ($right_frame == "folders.php") { - $right_frame_url = "folders.php"; + } else if ($right_frame == 'options.php') { + $right_frame_url = 'options.php'; + } else if ($right_frame == 'folders.php') { + $right_frame_url = 'folders.php'; } else { if (!isset($just_logged_in)) $just_logged_in = 0; $right_frame_url = "right_main.php?just_logged_in=$just_logged_in"; @@ -88,11 +87,11 @@ if ($location_of_bar == 'right') { echo ""; - echo ""; + echo ''; } else { - echo ""; + echo ''; echo ""; } -- 2.25.1