injitools / cms-Inji

system/modules/Ui/objects/DataManager/Action/ChangeParams.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
                 $model->save();

             }

         }

-        return 'Измненено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['запись', 'записи', 'записей']);

+        return 'Измненено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['запись', 'записи', 'записей']);

     }

 

 }

system/modules/Ui/Controllers/DataManagerController.php

Spacing +6 added lines, -6 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();
@@ -219,7 +219,7 @@ 
                 if (!empty($actions[$request['action']])) {
                     $actionParams = $actions[$request['action']];
                     if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
-                        $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
+                        $result->content = 'У вас нет прав доступа к операции '.(!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
                     } else {
                         try {
                             $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
@@ -231,7 +231,7 @@ 
                 }
             }
         } else {
-            $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
+            $result->content = 'У вас нет прав доступа к менеджеру '.$request['managerName'].' модели '.$request['modelName'];
         }
         $result->send();
     }

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

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 if (empty($params['activeForm']) || $params['activeForm']->parent === null) {
     ?>
-    <form <?= $form->id ? 'id="' . $form->id . '"' : ''; ?> action ="<?= $form->action; ?>" method ="<?= $form->method; ?>"  enctype="multipart/form-data"
+    <form <?= $form->id ? 'id="'.$form->id.'"' : ''; ?> action ="<?= $form->action; ?>" method ="<?= $form->method; ?>"  enctype="multipart/form-data"
     <?php
     foreach ($options as $attribute => $value) {
         echo " {$attribute} = '{$value}' ";

system/modules/Ecommerce/models/Cart.php

Spacing +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
 
     public static function itemName($item)
     {
-        return $item->pk() . '. ' . $item->name();
+        return $item->pk().'. '.$item->name();
     }
 
     public static $forms = [

system/modules/Migrations/objects/Parser/Object/Value.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
                 $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
                 if ($this->model->{$this->param->value}) {
                     $file = \Files\File::get($this->model->{$this->param->value});
-                    if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
+                    if ($file && $value && file_exists($dir.'/'.$value) && file_exists(\App::$primary->path.$file->path) && md5_file($dir.'/'.$value) == md5_file(\App::$primary->path.$file->path)) {
                         $notEq = false;
                     }
                     if ($file && $notEq) {
@@ -81,7 +81,7 @@ 
                     }
                 }
                 if ($notEq) {
-                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
                 }
                 break;
             default:

system/modules/Migrations/objects/Parser/Object.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                         if ($param->type == 'custom') {
                             $parserName = $param->value;
                         } else {
-                            $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
+                            $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type);
                         }
                         $parser = new $parserName;
                         $parser->data = &$data[$param->code];

system/modules/Ui/objects/Tree.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
           }
           $count += count($items);
           foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
           }
           ?>
         </ul>
@@ -52,7 +52,7 @@ 
             $item = $item['text'];
         }
         if (!isset($attributes['id'])) {
-            $attributes['id'] = str_replace('\\', '_', get_class($object)) . "-{$object->pk()}";
+            $attributes['id'] = str_replace('\\', '_', get_class($object))."-{$object->pk()}";
         }
         if (!$maxDeep || $deep < $maxDeep) {
             $items = $class::getList(['where' => ['parent_id', $object->pk()], 'order' => $order]);
@@ -63,7 +63,7 @@ 
                     echo \Html::el('li', $attributes, $item, true);
                     echo '<ul>';
                 }
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
             }
         }
         if ($isset) {

system/modules/Money/models/Wallet.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         'manager' => [

             'cols' => ['user:id', 'user_id', 'currency_id', 'amount'],

             'sortable' => ['user:id', 'user_id', 'currency_id', 'amount'],

-            'filters' => [ 'currency_id'],

+            'filters' => ['currency_id'],

         ]

     ];

 

