edit/head: move admin preparation to separate include

diff --git a/edit/head.inc.php b/edit/head.inc.php
new file mode 100644 (file)
index 0000000..5c056a7
--- /dev/null
+++ b/edit/head.inc.php
@@ -0,0 +1,32 @@
+<?php
+if (!isset($Page->raw)) {
+       # open bottom template as initial contents
+       $template = 'template.inc.html';
+       if ($Page->handler and file_exists("{$Page->handler}/$template")) {
+               $template = "{$Page->handler}/$template";
+       }
+       $Page->raw($template);
+       $Page->meta['article:published_time'] = date('Y-m-d h:i:s O');
+       $Page->meta['article:author'] = '/' . $User->dir;
+       $Page->body = NULL;
+}
+
+if (isset($Page->raw)) {
+       # restore meta tags in static contents for editing
+       foreach (array_reverse($Page->meta) as $metaprop => $val) {
+               $Page->raw = sprintf(
+                       '<meta property="%s" content="%s">'."\n",
+                       $metaprop, $val
+               ) . $Page->raw;
+       }
+}
+
+$ckesrc = '/lib/ckeditor'; # local install
+if (!file_exists(DOCROOT . $ckesrc)) {
+       $ckesrc = '//cdn.ckeditor.com/4.15.1/full-all'; # remote fallback
+}
+ob_start();
+printf("<script>var ckesrc = '%s'</script>\n", "$ckesrc/ckeditor.js");
+print '<script src="/edit/page.js"></script>'."\n";
+$Page->head = ob_get_clean();
+

diff --git a/page.inc.php b/page.inc.php
index 17e7c807269f444df3a9e8589bee7ff674a533b3..3559e63b07fafff9f548411e8ee4f41c8db75daf 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,15 +1,4 @@
 <?php
-if ($User and $User->admin("edit {$Page->link}")) {
-       $ckesrc = '/lib/ckeditor'; # local install
-       if (!file_exists(DOCROOT . $ckesrc)) {
-               $ckesrc = '//cdn.ckeditor.com/4.15.1/full-all'; # remote fallback
-       }
-       ob_start();
-       printf("<script>var ckesrc = '%s'</script>\n", "$ckesrc/ckeditor.js");
-       print '<script src="/edit/page.js"></script>'."\n";
-       $Page->head = ob_get_clean();
-}
-
 include_once 'head.inc.php';
 
 print "<header>\n";

diff --git a/page.php b/page.php
index f493c7fb04f8cca4619dedd1ba66b2985da9f334..f7c8f7d1b7841944154d0e99d5c1e3adaed90f44 100644 (file)
--- a/page.php
+++ b/page.php
@@ -56,28 +56,11 @@ $Page->place += [
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
-if (!isset($Page->raw) and $User->admin("edit {$Page->link}")) {
-       # open bottom template as initial contents
-       $template = 'template.inc.html';
-       if ($Page->handler and file_exists("{$Page->handler}/$template")) {
-               $template = "{$Page->handler}/$template";
-       }
-       $Page->raw($template);
-       $Page->meta['article:published_time'] = date('Y-m-d h:i:s O');
-       $Page->meta['article:author'] = '/' . $User->dir;
-       $Page->body = NULL;
+if ($User->admin("edit {$Page->link}")) {
+       include_once 'edit/head.inc.php';
 }
 
 if (isset($Page->raw)) {
-       if ($User->admin("edit {$Page->link}")) {
-               # restore meta tags in static contents for editing
-               foreach (array_reverse($Page->meta) as $metaprop => $val) {
-                       $Page->raw = sprintf(
-                               '<meta property="%s" content="%s">'."\n",
-                               $metaprop, $val
-                       ) . $Page->raw;
-               }
-       }
        $Page->raw = '<div class="static">'."\n\n".$Page->raw."</div>\n\n";
 }