cleanup some plugins to make use of sqgetGlobalVar

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

diff --git a/plugins/info/options.php b/plugins/info/options.php
index ff1febf9cf9ce029da310b7dc7a1eb762127a2f1..8e400e0a4ea1db412ebb9d9deb41f8427db003e3 100644 (file)
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -27,23 +27,17 @@ displayPageHeader($color, 'None');
 $mailbox = 'INBOX';
 
 /* GLOBALS */
 $mailbox = 'INBOX';
 
 /* GLOBALS */

-$username = $_SESSION['username'];
-$key  = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
+sqgetGlobalVar('username', $username, SQ_SESSION);     
+sqgetGlobalVar('key', $key, SQ_COOKIE);     
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);  

 
 

-if(isset($_POST['submit'])) {
-    $submit = $_POST['submit'];
-}
+sqgetGlobalVar('submit', $submit, SQ_POST);

 
 for($i = 0; $i <= 9; $i++){
 
 for($i = 0; $i <= 9; $i++){

-    if(isset($_POST["CHECK_TEST_$i"])) {
-        $var = "CHECK_TEST_$i";
-        $$var = $_POST["CHECK_TEST_$i"];
-    }
-    if(isset($_POST["TEST_$i"])) {
-        $var = "TEST_$i";
-        $$var = $_POST["TEST_$i"];
-    }
+    $varc = 'CHECK_TEST_'.$i;
+    sqgetGlobalVar($varc, $$varc, SQ_POST);
+    $vart  = 'TEST_'.$i;
+    sqgetGlobalVar($vart, $$vart, SQ_POST);

 }
 
 /* END GLOBALS */
 }
 
 /* END GLOBALS */

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 9040fef87d7161892f915bf2d26c65185b68ddc2..56b8416c4520782da4e992e3e5fa9488dded67e7 100644 (file)
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -19,11 +19,11 @@ include_once(SM_PATH . 'functions/html.php');
 displayPageHeader($color, $mailbox);
 
 /* get globals */
 displayPageHeader($color, $mailbox);
 
 /* get globals */

-$mailbox = $_GET['mailbox'];
-$send_to = $_GET['send_to'];
-$subject = $_GET['subject'];
-$body    = $_GET['body'];
-$action  = $_GET['action'];
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+sqgetGlobalVar('send_to', $send_to, SQ_GET);
+sqgetGlobalVar('subject', $subject, SQ_GET);
+sqgetGlobalVar('body',    $body,    SQ_GET);
+sqgetGlobalVar('action',  $action,  SQ_GET);

 
 echo html_tag('p', '', 'left' ) .
 html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
 
 echo html_tag('p', '', 'left' ) .
 html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index 62fc882829df2812278e7bcd3cba0af4e2891eff..83c33df981a6152cab5e4fa624eff0f91d160540 100644 (file)
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -21,13 +21,12 @@ require_once(SM_PATH . 'functions/prefs.php');
 
 global $color, $uid_support;
 
 
 global $color, $uid_support;
 

-$passed_id = $_GET['passed_id'];
-$mailbox = $_GET['mailbox'];
-
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);

 
 

