X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=a7bc9586fd594d35eb1b34e2912032d60cc74d4f;hb=06783280842a90181b2e984bd8ea13e3b7466edb;hp=72f0c0783d789e002632f9c48f4f7b2ae50674ec;hpb=5afe02cfab408727fec98ffafa8556e3278d2691;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 72f0c078..a7bc9586 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -3,51 +3,70 @@
/**
* webmail.php -- Displays the main frameset
*
- * Copyright (c) 1999-2002 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This file generates the main frameset. The files that are
* shown can be given as parameters. If the user is not logged in
* this file will verify username and password.
*
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-require_once('../functions/strings.php');
-require_once('../config/config.php');
-require_once('../functions/prefs.php');
-require_once('../functions/imap.php');
-require_once('../functions/plugin.php');
-require_once('../functions/i18n.php');
-require_once('../functions/auth.php');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
-$base_uri = dirname(dirname($PHP_SELF)) . "/";
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-session_start();
-is_logged_in();
+if (sqgetGlobalVar('sort', $sort)) {
+ $sort = (int) $sort;
+}
-/**
- * We'll need this to later have a noframes version
- *
- * Check if the user has a language preference, but no cookie.
- * Send him a cookie with his language preference, if there is
- * such discrepancy.
- */
-$my_language = getPref($data_dir, $username, 'language');
-if ($my_language != $squirrelmail_language) {
- setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
+if (sqgetGlobalVar('startMessage', $startMessage)) {
+ $startMessage = (int) $startMessage;
+}
+
+if (!sqgetGlobalVar('mailbox', $mailbox)) {
+ $mailbox = 'INBOX';
+}
+
+sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
+
+if ( isset($_SESSION['session_expired_post']) ) {
+ sqsession_unregister('session_expired_post');
+}
+if(!sqgetGlobalVar('mailto', $mailto)) {
+ $mailto = '';
}
-set_up_language(getPref($data_dir, $username, 'language'));
+do_hook('webmail_top');
-echo "
\n" .
- "$org_title";
+$output = "\n".
+ "\n" .
+ "\n" .
+ "$org_title\n".
+ "";
$left_size = getPref($data_dir, $username, 'left_size');
$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
+
+if (isset($languages[$squirrelmail_language]['DIR']) &&
+ strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
+ $temp_location_of_bar = 'right';
+} else {
+ $temp_location_of_bar = 'left';
+}
+
if ($location_of_bar == '') {
- $location_of_bar = 'left';
+ $location_of_bar = $temp_location_of_bar;
}
+$temp_location_of_bar = '';
+
if ($left_size == "") {
if (isset($default_left_size)) {
$left_size = $default_left_size;
@@ -58,10 +77,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "