From 1fc8f31d38bfcd9fbf89a42cb0e47ed1d7eacde4 Mon Sep 17 00:00:00 2001 From: grandeljay Date: Wed, 30 Aug 2023 15:00:29 +0200 Subject: [PATCH] fix: getting user power --- src/api/save-preview.php | 2 +- src/classes/wishthis/Page.php | 8 ++++---- src/classes/wishthis/User.php | 4 ++++ src/pages/power.php | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/api/save-preview.php b/src/api/save-preview.php index da362de4..67f35f4f 100644 --- a/src/api/save-preview.php +++ b/src/api/save-preview.php @@ -38,7 +38,7 @@ switch ($_SERVER['REQUEST_METHOD']) { $preview_create = true; } - if ($preview_create && $user->power >= $page->power) { + if ($preview_create && $user->getPower() >= $page->power) { file_put_contents($preview_filepath, $preview); } } diff --git a/src/classes/wishthis/Page.php b/src/classes/wishthis/Page.php index cbe0ad41..cab33829 100644 --- a/src/classes/wishthis/Page.php +++ b/src/classes/wishthis/Page.php @@ -169,7 +169,7 @@ class Page /** * Power */ - if (isset($user->power) && $user->power < $this->power && 0 !== $this->power) { + if ($user->getPower() < $this->power && 0 !== $this->power) { redirect(Page::PAGE_POWER . '&required=' . $this->power); } @@ -184,7 +184,7 @@ class Page ); if ($options && $options->getOption('updateAvailable') && !in_array($this->name, $ignoreUpdateRedirect)) { - if (100 === $user->power) { + if (100 === $user->getPower()) { redirect(Page::PAGE_UPDATE); } else { redirect(Page::PAGE_MAINTENANCE); @@ -485,7 +485,7 @@ class Page 'url' => Page::PAGE_PROFILE, 'icon' => 'user circle alternate', ); - if (100 === $user->power) { + if (100 === $user->getPower()) { $pages[$account]['items'][] = array( 'text' => __('Login as'), 'url' => Page::PAGE_LOGIN_AS, @@ -522,7 +522,7 @@ class Page ); } - if (isset($user->power) && 100 === $user->power) { + if (100 === $user->getPower()) { $pages[$system]['items'][] = array( 'text' => __('Settings'), 'url' => Page::PAGE_SETTINGS, diff --git a/src/classes/wishthis/User.php b/src/classes/wishthis/User.php index b8a08e66..aa2f37d4 100644 --- a/src/classes/wishthis/User.php +++ b/src/classes/wishthis/User.php @@ -464,4 +464,8 @@ class User public function getPassword(): string { return $this->password; } + + public function getPower(): int { + return $this->power; + } } diff --git a/src/pages/power.php b/src/pages/power.php index c7b4e7df..e7dd8ee6 100644 --- a/src/pages/power.php +++ b/src/pages/power.php @@ -22,7 +22,7 @@ $user = User::getCurrent();

-

' . $_GET['required'] . '', '' . $user->power . '') ?>

+

' . $_GET['required'] . '', '' . $user->getPower() . '') ?>