@@ -66,7 +66,7 @@ 
     {

         $amount = (float) $amount;

         $query = \App::$cur->db->newQuery();

-        $string = 'UPDATE ' . \App::$cur->db->table_prefix . $this->table() . ' SET `' . $this->colPrefix() . 'amount`=`' . $this->colPrefix() . 'amount`+' . $amount . ' where `' . $this->index() . '` = ' . $this->id;

+        $string = 'UPDATE '.\App::$cur->db->table_prefix.$this->table().' SET `'.$this->colPrefix().'amount`=`'.$this->colPrefix().'amount`+'.$amount.' where `'.$this->index().'` = '.$this->id;

         $query->query($string);

         $history = new Wallet\History();

         $history->wallet_id = $this->pk();

@@ -86,7 +86,7 @@ 
     {

         switch ($this->currency->round_type) {

             case 'floor':

-                $dif = (float) ('1' . str_repeat('0', $this->currency->round_precision));

+                $dif = (float) ('1'.str_repeat('0', $this->currency->round_precision));

                 return floor($this->amount * $dif) / $dif;

             default :

                 return $this->amount;

system/modules/StaticLoader/StaticLoader.php

Spacing +20 added lines, -20 removed lines

@@ -26,16 +26,16 @@ 
         }
         $app = substr($path, 0, strpos($path, '/'));
        
-        if ($app && file_exists(INJI_SYSTEM_DIR . '/program/' . $app)) {
+        if ($app && file_exists(INJI_SYSTEM_DIR.'/program/'.$app)) {
             $path = substr($path, strpos($path, '/') + 1);
             if (\App::$cur->name != $app) {
                 $scriptApp = new App();
                 $scriptApp->name = $app;
                 $scriptApp->system = true;
-                $scriptApp->staticPath = "/" . $scriptApp->name . "/static";
-                $scriptApp->templatesPath = "/" . $scriptApp->name . "/static/templates";
-                $scriptApp->path = INJI_SYSTEM_DIR . '/program/' . $scriptApp->name;
-                $scriptApp->type = 'app' . ucfirst(strtolower($scriptApp->name));
+                $scriptApp->staticPath = "/".$scriptApp->name."/static";
+                $scriptApp->templatesPath = "/".$scriptApp->name."/static/templates";
+                $scriptApp->path = INJI_SYSTEM_DIR.'/program/'.$scriptApp->name;
+                $scriptApp->type = 'app'.ucfirst(strtolower($scriptApp->name));
                 $scriptApp->installed = true;
                 $scriptApp->params = [];
                 $scriptApp->config = Config::app($scriptApp);
@@ -53,13 +53,13 @@ 
         $type = substr($path, 0, strpos($path, '/'));
         switch ($type) {
             case 'libs':
-                return App::$cur->Libs->getPath(array_slice(explode('/', $path),2));
+                return App::$cur->Libs->getPath(array_slice(explode('/', $path), 2));
             case 'templates':
                 $path = substr($path, strpos($path, '/') + 1);
-                return $scriptApp->view->templatesPath . '/' . $path;
+                return $scriptApp->view->templatesPath.'/'.$path;
             case 'system':
                 $path = substr($path, strpos($path, '/') + 1);
-                return INJI_SYSTEM_DIR . '/static/' . $path;
+                return INJI_SYSTEM_DIR.'/static/'.$path;
             case 'moduleAsset':
                 $path = substr($path, strpos($path, '/') + 1);
                 if (!strpos($path, '/')) {
@@ -72,11 +72,11 @@ 
                 }
                 $path = substr($path, strpos($path, '/') + 1);
                 if (is_callable([$module, 'staticCalled'])) {
-                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path . '/static/');
+                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path.'/static/');
                 }
-                return $scriptApp->$module->path . '/static/' . $path;
+                return $scriptApp->$module->path.'/static/'.$path;
             default:
-                return $scriptApp->path . '/static/' . $path;
+                return $scriptApp->path.'/static/'.$path;
         }
     }
 
@@ -139,9 +139,9 @@ 
                         $pos = $_GET['resize_pos'];
                     }
                     $dirnoslash = str_replace('/', '', substr($fileinfo['dirname'], strpos($fileinfo['dirname'], '/static')));
-                    $path = $dir . '/static/cache/' . $dirnoslash . $fileinfo['filename'] . '.' . $sizes[0] . 'x' . $sizes[1] . $crop . $pos . '.' . $fileinfo['extension'];
+                    $path = $dir.'/static/cache/'.$dirnoslash.$fileinfo['filename'].'.'.$sizes[0].'x'.$sizes[1].$crop.$pos.'.'.$fileinfo['extension'];
                     if (!file_exists($path)) {
-                        Tools::createDir($dir . '/static/cache/');
+                        Tools::createDir($dir.'/static/cache/');
                         copy($file, $path);
                         Tools::resizeImage($path, $sizes[0], $sizes[1], $crop, $pos);
                     }
@@ -166,9 +166,9 @@ 
         header("Cache-control: public");
         header("Accept-Ranges: bytes");
         header("Pragma: public");
-        header("Content-Length: " . filesize($file));
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($file)) . ' GMT');
-        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256) . ' GMT');
+        header("Content-Length: ".filesize($file));
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($file)).' GMT');
+        header('Expires: '.gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256).' GMT');
         if (filemtime($file) <= $modifiedSince && (!isset($_SERVER['HTTP_CACHE_CONTROL']) || $_SERVER['HTTP_CACHE_CONTROL'] != 'no-cache')) {
             // Разгружаем канал передачи данных!
             header('HTTP/1.1 304 Not Modified');
@@ -179,19 +179,19 @@ 
         header('Content-Description: File Transfer');
         //}
         if (isset($this->mimes[strtolower($fileinfo['extension'])])) {
-            header("Content-Type: " . $this->mimes[strtolower($fileinfo['extension'])]);
+            header("Content-Type: ".$this->mimes[strtolower($fileinfo['extension'])]);
         }
 
         if (isset($_GET['frustrate_dl']) || in_array($fileinfo['extension'], array('doc', 'docx', 'xls', 'xlsx'))) {
 
-            $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension'];
+            $fileName = $fileinfo['filename'].'.'.$fileinfo['extension'];
             if (App::$cur->db->connect) {
-                $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
+                $fileObj = Files\File::get(['path', '%/'.$fileinfo['filename'].'.'.$fileinfo['extension'], 'LIKE']);
                 if ($fileObj) {
                     $fileName = $fileObj->original_name;
                 }
             }
-            header('Content-Disposition: attachment; filename="' . $fileName . '"');
+            header('Content-Disposition: attachment; filename="'.$fileName.'"');
         }
 
         header('Content-Transfer-Encoding: binary');