Drop unused file imap_search.php.

[squirrelmail.git] / src / folders_subscribe.php

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 154ea47219a4f25442d4e23e29cf5f77dcc4a557..61bfe84caf1b96303b86a798a9bf2a76d569a2f4 100644 (file)
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,31 +3,34 @@
 /**
  * folders_subscribe.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * Subscribe and unsubcribe from folders. 
+ * Subscribe and unsubcribe from folders.
  * Called from folders.php
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 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();
@@ -43,7 +46,7 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0
 if ($method == 'sub') {
     if($no_list_for_subscribe && $imap_server_type == 'cyrus') {
        /* Cyrus, atleast, does not typically allow subscription to
-       * nonexistent folders (this is an optional part of IMAP),
+        * nonexistent folders (this is an optional part of IMAP),
         * lets catch it here and report back cleanly. */
        if(!sqimap_mailbox_exists($imapConnection, $mailbox[0])) {
           header("Location: $location/folders.php?success=subscribe-doesnotexist");
@@ -67,4 +70,4 @@ if ($method == 'sub') {
 sqimap_logout($imapConnection);
 header("Location: $location/folders.php?success=$success");
 
-?>
+?>
\ No newline at end of file