makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

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!

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1791 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
dougk_ff7 2002-01-03 22:44:28 +00:00
parent 39423097c8
commit d0c05ab605
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/groupcp.php
View file

@ -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();
@ -551,6 +551,18 @@ else if( $group_id )
// END approve or deny
//
//
// 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
//
@ -1241,4 +1253,4 @@ else
//
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?>
?>

4
phpBB/templates/subSilver/admin/index_navigate.tpl
View file

@ -1,7 +1,7 @@
<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
<tr>
<td align="center" ><a href="{U_FORUM_INDEX}" target="_top"><img src="../templates/subSilver/images/logo_phpBB_med.gif" border="0" /></a></td>
<td align="center" ><a href="{U_FORUM_INDEX}" target="_parent"><img src="../templates/subSilver/images/logo_phpBB_med.gif" border="0" /></a></td>
</tr>
<tr>
<td align="center" >
@ -13,7 +13,7 @@
<td class="row1"><span class="genmed"><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></span></td>
</tr>
<tr>
<td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="_top" class="genmed">{L_FORUM_INDEX}</a></span></td>
<td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="_parent" class="genmed">{L_FORUM_INDEX}</a></span></td>
</tr>
<tr>
<td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></span></td>

2
phpBB/templates/subSilver/profile_add_body.tpl
View file

@ -208,7 +208,7 @@
<td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br />
<span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
<td class="row2">
<input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" class="post" />
<input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="14" class="post" />
</td>
</tr>
<tr>