From e26824be2d1f3595d6f39fbb65b7a549bb83abf5 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Tue, 18 Aug 2015 15:13:40 +0200
Subject: [PATCH] Selection of edits in the broomcloset

---
 _sakura/changelog.json                        | 25 ++++++++++++++++++-
 _sakura/sakura.php                            |  2 +-
 .../templates/broomcloset/global/footer.tpl   |  2 +-
 .../templates/broomcloset/global/header.tpl   |  7 +++---
 main/manage.php                               |  8 ++++++
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/_sakura/changelog.json b/_sakura/changelog.json
index 3316bc9..153e23b 100644
--- a/_sakura/changelog.json
+++ b/_sakura/changelog.json
@@ -41,7 +41,9 @@
                 "20150809",
                 "20150810",
                 "20150811",
-                "20150812"
+                "20150812",
+                "20150813",
+                "20150814"
 
             ]
 
@@ -2000,6 +2002,27 @@
                 "user":     "Flashwave"
             }
 
+        ],
+
+        "20150813": [
+
+            {
+                "type":     "FIX",
+                "change":   "Fixed some broken links on manage.",
+                "user":     "Flashwave"
+            },
+            {
+                "type":     "ADD",
+                "change":   "Add permission check when trying to enter manage.",
+                "user":     "Flashwave"
+            }
+
+        ],
+
+        "20150814": [
+
+
+
         ]
 
     }
diff --git a/_sakura/sakura.php b/_sakura/sakura.php
index d79b2de..1ab7611 100644
--- a/_sakura/sakura.php
+++ b/_sakura/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION',    '20150811');
+define('SAKURA_VERSION',    '20150813');
 define('SAKURA_VLABEL',     'Eminence');
 define('SAKURA_COLOUR',     '#6C3082');
 define('SAKURA_STABLE',     false);
diff --git a/_sakura/templates/broomcloset/global/footer.tpl b/_sakura/templates/broomcloset/global/footer.tpl
index 786ab60..f1c2042 100644
--- a/_sakura/templates/broomcloset/global/footer.tpl
+++ b/_sakura/templates/broomcloset/global/footer.tpl
@@ -1,6 +1,6 @@
             </div>
             <div class="footer">
-                <div style="color: {{ sakura.vcolour }};">Sakura b{{ sakura.version }} ({{ sakura.vlabel }}/{{ sakura.vtype }})</div>
+                <div style="color: {{ sakura.vcolour }};">Sakura b{{ sakura.version }} ({{ sakura.vlabel }}/{{ sakura.stable ? 'Stable' : 'Development' }})</div>
             </div>
         </div>
     </body>
diff --git a/_sakura/templates/broomcloset/global/header.tpl b/_sakura/templates/broomcloset/global/header.tpl
index 1051f39..8c19b48 100644
--- a/_sakura/templates/broomcloset/global/header.tpl
+++ b/_sakura/templates/broomcloset/global/header.tpl
@@ -9,7 +9,6 @@
             <meta http-equiv="refresh" content="3; URL={{ page.redirect }}" />
         {% endif %}
         <!-- CSS -->
-        <link rel="stylesheet" type="text/css" href="//{{ sakura.content_path }}/global.css" />
         <link rel="stylesheet" type="text/css" href="{{ sakura.resources }}/css/manage.css" />
         <link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />
         <!-- JS -->
@@ -20,9 +19,9 @@
             <span id="top"></span>
             <div class="header" id="header">
                 <div class="logo">
-                    <a href="//{{ sakura.urls.main }}/manage/">Broom Closet</a> /
-                    <a href="//{{ sakura.urls.main }}/manage/{{ page.activepage }}/">{{ page.pages[page.activepage].desc }}</a> /
-                    <a href="//{{ sakura.urls.main }}/manage/{{ page.activepage }}/{{ page.activesub }}/">{{ page.pages[page.activepage].subs[page.activesub].desc }}</a>
+                    <a href="/manage/">Broom Closet</a> /
+                    <a href="/manage/{{ page.activepage }}/">{{ page.pages[page.activepage].desc }}</a> /
+                    <a href="/manage/{{ page.activepage }}/{{ page.activesub }}/">{{ page.pages[page.activepage].subs[page.activesub].desc }}</a>
                 </div>
                 <div class="nav">
                     <div class="menu" id="siteNav">
diff --git a/main/manage.php b/main/manage.php
index 2919138..2344f71 100644
--- a/main/manage.php
+++ b/main/manage.php
@@ -12,6 +12,14 @@ define('SAKURA_MANAGE', true);
 // Include components
 require_once str_replace(basename(__DIR__), '', dirname(__FILE__)) .'_sakura/sakura.php';
 
+// Make sure user has the permissions to view this
+if(!Permissions::check('MANAGE', 'USE_MANAGE', Session::$userId, 1)) {
+
+    header('Location: /');
+    exit;
+
+}
+
 // Management pages
 $managePages = [