injitools / cms-Inji

system/modules/Dashboard/Dashboard.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     $modelName = $item->model;
     $relItem = $modelName::get($item->$col);
     if ($relItem) {
-      return "<a href='/admin/" . $relItem->genViewLink() . "'>" . $relItem->name() . "</a>";
+      return "<a href='/admin/".$relItem->genViewLink()."'>".$relItem->name()."</a>";
     }
     return 'Ресурс удален';
   }

system/modules/Ui/appAdminControllers/content/dataManager/view.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 if ($aform->checkAccess()) {
   $table->addButton([
       'text' => 'Редактировать',
-      'onclick' => 'inji.Ui.forms.popUp("' . addcslashes($modelName, '\\') . ':' . $item->pk() . '",' . json_encode($formParams) . ');',
+      'onclick' => 'inji.Ui.forms.popUp("'.addcslashes($modelName, '\\').':'.$item->pk().'",'.json_encode($formParams).');',
   ]);
 }
 $row = [];
@@ -42,7 +42,7 @@ 
     ]]);
     ?>)</h3>
   <?php
-  foreach (\Dashboard\Comment::getList([ 'where' => [
+  foreach (\Dashboard\Comment::getList(['where' => [
           ['item_id', $item->id],
           ['model', $modelName],
       ], 'order' => ['date_create', 'desc']]) as $comment) {

system/modules/Ui/objects/DataManager.php

Spacing +33 added lines, -33 removed lines

@@ -57,7 +57,7 @@ 
       $this->name = $this->managerOptions['name'];
     }
 
-    $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+    $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
   }
 
   /**
@@ -103,7 +103,7 @@ 
     if (!empty($this->managerOptions['filters'])) {
       $buttons[] = [
           'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+          'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
       ];
     }
@@ -111,7 +111,7 @@ 
       $formParams['formName'] = 'simpleItem';
       $buttons[] = [
           'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
       ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
@@ -123,8 +123,8 @@ 
       $aform = new ActiveForm(new $modelName, $formParams['formName']);
       if ($aform->checkAccess()) {
         $buttons[] = [
-            'text' => 'Создать ' . $name,
-            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+            'text' => 'Создать '.$name,
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
         ];
       }
     }
@@ -158,7 +158,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'] : $return[$key]['className'];
+      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $return[$key]['className'];
       if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
       }
@@ -189,7 +189,7 @@ 
           <?php
           foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
             }
           }
           ?>
@@ -239,7 +239,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;
@@ -255,7 +255,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'];
@@ -317,7 +317,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'];
               }
@@ -344,16 +344,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;
@@ -392,9 +392,9 @@ 
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
       }
       $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
-      $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '%5C', get_class($originalItem));
-      $row[] = "<a href ='/admin/" . $item->genViewLink() . "?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
+      $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
+      $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '%5C', get_class($originalItem));
+      $row[] = "<a href ='/admin/".$item->genViewLink()."?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
       foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
           $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
@@ -438,16 +438,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/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
+              $href = "<a href ='/admin/".$item->{$modelName::$cols[$colName]['relation']}->genViewLink()."'>";
               if (!empty($modelName::$cols[$colName]['showCol'])) {
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
               } else {
@@ -477,17 +477,17 @@ 
           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));
+          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
           return "<a href ='/admin/{$originalItem->genViewLink()}?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));
+          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
           return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } elseif ($modelName::$cols[$colName]['type'] == 'html') {
           $uid = \Tools::randomString();
@@ -517,7 +517,7 @@ 
               el{$uid}.after('<a href=\"#\" onclick=\"el{$uid}Toggle();return false;\">Развернуть</a>');
             }
             })</script>";
-          return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
+          return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>".$script;
         } else {
           return \Model::resloveTypeValue($item, $colName);
         }
@@ -550,7 +550,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'])) {
@@ -564,7 +564,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) {
@@ -621,7 +621,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'];
               }
@@ -648,16 +648,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;
@@ -690,7 +690,7 @@ 
       $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
     }
     $tableCols[] = '';
-    $this->table->class .=' datamanagertable';
+    $this->table->class .= ' datamanagertable';
     $this->table->setCols($tableCols);
   }
 
@@ -711,12 +711,12 @@ 
       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) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+      $path = $category->tree_path.($category->pk() ? $category->pk()."/" : '');
       $cleanClassName = str_replace('\\', '\\\\', get_class($category));
       return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
                 

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/{$item->genViewLink()}?" . http_build_query($query) . "'><i class='glyphicon glyphicon-eye-open'></i></a>";
+        return "<a href='/admin/{$item->genViewLink()}?".http_build_query($query)."'><i class='glyphicon glyphicon-eye-open'></i></a>";
     }
 
 }

system/modules/Ui/Controllers/DataManagerController.php

Spacing +6 added lines, -6 removed lines

@@ -96,7 +96,7 @@ 
       ob_end_clean();
       header('Content-Encoding: UTF-8');
       header("Content-Type: text/csv");
-      header("Content-Disposition: attachment; filename=" . $request['modelName']::$objectName . '.csv');
+      header("Content-Disposition: attachment; filename=".$request['modelName']::$objectName.'.csv');
       echo "\xEF\xBB\xBF"; // UTF-8 BOM
 
 
@@ -108,7 +108,7 @@ 
           echo ";";
         }
         $endRow = false;
-        echo '"' . $options['label'] . '"';
+        echo '"'.$options['label'].'"';
       }
       echo "\n";
       $endRow = true;
@@ -127,7 +127,7 @@ 
             echo ";";
           }
           $endRow = false;
-          echo '"' . str_replace(["\n", '"'], ['“'], $col) . '"';
+          echo '"'.str_replace(["\n", '"'], ['“'], $col).'"';
         }
         echo "\n";
         $endRow = true;
@@ -147,7 +147,7 @@ 
     if (isset($pages) && $pages) {
       if ($pages) {
         $pages->draw();
-        echo '<div style="background:#fff;">записей: <b>' . $pages->options['count'] . '</b>. страница <b>' . $pages->params['page'] . '</b> из <b>' . $pages->params['pages'] . '</b></div>';
+        echo '<div style="background:#fff;">записей: <b>'.$pages->options['count'].'</b>. страница <b>'.$pages->params['page'].'</b> из <b>'.$pages->params['pages'].'</b></div>';
       }
       $result->content['pages'] = ob_get_contents();
       ob_end_clean();
@@ -219,7 +219,7 @@ 
         if (!empty($actions[$request['action']])) {
           $actionParams = $actions[$request['action']];
           if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
-            $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
+            $result->content = 'У вас нет прав доступа к операции '.(!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
           } else {
             try {
               $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
@@ -231,7 +231,7 @@ 
         }
       }
     } else {
-      $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
+      $result->content = 'У вас нет прав доступа к менеджеру '.$request['managerName'].' модели '.$request['modelName'];
     }
     $result->send();
   }

system/Inji/Model.php

Spacing +57 added lines, -57 removed lines

@@ -207,7 +207,7 @@ 
             $relModel = $relations[$colInfo['colParams']['relation']]['model'];
             $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
             if ($manageHref) {
-              $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+              $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relModel)."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
             } else {
               $value = $relValue ? $relValue->name() : 'Не задано';
             }
@@ -217,7 +217,7 @@ 
       case 'image':
         $file = Files\File::get($item->$colName);
         if ($file) {
-          $value = '<img src="' . $file->path . '?resize=60x120" />';
+          $value = '<img src="'.$file->path.'?resize=60x120" />';
         } else {
           $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
         }
@@ -261,7 +261,7 @@ 
                 case 'map':
                   if ($item->$colName && json_decode($item->$colName, true)) {
                     $addres = json_decode($item->$colName, true);
-                    $name = $addres['address'] ? $addres['address'] : 'lat:' . $addres['lat'] . ': lng:' . $addres['lng'];
+                    $name = $addres['address'] ? $addres['address'] : 'lat:'.$addres['lat'].': lng:'.$addres['lng'];
                     \App::$cur->libs->loadLib('yandexMap');
                     ob_start();
                     $uid = Tools::randomString();
@@ -293,7 +293,7 @@ 
                     <?php
                     $content = ob_get_contents();
                     ob_end_clean();
-                    $onclick = 'inji.Ui.modals.show("' . addcslashes($addres['address'], '"') . '", $("#map' . $uid . '_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal' . $uid . '","modal-lg");';
+                    $onclick = 'inji.Ui.modals.show("'.addcslashes($addres['address'], '"').'", $("#map'.$uid.'_container script").html().replace(/^\/\*/g, "").replace(/\*\/$/g, "")+"</script>","mapmodal'.$uid.'","modal-lg");';
                     $onclick .= 'return false;';
                     $value = "<a href ='#' onclick='{$onclick}' >{$name}</a>";
                     $value .= $content;
@@ -333,12 +333,12 @@ 
       return;
     }
     if (!is_array($array)) {
-      if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
+      if (!isset($cols[static::colPrefix().$array]) && isset(static::$cols[$array])) {
         static::createCol($array);
         $cols = static::cols(true);
       }
-      if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
-        $array = static::colPrefix() . $array;
+      if (!isset($cols[$array]) && isset($cols[static::colPrefix().$array])) {
+        $array = static::colPrefix().$array;
       } else {
         static::checkForJoin($array, $rootModel);
       }
@@ -347,14 +347,14 @@ 
     switch ($searchtype) {
       case 'key':
         foreach ($array as $key => $item) {
-          if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
+          if (!isset($cols[static::colPrefix().$key]) && isset(static::$cols[$key])) {
             static::createCol($key);
             $cols = static::cols(true);
           }
-          if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
-            $array[static::colPrefix() . $key] = $item;
+          if (!isset($cols[$key]) && isset($cols[static::colPrefix().$key])) {
+            $array[static::colPrefix().$key] = $item;
             unset($array[$key]);
-            $key = static::colPrefix() . $key;
+            $key = static::colPrefix().$key;
           }
           if (is_array($array[$key])) {
             static::fixPrefix($array[$key], 'key', $rootModel);
@@ -365,12 +365,12 @@ 
         break;
       case 'first':
         if (isset($array[0]) && is_string($array[0])) {
-          if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
+          if (!isset($cols[static::colPrefix().$array[0]]) && isset(static::$cols[$array[0]])) {
             static::createCol($array[0]);
             $cols = static::cols(true);
           }
-          if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
-            $array[0] = static::colPrefix() . $array[0];
+          if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix().$array[0]])) {
+            $array[0] = static::colPrefix().$array[0];
           } else {
             static::checkForJoin($array[0], $rootModel);
           }
@@ -402,13 +402,13 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+            $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
             break;
           case 'one':
           case 'many':
             $relCol = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($relCol);
-            $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+            $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
             break;
         }
         $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel);
