diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-18 18:11:42 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-18 18:11:42 +0000 |
| commit | c7bc2e37bd911db403d20da02797161e58643f99 (patch) | |
| tree | cc54171cc6f49062adf723fcd356c290658f2729 /phpBB/groupcp.php | |
| parent | 612c3ee1fb5021dea4651ea213c03d542af634a8 (diff) | |
| download | forums-c7bc2e37bd911db403d20da02797161e58643f99.tar forums-c7bc2e37bd911db403d20da02797161e58643f99.tar.gz forums-c7bc2e37bd911db403d20da02797161e58643f99.tar.bz2 forums-c7bc2e37bd911db403d20da02797161e58643f99.tar.xz forums-c7bc2e37bd911db403d20da02797161e58643f99.zip | |
Hopefully cope with boards running from SSL, ie. https://
git-svn-id: file:///svn/phpbb/trunk@1363 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/groupcp.php')
| -rw-r--r-- | phpBB/groupcp.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index cf13ce9e57..bd87e74439 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -171,6 +171,7 @@ else if( isset($HTTP_POST_VARS['joingroup']) && $group_id ) $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; + $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://"; $emailer->use_template("group_request"); $emailer->email_address($moderator['user_email']); @@ -182,7 +183,7 @@ else if( isset($HTTP_POST_VARS['joingroup']) && $group_id ) "GROUP_MODERATOR" => $moderator['username'], "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_GROUPCP" => "http://" . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") + "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") ); $emailer->send(); $emailer->reset(); @@ -363,6 +364,7 @@ else if( $group_id ) $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; + $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://"; $emailer->use_template("group_added"); $emailer->email_address($row['user_email']); @@ -374,7 +376,7 @@ else if( $group_id ) "GROUP_NAME" => $group_name, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_GROUPCP" => "http://" . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") + "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") ); $emailer->send(); $emailer->reset(); @@ -475,6 +477,7 @@ else if( $group_id ) $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; + $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://"; $emailer->use_template("group_approved"); $emailer->email_address($email_addresses); @@ -486,7 +489,7 @@ else if( $group_id ) "GROUP_NAME" => $group_name, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_GROUPCP" => "http://" . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") + "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") ); $emailer->send(); $emailer->reset(); |