no need to pass $key variable to sqimap_login anymore

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11477 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 09df3f7fbc210ad9c50556e85cccb3781f6b3ad8..f10e0646bb267b737e86d4f2399325f71b7c4ecd 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -192,10 +192,8 @@ function filters_bulkquery($filters, $IPs) {
  */
 function start_filters($hook_args) {
     global $imapServerAddress, $imapPort, $imap_stream, $imapConnection,
-           $UseSeparateImapConnection, $AllowSpamFilters, $filter_inbox_count;
-
-    sqgetGlobalVar('username', $username, SQ_SESSION);
-    sqgetGlobalVar('key',      $key,      SQ_COOKIE);
+           $UseSeparateImapConnection, $AllowSpamFilters, $filter_inbox_count,
+           $username;
 
     /**
      * check hook that calls filtering. If filters are called by right_main_after_header,
@@ -230,7 +228,7 @@ function start_filters($hook_args) {
     // Also check if we are forced to use a separate IMAP connection
     if ((!isset($imap_stream) && !isset($imapConnection)) ||
         $UseSeparateImapConnection ) {
-            $stream = sqimap_login($username, $key, $imapServerAddress,
+            $stream = sqimap_login($username, false, $imapServerAddress,
                                 $imapPort, 10);
             $previously_connected = false;
     } else if (isset($imapConnection)) {

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index e5a67e310af6336457a8fca6faa0ece84b6221eb..e9536d2ea067f9379bd47844e9180a0ff30e10a3 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -21,9 +21,6 @@ include_once(SM_PATH . 'plugins/filters/filters.php');
 displayPageHeader($color, 'None');
 
 /* get globals */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
 sqgetGlobalVar('theid', $theid);
@@ -128,7 +125,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
 
     if (isset($action) && ($action == 'add' || $action == 'edit')) {
 
-        $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+        $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
         $boxes = sqimap_mailbox_list($imapConnection);
 
         for ($a = 0, $cnt = count($boxes); $a < $cnt; $a++) {

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index b228298f3fc2bf6b3fd22816e52795dfd20bf8b6..d644fde722ba11aeed82bcbac3eb98883bac3ce9 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -20,9 +20,6 @@ include_once(SM_PATH . 'functions/imap_messages.php');
 include_once(SM_PATH . 'plugins/filters/filters.php');
 
 /* get globals */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
 sqgetGlobalVar('action', $action, SQ_GET);
@@ -80,7 +77,7 @@ if ($SpamFilters_YourHop == ' ') {
 
 
 if (isset($action) && $action == 'spam') {
-    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+    $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
     $boxes = sqimap_mailbox_list($imapConnection);
     sqimap_logout($imapConnection);
     $numboxes = count($boxes);
@@ -215,4 +212,4 @@ if (isset($action) && $action == 'spam') {
     echo '</table>';
 }
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/info/options.php b/plugins/info/options.php
index 85677c19448a674c4cd6c89bb74203fa54cbce3d..8da3dd9e2e8703c99ac6dad0761845689dea74d4 100644 (file)
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -42,8 +42,6 @@ if (! is_plugin_enabled('info')) {
 }
 
 /* GLOBALS */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-
 sqgetGlobalVar('submit', $submit, SQ_POST);
 
 for($i = 0; $i <= 9; $i++){
@@ -207,4 +205,4 @@ sqimap_logout($imap_stream);
  */
 do_hook('info_bottom');
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 7bf720b14269536124b85bbfdfe2dfb3b196569f..c22928fca7bd7c2e694e7d2344494e206ca671f8 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -22,9 +22,6 @@ include_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php');
 include_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
 /* globals */
-sqgetGlobalVar('username',   $username,   SQ_SESSION);
-sqgetGlobalVar('key',        $key,        SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 /* end globals */
 
@@ -173,7 +170,7 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
     }
 
     Mail_Fetch_Status(_("Opening IMAP server"));
-    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
+    $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 10);
 
     // check if destination folder is not set, is not subscribed and is not \noselect folder
     if($mailfetch_subfolder == '' ||
@@ -324,4 +321,4 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
 ?>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php
index 8022396751ae5b55ce8791437ff6cb8a75df5b55..bedab89fdaafc7eb01fa35afc7820180160e2632 100644 (file)
--- a/plugins/mail_fetch/functions.php
+++ b/plugins/mail_fetch/functions.php
@@ -45,15 +45,13 @@ if (file_exists(SM_PATH . 'config/mail_fetch_config.php')) {
  * @private
  */
 function  mail_fetch_load_pref_function() {
-    global $data_dir;
+    global $data_dir, $username;
     global $mailfetch_server_number;
     global $mailfetch_cypher, $mailfetch_port_;
     global $mailfetch_server_,$mailfetch_alias_,$mailfetch_user_,$mailfetch_pass_;
     global $mailfetch_lmos_, $mailfetch_uidl_, $mailfetch_login_, $mailfetch_fref_;
     global $PHP_SELF;
 
-    sqgetGlobalVar('username', $username, SQ_SESSION);
-
     if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
         $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
         $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher', 'on' );
@@ -82,10 +80,7 @@ function mail_fetch_login_function() {
     //include_once (SM_PATH . 'include/validate.php');
     include_once (SM_PATH . 'functions/imap_general.php');
 
-    global $data_dir, $imapServerAddress, $imapPort;
-
-    sqgetGlobalVar('username', $username, SQ_SESSION);
-    sqgetGlobalVar('key',      $key,      SQ_COOKIE);
+    global $username, $data_dir, $imapServerAddress, $imapPort;
 
     $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
 
@@ -136,7 +131,7 @@ function mail_fetch_login_function() {
                 continue;
             }
 
-            $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
+            $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 10);
 
             $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
             if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
@@ -228,9 +223,8 @@ function mail_fetch_login_function() {
  * Internal function used to detect new logins
  */
 function mail_fetch_setnew_function() {
-    global $data_dir;
+    global $data_dir, $username;
 
-    sqgetGlobalVar('username', $username, SQ_SESSION);
     setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
 }
 

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 6cea52716e5acc974e28b5e49f65255e85532714..caf1f7fff632fc8b5b895048de50791e11d302c5 100644 (file)
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -20,9 +20,6 @@ require('../../include/init.php');
 include_once(SM_PATH . 'functions/imap_general.php');
 
 /* globals */
-sqgetGlobalVar('username',   $username,   SQ_SESSION);
-sqgetGlobalVar('key',        $key,        SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 
 if(!sqgetGlobalVar('mf_cypher', $mf_cypher, SQ_POST)) {
@@ -212,7 +209,7 @@ switch( $mf_action ) {
          html_tag( 'tr' ) .
              html_tag( 'th', _("Store in Folder:"), 'right' ) .
              html_tag( 'td', '', 'left' );
-     $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+     $imapConnection = sqimap_login ($username, false, $imapServerAddress, $imapPort, 0);
      $boxes = sqimap_mailbox_list($imapConnection);
      echo '<select name="mf_subfolder">';
 
@@ -333,7 +330,7 @@ switch( $mf_action ) {
                  html_tag( 'th', _("Store in Folder:"), 'right' ) .
                  html_tag( 'td', '', 'left' );
 
-     $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+     $imapConnection = sqimap_login ($username, false, $imapServerAddress, $imapPort, 0);
      $boxes = sqimap_mailbox_list($imapConnection);
      echo '<select name="mf_subfolder">';
      $selected = 0;
@@ -386,4 +383,4 @@ switch( $mf_action ) {
                    'center', '', 'width="70%"' );
 }
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index b6d897c2f9c451f605ffccb1d2d9a8ad1827b39f..25fc00906643dbc71ad41e2199418641dbf5fbf5 100644 (file)
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -107,12 +107,10 @@ function CalcEntity($entString, $direction) {
  * @access public
  */
 function get_message_details($mailbox, $passed_id, $stripHTML=FALSE) {
-    global $imapServerAddress, $imapPort, $color,$msgd_8bit_in_hex;
+    global $imapServerAddress, $imapPort, $color,$msgd_8bit_in_hex, $username;
 
     $returnValue = '';
 
-    sqgetGlobalVar('username', $username, SQ_SESSION);
-
     $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
     $read = sqimap_mailbox_select($imapConnection, $mailbox);
     $body = sqimap_run_command($imapConnection, "FETCH $passed_id RFC822",true, $response, $readmessage, TRUE);
@@ -368,4 +366,4 @@ ECHO;
     }
     return $returnValue;
 }
-?>
\ No newline at end of file
+?>

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index 53d17d14dff63689ee9fe61f3268cd65d1a7ece2..4ca648b3bedd271cf0527f62a86848a3753a3986 100644 (file)
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -102,9 +102,7 @@ function sent_subfolders_load_prefs() {
  * Adds sent_subfolders options in folder preferences
  */
 function sent_subfolders_optpage_loadhook_folders() {
-    global $optpage_data, $imapServerAddress, $imapPort, $show_contain_subfolders_option;
-
-    sqgetGlobalVar('username', $username, SQ_SESSION);
+    global $username, $optpage_data, $imapServerAddress, $imapPort, $show_contain_subfolders_option;
 
     /* Get some imap data we need later. */
     $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
@@ -190,12 +188,11 @@ function save_option_sent_subfolders_setting($option) {
  * creates required imap folders
  */
 function sent_subfolders_update_sentfolder() {
-    global $sent_folder;
+    global $sent_folder, $username;
     global $sent_subfolders_base, $sent_subfolders_setting;
     global $data_dir, $imapServerAddress, $imapPort, $color;
     global $use_sent_subfolders, $move_to_sent;
 
-    sqgetGlobalVar('username', $username, SQ_SESSION);
     sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
     if ($use_sent_subfolders || $move_to_sent) {

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index f27e8b6e29172ea3cae2e1cc7f54946804ee58a4..b72ee0cbd745228ad73ec641061fb919024bca24 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -25,8 +25,6 @@ include_once(SM_PATH . 'plugins/spamcop/functions.php');
 
 /* GLOBALS */
 
-sqgetGlobalVar('username', $username, SQ_SESSION);
-
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
 sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
 sqgetGlobalVar('js_web', $js_web, SQ_GET);
@@ -171,4 +169,4 @@ echo "</p>";
 </tr>
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>