git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foto: api directory modification headers
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index dae508103159e3518fab45a6334ba14255a95710..8a37533f4c6e78e928980c5a92454f3e589be83d 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-26,7
+26,7
@@
elseif (file_exists("$request/index.html")) {
require_once('article.inc.php');
$Page = new ArchiveArticle($staticpage);
require_once('article.inc.php');
$Page = new ArchiveArticle($staticpage);
-if ($_SERVER['HTTP_ACCEPT'] === 'text/plain') {
+if (
@
$_SERVER['HTTP_ACCEPT'] === 'text/plain') {
$Page->api = TRUE;
}
$Page->api = TRUE;
}
@@
-56,11
+56,12
@@
$Page->place += [
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
-if ($User->admin("edit {$Page->link}")) {
+if ($
Page->editable = $
User->admin("edit {$Page->link}")) {
include_once 'edit/head.inc.php';
}
include_once 'edit/head.inc.php';
}
-if (isset($Page->raw)) {
+if (isset($Page->raw)
+and @$_SERVER['HTTP_ACCEPT'] !== 'application/xml') {
$Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
}
$Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
}
@@
-69,7
+70,7
@@
if (isset($Page->raw)) {
include_once 'format.inc.php';
ob_start();
include_once 'format.inc.php';
ob_start();
-if ($Page->handler and !
require("./{$Page->handler}/index.php"
)) {
+if ($Page->handler and !
$Page->index($Page->api
)) {
# replace contents by code output on false return
$Page->raw = ob_get_clean();
}
# replace contents by code output on false return
$Page->raw = ob_get_clean();
}
@@
-83,7
+84,10
@@
else {
}
}
}
}
-if (!$Page->api and $_SERVER['HTTP_ACCEPT'] !== 'application/xml') {
+if (@$_SERVER['HTTP_ACCEPT'] === 'application/xml') {
+ header('Access-Control-Allow-Origin: *');
+}
+elseif (!$Page->api) {
include_once 'page.inc.php';
}
print $Page->render();
include_once 'page.inc.php';
}
print $Page->render();