X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=ac2bac75bfdb7bbd1b254aa600707496bc9c9391;hp=0466064132b3f8bfa75daa4b661861da1a901a9c;hb=c67e4479e74125ff1afe3177f27399e76787442c;hpb=148ee1efcbaf37f9ee8256eb150af4c5b5728d93 diff --git a/src/webmail.php b/src/webmail.php index 04660641..ac2bac75 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -3,7 +3,7 @@ /** * webmail.php -- Displays the main frameset * - * Copyright (c) 1999-2002 The SquirrelMail development team + * Copyright (c) 1999-2003 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 @@ -13,20 +13,39 @@ * $Id$ */ -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'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'config/config.php'); +require_once(SM_PATH . 'functions/prefs.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/i18n.php'); +require_once(SM_PATH . 'functions/auth.php'); +require_once(SM_PATH . 'functions/global.php'); if (!function_exists('sqm_baseuri')){ - require_once('../functions/display_messages.php'); + require_once(SM_PATH . 'functions/display_messages.php'); } $base_uri = sqm_baseuri(); session_start(); + +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); + +sqgetGlobalVar('right_frame', $right_frame, SQ_GET); + +if ( isset($_SESSION['session_expired_post']) ) { + sqsession_unregister('session_expired_post'); +} +if(!sqgetGlobalVar('mailto', $mailto)) { + $mailto = ''; +} + is_logged_in(); do_hook('webmail_top'); @@ -45,8 +64,10 @@ if ($my_language != $squirrelmail_language) { set_up_language(getPref($data_dir, $username, 'language')); -echo "
\n" . - "