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/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/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">

system/modules/Ui/widgets/ActiveForm/ActiveForm.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$id = 'activeForm-' . Tools::randomString();
+$id = 'activeForm-'.Tools::randomString();
 $formInputs = $activeForm->inputs;
 foreach ($formInputs as $inputName => $inputParams) {
     if (is_object($inputParams)) {

Indentation +26 added lines, -26 removed lines

@@ -9,33 +9,33 @@
 ?>
 <div id ='<?= $id; ?>' class="uiActiveForm" data-modelname="<?= $activeForm->modelName; ?>" data-formname="<?= $activeForm->formName; ?>" data-inputs='<?= json_encode($formInputs); ?>'>
   <?php
-  $form->action = $activeForm->action;
-  $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : ''], ['activeForm' => $activeForm]);
+    $form->action = $activeForm->action;
+    $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : ''], ['activeForm' => $activeForm]);
 
-  if (empty($activeForm->form['noMapCell'])) {
-      foreach ($activeForm->form['map'] as $row) {
-          $colSize = 12 / count($row);
-          echo "<div class ='row'>";
-          foreach ($row as $col) {
-              echo "<div class = 'col-sm-{$colSize}'>";
-              if ($col) {
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
-              }
-              echo '</div>';
-          }
-          echo '</div>';
-      }
-  } else {
-      foreach ($activeForm->form['map'] as $row) {
-          foreach ($row as $col) {
-              if ($col) {
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
-              }
-          }
-      }
-  }
-  $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить', [], ['activeForm' => $activeForm]);
-  ?>
+    if (empty($activeForm->form['noMapCell'])) {
+        foreach ($activeForm->form['map'] as $row) {
+            $colSize = 12 / count($row);
+            echo "<div class ='row'>";
+            foreach ($row as $col) {
+                echo "<div class = 'col-sm-{$colSize}'>";
+                if ($col) {
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
+                }
+                echo '</div>';
+            }
+            echo '</div>';
+        }
+    } else {
+        foreach ($activeForm->form['map'] as $row) {
+            foreach ($row as $col) {
+                if ($col) {
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
+                }
+            }
+        }
+    }
+    $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить', [], ['activeForm' => $activeForm]);
+    ?>
 </div>
 <script>
     inji.onLoad(function () {

system/modules/Ui/widgets/DataManager/managerButtons.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $html = '';
 foreach ($buttons as $button) {
     if (!empty($button['class'])) {
-        $button['class'] = 'btn btn-primary btn-sm ' . $button['class'];
+        $button['class'] = 'btn btn-primary btn-sm '.$button['class'];
     } else {
         $button['class'] = 'btn btn-primary btn-sm';
     }

system/modules/Ui/widgets/DataManager/DataManager.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
     'id' => $dataManager->managerId,
     'class' => 'dataManager',
     'data-params' => $params,
-    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName) . ($model && $model->pk() ? ':' . $model->pk() : ''),
+    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName).($model && $model->pk() ? ':'.$model->pk() : ''),
     'data-managername' => $dataManager->managerName,
     'data-cols' => $dataManager->cols,
     'data-options' => $dataManager->managerOptions
@@ -22,7 +22,7 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-    $mainCol['style'].='margin-left:260px;';
+    $mainCol['style'] .= 'margin-left:260px;';
     echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
     $this->widget('Ui\DataManager/categorys', compact('dataManager'));
     echo '</div>';