From 9f3523de6bf1b22810a5e194e0ee79912258a586 Mon Sep 17 00:00:00 2001
From: "origami11@yandex.ru" <phedor@edu.yar.ru>
Date: Fri, 9 Dec 2022 16:09:40 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Controller/Action.php | 9 ++++++---
 src/Layout/Manager.php    | 6 ++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Controller/Action.php b/src/Controller/Action.php
index 485bd3c..241b3df 100644
--- a/src/Controller/Action.php
+++ b/src/Controller/Action.php
@@ -30,7 +30,6 @@ class Action
 
     public $modulePath = null; // Путь к модулю
     public $moduleTitle = '';
-    public $modulePrefix = '';
 
     public $viewPathPrefix = null; // Путь к шаблонам контроллера
 
@@ -219,8 +218,12 @@ class Action
         $url = new Url();
 
         if ($access == null || $access->checkAction($name)) {
-            $moduleName = explode("\\", strtolower(get_class($this)), 2);
-            $param = array_merge(array('module' => $this->modulePrefix . $moduleName[1], "action" => $name), $param);
+            $moduleName = explode("\\", strtolower(get_class($this)));
+            array_shift($moduleName);
+            if ($moduleName[0] == $moduleName[1]) {
+                array_shift($moduleName);
+            }
+            $param = array_merge(array('module' => implode("\\", $moduleName), "action" => $name), $param);
 
             $url->setParent($this->part);
             $url->setQuery($param);
diff --git a/src/Layout/Manager.php b/src/Layout/Manager.php
index e843219..d687113 100644
--- a/src/Layout/Manager.php
+++ b/src/Layout/Manager.php
@@ -67,17 +67,15 @@ class Manager extends Filter
      */
     public function execute(HttpRequest $request)
     {
-//        print_r($request->get('mode'));
         foreach ($this->condition as $condition) {
             if (call_user_func($condition[0], $request)) {
                 $layout = $condition[1];
                 $view = $layout->execute($request);
                 if (is_object($view)) {
-                    echo $view->render();
+                    return $view->render();
                 } else {
-                    echo $view;
+                    return $view;
                 }
-                return null;
             }
         }
     }