git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reply: omit header from mandatory output
[minimedit.git]
/
issue
/
index.php
diff --git
a/issue/index.php
b/issue/index.php
index 6b1c3dc53b7fe5aad589b91afb27820be36864b8..e7c69bb49de71088c48f8927dc2b3035685659a9 100644
(file)
--- a/
issue/index.php
+++ b/
issue/index.php
@@
-6,25
+6,31
@@
require_once 'database.inc.php';
if ($id) {
$Article->title = "Issue #$id";
if ($id) {
$Article->title = "Issue #$id";
- $
row
= $Db->query(
- 'SELECT * FROM issues WHERE
id = ?', [
$id]
+ $
Issue
= $Db->query(
+ 'SELECT * FROM issues WHERE
page = ? AND id = ?', [$Page,
$id]
)->fetch();
)->fetch();
- if (!$
row
) throw new Exception('Issuenummer niet gevonden');
+ if (!$
Issue
) throw new Exception('Issuenummer niet gevonden');
- $Article->title .= ': '.htmlspecialchars($
row
->subject);
+ $Article->title .= ': '.htmlspecialchars($
Issue
->subject);
print "<h2>{$Article->title}</h2>\n";
print "<h2>{$Article->title}</h2>\n";
-
print $row->body
;
+
$author = $Issue->author ? new User('profile/'.$Issue->author, FALSE) : NULL
;
printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
'Geplaatst',
printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
'Geplaatst',
- $
row->author ? " door <strong>{$row->author
}</strong>" : '',
- showdate(preg_split('/\D/', $
row
->created))
+ $
author ? " door <strong>{$author->name
}</strong>" : '',
+ showdate(preg_split('/\D/', $
Issue
->created))
);
);
- if ($row->closed) {
+ if ($Issue->assign) {
+ printf('<p><em>%s</em> aan <strong>%s</strong></p>'."\n",
+ 'Toegewezen', htmlspecialchars($Issue->assign)
+ );
+ }
+ if ($Issue->closed) {
printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
'Opgelost', '',
printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
'Opgelost', '',
- showdate(preg_split('/\D/', $
row
->closed))
+ showdate(preg_split('/\D/', $
Issue
->closed))
);
}
);
}
+ print $Issue->body;
$Args = "/$id"; # minimal reference
print placeholder_include('reply');
return;
$Args = "/$id"; # minimal reference
print placeholder_include('reply');
return;
@@
-33,7
+39,7
@@
if ($id) {
if ($_POST) {
$html = nl2br(htmlspecialchars($_POST['body']));
$html = empty($html) ? NULL : "<p>$html</p>";
if ($_POST) {
$html = nl2br(htmlspecialchars($_POST['body']));
$html = empty($html) ? NULL : "<p>$html</p>";
- $query = $Db->
inser
t('issues', [
+ $query = $Db->
se
t('issues', [
'page' => $Page,
'subject' => $_POST['subject'],
'body' => $html,
'page' => $Page,
'subject' => $_POST['subject'],
'body' => $html,
@@
-45,16
+51,22
@@
if ($_POST) {
$_POST = [];
}
$_POST = [];
}
-$query = $Db->query('SELECT * FROM issues ORDER BY updated DESC');
+$sql = 'SELECT * FROM issues WHERE page = ?';
+if (isset($_GET['open'])) {
+ $sql .= ' AND closed IS NULL';
+}
+$sql .= ' ORDER BY closed IS NOT NULL, updated DESC';
+$query = $Db->query($sql, [$Page]);
ob_start();
print '<ul>';
while ($row = $query->fetch()) {
ob_start();
print '<ul>';
while ($row = $query->fetch()) {
- printf('<li><a href="%s">%s <small class="date">%s</small></a>',
+ printf('<li><a href="%s">%s <small class="date">%s</small>
%s
</a>',
"/$Page/{$row->id}/{$row->link}",
sprintf($row->closed ? '<strike>%s</strike>' : '%s',
htmlspecialchars($row->subject)),
"/$Page/{$row->id}/{$row->link}",
sprintf($row->closed ? '<strike>%s</strike>' : '%s',
htmlspecialchars($row->subject)),
- showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
+ showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3)),
+ isset($row->assign) ? ' <em class="right">'.$row->assign.'</em>' : ''
);
print "</li>\n";
}
);
print "</li>\n";
}