makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated moderator panel, particularly move/delete topic

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1043 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-09-15 23:03:31 +00:00
parent 1857c70a35
commit 00f894f742
6 changed files with 753 additions and 518 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/lang_english.php
View file

@ -198,6 +198,7 @@ $lang['All_Topics'] = "All Topics";
$lang['Topic_Announcement'] = "<b>Announcement:</b>"; $lang['Topic_Announcement'] = "<b>Announcement:</b>";
$lang['Topic_Sticky'] = "<b>Sticky:</b>"; $lang['Topic_Sticky'] = "<b>Sticky:</b>";
$lang['Topic_Moved'] = "<b>Moved:</b>"; $lang['Topic_Moved'] = "<b>Moved:</b>";
$lang['Topic_Poll'] = "<b>[ Poll ]</b>";
// //
// Viewtopic // Viewtopic

1139
phpBB/modcp.php
View file

File diff suppressed because it is too large Load diff

37
phpBB/templates/PSO/modcp_body.tpl
View file

@ -1,14 +1,25 @@
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> <form method="post" action="{S_MODCP_ACTION}"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr> <tr>
<td align="left" valign="bottom" nowrap><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td> <td align="left" valign="bottom" nowrap><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
</tr> </tr>
</table> </table>
<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center"> <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr><form method="post" action="{S_MODCP_ACTION}"> <tr>
<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0"> <td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr> <tr>
<td class="cat" colspan="5" align="center"><span class="cattitle">{L_MOD_CP}</span><br><span class="gensmall">{L_MOD_CP_EXPLAIN}</span></td> <td class="cat" colspan="5"><table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td class="cat" align="center"><span class="cattitle">{L_MOD_CP}</span><br /><span class="gensmall">{L_MOD_CP_EXPLAIN}</span></td>
</tr>
<tr>
<td><table width="100%" cellspacing="0" cellpadding="4" border="0">
<tr>
<td align="center" valign="bottom"><input class="button" type="submit" name="delete" value="{L_DELETE}"> &nbsp; <input class="button" type="submit" name="move" value="{L_MOVE}"> &nbsp; <input class="button" type="submit" name="lock" value="{L_LOCK}"> &nbsp; <input class="button" type="submit" name="unlock" value="{L_UNLOCK}"></td>
</tr>
</table></td>
</tr>
</table></td>
</tr> </tr>
<tr> <tr>
<th width="4%">&nbsp;</th> <th width="4%">&nbsp;</th>
@ -19,11 +30,11 @@
</tr> </tr>
<!-- BEGIN topicrow --> <!-- BEGIN topicrow -->
<tr> <tr>
<td class="row1" align="center" valign="middle">{topicrow.FOLDER_IMG}</td> <td class="row1" align="center" valign="middle">&nbsp;{topicrow.FOLDER_IMG}&nbsp;</td>
<td class="row2">&nbsp;<span class="gensmall"><a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span></td> <td class="row2">&nbsp;<span class="gensmall">{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span></td>
<td class="row1" align="center" valign="middle"><span class="gen">{topicrow.REPLIES}</span></td> <td class="row1" align="center" valign="middle"><span class="gen">{topicrow.REPLIES}</span></td>
<td class="row2" align="center" valign="middle"><span class="gensmall">{topicrow.LAST_POST}</span></td> <td class="row2" align="center" valign="middle"><span class="gensmall">{topicrow.LAST_POST}</span></td>
<td class="row1" align="center" valign="middle"><input type="checkbox" name="preform_op[]" value="{topicrow.TOPIC_ID}"></td> <td class="row1" align="center" valign="middle"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"></td>
</tr> </tr>
<!-- END topicrow --> <!-- END topicrow -->
<tr> <tr>
@ -31,14 +42,22 @@
<tr> <tr>
<td align="left" valign="middle" nowrap>&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td> <td align="left" valign="middle" nowrap>&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td>
<td width="100%" align="right" valign="middle"><span class="gen">{PAGINATION}</span>&nbsp;</td> <td width="100%" align="right" valign="middle"><span class="gen">{PAGINATION}</span>&nbsp;</td>
<td align="right" valign="middle">&nbsp;&nbsp;{S_HIDDEN_FIELDS}<input type="submit" name="delete" value="{L_DELETE}">&nbsp;<input type="submit" name="move" value="{L_MOVE}">&nbsp;<input type="submit" name="lock" value="{L_LOCK}">&nbsp;<input type="submit" name="unlock" value="{L_UNLOCK}"></td> </tr>
<tr>
<td colspan="2"><table width="100%" cellspacing="0" cellpadding="4" border="0">
<tr>
<td align="center" valign="bottom"><input class="button" type="submit" name="delete" value="{L_DELETE}"> &nbsp; <input class="button" type="submit" name="move" value="{L_MOVE}"> &nbsp; <input class="button" type="submit" name="lock" value="{L_LOCK}"> &nbsp; <input class="button" type="submit" name="unlock" value="{L_UNLOCK}"></td>
</tr>
</table></td>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>
</table></td> </table></td>
</form></tr> </tr>
</table> </table>
{S_HIDDEN_FIELDS}</form>
<table cellspacing="2" border="0" width="98%" align="center"> <table cellspacing="2" border="0" width="98%" align="center">
<tr> <tr>
<td width="40%"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td> <td width="40%"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>

77
phpBB/templates/PSO/modcp_split.tpl Normal file
View file

@ -0,0 +1,77 @@
<form method="post" action="{S_SPLIT_ACTION}"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr>
<td align="left" valign="bottom" nowrap><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
</tr>
</table>
<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr>
<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr>
<td class="cat" colspan="3" align="center"><span class="cattitle">{L_SPLIT_TOPIC}</span><br /><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
<td class="row2" colspan="2"><span class="courier"><input type="text" size="50" maxlength="100" name="subject"></span></td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_SPLIT_FORUM}</span></td>
<td class="row2" colspan="2"><span class="courier">{FORUM_INPUT}</span></td>
</tr>
<tr>
<td class="cat" colspan="3"><table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td width="50%" align="center"><input class="button" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}"></td>
<td width="50%" align="center"><input class="button" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}"></td>
</tr>
</table></td>
</tr>
<tr>
<th>{L_AUTHOR}</th>
<th>{L_MESSAGE}</th>
<th>{L_SELECT}</th>
</tr>
<!-- BEGIN postrow -->
<tr bgcolor="{postrow.ROW_COLOR}">
<td align="left" valign="top"><a name="{postrow.U_POST_ID}"></a><table width="170" cellspacing="0" cellpadding="0" border="0">
<tr>
<td valign="top"><span class="gen"><b>{postrow.POSTER_NAME}</b></span><br /></td>
</tr>
</table></td>
<td width="100%" valign="top"><table width="100%" cellspacing="1" cellpadding="0" border="0">
<tr>
<td valign="top"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="gensmall">{L_POSTED}: {postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
</tr>
<tr>
<td colspan="2"><hr /></td>
</tr>
</table></td>
</tr>
<tr>
<td width="100%" height="100%" valign="top"><span class="gen">{postrow.MESSAGE}</span></td>
</tr>
</table></td>
<td width="5%" align="center">&nbsp;<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}">&nbsp;</td>
</tr>
<!-- END postrow -->
<tr>
<td class="cat" colspan="3"><table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td width="50%" align="center"><input class="button" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}"></td>
<td width="50%" align="center"><input class="button" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}"></td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
</table>
{S_HIDDEN_FIELDS}</form>
<table cellspacing="2" border="0" width="98%" align="center">
<tr>
<td width="40%"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
</tr>
</table>

