From 3267e4d87ff78d4e29755ccc36fb236b0d529cd5 Mon Sep 17 00:00:00 2001 From: jangliss Date: Fri, 7 Feb 2003 23:13:13 +0000 Subject: [PATCH] Updates to reflex removal of sqextractGlobalVar git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4510 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/spamcop/options.php | 6 +++--- plugins/spamcop/setup.php | 2 +- src/addrbook_search.php | 2 +- src/view_text.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php index 8892ef32..c4298c83 100755 --- a/plugins/spamcop/options.php +++ b/plugins/spamcop/options.php @@ -15,9 +15,9 @@ require_once(SM_PATH . 'include/validate.php'); displayPageHeader($color, 'None'); /* globals */ -sqextractGlobalVar('action'); -sqextractGlobalVar('meth'); -sqextractGlobalVar('ID'); +sqgetGlobalVar('action', $action); +sqgetGlobalVar('meth', $meth); +sqgetGlobalVar('ID' , $meth); extract($_SESSION); /* end of globals */ diff --git a/plugins/spamcop/setup.php b/plugins/spamcop/setup.php index cf4d0868..21d472f5 100755 --- a/plugins/spamcop/setup.php +++ b/plugins/spamcop/setup.php @@ -23,7 +23,7 @@ function squirrelmail_plugin_init_spamcop() { $squirrelmail_plugin_hooks['read_body_header_right']['spamcop'] = 'spamcop_show_link'; - sqextractGlobalVar('spamcop_is_composing'); + sqgetGlobalVar('spamcop_is_composing' , $spamcop_is_composing); if (isset($spamcop_is_composing)) { $squirrelmail_plugin_hooks['compose_send']['spamcop'] = diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 89143a80..3eff9318 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -29,7 +29,7 @@ $username = $_SESSION['username']; $onetimepad = $_SESSION['onetimepad']; $base_uri = $_SESSION['base_uri']; -sqextractGlobalVar('show'); +sqgetGlobalVar('show' , $show); if ( isset($_POST['query']) ) { $query = $_POST['query']; } diff --git a/src/view_text.php b/src/view_text.php index 0aa24e99..803c4ac3 100644 --- a/src/view_text.php +++ b/src/view_text.php @@ -40,7 +40,7 @@ $key = $_COOKIE['key']; $delimiter = $_SESSION['delimiter']; $onetimepad = $_SESSION['onetimepad']; $QUERY_STRING = $_SERVER['QUERY_STRING']; -sqextractGlobalVar('messages'); +sqgetGlobalVar('messages', $messages); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); -- 2.25.1