X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_subscribe.php;h=c5b78485d6868ad4baa4f440117333f551e3e212;hb=8e73da2b634a087fd9a33acb661368aef3d5dca7;hp=d7487b51f888ef2be69a46974cceba2b9de228bc;hpb=a32985a59fe460e2bf5c2e9ea2dd6004d0f66b54;p=squirrelmail.git
diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index d7487b51..c5b78485 100644
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -3,43 +3,43 @@
/**
* folders_subscribe.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
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 */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-
-$method = $_GET['method'];
-$mailbox = $_POST['mailbox'];
-
+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 */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
$location = get_location();
-if (!isset($mailbox) || !isset($mailbox[0]) || $mailbox[0] == "") {
+if (!isset($mailbox) || !isset($mailbox[0]) || $mailbox[0] == '') {
header("Location: $location/folders.php");
- sqimap_logout($imapConnection);
+
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
@@ -51,38 +51,20 @@ if ($method == 'sub') {
exit(0);
}
}
-
for ($i=0; $i < count($mailbox); $i++) {
$mailbox[$i] = trim($mailbox[$i]);
sqimap_subscribe ($imapConnection, $mailbox[$i]);
- header("Location: $location/folders.php?success=subscribe");
}
+ $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");
}
+ $success = 'unsubscribe';
}
+
sqimap_logout($imapConnection);
+header("Location: $location/folders.php?success=$success");
-/*
-displayPageHeader($color, 'None');
-echo "