From 906f7e9fa070f6df07bd4ba8c72a9c7908039761 Mon Sep 17 00:00:00 2001 From: kink Date: Sat, 5 Aug 2006 14:39:17 +0000 Subject: [PATCH] Do not pass the $key to sqimap_login, that takes care of that itself. Also remove any globals that are not needed anymore because of this change, or because they're already set in init.php. I believe that we should move to a sqimap_login() without any parameters, but this is a good first step. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11476 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addrbook_search.php | 4 ---- src/compose.php | 15 +++++---------- src/download.php | 5 +---- src/empty_trash.php | 7 ++----- src/folders.php | 7 +------ src/left_main.php | 7 ++----- src/printer_friendly_bottom.php | 6 +----- src/read_body.php | 6 +----- src/right_main.php | 2 -- src/search.php | 5 +---- src/vcard.php | 7 ++----- src/view_header.php | 7 ++----- src/view_html.php | 7 ++----- src/view_text.php | 13 ++++--------- src/webmail.php | 4 ---- 15 files changed, 24 insertions(+), 78 deletions(-) diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 843303cc..f75abff9 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -154,10 +154,6 @@ function display_result($res, $includesource = true) { /* ================= End of functions ================= */ /** lets get the global vars we may need */ -sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); if (! sqgetGlobalVar('show' , $show)) { $show = ''; diff --git a/src/compose.php b/src/compose.php index 059fd8f7..80784195 100644 --- a/src/compose.php +++ b/src/compose.php @@ -33,13 +33,8 @@ require_once(SM_PATH . 'functions/forms.php'); require_once(SM_PATH . 'functions/identity.php'); /* --------------------- Get globals ------------------------------------- */ -/** COOKIE VARS */ -sqgetGlobalVar('key', $key, SQ_COOKIE); /** SESSION VARS */ -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); sqgetGlobalVar('composesession', $composesession, SQ_SESSION); @@ -382,7 +377,7 @@ if ($draft) { $draft_message = _("Draft Email Saved"); /* If this is a resumed draft, then delete the original */ if(isset($delete_draft)) { - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false); + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false); sqimap_mailbox_select($imap_stream, $draft_folder); // force bypass_trash=true because message should be saved when deliverMessage() returns true. // in current implementation of sqimap_msgs_list_flag() single message id can @@ -481,7 +476,7 @@ if ($send) { /* if it is resumed draft, delete draft message */ if ( isset($delete_draft)) { - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false); + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false); sqimap_mailbox_select($imap_stream, $draft_folder); // bypass_trash=true because message should be saved when deliverMessage() returns true. // in current implementation of sqimap_msgs_list_flag() single message id can @@ -702,7 +697,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $mailprio = 3; if ($passed_id) { - $imapConnection = sqimap_login($username, $key, $imapServerAddress, + $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); @@ -1643,7 +1638,7 @@ function deliverMessage($composeMessage, $draft=false) { } elseif ($draft) { global $draft_folder; require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); @@ -1681,7 +1676,7 @@ function deliverMessage($composeMessage, $draft=false) { } else { unset ($deliver); $move_to_sent = getPref($data_dir,$username,'move_to_sent'); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); /* Move to sent code */ if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) { diff --git a/src/download.php b/src/download.php index 1d5acca8..72b2c8bf 100644 --- a/src/download.php +++ b/src/download.php @@ -26,9 +26,6 @@ header('Pragma: '); header('Cache-Control: cache'); /* globals */ -sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); sqgetGlobalVar('messages', $messages, SQ_SESSION); sqgetGlobalVar('mailbox', $mailbox, SQ_GET); @@ -46,7 +43,7 @@ set_my_charset(); /* end globals */ -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); $aMailbox = sqm_api_mailbox_select($imapConnection, $account, $mailbox,array(),array()); if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) && diff --git a/src/empty_trash.php b/src/empty_trash.php index a099d667..c467a8bf 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -23,14 +23,11 @@ require(SM_PATH . 'functions/tree.php'); /* get those globals */ -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('key', $key, SQ_COOKIE); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); /* finished globals */ -$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); $mailbox = $trash_folder; $boxes = sqimap_mailbox_list($imap_stream); @@ -74,4 +71,4 @@ session_write_close(); $location = get_location(); header ("Location: $location/left_main.php"); -?> \ No newline at end of file +?> diff --git a/src/folders.php b/src/folders.php index 559a284e..afa22032 100644 --- a/src/folders.php +++ b/src/folders.php @@ -26,17 +26,12 @@ require_once(SM_PATH . 'functions/forms.php'); displayPageHeader($color, 'None'); /* get globals we may need */ - -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('key', $key, SQ_COOKIE); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); - sqgetGlobalVar('smaction', $action, SQ_POST); /* end of get globals */ -$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login ($username, false, $imapServerAddress, $imapPort, 0); /* switch to the right function based on what the user selected */ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) { diff --git a/src/left_main.php b/src/left_main.php index 61af595d..cba10d1c 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -28,10 +28,7 @@ define('SM_BOX_UNCOLLAPSED', 0); define('SM_BOX_COLLAPSED', 1); /* get globals */ -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('key', $key, SQ_COOKIE); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); sqgetGlobalVar('fold', $fold, SQ_GET); sqgetGlobalVar('unfold', $unfold, SQ_GET); @@ -39,7 +36,7 @@ sqgetGlobalVar('unfold', $unfold, SQ_GET); // open a connection on the imap port (143) // why hide the output? -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, true); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, true); /** * Using stristr since very old preferences may contain "None" and "none". @@ -209,4 +206,4 @@ $oTemplate->display('left_main.tpl'); sqimap_logout($imapConnection); $oTemplate->display('footer.tpl'); -?> \ No newline at end of file +?> diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 350c466b..00e416b4 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -27,10 +27,6 @@ require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'functions/url_parser.php'); /* get some of these globals */ -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); @@ -40,7 +36,7 @@ if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) { sqgetGlobalVar('show_html_default', $show_html_default, SQ_FORM); /* end globals */ -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) { $message = $messages[$mbx_response['UIDVALIDITY']][$passed_id]; diff --git a/src/read_body.php b/src/read_body.php index e8a74a15..b04812b0 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -816,11 +816,7 @@ function getButton($type, $name, $value, $js = '', $enabled = TRUE) { /* get the globals we may need */ -sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) { $messages = array(); @@ -896,7 +892,7 @@ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); /* end of get globals */ global $sqimap_capabilities, $lastTargetMailbox; -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); diff --git a/src/right_main.php b/src/right_main.php index a2903eb4..e644d8d1 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -30,9 +30,7 @@ require_once(SM_PATH . 'functions/mailbox_display.php'); /* lets get the global vars we may need */ -sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION); if (is_array($delayed_errors)) { $oErrorHandler->AssignDelayedErrors($delayed_errors); diff --git a/src/search.php b/src/search.php index 427fb16e..127a96b1 100644 --- a/src/search.php +++ b/src/search.php @@ -1162,10 +1162,7 @@ function sqimap_asearch_get_selectable_unformatted_mailboxes(&$boxes) /* ------------------------ main ------------------------ */ /* get globals we will need */ -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('key', $key, SQ_COOKIE); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) { $checkall = (int) $temp; @@ -1572,7 +1569,7 @@ if ($search_advanced) { uasort($imap_asearch_options, 'asearch_unhtml_strcoll'); /* open IMAP connection */ -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); /* get mailboxes once here */ diff --git a/src/vcard.php b/src/vcard.php index d22b9687..8d61d4ea 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -31,9 +31,6 @@ include_once(SM_PATH . 'functions/imap_general.php'); include_once(SM_PATH . 'functions/imap_messages.php'); /* globals */ -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); @@ -41,7 +38,7 @@ sqgetGlobalVar('ent_id', $ent_id, SQ_GET); sqgetGlobalVar('startMessage', $startMessage, SQ_GET); /* end globals */ -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); displayPageHeader($color, 'None'); @@ -252,4 +249,4 @@ echo '' . _("Download this as a file") . ''; display('footer.tpl'); -?> \ No newline at end of file +?> diff --git a/src/webmail.php b/src/webmail.php index 8a53880c..2da1f5a6 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -18,10 +18,6 @@ */ require('../include/init.php'); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); - if (sqgetGlobalVar('sort', $sort)) { $sort = (int) $sort; } -- 2.25.1