From f38b7cf06c3343a7fead417d90bd67d291f5dc29 Mon Sep 17 00:00:00 2001 From: kink Date: Tue, 11 Mar 2003 17:39:25 +0000 Subject: [PATCH] More cleanup. This dir all done. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4645 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/delete_message.php | 14 ++++++++------ src/empty_trash.php | 8 ++++---- src/folders.php | 13 ++++++------- src/left_main.php | 19 +++++++++--------- src/printer_friendly_bottom.php | 16 +++++++--------- src/right_main.php | 3 +-- src/search.php | 34 ++++----------------------------- src/signout.php | 8 ++------ src/vcard.php | 15 ++++++++------- src/webmail.php | 18 ++++++----------- 10 files changed, 55 insertions(+), 93 deletions(-) diff --git a/src/delete_message.php b/src/delete_message.php index 6078920d..09c2fef6 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -19,12 +19,14 @@ require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; - -$message = $_GET['message']; -$mailbox = $_GET['mailbox']; +/* get globals */ +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + +sqgetGlobalVar('message', $message, SQ_GET); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); +/* end globals */ if (isset($_GET['saved_draft'])) { $saved_draft = urlencode($_GET['saved_draft']); diff --git a/src/empty_trash.php b/src/empty_trash.php index 607fc3cb..313cb01a 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -23,10 +23,10 @@ require_once(SM_PATH . 'functions/tree.php'); /* get those globals */ -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; -$delimiter = $_SESSION['delimiter']; +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); /* finished globals */ diff --git a/src/folders.php b/src/folders.php index 466e6ef7..182a1d3c 100644 --- a/src/folders.php +++ b/src/folders.php @@ -26,13 +26,12 @@ displayPageHeader($color, 'None'); /* get globals we may need */ -$username = $_SESSION['username']; -$key = $_COOKIE['key']; -$delimiter = $_SESSION['delimiter']; -$onetimepad = $_SESSION['onetimepad']; -if (isset($_GET['success'])) { - $success = $_GET['success']; -} +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + +sqgetGlobalVar('success', $success, SQ_GET); /* end of get globals */ diff --git a/src/left_main.php b/src/left_main.php index b65d8393..c72f89dc 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -504,17 +504,16 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { /* -------------------- MAIN ------------------------ */ -$key = $_COOKIE['key']; -$onetimepad = $_SESSION['onetimepad']; -$username = $_SESSION['username']; -$delimiter = $_SESSION['delimiter']; +/* get globals */ +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); -if (isset($_GET['fold'])) { - $fold = $_GET['fold']; -} -if (isset($_GET['unfold'])) { - $unfold = $_GET['unfold']; -} +sqgetGlobalVar('fold', $fold, SQ_GET); +sqgetGlobalVar('unfold', $unfold, SQ_GET); + +/* end globals */ // open a connection on the imap port (143) $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index c334b0d2..cd7d042b 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -27,18 +27,16 @@ require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/html.php'); /* get some of these globals */ -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); -$passed_id = (int) $_GET['passed_id']; -$mailbox = $_GET['mailbox']; +sqgetGlobalVar('passed_id', $passed_id, SQ_GET); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); -if (!isset($_GET['passed_ent_id'])) { +if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) { $passed_ent_id = ''; -} else { - $passed_ent_id = $_GET['passed_ent_id']; -} +} /* end globals */ $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); diff --git a/src/right_main.php b/src/right_main.php index 2ccde4d8..81501534 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -156,8 +156,7 @@ if (isset($note)) { echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n"; } -if (isset($_SESSION['just_logged_in'])) { - $just_logged_in = $_SESSION['just_logged_in']; +if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { if ($just_logged_in == true) { $just_logged_in = false; diff --git a/src/search.php b/src/search.php index 8c553224..448e8599 100644 --- a/src/search.php +++ b/src/search.php @@ -23,10 +23,10 @@ global $allow_thread_sort; /* get globals we may need */ -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; -$delimiter = $_SESSION['delimiter']; +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); if (isset($_GET['mailbox'])) { $mailbox = strip_tags($_GET['mailbox']); @@ -238,32 +238,6 @@ $search_all = 'none'; $perbox_count = array (); $recent_count = getPref($data_dir, $username, 'search_memory', 0); -/* get globals we may need */ - -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; -$delimiter = $_SESSION['delimiter']; - -if (isset($_GET['mailbox'])) { - $mailbox = strip_tags($_GET['mailbox']); -} -if (isset($_GET['submit'])) { - $submit = strip_tags($_GET['submit']); -} -if (isset($_GET['what'])) { - $what = $_GET['what']; -} -if (isset($_GET['where'])) { - $where = strip_tags($_GET['where']); -} -if (isset($_GET['checkall'])) { - $checkall = strip_tags($_GET['checkall']); -} -if (isset($_GET['count'])) { - $count = strip_tags($_GET['count']); -} - /* get mailbox names */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $boxes = sqimap_mailbox_list($imapConnection); diff --git a/src/signout.php b/src/signout.php index 1fb84845..ea3b95e0 100644 --- a/src/signout.php +++ b/src/signout.php @@ -39,13 +39,9 @@ if (!isset($frame_top)) { /* If a user hits reload on the last page, $base_uri isn't set * because it was deleted with the session. */ -if (!isset($_SESSION['base_uri'])) { - if (!function_exists('sqm_baseuri')){ - require_once(SM_PATH . 'functions/display_messages.php'); - } +if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) { + require_once(SM_PATH . 'functions/display_messages.php'); $base_uri = sqm_baseuri(); -} else { - $base_uri = $_SESSION['base_uri']; } do_hook('logout'); diff --git a/src/vcard.php b/src/vcard.php index da4a7a63..ee109a6c 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -22,13 +22,14 @@ require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'include/load_prefs.php'); /* globals */ -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; -$mailbox = $_GET['mailbox']; -$passed_id = (int) $_GET['passed_id']; -$ent_id = $_GET['ent_id']; -$startMessage = (int) $_GET['startMessage']; +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + +sqgetGlobalVar('passed_id', $passed_id, SQ_GET); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); +sqgetGlobalVar('ent_id', $ent_id, SQ_GET); +sqgetGlobalVar('startMessage', $startMessage, SQ_GET); /* end globals */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); diff --git a/src/webmail.php b/src/webmail.php index 2ca66d47..0df533a3 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -33,18 +33,12 @@ $base_uri = sqm_baseuri(); session_start(); -if (isset($_SESSION['username'])) { - $username = $_SESSION['username']; -} -if (isset($_SESSION['delimiter'])) { - $delimiter = $_SESSION['delimiter']; -} -if (isset($_SESSION['onetimepad'])) { - $onetimepad = $_SESSION['onetimepad']; -} -if (isset($_GET['right_frame'])) { - $right_frame = $_GET['right_frame']; -} +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + +sqgetGlobalVar('right_frame', $right_frame, SQ_GET); + if ( isset($_SESSION['session_expired_post']) ) { sqsession_unregister('session_expired_post'); } -- 2.25.1