diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-12-10 15:27:19 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-12-10 15:27:19 +0000 |
| commit | 7a790a51bb6acd65b193660367c8af3629256907 (patch) | |
| tree | 46a1289f5e2cd9b32906f1ab037c676a829f6e9e /roundcubemail/index.php | |
| parent | 291aa89005cb17ccbc05a95e6f0e7651230836ed (diff) | |
New class rcube_user + send message disposition notification
git-svn-id: https://svn.roundcube.net/trunk@938 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/index.php')
| -rw-r--r-- | roundcubemail/index.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index ce66d2cd4..9f2d3365e 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -2,7 +2,7 @@ /* +-----------------------------------------------------------------------+ | RoundCube Webmail IMAP Client | - | Version 0.1-20071017 | + | Version 0.1-20071210 | | | | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | @@ -41,7 +41,7 @@ */ // application constants -define('RCMAIL_VERSION', '0.1-20071017'); +define('RCMAIL_VERSION', '0.1-20071210'); define('RCMAIL_CHARSET', 'UTF-8'); define('JS_OBJECT_NAME', 'rcmail'); @@ -196,7 +196,7 @@ else if ($_action != 'login' && $_SESSION['user_id'] && $_action != 'send') // log in to imap server -if (!empty($_SESSION['user_id']) && $_task=='mail') +if (!empty($USER->ID) && $_task=='mail') { $conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']); if (!$conn) @@ -210,7 +210,7 @@ if (!empty($_SESSION['user_id']) && $_task=='mail') // not logged in -> set task to 'login -if (empty($_SESSION['user_id'])) +if (empty($USER->ID)) { if ($OUTPUT->ajax_call) $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);"); @@ -238,7 +238,7 @@ if (!empty($_action)) // not logged in -> show login page -if (!$_SESSION['user_id']) +if (empty($USER->ID)) { $OUTPUT->task = 'login'; $OUTPUT->send('login'); @@ -274,6 +274,9 @@ if ($_task=='mail') if ($_action=='viewsource') include('program/steps/mail/viewsource.inc'); + if ($_action=='sendmdn') + include('program/steps/mail/sendmdn.inc'); + if ($_action=='send') include('program/steps/mail/sendmail.inc'); |