Some fixes

johncms · Aug 7, 2021 · 58c91c4 · 58c91c4
1 parent 2465f30
commit 58c91c4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/system/src/Counters.php b/system/src/Counters.php
@@ -455,7 +455,7 @@ public function albumCounters(): array
             file_put_contents($file, json_encode(['album' => $album, 'photo' => $photo, 'new' => $new, 'new_adm' => $new_adm]), LOCK_EX);
         }
 
-        if ($this->user->rights >= 6 && $new_adm) {
+        if ($this->user?->isAdmin() && $new_adm) {
             $newcount = $new_adm;
         } elseif ($new) {
             $newcount = $new;

diff --git a/themes/default/templates/system/app/debug.phtml b/themes/default/templates/system/app/debug.phtml
@@ -1,4 +1,4 @@
-<?php if (($user->rights >= 7 && DEBUG) || DEBUG_FOR_ALL): ?>
+<?php if (($user?->isAdmin() && DEBUG) || DEBUG_FOR_ALL): ?>
     <?php
     $connection = \Illuminate\Database\Capsule\Manager::connection();
     $query_log = $connection->getQueryLog();

diff --git a/themes/default/templates/system/app/sidebar-main-menu.phtml b/themes/default/templates/system/app/sidebar-main-menu.phtml
@@ -122,8 +122,8 @@ $ads_array = $ads->getAds();
                 <span class="flex-grow-1"><?= d__('system', 'Information, FAQ') ?></span>
             </a>
         </li>
-        <?php if ($user->rights >= 1): ?>
-            <?php if ($user->rights >= 7): ?>
+        <?php if ($user?->hasAnyRole()): ?>
+            <?php if ($user?->isAdmin()): ?>
                 <li>
                     <div class="border-bottom mt-3 mb-3"></div>
                     <a href="/admin/">

diff --git a/themes/default/templates/system/app/sidebar-user-menu.phtml b/themes/default/templates/system/app/sidebar-user-menu.phtml
@@ -2,7 +2,7 @@
 /**
  * @var string $locale
  * @var Johncms\System\Legacy\Tools $tools
- * @var Johncms\System\Users\User $user
+ * @var Johncms\Users\User $user
  */
 
 ?>
@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div>
-                <?= ($user->id ? $user->name : d__('system', 'Log In')) ?>
+                <?= ($user ? $user->name : d__('system', 'Log In')) ?>
             </div>
         </div>
         <div>