From 40f40a8d6ddeda416bc945022efeb30dae7d5257 Mon Sep 17 00:00:00 2001
From: "CORP\\phedor" <origami11@yandex.ru>
Date: Sat, 28 Apr 2018 14:13:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?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 |  7 ++-----
 src/Form/BrowserInput.php |  6 ++++++
 src/Form/Form.php         | 31 ++++++++++++++-----------------
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 src/Form/BrowserInput.php

diff --git a/src/Controller/Action.php b/src/Controller/Action.php
index 34137af..a86511b 100644
--- a/src/Controller/Action.php
+++ b/src/Controller/Action.php
@@ -219,11 +219,8 @@ class Action
         $url = new Url();
 
         if ($access == null || $access->checkAction($name)) {
-            $param = array_merge(array(
-                        'module' => strtr($this->modulePrefix . strtolower(get_class($this)), array('module_' => '')),
-                        "action" => $name
-
-                    ), $param);
+            $moduleName = explode("\\", strtolower(get_class($this)), 2);
+            $param = array_merge(array('module' => $this->modulePrefix . $moduleName[1], "action" => $name), $param);
 
             $url->setParent($this->part);
             $url->setQuery($param);
diff --git a/src/Form/BrowserInput.php b/src/Form/BrowserInput.php
new file mode 100644
index 0000000..f6e1e69
--- /dev/null
+++ b/src/Form/BrowserInput.php
@@ -0,0 +1,6 @@
+<?php
+namespace ctiso\Form;
+use ctiso\Form\Input;
+
+class BrowserInput extends Input {
+}
\ No newline at end of file
diff --git a/src/Form/Form.php b/src/Form/Form.php
index 02e6e7e..200d7ad 100644
--- a/src/Form/Form.php
+++ b/src/Form/Form.php
@@ -50,9 +50,6 @@ class THidden extends Input {
     public $hidden = true;
 }
 
-class TComponentBrowserInput extends Input {
-}
-
 /**
  * Форма для ввода
  */
@@ -77,30 +74,30 @@ class Form extends View {
     public function __construct()
     {
         $this->constructor = array(
-            'input'       => 'Form_Input',
-            'inputreq'    => 'Form_Input', // input с проверкой на заполненность
+            'input'       => 'ctiso\\Form\\Input',
+            'inputreq'    => 'ctiso\\Form\\Input', // input с проверкой на заполненность
 
-            'date'        => 'Form_Date',
-            'datereq'     => 'Form_Date',
+            'date'        => 'ctiso\\Form\\Date',
+            'datereq'     => 'ctiso\\Form\\Date',
             'datetime'    => 'TDateTime',
 
-            'color'       => 'Form_Color',
-            'textarea'    => 'Form_TextArea',
-            'text'        => 'Form_TextArea',
-            'multiselect' => 'Form_SelectMany',
+            'color'       => 'ctiso\\Form\\Color',
+            'textarea'    => 'ctiso\\Form\\TextArea',
+            'text'        => 'ctiso\\Form\\TextArea',
+            'multiselect' => 'ctiso\\Form\\SelectMany',
 //            'selectmany'   => 'TSelectMany',
-            'select1'     => 'Form_SelectOne',
-            'select'      => 'Form_SelectOne',
+            'select1'     => 'ctiso\\Form\\SelectOne',
+            'select'      => 'ctiso\\Form\\SelectOne',
             'questiontype'=> 'TQuestionType',
             'secret'      => 'TSecret',
             'upload'      => 'TUpload',
             'image'       => 'TUpload',
             'checkbox'    => 'TCheckbox',
-            'checkmany'   => 'Form_SelectMany',
+            'checkmany'   => 'ctiso\\Form\\SelectMany',
             'hidden'      => 'THidden',
-            'radio'       => 'Form_SelectOne',
-            'filebrowser' => 'TComponentBrowserInput',
-            'documents' => 'TComponentBrowserInput',
+            'radio'       => 'ctiso\\Form\\SelectOne',
+            'filebrowser' => 'ctiso\\Form\\BrowserInput',
+            'documents' => 'ctiso\\Form\\BrowserInput',
         );
 
     }