More cleanup. This dir all done.

[squirrelmail.git] / src / folders_subscribe.php

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 154ea47219a4f25442d4e23e29cf5f77dcc4a557..dbf1b3a7e8c6abdc9e88bfc723fa5bf79ced4491 100644 (file)
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,7 +3,7 @@
 /**
  * folders_subscribe.php
  *
- * 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.
  *
  * Subscribe and unsubcribe from folders. 
@@ -17,17 +17,16 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 
 /* globals */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-
-$method = $_GET['method'];
-$mailbox = $_POST['mailbox'];
-
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('method',    $method,        SQ_GET);
+sqgetGlobalVar('mailbox',   $mailbox,       SQ_POST);
 /* end globals */
 
 $location = get_location();