git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: apply admin restrictions from .private contents
[minimedit.git]
/
issue
/
index.php
diff --git
a/issue/index.php
b/issue/index.php
index cc17f0310ac0cb44f0a1018477fb51dd4256c074..0c18142f06e71c709e997e76514212ebeb1c3c8e 100644
(file)
--- a/
issue/index.php
+++ b/
issue/index.php
@@
-1,23
+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
- $Article->title .= ': '.htmlspecialchars($Issue->subject);
- $Article->teaser = $Issue->body;
- $Article->body = $replies; # find image
+ $Page->title .= ': '.htmlspecialchars($Issue->subject);
+ $Page->teaser = $Issue->body;
+ $Page->body = $replies; # find image
+ if ($Page->api) return;
- print "<h2>{$
Articl
e->title}</h2>\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)));
print '<aside class="metadata"><dl>'."\n";
print '<dt>Geplaatst</dt>';
printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->created)));
@@
-41,10
+42,14
@@
if ($id and ctype_digit($id)) {
return;
}
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'],
'body' => messagehtml($_POST['body']),
'author' => $User->login,
'subject' => $_POST['subject'],
'body' => messagehtml($_POST['body']),
'author' => $User->login,
@@
-63,7
+68,7
@@
if (isset($_GET['open'])) {
$sql .= ' AND closed IS NULL';
}
$sql .= ' ORDER BY closed IS NOT NULL, updated DESC';
$sql .= ' AND closed IS NULL';
}
$sql .= ' ORDER BY closed IS NOT NULL, updated DESC';
-$query = $Db->query($sql, [$Page]);
+$query = $Db->query($sql, [$Page
->handler
]);
if ($id == 'feed') {
require 'issue/feed.inc.php';
if ($id == 'feed') {
require 'issue/feed.inc.php';
@@
-74,7
+79,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));
{
@@
-97,4
+102,4
@@
while ($row = $query->fetch()) {
print "</a></div></li>\n";
}
print "</ul>\n";
print "</a></div></li>\n";
}
print "</ul>\n";
-$Place['issuelist'] = ob_get_clean();
+$P
age->p
lace['issuelist'] = ob_get_clean();