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

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 94e51395..a887fde6 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,7 +3,7 @@
 /**
  * folders_subscribe.php
  *
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * 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. 
@@ -12,64 +12,48 @@
  * $Id$
  */
 
-/*****************************************************************/
-/*** 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. ***/
-/*****************************************************************/
-
 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);
 
-   $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);
+$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);
 
-   /*
-   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>";
-   */
+/*
+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>";
+*/
 ?>