diff options
| author | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2002-01-03 22:44:28 +0000 |
|---|---|---|
| committer | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2002-01-03 22:44:28 +0000 |
| commit | d0c05ab60542dd20316eacee374155018bc76ade (patch) | |
| tree | d3709ab4f3c69c569c3256addd5d1cc7979daba0 /phpBB/groupcp.php | |
| parent | 39423097c8add6124d14436f3e4addede35c92d5 (diff) | |
| download | forums-d0c05ab60542dd20316eacee374155018bc76ade.tar forums-d0c05ab60542dd20316eacee374155018bc76ade.tar.gz forums-d0c05ab60542dd20316eacee374155018bc76ade.tar.bz2 forums-d0c05ab60542dd20316eacee374155018bc76ade.tar.xz forums-d0c05ab60542dd20316eacee374155018bc76ade.zip | |
Three bugs fixed here... Bug ID 494154, which was a bug in the group moderation page, where email links would not redirect to the login page. Bug ID 498927 was a problem between the time/date format. Bug ID 498961 was a slight cosmetic error in the admin panel. That's all for now!
git-svn-id: file:///svn/phpbb/trunk@1791 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/groupcp.php')
| -rw-r--r-- | phpBB/groupcp.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index 75f3421f79..8ea9f90b1f 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -195,7 +195,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" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") + "U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id&validate=true") ); $emailer->send(); $emailer->reset(); @@ -552,6 +552,18 @@ else if( $group_id ) // // + // Did the group moderator get here through an email? + // If so, check to see if they are logged in. + // + if( isset($HTTP_GET_VARS['validate']) ); + { + if( !$userdata['session_logged_in'] ) + { + header("Location: " . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + } + } + + // // Get group details // $sql = "SELECT * @@ -1241,4 +1253,4 @@ else // include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?>
\ No newline at end of file +?> |
