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/privmsg.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/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 2855b73b0b..4db1cdd78a 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -1082,53 +1082,6 @@ else if( $submit || $refresh || $mode != "" ) if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) ) { - 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 = "privmsg.$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://"; - } - $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; include($phpbb_root_path . 'includes/emailer.'.$phpEx); @@ -1147,7 +1100,7 @@ else if( $submit || $refresh || $mode != "" ) "SITENAME" => $board_config['sitename'], "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_INBOX" => $protocol . $server_name . $script_name . "?folder=inbox") + "U_INBOX" => $script_url . "?folder=inbox") ); $emailer->send(); |