Getting ready for 1.4.0 RC1

[squirrelmail.git] / plugins / sent_subfolders / setup.php

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index 882b9d784222de67b7732d08370478348006da76..1652336f9880ff4caff2a97db07b21be1cb6a6f5 100644 (file)
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -3,7 +3,7 @@
 /**
  * setup.php -- Sent Subfolders Setup File
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This is a standard Squirrelmail-1.2 API for plugins.
@@ -48,9 +48,13 @@ function squirrelmail_plugin_init_sent_subfolders() {
 
 function sent_subfolders_check_handleAsSent() {
     global $handleAsSent_result, $sent_subfolders_base,
-           $use_sent_subfolders, $delimiter;
+           $use_sent_subfolders;
+    if ( !check_php_version(4,1) ) {
+        global $_SESSION;
+    }
     $sent_subfolders_base = 'INBOX.Sent';
     $args = func_get_arg(0);
+    $delimiter = $_SESSION['delimiter'];
 
     /* Only check the folder string if we have been passed a mailbox. */
     if ($use_sent_subfolders && (count($args) > 1)) {
@@ -82,7 +86,13 @@ function sent_subfolders_load_prefs() {
 }
 
 function sent_subfolders_optpage_loadhook_folders() {
-    global $optpage_data, $username, $key, $imapServerAddress, $imapPort;
+    global $optpage_data, $imapServerAddress, $imapPort;
+
+    if ( !check_php_version(4,1) ) {
+        global $_SESSION, $_COOKIE;
+    }
+    $username = $_SESSION['username'];
+    $key = $_COOKIE['key'];
 
     /* Get some imap data we need later. */
     $imapConnection =
@@ -144,11 +154,18 @@ function save_option_sent_subfolders_setting($option) {
 }
 
 function sent_subfolders_update_sentfolder() {
-    global $sent_folder, $delimiter, $auto_create_special, $auto_create_done;
+    global $sent_folder, $auto_create_special, $auto_create_done;
     global $sent_subfolders_base, $sent_subfolders_setting;
-    global $username, $data_dir, $key, $imapServerAddress, $imapPort;
+    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'];
+
     if ($use_sent_subfolders || $move_to_sent) {
         $year = date('Y');
         $month = date('m');