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

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index 8892ef32d453f58f2b70fc1c2df0c0493b997d57..c4298c83c28f3418c9d2190a9ce0da391c03a8d1 100755 (executable)
--- 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 cf4d0868fa1c2b361e04c7a75a27601dde5f0bad..21d472f5baab2525bab264e66189c8307315703d 100755 (executable)
--- 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 89143a808bad4c006201a5bcca985a8e04e249bd..3eff93185200bfe3727bda9972034cc772657992 100644 (file)
--- 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 0aa24e99924e7da7d87f50c6ca6ed61f53627929..803c4ac3766160e19d9f28f1c1e9662f7cd0d663 100644 (file)
--- 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);