kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

combine noticeboard queries

Browse Source
This commit is contained in:
Savetheinternet 2011-10-08 18:26:23 +11:00
parent d1f8d5f5e8
commit 7360381b41
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mod.php
View File

@ -85,7 +85,7 @@
$fieldset['Boards'] .= ulBoards(); $fieldset['Boards'] .= ulBoards();
if(hasPermission($config['mod']['noticeboard'])) { if(hasPermission($config['mod']['noticeboard'])) {
$query = prepare("SELECT * FROM `noticeboard` ORDER BY `id` DESC LIMIT :limit"); $query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :limit");
$query->bindValue(':limit', $config['mod']['noticeboard_dashboard'], PDO::PARAM_INT); $query->bindValue(':limit', $config['mod']['noticeboard_dashboard'], PDO::PARAM_INT);
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
@ -93,13 +93,6 @@
$_body = ''; $_body = '';
while($notice = $query->fetch()) { while($notice = $query->fetch()) {
$m_query = prepare("SELECT `username` FROM `mods` WHERE `id` = :id");
$m_query->bindValue(':id', $notice['mod'], PDO::PARAM_INT);
$m_query->execute() or error(db_error($m_query));
if(!$_mod = $m_query->fetch()) {
$_mod = Array('username' => '<em>???</em>');
}
$_body .= '<li><a href="?/noticeboard#' . $_body .= '<li><a href="?/noticeboard#' .
$notice['id'] . $notice['id'] .
'">' . '">' .
@ -109,7 +102,9 @@
'<em>no subject</em>' '<em>no subject</em>'
) . ) .
'</a><span class="unimportant"> &mdash; by ' . '</a><span class="unimportant"> &mdash; by ' .
utf8tohtml($_mod['username']) . (isset($notice['username']) ?
utf8tohtml($notice['username'])
: '<em>???</em>') .
' at ' . ' at ' .
date($config['post_date'], $notice['time']) . date($config['post_date'], $notice['time']) .
'</span></li>'; '</span></li>';
@ -574,15 +569,10 @@
'</form></fieldset>'; '</form></fieldset>';
} }
$query = prepare("SELECT * FROM `noticeboard` ORDER BY `id` DESC LIMIT :limit"); $query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :limit");
$query->bindValue(':limit', $config['mod']['noticeboard_display'], PDO::PARAM_INT); $query->bindValue(':limit', $config['mod']['noticeboard_display'], PDO::PARAM_INT);
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
while($notice = $query->fetch()) { while($notice = $query->fetch()) {
$m_query = prepare("SELECT `username` FROM `mods` WHERE `id` = :id");
$m_query->bindValue(':id', $notice['mod'], PDO::PARAM_INT);
$m_query->execute() or error(db_error($m_query));
$_mod = $m_query->fetch();
$body .= '<div class="ban">' . $body .= '<div class="ban">' .
(hasPermission($config['mod']['noticeboard_delete']) ? (hasPermission($config['mod']['noticeboard_delete']) ?
'<span style="float:right;padding:2px"><a class="unimportant" href="?/noticeboard/delete/' . $notice['id'] . '">[delete]</a></span>' '<span style="float:right;padding:2px"><a class="unimportant" href="?/noticeboard/delete/' . $notice['id'] . '">[delete]</a></span>'
@ -594,8 +584,8 @@
'<em>no subject</em>' '<em>no subject</em>'
) . ) .
'<span class="unimportant"> &mdash; by ' . '<span class="unimportant"> &mdash; by ' .
($_mod ? (isset($notice['username']) ?
utf8tohtml($_mod['username']) utf8tohtml($notice['username'])
: :
'<em>???</em>' '<em>???</em>'
) . ) .