diff -ruN ../am223/changes ./changes --- ../am223/changes 2004-09-09 23:49:32.000000000 -0400 +++ ./changes 2004-09-09 22:35:52.000000000 -0400 @@ -153,3 +153,9 @@ have the "personal name" defined * Added option to get rid of duplicate INBOX folder for some IMAP server configurations + +Version 2.23-cookies - Laird Bedore + +* Removed HTTP basic authentication and enabled PHP sessions (requires cookies) +* Changed the "Login" button to "Logout" in english language file +* Added configuration in config.inc to define session file save path diff -ruN ../am223/config.inc ./config.inc --- ../am223/config.inc 2004-09-09 23:50:29.000000000 -0400 +++ ./config.inc 2004-09-09 22:37:19.000000000 -0400 @@ -24,6 +24,10 @@ // controls the name at the top of the window define('PROG_NAME', "AeroMail"); +// Session save path: where your cookies; session data is stored. This should +// be a secure directory that your users cannot access. +define('SESSION_SAVE_PATH', "/usr/local/lib/php/sessions"); + // directory for folders to be stored - applies to UWash servers only // if server type is Cyrus, this var is not used define('PROG_DIR', "~/"); @@ -43,9 +47,6 @@ //define('IMAP_OPTS',"/imap/ssl"); //define('IMAP_OPTS',"/imap/ssl/novalidate-cert"); -// url to redirect to when a user clicks on cancel when loggin in -define('SERVER_REDIR', "http://aeromail.nicolaas.net/"); - // default number of messages to display per screen define('MSG_COUNT', 25); diff -ruN ../am223/global.inc ./global.inc --- ../am223/global.inc 2004-09-09 23:57:51.000000000 -0400 +++ ./global.inc 2004-09-09 22:40:11.000000000 -0400 @@ -1,10 +1,14 @@ "; + Header("Location: login.php"); exit; } include('layout.inc'); -if ((!$PHP_AUTH_USER) or (!$PHP_AUTH_PW) or ($time > time())) +if ((!$_SESSION[user]) or (!$_SESSION[pass])) { login_prompt(); } else { - if($PHP_AUTH_USER && $PHP_AUTH_PW) - { - $user = $PHP_AUTH_USER; - $pass = $PHP_AUTH_PW; + $user = $_SESSION[user]; + $pass = $_SESSION[pass]; $folder = !$folder ? "INBOX" : $folder; $mailbox = mailbox_log_in($folder); if(!$mailbox) login_prompt(); - } } ?> diff -ruN ../am223/login.php ./login.php --- ../am223/login.php 1969-12-31 19:00:00.000000000 -0500 +++ ./login.php 2004-09-09 22:40:54.000000000 -0400 @@ -0,0 +1,68 @@ +\n\n"; + include("style.php"); + ?> +<?php echo "Login - ".PROG_NAME ?> + + + + +
+
+ cellpadding=0 celspacing=0 border=0>
+ + + + + + + + + + + + + + + +
align=center> + size=4>: Login +
> + Username + > + Password +
> + + > + +
colspan=2 align=right> + +
+
+ +
+ + diff -ruN ../am223/logout.php ./logout.php --- ../am223/logout.php 2004-09-09 23:53:23.000000000 -0400 +++ ./logout.php 2004-09-09 23:53:31.000000000 -0400 @@ -1,5 +1,14 @@ diff -ruN ../am223/send_message.php ./send_message.php --- ../am223/send_message.php 2004-09-09 23:41:00.000000000 -0400 +++ ./send_message.php 2004-09-09 23:42:31.000000000 -0400 @@ -33,13 +33,10 @@ $to = removecrlf($to); if (!strstr($to, "@")) { - if (is_string(SERVER_SUFFIX)) { -echo "Using server suffix " . SERVER_SUFFIX . "
\n"; + if (is_string(SERVER_SUFFIX)) $to .= "@" . SERVER_SUFFIX; - } else { -echo "Defaulting to IMAP server " . IMAP_SERVER . "
\n"; + else $to .= "@" . IMAP_SERVER; - } } $mailheaders .= "To: ".removecrlf($to)."\r\n"; @@ -95,6 +92,7 @@ $from_user = FORCE_FROM ? "$user@" . SERVER_SUFFIX : $user; else $from_user = FORCE_FROM ? "$user@" . IMAP_SERVER : $user; + mailfrom($from_user, $msg_body, $mailheaders); // add message to the sent mail folder