injitools / cms-Inji

system/modules/Ui/objects/ActiveForm.php

Spacing +7 added lines, -7 removed lines

@@ -84,7 +84,7 @@ 
                             $this->model->_params[$modelName::index()] = 0;
                         }
                         $relOptions['model']::fixPrefix($relOptions['col']);
-                        $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+                        $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
                 } elseif (!empty($modelName::$cols[$col])) {
@@ -98,7 +98,7 @@ 
     public function checkRequest($params = [], $ajax = false)
     {
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->formName.'"');
             return [];
         }
         $successId = 0;
@@ -122,7 +122,7 @@ 
                     if (!empty($this->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($col, $this->form['userGroupReadonly'][\Users\User::$cur->group_id])) {
                         continue;
                     }
-                    $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($param['type']);
+                    $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($param['type']);
                     $input = new $inputClassName();
                     $input->activeForm = $this;
                     $input->activeFormParams = $params;
@@ -182,7 +182,7 @@ 
     public function draw($params = [], $ajax = false)
     {
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" form with name: "'.$this->formName.'"');
             return [];
         }
         $form = new Form(!empty($this->form['formOptions']) ? $this->form['formOptions'] : []);
@@ -194,7 +194,7 @@ 
         if (is_object($options)) {
             $options->draw();
         } else {
-            $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
+            $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($options['type']);
             $input = new $inputClassName();
             $input->form = $form;
             $input->activeForm = $this;
@@ -270,7 +270,7 @@ 
         }
         foreach ($values as $key => $value) {
             if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
-                $values[$key]['input']['name'] = $aditionalInputNamePrefix . "[{$value['input']['name']}]";
+                $values[$key]['input']['name'] = $aditionalInputNamePrefix."[{$value['input']['name']}]";
             }
         }
         return $values;
@@ -294,7 +294,7 @@ 
     public function checkAccess()
     {
         if (empty($this->form)) {
-            $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
+            $this->drawError('"'.$this->modelName.'" form with name: "'.$this->formName.'" not found');
             return false;
         }
         if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {

system/modules/Ui/objects/FastEdit.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         echo "<div class = 'fastEdit' ";
         if ($object) {
-            echo "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
+            echo "data-model='".get_class($object)."' data-col='{$col}' data-key='".$object->pk()."'";
         }
         echo ">";
         $value = $value !== null ? $value : ($object ? $object->$col : '');

system/modules/Ui/objects/ActiveForm/Input.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     public function validate(&$request)
     {
         if (empty($request[$this->colName]) && !empty($this->colParams['required'])) {
-            throw new \Exception('Вы не заполнили: ' . $this->colLabel());
+            throw new \Exception('Вы не заполнили: '.$this->colLabel());
         }
         //var_dump($this->colName,$this->colParams);
         //exit();

system/modules/Ui/objects/ActiveForm/Input/Image.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName],
                 'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName],
                     ], [
-                'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk(),
+                'upload_code' => 'activeForm:'.$this->activeForm->modelName.':'.$this->activeForm->model->pk(),
                 'accept_group' => 'image'
             ]);
             if ($file_id) {

system/modules/Ui/objects/ActiveForm/Input/Files.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                     'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName][$key],
                     'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName][$key],
                         ], [
-                    'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk()
+                    'upload_code' => 'activeForm:'.$this->activeForm->modelName.':'.$this->activeForm->model->pk()
                 ]);
             }
             $this->activeForm->model->{$this->colName} = implode(',', array_filter($file_ids));

system/modules/Ui/objects/DataManager/Action/Open.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             'formName' => !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager',

             'redirectUrl' => !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : str_replace('\\', '/', $dataManager->modelName)

         ];

-        return "<a href='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->pk()}?" . http_build_query($query) . "'><i class='glyphicon glyphicon-eye-open'></i></a>";

+        return "<a href='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->pk()}?".http_build_query($query)."'><i class='glyphicon glyphicon-eye-open'></i></a>";

     }

 

 }

system/modules/Ui/objects/DataManager/Action/Href.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         if (!empty($actionParams['query'])) {

             $query = $query + $actionParams['query'];

         }

-        return "<a class='" . (isset($actionParams['class']) ? $actionParams['class'] : '') . "' href='{$actionParams['href']}?" . http_build_query($query) . "'>{$actionParams['text']}</a>";

+        return "<a class='".(isset($actionParams['class']) ? $actionParams['class'] : '')."' href='{$actionParams['href']}?".http_build_query($query)."'>{$actionParams['text']}</a>";

     }

 

 }

system/modules/Ui/objects/DataManager/Action/Edit.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             'formName' => !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager'

         ];

 

-        return '<a href ="#" onclick=\'inji.Ui.forms.popUp("' . addcslashes(get_class($item), '\\') . ':' . $item->pk() . '",' . json_encode($formParams) . ');

+        return '<a href ="#" onclick=\'inji.Ui.forms.popUp("'.addcslashes(get_class($item), '\\').':'.$item->pk().'",'.json_encode($formParams).');

                                       return false;\'><i class="glyphicon glyphicon-edit"></i></a>';

     }

 

system/modules/Ui/objects/DataManager/Action/Delete.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 

     public static function rowButton($dataManager, $item, $params, $actionParams)

     {

-        return '<a href ="#" onclick=\'inji.Ui.dataManagers.get(this).delRow(' . $item->pk() . ');

+        return '<a href ="#" onclick=\'inji.Ui.dataManagers.get(this).delRow('.$item->pk().');

                                       return false;\'><i class="glyphicon glyphicon-remove"></i></a>';

     }

 

@@ -31,7 +31,7 @@ 
             $model->delete();

         }

         $count = count($models);

-        return 'Удалено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['запись', 'записи', 'записей']);

+        return 'Удалено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['запись', 'записи', 'записей']);

     }

 

 }