From 6fed56d0d691eecccdcccf0b65a0fa307c448d0a Mon Sep 17 00:00:00 2001
From: MaksPL <msloboda@ukr.net>
Date: Tue, 23 Mar 2021 11:08:43 +0200
Subject: [PATCH 1/3] hotfix user controller init

---
 src/controllers/UserController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/UserController.php b/src/controllers/UserController.php
index 4b752bd9..ae9fc3ab 100644
--- a/src/controllers/UserController.php
+++ b/src/controllers/UserController.php
@@ -41,6 +41,8 @@ class UserController extends Controller
 
     public function init()
     {
+        parent::init();
+        
         if (\Yii::$app->request->get(static::REQUEST_PARAM_USERNAME) && !$this->user) {
             throw new NotFoundHttpException("User not found or inactive");
         } else {

From c870d8e0874e8c6ea98df12974a6fd31134832b6 Mon Sep 17 00:00:00 2001
From: Maxpl <msloboda@ukr.net>
Date: Wed, 25 May 2022 22:54:43 +0300
Subject: [PATCH 2/3] Update index.php

fix admin storage index
---
 src/views/admin-storage/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin-storage/index.php b/src/views/admin-storage/index.php
index 4e9117c4..184e8c39 100644
--- a/src/views/admin-storage/index.php
+++ b/src/views/admin-storage/index.php
@@ -7,7 +7,7 @@
  */
 ?>
 <h2><?= \Yii::t('skeeks/cms', 'Servers to store the files.') ?></h2>
-<?php foreach (\Yii::$app->storage->getClusters() as $count => $cluster) : ?>
+<?php $count = 0; foreach (\Yii::$app->storage->getClusters() as $cluster) : ?>
     <div class="sx-box g-pa-10 sx-bg-primary">
         <div class="row">
             <div class="col-md-12">

From 9d1464c3f6c4e6bf310c3b7049484294fc241007 Mon Sep 17 00:00:00 2001
From: Maxpl <msloboda@ukr.net>
Date: Wed, 25 May 2022 23:42:58 +0300
Subject: [PATCH 3/3] Update AdminUserController.php

fix user edit in base-app
---
 src/controllers/AdminUserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/AdminUserController.php b/src/controllers/AdminUserController.php
index e3f8c1d1..d72dfc80 100644
--- a/src/controllers/AdminUserController.php
+++ b/src/controllers/AdminUserController.php
@@ -469,7 +469,7 @@ public function actions()
                 },
 
                 "accessCallback" => function () {
-                    if ($this->model) {
+                    if ($this->model && class_exists(ShopOrder::class)) {
                         return ShopOrder::find()->cmsSite()->andWhere(['cms_user_id' => $this->model->id])->exists();
                     }