X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_subscribe.php;h=61bfe84caf1b96303b86a798a9bf2a76d569a2f4;hb=e50f5ac2682d655013d18d97f9a2aa30b7ed9485;hp=ef8c984778b576208515ae11c2038cf74b65007f;hpb=e9f8ea4ecb40efdb6f19631f8359ebd1fbf588be;p=squirrelmail.git

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index ef8c9847..61bfe84c 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -1,66 +1,73 @@
 <?php
-   /**
-    **  folders_subscribe.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Subscribe and unsubcribe form folders. 
-    **  Called from folders.php
-    **/
 
-   session_start();
+/**
+ * folders_subscribe.php
+ *
+ * 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.
+ * Called from folders.php
+ *
+ * @version $Id$
+ * @package squirrelmail
+ */
 
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+define('SM_PATH','../');
 
-   include("../src/load_prefs.php");
+/* 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');
 
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   $dm = sqimap_get_delimiter($imapConnection);
+/* 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 ($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");
-      }
-   }
-   sqimap_logout($imapConnection);
+$location = get_location();
 
-   /*
-   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>";
-   */
-?>
+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]);
+    }
+    $success = 'subscribe';
+} else {
+    for ($i=0; $i < count($mailbox); $i++) {
+        $mailbox[$i] = trim($mailbox[$i]);
+        sqimap_unsubscribe ($imapConnection, $mailbox[$i]);
+    }
+    $success = 'unsubscribe';
+}
+
+sqimap_logout($imapConnection);
+header("Location: $location/folders.php?success=$success");
+
+?>
\ No newline at end of file