injitools / cms-Inji

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/categorys.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <h3>Категории
     <div class="pull-right">
-        <a class ='btn btn-xs btn-primary' onclick='<?= 'inji.Ui.forms.popUp("' . str_replace('\\', '\\\\', $dataManager->managerOptions['categorys']['model']) . '");'; ?>'>Создать</a>
+        <a class ='btn btn-xs btn-primary' onclick='<?= 'inji.Ui.forms.popUp("'.str_replace('\\', '\\\\', $dataManager->managerOptions['categorys']['model']).'");'; ?>'>Создать</a>
     </div>
 </h3>
 <div class="categoryTree">

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

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/ActiveForm.php

Spacing +7 added lines, -7 removed lines

@@ -84,7 +84,7 @@ 
                             $this->model->_params[$modelName::index()] = 0;
                         }
                         $relOptions['model']::fixPrefix($relOptions['col']);
-                        $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+                        $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
                 } elseif (!empty($modelName::$cols[$col])) {
@@ -98,7 +98,7 @@ 
     public function checkRequest($params = [], $ajax = false)
     {
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->formName.'"');
             return [];
         }
         $successId = 0;
@@ -122,7 +122,7 @@ 
                     if (!empty($this->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($col, $this->form['userGroupReadonly'][\Users\User::$cur->group_id])) {
                         continue;
                     }
-                    $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($param['type']);
+                    $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($param['type']);
                     $input = new $inputClassName();
                     $input->activeForm = $this;
                     $input->activeFormParams = $params;
@@ -182,7 +182,7 @@ 
     public function draw($params = [], $ajax = false)
     {
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" form with name: "'.$this->formName.'"');
             return [];
         }
         $form = new Form(!empty($this->form['formOptions']) ? $this->form['formOptions'] : []);
@@ -194,7 +194,7 @@ 
         if (is_object($options)) {
             $options->draw();
         } else {
-            $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
+            $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($options['type']);
             $input = new $inputClassName();
             $input->form = $form;
             $input->activeForm = $this;
@@ -270,7 +270,7 @@ 
         }
         foreach ($values as $key => $value) {
             if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
-                $values[$key]['input']['name'] = $aditionalInputNamePrefix . "[{$value['input']['name']}]";
+                $values[$key]['input']['name'] = $aditionalInputNamePrefix."[{$value['input']['name']}]";
             }
         }
         return $values;
@@ -294,7 +294,7 @@ 
     public function checkAccess()
     {
         if (empty($this->form)) {
-            $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
+            $this->drawError('"'.$this->modelName.'" form with name: "'.$this->formName.'" not found');
             return false;
         }
         if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {

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