From f1b88a08ef8c34b9c2865468174b096ab0f77d6e Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Fri, 2 Dec 2016 23:06:50 +0100
Subject: [PATCH] Abstract administrator username by using isAdmin() method

---
 app/admin/init.php              | 2 +-
 app/admin/views/users.phtml     | 2 +-
 app/default/views/layout.phtml  | 2 +-
 app/install/init.php            | 2 +-
 app/install/scripts/upgrade.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/init.php b/app/admin/init.php
index b52455d..9275ae9 100644
--- a/app/admin/init.php
+++ b/app/admin/init.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($auth->getUsername() != "admin") {
+if (!$auth->isAdmin()) {
     header("HTTP/1.1 403 Forbidden");
     exit;
 }
\ No newline at end of file
diff --git a/app/admin/views/users.phtml b/app/admin/views/users.phtml
index 9f321c7..33c327c 100644
--- a/app/admin/views/users.phtml
+++ b/app/admin/views/users.phtml
@@ -11,7 +11,7 @@
         <tr>
             <td><?php echo htmlspecialchars($user->getUsername()); ?></td>
             <td>
-                <?php if ($user->getUsername() != "admin") : ?>
+                <?php if (!$user->isAdmin()) : ?>
                 <a href="?mod=admin&amp;a=delete-user&amp;username=<?php echo urlencode($user->getUsername()); ?>">supprimer</a>
                 <?php else: ?>
                 -
diff --git a/app/default/views/layout.phtml b/app/default/views/layout.phtml
index 089b421..82b9f73 100644
--- a/app/default/views/layout.phtml
+++ b/app/default/views/layout.phtml
@@ -28,7 +28,7 @@
         </div>
         <?php if ($userAuthed) : ?>
         <footer>
-            <?php if ($userAuthed->getUsername() == "admin") : ?>
+            <?php if ($userAuthed->isAdmin()) : ?>
             <a href="?mod=admin&amp;a=users" style="color: #EF0000;">Administration</a> |
             <?php endif; ?>
             Version <?php echo APPLICATION_VERSION; ?>
diff --git a/app/install/init.php b/app/install/init.php
index 28b1ea0..4187b6e 100644
--- a/app/install/init.php
+++ b/app/install/init.php
@@ -5,7 +5,7 @@
     exit;
 }
 
-if ($action == "upgrade" && $auth->getUsername() != "admin") {
+if ($action == "upgrade" && !$auth->isAdmin()) {
     header("HTTP/1.1 403 Forbidden");
     exit;
 }
\ No newline at end of file
diff --git a/app/install/scripts/upgrade.php b/app/install/scripts/upgrade.php
index ba3530e..e5f4351 100644
--- a/app/install/scripts/upgrade.php
+++ b/app/install/scripts/upgrade.php
@@ -5,7 +5,7 @@
     exit;
 }
 
-if ($auth->getUsername() != "admin") {
+if (!$auth->isAdmin()) {
     header("HTTP/1.1 403 Forbidden");
     exit;
 }