diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-02-18 12:34:38 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-02-18 12:34:38 +0000 |
commit | 1a37d0d8ef8ed57f74dfc633bbc19551f376e7fd (patch) | |
tree | dc7b995c24982878a13519e3b843d68c4299f25b /phpBB/groupcp.php | |
parent | ae80afa875d0cd847c91c9050866f56e6139d8c0 (diff) | |
download | forums-1a37d0d8ef8ed57f74dfc633bbc19551f376e7fd.tar forums-1a37d0d8ef8ed57f74dfc633bbc19551f376e7fd.tar.gz forums-1a37d0d8ef8ed57f74dfc633bbc19551f376e7fd.tar.bz2 forums-1a37d0d8ef8ed57f74dfc633bbc19551f376e7fd.tar.xz forums-1a37d0d8ef8ed57f74dfc633bbc19551f376e7fd.zip |
Somewhat overhauled posting, fixed various bugs, completed new way of handling URIs in emails, blah blah
git-svn-id: file:///svn/phpbb/trunk@2183 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/groupcp.php')
-rw-r--r-- | phpBB/groupcp.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index d435f750e9..0a7579870b 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -33,6 +33,14 @@ init_userprefs($userdata); // End session management // +$script_name = preg_replace("/^\/?(.*?)\/?$/", "\\1", trim($board_config['script_path'])); +$script_name = ( $script_name != '' ) ? $script_name . '/groupcp.'.$phpEx : 'groupcp.'.$phpEx; +$server_name = trim($board_config['server_name']); +$server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://"; +$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; + +$server_url = $server_protocol . $script_name . $server_name . $server_port; + if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) { $group_id = ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_GET_VARS[POST_GROUPS_URL]) : intval($HTTP_POST_VARS[POST_GROUPS_URL]); @@ -197,7 +205,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" => $script_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true") + "U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true") ); $emailer->send(); $emailer->reset(); @@ -403,7 +411,7 @@ else if( $group_id ) "GROUP_NAME" => $group_name, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id") + "U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id") ); $emailer->send(); $emailer->reset(); @@ -509,7 +517,7 @@ else if( $group_id ) "GROUP_NAME" => $group_name, "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id") + "U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id") ); $emailer->send(); $emailer->reset(); |