X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=6da41967ba10826e8f1e66a6c289492b4d15e8fa;hb=24fc49052db9408811aadf5b2e2740371553ace2;hp=b52968bc966fff61f4e3bf51d9849f5e8ac4a70a;hpb=a714cb95df2960fe30903a1a8e0c0757352a91e2;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index b52968bc..6da41967 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; - $$naame = $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,9 +31,13 @@ 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]; +/** + * 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(); @session_destroy(); /* @@ -76,7 +45,8 @@ $base_uri = $regs[1]; * we get a new one. */ $cookie_params = session_get_cookie_params(); -setcookie(session_name(),'',0,$cookie_params['path'].$cookie_params['domain']); +setcookie(session_name(), '', 0, $cookie_params['path'], + $cookie_params['domain']); setcookie('username', '', 0, $base_uri); setcookie('key', '', 0, $base_uri); header('Pragma: no-cache'); @@ -85,7 +55,7 @@ do_hook('login_cookie'); /* Output the javascript onload function. */ -$header = "