X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_subscribe.php;h=dbf1b3a7e8c6abdc9e88bfc723fa5bf79ced4491;hb=f38b7cf06c3343a7fead417d90bd67d291f5dc29;hp=f49f56234cac1648b8c55fc51669aac13f3bf63f;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index f49f5623..dbf1b3a7 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,10 +3,10 @@
 /**
  * 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 form folders. 
+ * Subscribe and unsubcribe from folders. 
  * Called from folders.php
  *
  * $Id$
@@ -16,20 +16,29 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+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');
 
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+/* globals */
+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();
 
-if (!isset($mailbox) || !isset($mailbox[0]) || $mailbox[0] == "") {
+if (!isset($mailbox) || !isset($mailbox[0]) || $mailbox[0] == '') {
     header("Location: $location/folders.php");
-    sqimap_logout($imapConnection);
+
     exit(0);
 }
 
+$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
@@ -41,38 +50,20 @@ if ($method == 'sub') {
           exit(0);
        }
     }
-
     for ($i=0; $i < count($mailbox); $i++) {
         $mailbox[$i] = trim($mailbox[$i]);
         sqimap_subscribe ($imapConnection, $mailbox[$i]);
-        header("Location: $location/folders.php?success=subscribe");
     }
+    $success = 'subscribe';
 } else {
     for ($i=0; $i < count($mailbox); $i++) {
         $mailbox[$i] = trim($mailbox[$i]);
         sqimap_unsubscribe ($imapConnection, $mailbox[$i]);
-        header("Location: $location/folders.php?success=unsubscribe");
     }
+    $success = 'unsubscribe';
 }
+
 sqimap_logout($imapConnection);
+header("Location: $location/folders.php?success=$success");
 
-/*
-displayPageHeader($color, 'None');
-echo "<BR><BR><BR><CENTER><B>";
-if ($method == "sub") {
-    echo _("Subscribed Successfully!");
-    echo "</B><BR><BR>";
-    echo _("You have been successfully subscribed.");
-} else {
-    echo _("Unsubscribed Successfully!");
-    echo "</B><BR><BR>";
-    echo _("You have been successfully unsubscribed.");
-}
-echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-echo _("Click here");
-echo "</A> ";
-echo _("to continue.");
-echo "</CENTER>";
-echo "</BODY></HTML>";
-*/
 ?>