1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 18:24:29 +01:00

fixed various bugs to do with the display of PMs

This commit is contained in:
Savetheinternet 2011-07-26 16:00:20 +10:00
parent 101530151a
commit 5b638d9f17

30
mod.php
View File

@ -670,9 +670,9 @@
$id = &$match[1]; $id = &$match[1];
if($mod['type'] >= $config['mod']['master_pm']) { if($mod['type'] >= $config['mod']['master_pm']) {
$query = prepare("SELECT `pms`.`id`, `time`, `sender`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `pms`.`id` = :id"); $query = prepare("SELECT `pms`.`id`, `time`, `sender`, `unread`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `pms`.`id` = :id");
} else { } else {
$query = prepare("SELECT `pms`.`id`, `time`, `sender`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `pms`.`id` = :id AND `to` = :mod"); $query = prepare("SELECT `pms`.`id`, `time`, `sender`, `unread`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `pms`.`id` = :id AND `to` = :mod");
$query->bindValue(':mod', $mod['id'], PDO::PARAM_INT); $query->bindValue(':mod', $mod['id'], PDO::PARAM_INT);
} }
@ -693,9 +693,13 @@
header('Location: ?/', true, $config['redirect_http']); header('Location: ?/', true, $config['redirect_http']);
} else { } else {
$query = prepare("UPDATE `pms` SET `unread` = 0 WHERE `id` = :id"); if($pm['unread']) {
$query->bindValue(':id', $id, PDO::PARAM_INT); $query = prepare("UPDATE `pms` SET `unread` = 0 WHERE `id` = :id");
$query->execute() or error(db_error($query)); $query->bindValue(':id', $id, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
modLog('Read a PM');
}
if($pm['to'] != $mod['id']) { if($pm['to'] != $mod['id']) {
$query = prepare("SELECT `username` FROM `mods` WHERE `id` = :id"); $query = prepare("SELECT `username` FROM `mods` WHERE `id` = :id");
@ -705,21 +709,27 @@
if($_mod = $query->fetch()) { if($_mod = $query->fetch()) {
$__to = &$_mod['username']; $__to = &$_mod['username'];
} else { } else {
$__to = '<em>??</em>'; $__to = false;
} }
} }
modLog('Read a PM');
$body = '<form action="" method="post" style="margin:0"><table>' . $body = '<form action="" method="post" style="margin:0"><table>' .
'<th>From</th><td>' . '<th>From</th><td>' .
'<a href="?/new_PM/' . $pm['sender'] . '">' . htmlentities($pm['username']) . '</a>' . (!$pm['username'] ?
'<em>??</em>'
:
'<a href="?/new_PM/' . $pm['sender'] . '">' . htmlentities($pm['username']) . '</a>'
) .
'</td></tr>' . '</td></tr>' .
(isset($__to) ? (isset($__to) ?
'<th>To</th><td>' . '<th>To</th><td>' .
'<a href="?/new_PM/' . $pm['to'] . '">' . htmlentities($__to) . '</a>' . ($__to === false ?
'<em>??</em>'
:
'<a href="?/new_PM/' . $pm['to'] . '">' . htmlentities($__to) . '</a>'
) .
'</td></tr>' '</td></tr>'
: '') . : '') .