X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=89d839305377d92854261b2b8156ded8f9e59983;hb=d8cffbab47c2fde196c462a2945a2c62b811372d;hp=2ca0a49c820976d10eed417d1588143ef72111cb;hpb=b6e0c3b65189c26e594d19cbceaed0bfa9d0def6;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index 2ca0a49c..89d83930 100644 --- a/src/login.php +++ b/src/login.php @@ -12,53 +12,18 @@ * $Id$ */ -$rcptaddress = ''; -if (isset($emailaddress)) { - if (stristr($emailaddress, 'mailto:')) { - $rcptaddress = substr($emailaddress, 7); - } else { - $rcptaddress = $emailaddress; - } - - if (($pos = strpos($rcptaddress, '?')) !== false) { - $a = substr($rcptaddress, $pos + 1); - $rcptaddress = substr($rcptaddress, 0, $pos); - $a = explode('=', $a, 2); - if (isset($a[1])) { - $name = urldecode($a[0]); - $val = urldecode($a[1]); - global $$name; - $$name = $val; - } - } - - /* At this point, we have parsed a lot of the mailto stuff. */ - /* Let's do the rest -- CC, BCC, Subject, Body */ - /* Note: They can all be case insensitive */ - foreach ($GLOBALS as $k => $v) { - $key = strtolower($k); - $value = urlencode($v); - if ($key == 'cc') { - $rcptaddress .= '&send_to_cc=' . $value; - } else if ($key == 'bcc') { - $rcptaddress .= '&send_to_bcc=' . $value; - } else if ($key == 'subject') { - $rcptaddress .= '&subject=' . $value; - } else if ($key == 'body') { - $rcptaddress .= '&body=' . $value; - } - } - - /* Double-encode in this fashion to get past redirect.php properly. */ - $rcptaddress = urlencode($rcptaddress); -} - -require_once('../functions/strings.php'); -require_once('../config/config.php'); -require_once('../functions/i18n.php'); -require_once('../functions/plugin.php'); -require_once('../functions/constants.php'); -require_once('../functions/page_header.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/i18n.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/constants.php'); +require_once(SM_PATH . 'functions/page_header.php'); +require_once(SM_PATH . 'functions/html.php'); +require_once(SM_PATH . 'functions/global.php'); /* * $squirrelmail_language is set by a cookie when the user selects @@ -66,26 +31,28 @@ require_once('../functions/page_header.php'); */ set_up_language($squirrelmail_language, TRUE); -/* Need the base URI to set the cookies. (Same code as in webmail.php). */ -ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); -$base_uri = $regs[1]; -@session_destroy(); +/** + * Find out the base URI to set cookies. + */ +if (!function_exists('sqm_baseuri')){ + require_once(SM_PATH . 'functions/display_messages.php'); +} +$base_uri = sqm_baseuri(); /* * In case the last session was not terminated properly, make sure * we get a new one. */ -$cookie_params = session_get_cookie_params(); -setcookie(session_name(),'',0,$cookie_params['path'].$cookie_params['domain']); -setcookie('username', '', 0, $base_uri); -setcookie('key', '', 0, $base_uri); + +sqsession_destroy(); + header('Pragma: no-cache'); do_hook('login_cookie'); /* Output the javascript onload function. */ -$header = "