Code cleanup and partial refactoring

No significant functional changes

Author: PhrozenByte

PicoAdmin/PicoAdmin.php

@@ -108,6 +108,7 @@ protected function handleAdminRequest()
             // show built-in landing page when no specific module was requested
             // landing page requires authentication, therefore non-authenticated users will end up on the login page
             $this->requestModule = 'landing';
+            $this->requestAction = $this->requestPayload = '';
             $this->authenticationRequired = true;
         }
 
@@ -269,6 +270,11 @@ protected function generateAuthToken($password)
         return $authToken;
     }
 
+    public function isAuthenticated()
+    {
+        return $this->authenticated;
+    }
+
     public function getAdminPageUrl($page, $queryData = null)
     {
         $page = $page ? $this->getPluginConfig('url') . '/' . $page : $this->getPluginConfig('url');

PicoAdmin/PicoContentAdmin.php

@@ -180,7 +180,7 @@ public function onAdminInitialized()
             // create new CSRF token
             $csrfTokenPayload = 'PicoContentAdmin|' . $this->admin->getPluginConfig('auth_token');
             $this->csrfToken = $this->session->generateSignedToken('PicoContentAdmin', $csrfTokenPayload);
-        } elseif ($this->action !== 'fullPreview') {
+        } elseif ($this->action !== 'navigation') {
             // check CSRF token
             $csrfTokenPayload = 'PicoContentAdmin|' . $this->admin->getPluginConfig('auth_token');
             $csrfToken = (isset($_POST['csrf_token']) && is_array($_POST['csrf_token'])) ? $_POST['csrf_token'] : array();
@@ -192,8 +192,8 @@ public function onAdminInitialized()
             }
 
             // make sure that this is a JSON request
-            if (!$this->admin->isJsonRequest()) {
-                $this->action = 'error';
+            if (($this->action !== 'fullPreview') && !$this->admin->isJsonRequest()) {
+                $this->action = 'jsonError';
             }
         }
 
