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/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/Table/row.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
         if (is_array($html)) {
             extract($html);
         }
-        echo "<td " . (!empty($class) ? "class='{$class}'" : '') . ">{$html}</td>";
+        echo "<td ".(!empty($class) ? "class='{$class}'" : '').">{$html}</td>";
     }
     ?>
 </tr>
\ No newline at end of file

system/modules/Ui/objects/Form.php

Spacing +7 added lines, -7 removed lines

@@ -31,9 +31,9 @@ 
     {
         foreach ($data as $key => $item) {
             if (is_array($item)) {
-                $this->genUserDataTree($item, $treeKey ? $treeKey . "[{$key}]" : $key);
+                $this->genUserDataTree($item, $treeKey ? $treeKey."[{$key}]" : $key);
             } else {
-                $this->userDataTree[$treeKey ? $treeKey . "[{$key}]" : $key] = $item;
+                $this->userDataTree[$treeKey ? $treeKey."[{$key}]" : $key] = $item;
             }
         }
     }
@@ -42,7 +42,7 @@ 
     {
         $params = compact('header', 'options');
         $params['form'] = $this;
-        \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/begin', $params);
+        \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/begin', $params);
     }
 
     /**
@@ -65,18 +65,18 @@ 
                 } else {
                     $params['options']['class'] .= ' htmleditor';
                 }
-                \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/textarea', $params);
+                \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/textarea', $params);
                 break;
             case 'map':
                 $params = compact('name', 'label', 'options');
                 $params['form'] = $this;
                 \App::$cur->libs->loadLib('yandexMap');
-                \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/map', $params);
+                \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/map', $params);
                 break;
             default :
                 $params = compact('name', 'label', 'options');
                 $params['form'] = $this;
-                \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/' . $type, $params);
+                \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/'.$type, $params);
         }
     }
 
@@ -90,7 +90,7 @@ 
     {
         $params = compact('btnText', 'attributs');
         $params['form'] = $this;
-        \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/end', $params);
+        \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/end', $params);
     }
 
 }

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 : '');