aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--phpBB/groupcp.php41
-rw-r--r--phpBB/posting.php25
-rw-r--r--phpBB/privmsg.php13
-rw-r--r--phpBB/profile.php15
4 files changed, 69 insertions, 25 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 14e7cbe1a7..c5c1bf29c5 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -170,7 +170,18 @@ else if( isset($HTTP_POST_VARS['joingroup']) && $group_id )
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
- $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) );
+ if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
+ }
+ else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
+ }
+ else
+ {
+ $path = '';
+ }
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
@@ -363,7 +374,18 @@ else if( $group_id )
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
- $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) );
+ if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
+ }
+ else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
+ }
+ else
+ {
+ $path = '';
+ }
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
@@ -476,7 +498,18 @@ else if( $group_id )
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
- $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) );
+ if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
+ }
+ else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
+ }
+ else
+ {
+ $path = '';
+ }
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
@@ -1112,4 +1145,4 @@ else
//
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-?> \ No newline at end of file
+?>
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 7236e24de6..bdd0a0f54c 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1323,29 +1323,18 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error )
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
- if( isset($HTTP_SERVER_VARS['PATH_INFO']))
+ if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
{
- if( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/")
- {
- $path = "";
- }
- else
- {
- $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
- }
+ $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
+ }
+ else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
}
else
{
- if (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/")
- {
- $path = "";
- }
- else
- {
- $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
- }
+ $path = '';
}
-
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 6411ffed68..985d13b400 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -1050,7 +1050,18 @@ else if( $submit || $refresh || $mode != "" )
if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
{
- $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) );
+ if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
+ }
+ else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
+ }
+ else
+ {
+ $path = '';
+ }
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 4c48610deb..00d729ad19 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -1002,7 +1002,18 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
- $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) );
+ if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['PATH_INFO']);
+ }
+ else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/')
+ {
+ $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']);
+ }
+ else
+ {
+ $path = '';
+ }
$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
@@ -2008,4 +2019,4 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
}
}
-?> \ No newline at end of file
+?>
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-19 11:56:29 +0000