X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_subscribe.php;h=af5e2737a9f5664c50015bb664c4edb3dda82311;hp=423252619014e17eeb4d9c888995ce258e8d693b;hb=15e6162eacc97158393bc75aed3afeb7b19c24a6;hpb=1195c34026fc65eb8e0ca7a337fe4b406764dee8

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 42325261..af5e2737 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -1,45 +1,60 @@
 <?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-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Subscribe and unsubcribe form folders. 
+ * Called from folders.php
+ *
+ * $Id$
+ */
 
-   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");
+/*****************************************************************/
+/*** 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. ***/
+/*****************************************************************/
 
-   include("../src/load_prefs.php");
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/display_messages.php');
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   $dm = sqimap_get_delimiter($imapConnection);
 
    $location = get_location();
-   if ($method == "sub") {
-      $mailbox = trim($mailbox);
-      sqimap_subscribe ($imapConnection, $mailbox);
-      header("Location: $location/folders.php?success=subscribe");
+   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 {
-      sqimap_unsubscribe ($imapConnection, $mailbox);
-      header("Location: $location/folders.php?success=unsubscribe");
+      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);
 
    /*
-   displayPageHeader($color, "None");
+   displayPageHeader($color, 'None');
    echo "<BR><BR><BR><CENTER><B>";
    if ($method == "sub") {
       echo _("Subscribed Successfully!");
@@ -58,4 +73,3 @@
    echo "</BODY></HTML>";
    */
 ?>
-