mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
- log entries for deleted topics don't provide a link to the topic or to the topic logs, do we need to change handling of this else where?
- added select all/deselect all to mcp_forum - realigned mcp_forum.html - don't display announcements on all pages in mcp_forum => easier use of "select all" + delete/other function git-svn-id: file:///svn/phpbb/trunk@5609 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
91720e826f
commit
38176447a8
5 changed files with 65 additions and 71 deletions
|
@ -89,22 +89,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
|
||||||
FROM ' . TOPICS_TABLE . " t
|
FROM ' . TOPICS_TABLE . " t
|
||||||
WHERE (t.forum_id = $forum_id OR t.forum_id = 0)
|
WHERE (t.forum_id = $forum_id OR t.forum_id = 0)
|
||||||
" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
|
" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
|
||||||
AND t.topic_type IN (" . POST_ANNOUNCE . ", " . POST_GLOBAL . ")
|
|
||||||
$limit_time_sql
|
|
||||||
ORDER BY $sort_order_sql";
|
|
||||||
$result = $db->sql_query($sql);
|
|
||||||
|
|
||||||
while ($row = $db->sql_fetchrow($result))
|
|
||||||
{
|
|
||||||
$topic_rows[] = $row;
|
|
||||||
}
|
|
||||||
$db->sql_freeresult($result);
|
|
||||||
|
|
||||||
$sql = 'SELECT t.*
|
|
||||||
FROM ' . TOPICS_TABLE . " t
|
|
||||||
WHERE t.forum_id = $forum_id
|
|
||||||
" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . '
|
|
||||||
AND t.topic_type IN (' . POST_NORMAL . ', ' . POST_STICKY . ")
|
|
||||||
$limit_time_sql
|
$limit_time_sql
|
||||||
ORDER BY t.topic_type DESC, $sort_order_sql";
|
ORDER BY t.topic_type DESC, $sort_order_sql";
|
||||||
$result = $db->sql_query_limit($sql, $topics_per_page, $start);
|
$result = $db->sql_query_limit($sql, $topics_per_page, $start);
|
||||||
|
|
|
@ -187,8 +187,8 @@ function mcp_front_view($id, $mode, $action)
|
||||||
'IP' => $row['ip'],
|
'IP' => $row['ip'],
|
||||||
'TIME' => $user->format_date($row['time']),
|
'TIME' => $user->format_date($row['time']),
|
||||||
'ACTION' => $row['action'],
|
'ACTION' => $row['action'],
|
||||||
'U_VIEWTOPIC' => $row['viewtopic'],
|
'U_VIEWTOPIC' => isset($row['viewtopic']) ? $row['viewtopic'] : '',
|
||||||
'U_VIEWLOGS' => $row['viewlogs'])
|
'U_VIEWLOGS' => isset($row['viewlogs']) ? $row['viewlogs'] : '')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,4 +57,10 @@
|
||||||
</tr>
|
</tr>
|
||||||
</table></form>
|
</table></form>
|
||||||
|
|
||||||
|
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
|
||||||
|
<tr>
|
||||||
|
<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', false);">{L_UNMARK_ALL}</a></b></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
<!-- INCLUDE mcp_footer.html -->
|
<!-- INCLUDE mcp_footer.html -->
|
|
@ -1,5 +1,7 @@
|
||||||
<!-- INCLUDE mcp_header.html -->
|
<!-- INCLUDE mcp_header.html -->
|
||||||
|
|
||||||
|
<!-- $Id$ -->
|
||||||
|
|
||||||
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}">
|
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}">
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
|
<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
<!-- INCLUDE mcp_header.html -->
|
<!-- INCLUDE mcp_header.html -->
|
||||||
|
|
||||||
|
<!-- $Id$ -->
|
||||||
|
|
||||||
<form name="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
|
<form name="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
|
||||||
<!-- IF S_CAN_SPLIT -->
|
<!-- IF S_CAN_SPLIT -->
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Add table
Reference in a new issue