+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);

 
 function CalcEntity($entString, $direction) {
     $result = $entString;
 
 function CalcEntity($entString, $direction) {
     $result = $entString;

diff --git a/plugins/message_details/message_details_main.php b/plugins/message_details/message_details_main.php
index c55315133836fb1adda1d8e7d71b9353556c277a..9e6b2c234ef99caac410f06414b51c235134c3cf 100644 (file)
--- a/plugins/message_details/message_details_main.php
+++ b/plugins/message_details/message_details_main.php
@@ -19,8 +19,8 @@ require_once(SM_PATH . 'functions/strings.php');
 
 displayHtmlHeader( _("Message details"), '', FALSE );
 
 
 displayHtmlHeader( _("Message details"), '', FALSE );
 

-$mailbox = $_GET['mailbox'];
-$passed_id = $_GET['passed_id'];
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET);

 
 echo "<frameset rows=\"60, *\" noresize border=\"0\">\n";
 echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id". '" name="top_frame" scrolling="off">';
 
 echo "<frameset rows=\"60, *\" noresize border=\"0\">\n";
 echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id". '" name="top_frame" scrolling="off">';

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index 1652336f9880ff4caff2a97db07b21be1cb6a6f5..dafc1035dc9dd93e6e87eb2d2c3e7191bfa191f0 100644 (file)
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -49,12 +49,10 @@ function squirrelmail_plugin_init_sent_subfolders() {
 function sent_subfolders_check_handleAsSent() {
     global $handleAsSent_result, $sent_subfolders_base,
            $use_sent_subfolders;
 function sent_subfolders_check_handleAsSent() {
     global $handleAsSent_result, $sent_subfolders_base,
            $use_sent_subfolders;

-    if ( !check_php_version(4,1) ) {
-        global $_SESSION;
-    }
+

     $sent_subfolders_base = 'INBOX.Sent';
     $args = func_get_arg(0);
     $sent_subfolders_base = 'INBOX.Sent';
     $args = func_get_arg(0);

-    $delimiter = $_SESSION['delimiter'];
+    sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);

 
     /* Only check the folder string if we have been passed a mailbox. */
     if ($use_sent_subfolders && (count($args) > 1)) {
 
     /* Only check the folder string if we have been passed a mailbox. */
     if ($use_sent_subfolders && (count($args) > 1)) {


@@ -88,11 +86,8 @@ function sent_subfolders_load_prefs() {
 function sent_subfolders_optpage_loadhook_folders() {
     global $optpage_data, $imapServerAddress, $imapPort;
 
 function sent_subfolders_optpage_loadhook_folders() {
     global $optpage_data, $imapServerAddress, $imapPort;
 

-    if ( !check_php_version(4,1) ) {
-        global $_SESSION, $_COOKIE;
-    }
-    $username = $_SESSION['username'];
-    $key = $_COOKIE['key'];
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+    sqgetGlobalVar('key', $key, SQ_COOKIE);

 
     /* Get some imap data we need later. */
     $imapConnection =
 
     /* Get some imap data we need later. */
     $imapConnection =


@@ -159,13 +154,10 @@ function sent_subfolders_update_sentfolder() {
     global $data_dir, $imapServerAddress, $imapPort;
     global $use_sent_subfolders, $move_to_sent, $imap_server_type;
 
     global $data_dir, $imapServerAddress, $imapPort;
     global $use_sent_subfolders, $move_to_sent, $imap_server_type;
 

-    if ( !check_php_version(4,1) ) {
-        global $_SESSION, $_COOKIE;
-    }
-    $username = $_SESSION['username'];
-    $key  = $_COOKIE['key'];
-    $delimiter = $_SESSION['delimiter'];
-
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+    sqgetGlobalVar('key', $key, SQ_COOKIE);
+    sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+    

     if ($use_sent_subfolders || $move_to_sent) {
         $year = date('Y');
         $month = date('m');
     if ($use_sent_subfolders || $move_to_sent) {
         $year = date('Y');
         $month = date('m');

diff --git a/plugins/squirrelspell/sqspell_config.php b/plugins/squirrelspell/sqspell_config.php
index 36fe289da9ae2e2a8236ef874ebfac41bcd8e0de..f2a59ca88104c43e8089e6c956da7814b65e2c57 100644 (file)
--- a/plugins/squirrelspell/sqspell_config.php
+++ b/plugins/squirrelspell/sqspell_config.php
@@ -15,11 +15,7 @@ require_once(SM_PATH . 'functions/prefs.php');
 /* Just for poor wretched souls with E_ALL. :) */
 global $data_dir;
 
 /* Just for poor wretched souls with E_ALL. :) */
 global $data_dir;
 

-if ( !check_php_version(4,1) ) {
-    global $_SESSION;
-}
-
-$username = $_SESSION['username'];
+sqgetGlobalVar('username', $username, SQ_SESSION);

 
 /**
  * Example:
 
 /**
  * Example:


@@ -34,7 +30,5 @@ $SQSPELL_WORDS_FILE =
    getHashedFile($username, $data_dir, "$username.words");
 
 $SQSPELL_EREG = 'ereg';
    getHashedFile($username, $data_dir, "$username.words");
 
 $SQSPELL_EREG = 'ereg';

-#$SQSPELL_SOUP_NAZI = 'Mozilla/3, Mozilla/2, Opera 4, Opera/4, '
-#   . 'Macintosh, OmniWeb';

 
 ?>
 
 ?>

diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index c6a9d106ffb14b44fcaf2f3a0f53c29a76d69189..23ab2b376b5d01a5fdd094415b45a208e5feecaa 100644 (file)
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -28,13 +28,7 @@
 function sqspell_makePage($title, $scriptsrc, $body){
   global $color, $SQSPELL_VERSION;
 
 function sqspell_makePage($title, $scriptsrc, $body){
   global $color, $SQSPELL_VERSION;
 

-  if ( !check_php_version(4,1) ) {
-      global $_GET;
-  }
-  if (isset($_GET['MOD'])) {
-      $MOD = $_GET['MOD'];
-  }
-  else {
+  if (! sqgetGlobalVar('MOD', $MOD, SQ_GET) ) {

       $MOD = 'options_main';
   }
 
       $MOD = 'options_main';
   }
 


@@ -342,9 +336,10 @@ function sqspell_getWords(){
      * the user's old mailbox password. I admin, this is rather dirty,
      * but efficient. ;)
      */
      * the user's old mailbox password. I admin, this is rather dirty,
      * but efficient. ;)
      */

-    $key = $_COOKIE['key'];
-    $onetimepad = $_SESSION['onetimepad'];
-    $old_key = $_POST['old_key'];
+    sqgetGlobalVar('key', $key, SQ_COOKIE);
+    sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+    sqgetGlobalVar('old_key', $old_key, SQ_POST);

 
     if ($old_key != '') {
         $clear_key=$old_key;
 
     if ($old_key != '') {
         $clear_key=$old_key;


@@ -457,8 +452,8 @@ function sqspell_writeWords($words){
      * User wants to encrypt the file. So be it.
      * Get the user's password to use as a key.
      */
      * User wants to encrypt the file. So be it.
      * Get the user's password to use as a key.
      */

-    $key = $_COOKIE['key'];
-    $onetimepad = $_SESSION['onetimepad'];
+    sqgetGlobalVar('key', $key, SQ_COOKIE);
+    sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);

 
     $clear_key=OneTimePadDecrypt($key, $onetimepad);
     /**
 
     $clear_key=OneTimePadDecrypt($key, $onetimepad);
     /**