injitools / cms-Inji

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' => array_merge($dataManager->managerOptions, ['actions'=>$dataManager->getActions()])
@@ -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/Form/select.php

Spacing +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 $aditionalInputs = [];
 $showedInput = false;
-if(!empty($options['createBtn'])){
+if (!empty($options['createBtn'])) {
   $optionsHtml = '<option disabled onclick="'.$options['createBtn']['onclick'].'">'.$options['createBtn']['text'].'</option>';
-}else {
+} else {
   $optionsHtml = '';
 }
 
@@ -17,7 +17,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"';
     }
@@ -27,7 +27,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>";
     }
@@ -44,14 +44,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/objects/ActiveForm/Input/Select.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     if (!empty($modelName)) {
       $inputOptions['createBtn'] = [
           'text' => 'Создать элемент',
-          'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+          'onclick' => 'inji.Ui.forms.popUp(\''.addslashes($modelName).'\',{},function(elem){'
           . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this))'
       ];
     }

system/modules/Ui/objects/DataManager.php

Spacing +30 added lines, -30 removed lines

@@ -58,7 +58,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());
     }
 
     /**
@@ -102,13 +102,13 @@ 
         if (!empty($this->managerOptions['filters'])) {
             $buttons[] = [
                 'text' => 'Фильтры',
-                'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+                'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
             ];
         }
         $buttons[] = [
             'text' => 'Добавить элемент',
-            '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).');',
         ];
 
         return $buttons;
@@ -138,7 +138,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]);
             }
@@ -170,7 +170,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>";
                   }
               }
               ?>
@@ -221,7 +221,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;
@@ -237,7 +237,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'];
@@ -296,7 +296,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'];
                             }
@@ -323,16 +323,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;
@@ -371,7 +371,7 @@ 
                 $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
             }
             $row = [];
-            $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+            $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
             $row[] = $item->pk();
             foreach ($this->managerOptions['cols'] as $key => $colName) {
                 if (!empty($params['download'])) {
@@ -417,16 +417,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/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+                            $href = "<a href ='/admin/".str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model'])."/".$item->{$modelName::$cols[$colName]['relation']}->pk()."'>";
                             if (!empty($modelName::$cols[$colName]['showCol'])) {
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
                             } else {
@@ -456,18 +456,18 @@ 
                     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));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($originalItem))."/{$originalItem->id}?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));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } else {
                     return \Model::resloveTypeValue($item, $colName);
                 }
@@ -502,7 +502,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'])) {
@@ -516,7 +516,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) {
@@ -570,7 +570,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'];
                             }
@@ -597,16 +597,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;
@@ -640,7 +640,7 @@ 
             $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
         }
         $tableCols[] = '';
-        $this->table->class .=' datamanagertable';
+        $this->table->class .= ' datamanagertable';
         $this->table->setCols($tableCols);
     }
 
@@ -663,12 +663,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>