X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_subscribe.php;h=c5b78485d6868ad4baa4f440117333f551e3e212;hb=55994cd645683d254ee6de4557a78af8f511a269;hp=a887fde69bf2f4fe441b644cdcff23f004e27250;hpb=32f4e3189ac2f04956d07af63d9cea44c3393fc5;p=squirrelmail.git

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index a887fde6..c5b78485 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,57 +3,68 @@
 /**
  * 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$
+ * @package squirrelmail
  */
 
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/display_messages.php');
+/** Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+/* 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 */
+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] == '') {
+    header("Location: $location/folders.php");
+
+    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
+	* 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");
+          sqimap_logout($imapConnection);
+          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';
 }
-if (!isset($mailbox)) {
-    header("Location: $location/folders.php");
-}
+
 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>";
-*/
 ?>