X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_subscribe.php;h=73ffb61bae7841eeabfcd81e4e79056fd00d37b8;hb=8d8da447778a43b78bc95f9601b385416ad84477;hp=94e51395af1d87adea6cf90a92e1cb7d4b533b86;hpb=355861846a51d35efe50848869d680fd3b4a5316;p=squirrelmail.git

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 94e51395..73ffb61b 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,73 +3,71 @@
 /**
  * folders_subscribe.php
  *
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Copyright (c) 1999-2004 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$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below looks.                        ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
+/**
+ * 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 */
+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);
+}
 
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/display_messages.php');
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 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]);
+    }
+    $success = 'subscribe';
+} else {
+    for ($i=0; $i < count($mailbox); $i++) {
+        $mailbox[$i] = trim($mailbox[$i]);
+        sqimap_unsubscribe ($imapConnection, $mailbox[$i]);
+    }
+    $success = 'unsubscribe';
+}
 
-   $location = get_location();
-   if ($method == 'sub') {
-      for ($i=0; $i < count($mailbox); $i++) {
-         $mailbox[$i] = trim($mailbox[$i]);
-         sqimap_subscribe ($imapConnection, $mailbox[$i]);
-         header("Location: $location/folders.php?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");
-      }
-   }
-   if (!isset($mailbox)) {
-         header("Location: $location/folders.php");
-   }
-   sqimap_logout($imapConnection);
+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>";
-   */
-?>
+?>
\ No newline at end of file