@@ -447,13 +447,13 @@ 
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
             //$info['modelName'] = $relations[$rel]['model'];
-            $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+            $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
             break;
           case 'one':
             $relCol = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($relCol);
             //$info['modelName'] = $relations[$rel]['model'];
-            $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+            $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
             break;
         }
         $info = $relations[$rel]['model']::parseColRecursion($info);
@@ -471,8 +471,8 @@ 
       } else {
         $info['colParams'] = [];
       }
-      if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
-        $info['col'] = static::colPrefix() . $info['col'];
+      if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix().$info['col']])) {
+        $info['col'] = static::colPrefix().$info['col'];
       }
       $info['modelName'] = get_called_class();
     }
@@ -578,7 +578,7 @@ 
     if ($params === false) {
       return false;
     }
-    return App::$cur->db->addCol(static::table(), static::colPrefix() . $colName, $params);
+    return App::$cur->db->addCol(static::table(), static::colPrefix().$colName, $params);
   }
 
   public static function createTable() {
@@ -607,28 +607,28 @@ 
       return true;
     }
     $cols = [
-        $colPrefix . 'id' => 'pk'
+        $colPrefix.'id' => 'pk'
     ];
     $className = get_called_class();
     if (!empty($className::$cols)) {
       foreach ($className::$cols as $colName => $colParams) {
         if ($colName == 'date_create') {
-          $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+          $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
           continue;
         }
         $params = $className::genColParams($colName);
         if ($params) {
-          $cols[$colPrefix . $colName] = $params;
+          $cols[$colPrefix.$colName] = $params;
         }
       }
     }
