diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2002-02-17 17:02:03 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2002-02-17 17:02:03 +0000 |
| commit | 40e81950455c2f05975c5635eb2be9c4e8052708 (patch) | |
| tree | a31ccf2c6ce3224e38b67d87a7a674d3df02947a /phpBB/profile.php | |
| parent | c8b89ff92b048dfae50dad8956c9b0c6b80752f9 (diff) | |
| download | forums-40e81950455c2f05975c5635eb2be9c4e8052708.tar forums-40e81950455c2f05975c5635eb2be9c4e8052708.tar.gz forums-40e81950455c2f05975c5635eb2be9c4e8052708.tar.bz2 forums-40e81950455c2f05975c5635eb2be9c4e8052708.tar.xz forums-40e81950455c2f05975c5635eb2be9c4e8052708.zip | |
Cleaned up stuff (for Email)
git-svn-id: file:///svn/phpbb/trunk@2178 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/profile.php')
| -rw-r--r-- | phpBB/profile.php | 60 |
1 files changed, 5 insertions, 55 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php index 36be5a490a..61e3be9610 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -35,56 +35,6 @@ init_userprefs($userdata); // End session management // -// -// Set default email variables -// -if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) ) -{ - $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF']; -} -else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) ) -{ - $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME']; -} -else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) ) -{ - $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO']; -} -else -{ - $script_name = "profile.$phpEx"; -} - -if ( !empty($board_config['cookie_domain']) ) -{ - $server_name = $board_config['cookie_domain']; -} -else if ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) ) -{ - $server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME']; -} -else if ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) ) -{ - $server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST']; -} -else -{ - $server_name = ""; -} - -if ( !empty($HTTP_SERVER_VARS['HTTPS']) ) -{ - $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://"; -} -else if ( !empty($HTTP_ENV_VARS['HTTPS']) ) -{ - $protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://"; -} -else -{ - $protocol = "http://"; -} - // ----------------------- // Page specific functions // @@ -1115,7 +1065,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "USERNAME" => $username, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey") + "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey") ); $emailer->send(); $emailer->reset(); @@ -1213,7 +1163,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "PASSWORD" => $password_confirm, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey", + "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey", "FAX_INFO" => $board_config['coppa_fax'], "MAIL_INFO" => $board_config['coppa_mail'], "EMAIL_ADDRESS" => $email, @@ -1235,7 +1185,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "PASSWORD" => $password_confirm, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey") + "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey") ); } @@ -1254,7 +1204,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "USERNAME" => $username, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey") + "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey") ); $emailer->send(); $emailer->reset(); @@ -1768,7 +1718,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "PASSWORD" => $user_password, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey") + "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey") ); $emailer->send(); $emailer->reset(); |