git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mail: decode multipart attachments (text, html, images)
[minimedit.git]
/
issue
/
index.php
diff --git
a/issue/index.php
b/issue/index.php
index 3f665db3456ea9e859dbc5b1d44b66aa6512bedf..35a1116b153b72cd26de0973b8e64842ecc5dad3 100644
(file)
--- a/
issue/index.php
+++ b/
issue/index.php
@@
-1,24
+1,24
@@
<?php
<?php
-global $User, $Db;
+global $User, $Db
, $Issue
;
require_once 'database.inc.php';
require_once 'database.inc.php';
-@list ($id, $title) = explode('/', ltrim($
Args
, '/'));
+@list ($id, $title) = explode('/', ltrim($
Page->path
, '/'));
if ($id and ctype_digit($id)) {
if ($id and ctype_digit($id)) {
- $
Articl
e->title = "Issue #$id";
- $
Args = "/$id"
; # minimal reference
+ $
Pag
e->title = "Issue #$id";
+ $
Page->link = $Page->handler . ($Page->path = "/$id")
; # minimal reference
$Issue = $Db->query(
$Issue = $Db->query(
- 'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page, $id]
+ 'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page
->handler
, $id]
)->fetch();
if (!$Issue) throw new Exception('Issuenummer niet gevonden');
)->fetch();
if (!$Issue) throw new Exception('Issuenummer niet gevonden');
- $replies =
placeholder_include
('reply'); # handle updates
+ $replies =
$Page->widget
('reply'); # handle updates
- $
Articl
e->title .= ': '.htmlspecialchars($Issue->subject);
- $
Article->teaser = $Issue->body;
- $Article->body = $replies; # find image
+ $
Pag
e->title .= ': '.htmlspecialchars($Issue->subject);
+ $
Page->body = $replies; # find image
+ if ($Page->api) return;
- print "<h2>{$
Articl
e->title}</h2>\n";
- print
"<dl class=\"aside right sidebar\">
\n";
+ print "<h2>{$
Pag
e->title}</h2>\n";
+ print
'<aside class="metadata"><dl>'."
\n";
print '<dt>Geplaatst</dt>';
printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->created)));
if ($Issue->author and $author = new User('profile/'.$Issue->author, FALSE)) {
print '<dt>Geplaatst</dt>';
printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->created)));
if ($Issue->author and $author = new User('profile/'.$Issue->author, FALSE)) {
@@
-32,38
+32,51
@@
if ($id and ctype_digit($id)) {
print '<dt>Opgelost</dt>';
printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->closed)));
}
print '<dt>Opgelost</dt>';
printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->closed)));
}
- print "</dl>\n\n";
+ print "</dl>
</aside>
\n\n";
print '<div>';
print '<div>';
- print $Issue->body;
print $replies;
print "</div>\n";
return;
}
print $replies;
print "</div>\n";
return;
}
-if ($_POST) {
+if ($Page->api) return;
+if ($_POST and isset($_POST['subject'])) {
require_once 'upload.inc.php';
require_once 'upload.inc.php';
+ if (strlen($_POST['subject']) < 2) {
+ throw new Exception('Een minimaal onderwerp is verplicht om een issue aan te maken.');
+ }
$query = $Db->set('issues', [
$query = $Db->set('issues', [
- 'page' => $Page,
+ 'page' => $Page
->handler
,
'subject' => $_POST['subject'],
'subject' => $_POST['subject'],
- '
body' => messagehtml($_POST['body']
),
+ '
link' => preg_replace('/\b(?:de|het|een)\s+|\W+/', '-', strtolower($_POST['subject'])
),
'author' => $User->login,
]);
if (!$query->rowCount()) {
throw new Exception('Issue niet opgeslagen.');
}
'author' => $User->login,
]);
if (!$query->rowCount()) {
throw new Exception('Issue niet opgeslagen.');
}
+ $row = $query->fetch();
+ if (!$row->id) {
+ throw new Exception('Issue niet goed opgeslagen.');
+ }
+ try {
+ createcomment($_POST, $row);
+ }
+ catch (Exception $e) {
+ throw new Exception("Issueinhoud niet opgeslagen: {$e->getMessage()}.");
+ }
$_POST = [];
}
$subsql = "SELECT count(*) FROM comments WHERE page=i.page||'/'||i.id";
$_POST = [];
}
$subsql = "SELECT count(*) FROM comments WHERE page=i.page||'/'||i.id";
-$cols = "*, ($subsql AND message IS NOT NULL) AS replycount";
+$cols = "*, ($subsql AND message IS NOT NULL)
- 1
AS replycount";
$cols .= ", ($subsql AND message ~ '<img') AS imagecount";
$sql = "SELECT $cols FROM issues i WHERE page = ?";
if (isset($_GET['open'])) {
$sql .= ' AND closed IS NULL';
}
$cols .= ", ($subsql AND message ~ '<img') AS imagecount";
$sql = "SELECT $cols FROM issues i 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]);
+$sql .= ' ORDER BY updated DESC';
+$query = $Db->query($sql, [$Page
->handler
]);
if ($id == 'feed') {
require 'issue/feed.inc.php';
if ($id == 'feed') {
require 'issue/feed.inc.php';
@@
-74,7
+87,7
@@
print '<ul>';
while ($row = $query->fetch()) {
printf('<li%s><div><a href="%s">',
$row->closed ? ' class="disabled"' : '',
while ($row = $query->fetch()) {
printf('<li%s><div><a href="%s">',
$row->closed ? ' class="disabled"' : '',
- "/
$Page
/{$row->id}/{$row->link}"
+ "/
{$Page->handler}
/{$row->id}/{$row->link}"
);
printf($row->closed ? '<s>%s</s>' : '%s', htmlspecialchars($row->subject));
{
);
printf($row->closed ? '<s>%s</s>' : '%s', htmlspecialchars($row->subject));
{
@@
-82,19
+95,19
@@
while ($row = $query->fetch()) {
showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
);
}
showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
);
}
- if ($row->imagecount) {
- print ' <span class="right icon icon-camera" title="afbeeldingen">📷</span>';
- }
if ($row->replycount) {
printf(' <span class=right>%s %d</span>',
'<span class="icon icon-comment" title="reacties">🗨</span>',
$row->replycount
);
}
if ($row->replycount) {
printf(' <span class=right>%s %d</span>',
'<span class="icon icon-comment" title="reacties">🗨</span>',
$row->replycount
);
}
+ if ($row->imagecount) {
+ print ' <span class="right icon icon-camera" title="afbeeldingen">📷</span>';
+ }
if (isset($row->assign)) {
print ' <em class="right">'.$row->assign.'</em>';
}
print "</a></div></li>\n";
}
print "</ul>\n";
if (isset($row->assign)) {
print ' <em class="right">'.$row->assign.'</em>';
}
print "</a></div></li>\n";
}
print "</ul>\n";
-$Place['issuelist'] = ob_get_clean();
+$P
age->p
lace['issuelist'] = ob_get_clean();