From 55577f8ad06be387bb245315e902ccfb02172389 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Tue, 20 Sep 2016 21:14:22 +0200
Subject: [PATCH] meow

---
 resources/views/yuuno/master.twig |  7 ++-----
 utility.php                       | 16 ----------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/resources/views/yuuno/master.twig b/resources/views/yuuno/master.twig
index 78ea48e..5c8968c 100644
--- a/resources/views/yuuno/master.twig
+++ b/resources/views/yuuno/master.twig
@@ -9,13 +9,10 @@
         <meta http-equiv="refresh" content="{{ redirectTimeout ? redirectTimeout : '3' }}; URL={{ redirect }}">
 {% endif %}
 {{ block('meta') }}
-
         <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
         <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-        <link rel="stylesheet" type="text/css" href="/css/libraries.css">
         <link rel="stylesheet" type="text/css" href="/css/yuuno.css">
 {{ block('css') }}
-
         <script type="text/javascript" src="/js/app.js"></script>
         <script type="text/javascript" src="/js/yuuno.js"></script>
 {{ block('js') }}
@@ -48,7 +45,7 @@
                         <!-- User menu, displayed on right side of the bar. -->
                         {% if user.isActive %}
                             <a class="menu-item avatar" href="{{ route('user.profile', user.id) }}" title="Logged in as {{ user.username }}" style="background-image: url('{{ route('user.avatar', user.id) }}'); width: auto; color: {{ user.colour }}; border-color: {{ user.colour }}; font-weight: 700;"></a>
-                            {#<a class="menu-item fa-envelope" href="#" title="Messages"></a>#}
+                            <a class="menu-item fa-envelope" href="#" title="Messages"></a>
                             <a class="menu-item fa-bell" href="javascript:;" title="Notifications"></a>
                             {% if user.permission(constant('Sakura\\Perms\\Manage::USE_MANAGE'), constant('Sakura\\Perms::MANAGE')) %}
                                 <a class="menu-item fa-gavel" href="{{ route('manage.index') }}" title="Manage"></a>
@@ -105,7 +102,7 @@
                 </noscript>
 
                 {% if config('general.cover') %}
-                    <div class="headerAnnouncement" style="background-image: url('{{ config('cover') }}');"></div>
+                    <div class="headerAnnouncement" style="background-image: url('{{ config('general.cover') }}');"></div>
                 {% endif %}
 
                 {% block content %}
diff --git a/utility.php b/utility.php
index b83f19d..c225e4d 100644
--- a/utility.php
+++ b/utility.php
@@ -3,8 +3,6 @@
  * A set of utility helper functions
  */
 
-use Phroute\Phroute\Exception\HttpMethodNotAllowedException;
-use Phroute\Phroute\Exception\HttpRouteNotFoundException;
 use Sakura\Config;
 use Sakura\Exceptions\ConfigValueNotFoundException;
 use Sakura\Net;
@@ -54,20 +52,6 @@ function view($name, $vars = [])
     return Template::render($name);
 }
 
-// Abort response
-function abort($status = 200)
-{
-    http_response_code($status);
-
-    switch ($status) {
-        case 403:
-            throw new HttpMethodNotAllowedException;
-
-        case 404:
-            throw new HttpRouteNotFoundException;
-    }
-}
-
 function clean_string($string, $lower = false, $noSpecial = false, $replaceSpecial = '')
 {
     // Run common sanitisation function over string