injitools / cms-Inji

system/modules/Apps/appSetupControllers/AppsController.php

Spacing +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
         $app = new App();
         $app->name = $appOptions->name;
         $app->system = true;
-        $app->staticPath = "/" . $appOptions->dir . "/static";
-        $app->templatesPath = "/" . $appOptions->dir . "/static/templates";
-        $app->path = INJI_PROGRAM_DIR . '/' . $appOptions->dir;
+        $app->staticPath = "/".$appOptions->dir."/static";
+        $app->templatesPath = "/".$appOptions->dir."/static/templates";
+        $app->path = INJI_PROGRAM_DIR.'/'.$appOptions->dir;
         $app->type = 'app';
         $app->installed = true;
         $app->params = [];

system/modules/Ui/Controllers/DataManagerController.php

Spacing +5 added lines, -5 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;
@@ -122,7 +122,7 @@ 
                         echo ";";
                     }
                     $endRow = false;
-                    echo '"' . str_replace("\n", '', $col) . '"';
+                    echo '"'.str_replace("\n", '', $col).'"';
                 }
                 echo "\n";
                 $endRow = true;
@@ -143,7 +143,7 @@ 
             $pages = $dataManager->getPages($request['params'], $request['model']);
             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();
@@ -228,7 +228,7 @@ 
                 }
             }
         } else {
-            $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
+            $result->content = 'У вас нет прав доступа к менеджеру '.$request['managerName'].' модели '.$request['modelName'];
         }
         $result->send();
     }

system/modules/Ui/Controllers/UiController.php

Spacing +5 added lines, -5 removed lines

@@ -38,17 +38,17 @@
             $return = new Server\Result();
             ob_start();
             $form->checkRequest($params, true);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($_GET);
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
+            $form->action = (App::$cur->system ? '/'.App::$cur->name : '').'/ui/formPopUp/?'.http_build_query($_GET);
             $form->draw($params, true);
             $return->content = ob_get_contents();
             ob_end_clean();
             $return->send();
         } else {
             $form->checkRequest($params);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($_GET);
-            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ') . $form->header);
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
+            $form->action = (App::$cur->system ? '/'.App::$cur->name : '').'/ui/formPopUp/?'.http_build_query($_GET);
+            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ').$form->header);
             $this->view->page(['content' => 'form', 'data' => compact('form', 'params')]);
         }
     }

system/modules/Ui/Controllers/ActiveFormController.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
             foreach ($inputs[$inputName]['cols'] as $col) {
                 $part = trim($part);
                 if ($part && strlen($part) > 2) {
-                    $colWhere[] = [$col, '%' . $part . '%', 'LIKE', $first ? 'AND' : 'OR'];
+                    $colWhere[] = [$col, '%'.$part.'%', 'LIKE', $first ? 'AND' : 'OR'];
                     $first = false;
                 }
             }

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

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@ 
                 case 'relation':
                     $relations = $colInfo['modelName']::relations();
                     $relValue = $relations[$colInfo['colParams']['relation']]['model']::get($item->$colName);
-                    $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relations[$colInfo['colParams']['relation']]['model']) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+                    $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relations[$colInfo['colParams']['relation']]['model'])."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
                     break;
             }
             break;
         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" />';
             }
@@ -58,7 +58,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/widgets/Form/select.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
     }
     if (
             (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
-            (is_array($primaryValue) && (in_array($key,$primaryValue) || (isset($form->userDataTree[$name]) && in_array($key,$form->userDataTree[$name]))))
+            (is_array($primaryValue) && (in_array($key, $primaryValue) || (isset($form->userDataTree[$name]) && in_array($key, $form->userDataTree[$name]))))
             ) {
         $selected = ' selected="selected"';
     }
@@ -22,7 +22,7 @@ 
             $showedInput = count($aditionalInputs) - 1;
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
         }
-        $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
+        $optionsHtml .= "<option data-aditionalInput='".(count($aditionalInputs) - 1)."' value ='{$key}'{$selected}>{$value['text']}</option>";
     } else {
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
     }
@@ -39,14 +39,14 @@ 
 
     if ($key !== $showedInput) {
         $input['options']['disabled'] = true;
-        $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
+        $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'].' hidden' : 'hidden';
     } else {
         $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
     }
     if ($input['type'] == 'select') {
         $input['options']['values'] = \Ui\ActiveForm::getOptionsList($input);
     }
-    $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
+    $form->input($input['type'], empty($input['name']) ? $name.'[aditional]' : $input['name'], false, $input['options']);
 }
 ?>
 <?= empty($options['noContainer']) ? '</div>' : ''; ?>
\ No newline at end of file

system/modules/Ui/widgets/Form/dynamicList.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
                                 echo '<td>';
                                 $col['options']['noContainer'] = true;
                                 $col['options']['value'] = $row[$colName];
-                                $form->input($col['type'], $name . '[' . ($i) . '][' . $colName . ']', false, $col['options']);
+                                $form->input($col['type'], $name.'['.($i).']['.$colName.']', false, $col['options']);
                                 echo '</td>';
                             }
                             echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
@@ -63,7 +63,7 @@ 
     foreach ($options['cols'] as $colName => $col) {
         echo '<td>';
         $col['options']['noContainer'] = true;
-        $form->input($col['type'], $name . '[counterPlaceholder][' . $colName . ']', false, $col['options']);
+        $form->input($col['type'], $name.'[counterPlaceholder]['.$colName.']', false, $col['options']);
         echo '</td>';
     }
     ?>

system/modules/Ui/widgets/Form/dataManager.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     } else {
         $dataManager = new \Ui\DataManager($options['relation']['type'] == 'relModel' ? $options['relation']['relModel'] : $options['relation']['model'], 'manager');
         $dataManager->predraw();
-        echo '<h3>' . $dataManager->table->name . '</h3>';
+        echo '<h3>'.$dataManager->table->name.'</h3>';
         echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
         echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
     }

system/modules/Ui/widgets/Form/changePassword.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 
 <?php
 echo empty($options['noContainer']) ? '<div class="form-group">' : '';
-echo $label !== false ? "<label>{$label}" . (!empty($options['required']) ? ' <span class="required-star">*</span>' : '') . "</label>" : '';
+echo $label !== false ? "<label>{$label}".(!empty($options['required']) ? ' <span class="required-star">*</span>' : '')."</label>" : '';
 ?>
 <div class="row">
     <div class="col-xs-6">