page: replace global variables by $Page object

[minimedit.git] / page.inc.php

diff --git a/page.inc.php b/page.inc.php
index 577f1e030806152973998a8b8d4f9a7d60de69da..137d266267fab1905b74492b3e556e3b77722684 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -7,11 +7,14 @@ print "<header>\n";
 ob_start();
 include 'menu.inc.html';
 ob_start();
-if ($User) {
+if ($User and property_exists($User, 'login') and $User->login) {
        print '<div class="login"><p>';
-       printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User->login);
-       if ($User->admin('edit')) {
-               $editpage = $Page.$Args;
+       printf('<span title="ingelogd">%s <a href="%s">%s</a></span>',
+               '<span class="icon icon-user">&#x1F464;</span>',
+               '/login', $User->login
+       );
+       if ($User->admin("edit {$Page->link}")) {
+               $editpage = $Page->link;
                if (is_dir($editpage)) {
                        if (file_exists("$editpage/index.html")) {
                                $editpage .= '/index.html';
@@ -21,7 +24,7 @@ if ($User) {
                        $editpage .= '.html';
                }
                if (!file_exists($editpage) or is_writable($editpage)) {
-                       print ' <a href="#edit">Wijzig</a>';
+                       print ' <a class="icon icon-edit" href="#edit" title="wijzig">&#x270D;</a>';
                }
        }
        print "</p></div>\n";
@@ -43,13 +46,13 @@ register_shutdown_function(function () {
        @include 'footer.inc.html';
        print "</footer>\n";
 
-       global $User;
-       if ($User and $User->admin('edit')) {
+       global $User, $Page;
+       if ($User and $User->admin("edit {$Page->link}")) {
                $ckesrc = '/lib/ckeditor'; # local install
                if (!file_exists(DOCROOT . $ckesrc)) {
-                       $ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback
+                       $ckesrc = '//cdn.ckeditor.com/4.15.1/full-all'; # remote fallback
                }
-               printf('<script src="%s"></script>'."\n", "$ckesrc/ckeditor.js");
+               printf("<script>var ckesrc = '%s'</script>\n", "$ckesrc/ckeditor.js");
                print '<script src="/edit/page.js"></script>'."\n";
        }