@@ -379,7 +379,7 @@ public function onPageRendering(Twig_Environment &$twig, array &$twigVariables,
         } elseif ($this->action === 'fullPreview') {
             // use frontend theme
             return;
-        } elseif ($this->action === 'error') {
+        } elseif ($this->action === 'jsonError') {
             header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
             return;
         } elseif ($this->action === 'csrfError') {

PicoAdmin/content/info.md

@@ -17,8 +17,10 @@ Robots: noindex,nofollow
 to use to access the admin panel below and hit `Generate`:
 
 <form action="" method="post">
-    <input type="password" name="password" placeholder="Password" />
-    <input type="submit" value="Generate" />
+    <fieldset>
+        <input type="password" name="password" placeholder="Password" />
+        <input type="submit" value="Generate" />
+    </fieldset>
 </form>
 
 <div class="admin-auth-token" data-auth-token="%meta.admin_auth_token%" markdown="1">

PicoAdmin/content/login.md

@@ -5,7 +5,7 @@ Robots: noindex,nofollow
 
 ## Pico Admin Login
 
-<form action="" method="post">
+<form action="?" method="post">
     <fieldset>
         <input type="password" name="password" placeholder="Password" />
         <input type="submit" value="Login" />

PicoAdmin/theme/admin-content.twig

@@ -11,9 +11,12 @@
     <script src="{{ admin_theme_url }}/js/admin-content.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        var picoContentAdmin = new PicoContentAdmin(picoAdmin, {{ csrf_token|json_encode }});
+        var picoContentAdmin = new PicoContentAdmin(
+            picoAdmin,
+            {{ csrf_token|json_encode }},
+            {% filter json_encode %}{1} | Pico Admin Panel | {{ site_title }}{% endfilter %}
+        );
         picoContentAdmin.init({
-            title: {% filter json_encode %}{1} | Pico Admin Panel | {{ site_title }}{% endfilter %},
             contentExt: {{ config.content_ext|json_encode }},
             yamlEditorOptions: utils.extend(
                 {{ config.PicoAdmin.PicoContentAdmin.yamlEditor|json_encode }},
@@ -30,13 +33,10 @@
 
     {% if admin_request.module == "content" %}
         <script type="text/javascript">
-            if (!picoContentAdmin.restore()) {
-                picoContentAdmin.takeOver(
-                    '{{ page_path|escape("js") }}',
-                    '{% if not rescue_mode %}{{ admin_request.action }}{% else %}rescue{% endif %}',
-                    '{{ page_title|escape("js") }}'
-                );
-            }
+            picoAdmin.takeOver('content', '{{ page_path|escape("js") }}', [
+                '{% if not rescue_mode %}{{ admin_request.action }}{% else %}rescue{% endif %}',
+                '{{ page_title|escape("js") }}'
+            ]);
         </script>
     {% endif %}
 {% endblock %}

PicoAdmin/theme/css/admin.css

@@ -103,9 +103,11 @@ header { border-right: 1px solid #ddd; }
 header > h1 {
     margin: 0;
     padding: 1rem;
+
     white-space: pre;
     overflow: hidden;
     text-overflow: ellipsis;
+
     background: #2EAE9B;
     color: #fff;
 }
@@ -183,8 +185,10 @@ footer a[href]:hover { color: #fff; }
     position: fixed;
     top: 0;
     left: 0;
+
     width: 100%;
     height: 100%;
+
     z-index: 100;
     background: #000;
 }
@@ -196,14 +200,19 @@ footer a[href]:hover { color: #fff; }
     top: 0;
     left: 0;
     right: 0;
+
     width: 768px;
     max-width: 100%;
     margin: 0 auto;
     padding: 0 0.5em;
+
     z-index: 200;
     opacity: 0.95;
 }
-#notification > .alert { border-top: 0 none; }
+#notification > .alert {
+    border-top: 0 none;
+    margin-bottom: 0;
+}
 #notification > .alert:last-child {
     border-bottom-left-radius: 0.3rem;
     border-bottom-right-radius: 0.3rem;
@@ -231,6 +240,7 @@ footer a[href]:hover { color: #fff; }
     align-items: center;
     background: #ccc;
     border: 1px solid #999;
+    margin-bottom: 1em;
 }
 .alert.alert-info {    background: #6cc; border-color: #399; }
 .alert.alert-success { background: #6c9; border-color: #396; }
@@ -256,13 +266,16 @@ footer a[href]:hover { color: #fff; }
 .alert > .button {
     align-self: flex-start;
     flex: 0 0 auto;
+
     display: block;
     margin: 1rem;
     padding: 0.5em 1em;
+
     color: #444;
     background: rgba(0, 0, 0, 0.15);
     border-radius: 0.3em;
     cursor: pointer;
+
     -webkit-transition: background .2s ease-in;
             transition: background .2s ease-in;
 }
@@ -272,17 +285,21 @@ footer a[href]:hover { color: #fff; }
 
 .alert > .dismiss {
     align-self: flex-start;
+
     min-width: 2em;
     height: 2em;
     margin: 1rem;
     line-height: 2em;
+
     font-size: 0.7rem;
     text-align: center;
     font-weight: bold;
+
     color: rgba(0, 0, 0, 0.4);
     background: rgba(0, 0, 0, 0.15);
     border-radius: 0.3rem;
     cursor: default;
+
     -webkit-transition: background .2s ease-in;
             transition: background .2s ease-in;
 }
@@ -407,10 +424,12 @@ footer a[href]:hover { color: #fff; }
     width: 2em;
     margin: 0;
     padding: 0.3em;
+
     background: #eee;
     text-align: center;
     color: #444;
     cursor: pointer;
+
     -webkit-transition: color .2s ease-in;
             transition: color .2s ease-in;
 }
@@ -493,13 +512,17 @@ footer a[href]:hover { color: #fff; }
     display: flex;
     flex-direction: column;
     justify-content: center;
+
     width: 12em;
     height: 10em;
-    border: 1px solid #ddd;
-    border-radius: 0.5em;
     margin: 0.25em;
     padding: 1em;
+
+    border: 1px solid #ddd;
+    border-radius: 0.5em;
+
     cursor: pointer;
+
     -webkit-transition: border-color .2s ease-in,
                         box-shadow .2s ease-in;
             transition: border-color .2s ease-in,