-    if (empty($cols[$colPrefix . 'date_create'])) {
-      $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+    if (empty($cols[$colPrefix.'date_create'])) {
+      $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
     }
     $tableIndexes = [];
     if ($indexes) {
       foreach ($indexes as $indexName => $index) {
-        $tableIndexes[] = $index['type'] . ' ' . App::$cur->db->table_prefix . $indexName . ' (' . implode(',', $index['cols']) . ')';
+        $tableIndexes[] = $index['type'].' '.App::$cur->db->table_prefix.$indexName.' ('.implode(',', $index['cols']).')';
       }
     }
 
@@ -652,7 +652,7 @@ 
    */
   public static function index() {
 
-    return static::colPrefix() . 'id';
+    return static::colPrefix().'id';
   }
 
   /**
@@ -663,7 +663,7 @@ 
   public static function colPrefix() {
     $classPath = explode('\\', get_called_class());
     $classPath = array_slice($classPath, 1);
-    return strtolower(implode('_', $classPath)) . '_';
+    return strtolower(implode('_', $classPath)).'_';
   }
 
   /**
@@ -697,7 +697,7 @@ 
    * @return string
    */
   public function name() {
-    return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№' . $this->pk();
+    return $this->{$this->nameCol()} ? $this->{$this->nameCol()} : '№'.$this->pk();
   }
 
   /**
@@ -731,12 +731,12 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+            App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
             break;
           case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
-            App::$cur->db->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+            App::$cur->db->join($relations[$rel]['model']::table(), static::index().' = '.$col);
             break;
         }
       }
@@ -751,8 +751,8 @@ 
       }
       if ($param !== null) {
         $cols = static::cols();
-        if (!isset($cols[$col]) && isset($cols[static::colPrefix() . $col])) {
-          $col = static::colPrefix() . $col;
+        if (!isset($cols[$col]) && isset($cols[static::colPrefix().$col])) {
+          $col = static::colPrefix().$col;
         }
         App::$cur->db->where($col, $param);
       } else {
@@ -816,12 +816,12 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
             break;
           case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
-            $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+            $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
             break;
         }
       }
@@ -1143,12 +1143,12 @@ 
           case 'to':
             $relCol = $relations[$rel]['col'];
             static::fixPrefix($relCol);
-            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+            $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
             break;
           case 'one':
             $col = $relations[$rel]['col'];
             $relations[$rel]['model']::fixPrefix($col);
-            $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+            $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
             break;
         }
       }
@@ -1165,7 +1165,7 @@ 
     } else {
       $cols .= '*';
     }
-    $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+    $cols .= ') as `count`'.(!empty($options['cols']) ? ','.$options['cols'] : '');
     $query->cols = $cols;
     if (!empty($options['group'])) {
       $query->group($options['group']);
@@ -1298,25 +1298,25 @@ 
     $itemModel = $class::$treeCategory;
     $oldPath = $this->tree_path;
     $this->tree_path = $this->getCatalogTree($this);
-    $itemsTable = \App::$cur->db->table_prefix . $itemModel::table();
-    $itemTreeCol = $itemModel::colPrefix() . 'tree_path';
+    $itemsTable = \App::$cur->db->table_prefix.$itemModel::table();
+    $itemTreeCol = $itemModel::colPrefix().'tree_path';
 
-    $categoryTreeCol = $this->colPrefix() . 'tree_path';
-    $categoryTable = \App::$cur->db->table_prefix . $this->table();
+    $categoryTreeCol = $this->colPrefix().'tree_path';
+    $categoryTable = \App::$cur->db->table_prefix.$this->table();
     if ($oldPath) {
       \App::$cur->db->query('UPDATE
-                ' . $categoryTable . ' 
+                ' . $categoryTable.' 
                     SET 
-                        ' . $categoryTreeCol . ' = REPLACE(' . $categoryTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $categoryTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $categoryTreeCol.' = REPLACE('.$categoryTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $categoryTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
 
       \App::$cur->db->query('UPDATE
-                ' . $itemsTable . '
+                ' . $itemsTable.'
                     SET 
-                        ' . $itemTreeCol . ' = REPLACE(' . $itemTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $itemTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $itemTreeCol.' = REPLACE('.$itemTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $itemTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
     }
-    $itemModel::update([$itemTreeCol => $this->tree_path . $this->id . '/'], [$itemModel::colPrefix() . $this->index(), $this->id]);
+    $itemModel::update([$itemTreeCol => $this->tree_path.$this->id.'/'], [$itemModel::colPrefix().$this->index(), $this->id]);
   }
 
   /**
@@ -1330,9 +1330,9 @@ 
     $catalogParent = $catalogClass::get($catalog->parent_id);
     if ($catalog && $catalogParent) {
       if ($catalogParent->tree_path) {
-        return $catalogParent->tree_path . $catalogParent->id . '/';
+        return $catalogParent->tree_path.$catalogParent->id.'/';
       } else {
-        return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
+        return $this->getCatalogTree($catalogParent).$catalogParent->id.'/';
       }
     }
     return '/';
@@ -1346,7 +1346,7 @@ 
     $categoryModel = $class::$categoryModel;
     $category = $categoryModel::get($this->{$categoryModel::index()});
     if ($category) {
-      $this->tree_path = $category->tree_path . $category->pk() . '/';
+      $this->tree_path = $category->tree_path.$category->pk().'/';
     } else {
       $this->tree_path = '/';
     }
@@ -1371,7 +1371,7 @@ 
       $this->changeCategoryTree();
     }
     if (!empty($this->_changedParams) && $this->pk()) {
-      Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
+      Inji::$inst->event('modelItemParamsChanged-'.get_called_class(), $this);
     }
     $this->beforeSave();
 
@@ -1416,7 +1416,7 @@ 
     }
     $this->_params = $result->fetch();
     if ($new) {
-      Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
+      Inji::$inst->event('modelCreatedItem-'.get_called_class(), $this);
     }
     $this->afterSave();
     return $this->{$this->index()};
@@ -1554,7 +1554,7 @@ 
     static::fixPrefix($params);
     $className = get_called_class();
     foreach ($params as $paramName => $value) {
-      $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
+      $shortName = preg_replace('!'.$this->colPrefix().'!', '', $paramName);
       if (!empty($className::$cols[$shortName])) {
         switch ($className::$cols[$shortName]['type']) {
           case 'decimal':
@@ -1831,7 +1831,7 @@ 
   public function __set($name, $value) {
     static::fixPrefix($name);
     $className = get_called_class();
-    $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $name);
+    $shortName = preg_replace('!'.$this->colPrefix().'!', '', $name);
     if (!empty($className::$cols[$shortName])) {
       switch ($className::$cols[$shortName]['type']) {
         case 'decimal':

system/program/admin/objects/adminController.php

Spacing +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@ 
   public function dataManagerAction($model = '', $dataManager = 'manager') {
     if (!$model) {
       $modulePath = Module::getModulePath($this->module->moduleName);
-      $path = $modulePath . '/models';
+      $path = $modulePath.'/models';
       if (file_exists($path)) {
         $files = array_slice(scandir($path), 2);
         foreach ($files as $file) {
-          if (is_dir($path . '/' . $file)) {
+          if (is_dir($path.'/'.$file)) {
             continue;
           }
           $model = pathinfo($file, PATHINFO_FILENAME);
@@ -30,7 +30,7 @@ 
         }
       }
     }
-    $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
+    $fullModelName = $this->module->moduleName.'\\'.ucfirst($model);
     $dataManager = new Ui\DataManager($fullModelName, $dataManager);
     $title = !empty($dataManager->managerOptions['name']) ? $dataManager->managerOptions['name'] : $fullModelName::objectName();
     $this->view->setTitle($title);
@@ -38,12 +38,12 @@ 
   }
 
   public function viewAction($model, $pk) {
-    $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
+    $fullModelName = $this->module->moduleName.'\\'.ucfirst($model);
     if (Users\User::$cur->group_id != 3 && (empty($fullModelName::$views['manager']['access']) || !in_array(Users\User::$cur->group_id, $fullModelName::$views['manager']['access']['groups']))) {
       Tools::redirect('/admin', 'У вас нет прав доступа для просмотра этого объекта', 'danger');
     }
     $item = $fullModelName::get($pk);
-    $this->view->setTitle(($fullModelName::$objectName ? $fullModelName::$objectName : $fullModelName) . ($item ? ( ' - ' . $item->name()) : ''));
+    $this->view->setTitle(($fullModelName::$objectName ? $fullModelName::$objectName : $fullModelName).($item ? (' - '.$item->name()) : ''));
     if (!empty($_POST['comment'])) {
       $comment = new Dashboard\Comment();
       $comment->text = $_POST['comment'];