If you change working things in configuration either use same case or fix it after...

[squirrelmail.git] / src / folders_subscribe.php

diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 423252619014e17eeb4d9c888995ce258e8d693b..761d2e183ea7f67691c4bfc4a2c98c4ef7cde573 100644 (file)
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -7,34 +7,33 @@
     **
     **  Subscribe and unsubcribe form folders. 
     **  Called from folders.php
+    **
+    **  $Id$
     **/
 
-   session_start();
-
-   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");
-
-   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");
+      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);
 
@@ -58,4 +57,3 @@
    echo "</BODY></HTML>";
    */
 ?>
-