5
phpBB/viewforum.php
View file

@ -395,6 +395,11 @@ if($total_topics)
$topic_type = ""; $topic_type = "";
} }
if( $topic_rowset[$i]['topic_vote'] )
{
$topic_type .= $lang['Topic_Poll'] . " ";
}
$topic_id = $topic_rowset[$i]['topic_id']; $topic_id = $topic_rowset[$i]['topic_id'];
$replies = $topic_rowset[$i]['topic_replies']; $replies = $topic_rowset[$i]['topic_replies'];

12
phpBB/viewtopic.php
View file

@ -495,7 +495,7 @@ if( !empty($forum_row['topic_vote']) )
$poll_expired = ( $vote_info[0]['vote_length'] ) ? ( ( $vote_info[0]['vote_start'] + $vote_info[0]['vote_length'] < time() ) ? TRUE : 0 ) : 0; $poll_expired = ( $vote_info[0]['vote_length'] ) ? ( ( $vote_info[0]['vote_start'] + $vote_info[0]['vote_length'] < time() ) ? TRUE : 0 ) : 0;
if( $user_voted || $view_result || $poll_expired || !$is_auth['auth_vote'] ) if( $user_voted || $view_result || $poll_expired || !$is_auth['auth_vote'] || $forum_row['topic_status'] == TOPIC_LOCKED )
{ {
$template->set_filenames(array( $template->set_filenames(array(
@ -783,8 +783,6 @@ for($i = 0; $i < $total_posts; $i++)
$message = preg_replace($orig_word, $replacement_word, $message); $message = preg_replace($orig_word, $replacement_word, $message);
} }
if($board_config['allow_smilies'] && $postrow[$i]['enable_smilies']) if($board_config['allow_smilies'] && $postrow[$i]['enable_smilies'])
{ {
$message = smilies_pass($message); $message = smilies_pass($message);
@ -864,17 +862,17 @@ if( $is_auth['auth_mod'] )
// $s_auth_mod_img = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\"><img src=\"" . $images['auth_mod'] . "\" alt=\"" . $lang['You'] . " " . $lang['can'] . " " . $lang['moderate_forum'] . "\" border=\"0\"/></a>"; // $s_auth_mod_img = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\"><img src=\"" . $images['auth_mod'] . "\" alt=\"" . $lang['You'] . " " . $lang['can'] . " " . $lang['moderate_forum'] . "\" border=\"0\"/></a>";
$topic_mod = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=delete&amp;quick_op=1") . "\"><img src=\"" . $images['topic_mod_delete'] . "\" alt = \"" . $lang['Delete_topic'] . "\" border=\"0\" /></a>&nbsp;"; $topic_mod = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=delete") . "\"><img src=\"" . $images['topic_mod_delete'] . "\" alt = \"" . $lang['Delete_topic'] . "\" border=\"0\" /></a>&nbsp;";
$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=move&amp;quick_op=1"). "\"><img src=\"" . $images['topic_mod_move'] . "\" alt = \"" . $lang['Move_topic'] . "\" border=\"0\" /></a>&nbsp;"; $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=move"). "\"><img src=\"" . $images['topic_mod_move'] . "\" alt = \"" . $lang['Move_topic'] . "\" border=\"0\" /></a>&nbsp;";
if($forum_row['topic_status'] == TOPIC_UNLOCKED) if($forum_row['topic_status'] == TOPIC_UNLOCKED)
{ {
$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=lock&amp;quick_op=1") . "\"><img src=\"" . $images['topic_mod_lock'] . "\" alt = \"" . $lang['Lock_topic'] . "\" border=\"0\" /></a>&nbsp;"; $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=lock") . "\"><img src=\"" . $images['topic_mod_lock'] . "\" alt = \"" . $lang['Lock_topic'] . "\" border=\"0\" /></a>&nbsp;";
} }
else else
{ {
$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=unlock&amp;quick_op=1") . "\"><img src=\"" . $images['topic_mod_unlock'] . "\" alt = \"" . $lang['Unlock_topic'] . "\" border=\"0\" /></a>&nbsp;"; $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=unlock") . "\"><img src=\"" . $images['topic_mod_unlock'] . "\" alt = \"" . $lang['Unlock_topic'] . "\" border=\"0\" /></a>&nbsp;";
} }
$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=split") . "\"><img src=\"" . $images['topic_mod_split'] . "\" alt = \"" . $lang['Split_topic'] . "\" border=\"0\" /></a>&nbsp;"; $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;mode=split") . "\"><img src=\"" . $images['topic_mod_split'] . "\" alt = \"" . $lang['Split_topic'] . "\" border=\"0\" /></a>&nbsp;";
} }