injitools / cms-Inji

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, ['запись', 'записи', 'записей']);

     }

 

 }

system/modules/Ui/objects/Tree.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
           }
           $count += count($items);
           foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
           }
           ?>
         </ul>
@@ -52,7 +52,7 @@ 
             $item = $item['text'];
         }
         if (!isset($attributes['id'])) {
-            $attributes['id'] = str_replace('\\', '_', get_class($object)) . "-{$object->pk()}";
+            $attributes['id'] = str_replace('\\', '_', get_class($object))."-{$object->pk()}";
         }
         if (!$maxDeep || $deep < $maxDeep) {
             $items = $class::getList(['where' => ['parent_id', $object->pk()]]);
@@ -63,7 +63,7 @@ 
                     echo \Html::el('li', $attributes, $item, true);
                     echo '<ul>';
                 }
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
             }
         }
         if ($isset) {

system/modules/Ui/objects/DataManager.php

Spacing +30 added lines, -30 removed lines

@@ -57,7 +57,7 @@ 
             $this->name = $modelName;
         }
 
-        $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+        $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
     }
 
     /**
@@ -101,13 +101,13 @@ 
         if (!empty($this->managerOptions['filters'])) {
             $buttons[] = [
                 'text' => 'Фильтры',
-                'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+                'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
             ];
         }
         $buttons[] = [
             'text' => 'Добавить элемент',
-            'onclick' => 'inji.Ui.forms.popUp("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ')',
+            'onclick' => 'inji.Ui.forms.popUp("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).')',
         ];
 
         return $buttons;
@@ -131,7 +131,7 @@ 
                     'className' => $action
                 ];
             }
-            $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $action;
+            $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $action;
         }
         return $return;
     }
@@ -166,7 +166,7 @@ 
               <?php
               foreach ($actions as $action => $actionParams) {
                   if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-                      echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                      echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
                   }
               }
               ?>
@@ -214,7 +214,7 @@ 
             return [];
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         $modelName = $this->modelName;
@@ -230,7 +230,7 @@ 
             $queryParams['start'] = $this->page * $this->limit - $this->limit;
         }
         if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-            $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+            $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
         }
         if (!empty($params['appType'])) {
             $queryParams['appType'] = $params['appType'];
@@ -287,7 +287,7 @@ 
                         if (!empty($params['filters'][$col]['max'])) {
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                                $date = $params['filters'][$col]['max'].' 23:59:59';
                             } else {
                                 $date = $params['filters'][$col]['max'];
                             }
@@ -314,16 +314,16 @@ 
                         }
                         switch ($params['filters'][$col]['compareType']) {
                             case 'contains':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'equals':
                                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                                 break;
                             case 'starts_with':
-                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'ends_with':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                                 break;
                         }
                         break;
@@ -362,7 +362,7 @@ 
                 $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
             }
             $row = [];
-            $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+            $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
             $row[] = $item->pk();
             foreach ($this->managerOptions['cols'] as $key => $colName) {
                 if (!empty($params['download'])) {
@@ -408,16 +408,16 @@ 
                     $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                     $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
                     $count = $count ? $count : 'Нет';
-                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
                 case 'many':
                     $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                     $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
                     $count = $count ? $count : 'Нет';
-                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
                 default :
                     if ($item->{$modelName::$cols[$colName]['relation']}) {
                         if (\App::$cur->name == 'admin') {
-                            $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+                            $href = "<a href ='/admin/".str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model'])."/".$item->{$modelName::$cols[$colName]['relation']}->pk()."'>";
                             if (!empty($modelName::$cols[$colName]['showCol'])) {
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
                             } else {
@@ -447,18 +447,18 @@ 
                     case'many':
                         $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                         $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-                        return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
+                        return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count} ".\Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов'])."</a>";
                     default:
                         return $item->$colName;
                 }
             } elseif (!empty($modelName::$cols[$colName]['type'])) {
-                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
-                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($originalItem))."/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } else {
                     return \Model::resloveTypeValue($item, $colName);
                 }
@@ -493,7 +493,7 @@ 
             return [];
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         if (!empty($params['limit'])) {
@@ -507,7 +507,7 @@ 
         ];
         $modelName = $this->modelName;
         if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-            $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+            $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
         }
         if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
@@ -559,7 +559,7 @@ 
                         if (!empty($params['filters'][$col]['max'])) {
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                                $date = $params['filters'][$col]['max'].' 23:59:59';
                             } else {
                                 $date = $params['filters'][$col]['max'];
                             }
@@ -586,16 +586,16 @@ 
                         }
                         switch ($params['filters'][$col]['compareType']) {
                             case 'contains':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'equals':
                                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                                 break;
                             case 'starts_with':
-                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'ends_with':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                                 break;
                         }
                         break;
@@ -657,13 +657,13 @@ 
             return false;
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         $tree = new Tree();
         $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-            return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-path ='" . $category->tree_path . ($category->pk() ? $category->pk() . "/" : '') . "'> " . $category->name . "</a> 
-                                    <a href = '#' onclick = 'inji.Ui.forms.popUp(\"" . str_replace('\\', '\\\\', get_class($category)) . ':' . $category->pk() . "\")' class ='glyphicon glyphicon-edit'></a>&nbsp;    
+            return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-path ='".$category->tree_path.($category->pk() ? $category->pk()."/" : '')."'> ".$category->name."</a> 
+                                    <a href = '#' onclick = 'inji.Ui.forms.popUp(\"" . str_replace('\\', '\\\\', get_class($category)).':'.$category->pk()."\")' class ='glyphicon glyphicon-edit'></a>&nbsp;    
                 <a onclick='inji.Ui.dataManagers.get(this).delCategory({$category->pk()});return false;' class ='glyphicon glyphicon-remove'></a>";
         });
         ?>