X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=9825da3d2adf59b1e9dc8ad43d0b7c548ac695e1;hb=dcc1cc825e550711d0207a737f9ea3ac2b38e923;hp=0220d843a86f9004a4679dec33b5606c128aa62f;hpb=48aac9dd2848f57d96b73f090280b669ef6dfe3a;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 0220d843..9825da3d 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 @@ -11,24 +11,46 @@ * this file will verify username and password. * * $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'); +/** 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(); +sqsession_is_active(); + +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'); + /** * We'll need this to later have a noframes version * @@ -43,14 +65,26 @@ if ($my_language != $squirrelmail_language) { set_up_language(getPref($data_dir, $username, 'language')); -echo "
\n" . - "