injitools / cms-Inji

system/modules/Modules/appAdminControllers/content/editor.php

Spacing +10 added lines, -10 removed lines

@@ -12,22 +12,22 @@ 
     'Операции'
 ]);
 $modulePath = Module::getModulePath($module);
-$path = $modulePath . '/models';
-$config = Config::custom(App::$primary->path . '/modules/' . $module . '/generatorHash.php');
+$path = $modulePath.'/models';
+$config = Config::custom(App::$primary->path.'/modules/'.$module.'/generatorHash.php');
 if (file_exists($path)) {
     $files = array_slice(scandir($path), 2);
     foreach ($files as $file) {
-        if (is_dir($path . '/' . $file)) {
+        if (is_dir($path.'/'.$file)) {
             continue;
         }
         $modelName = pathinfo($file, PATHINFO_FILENAME);
         $table->addRow([
             $modelName,
-            (!empty($config['models/' . $file]) && $config['models/' . $file] == md5(file_get_contents($path . '/' . $file))) ? '<b class="text-success">Нету</b>' : '<b class="text-danger">Есть</b>',
+            (!empty($config['models/'.$file]) && $config['models/'.$file] == md5(file_get_contents($path.'/'.$file))) ? '<b class="text-success">Нету</b>' : '<b class="text-danger">Есть</b>',
             [
                 'class' => 'actionTd',
-                'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editModel/' . $module . '/' . $modelName . '"><i class="glyphicon glyphicon-edit"></i></a>'
-                . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delModel/' . $module . '/' . $modelName . '"><i class="glyphicon glyphicon-remove"></i></a>'
+                'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editModel/'.$module.'/'.$modelName.'"><i class="glyphicon glyphicon-edit"></i></a>'
+                . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delModel/'.$module.'/'.$modelName.'"><i class="glyphicon glyphicon-remove"></i></a>'
             ]
         ]);
     }
@@ -50,16 +50,16 @@ 
     'Controllers'
 ];
 foreach ($types as $type) {
-    if (file_exists($modulePath . '/' . $type)) {
-        $files = array_slice(scandir($modulePath . '/' . $type), 2);
+    if (file_exists($modulePath.'/'.$type)) {
+        $files = array_slice(scandir($modulePath.'/'.$type), 2);
         foreach ($files as $file) {
             $table->addRow([
                 pathinfo($file, PATHINFO_FILENAME),
                 $type,
                 [
                     'class' => 'actionTd',
-                    'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/controllerEditor/' . $module . '/' . $type . '/' . pathinfo($file, PATHINFO_FILENAME) . '"><i class="glyphicon glyphicon-edit"></i></a>'
-                    . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delController/' . $module . '/' . $type . '/' . pathinfo($file, PATHINFO_FILENAME) . '"><i class="glyphicon glyphicon-remove"></i></a>'
+                    'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/controllerEditor/'.$module.'/'.$type.'/'.pathinfo($file, PATHINFO_FILENAME).'"><i class="glyphicon glyphicon-edit"></i></a>'
+                    . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delController/'.$module.'/'.$type.'/'.pathinfo($file, PATHINFO_FILENAME).'"><i class="glyphicon glyphicon-remove"></i></a>'
                 ]
             ]);
         }

system/modules/Modules/appAdminControllers/content/modelEditor.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 $form = new Ui\Form();
-$form->begin((!empty($modelFullName) ? 'Изменение' : 'Создание') . ' модели');
+$form->begin((!empty($modelFullName) ? 'Изменение' : 'Создание').' модели');
 $cols = [
     'label' => ['type' => 'text', 'label' => 'Название'],
     'code' => ['type' => 'text', 'label' => 'Код'],

system/modules/Modules/appAdminControllers/content/controllerEditor.php

Spacing +3 added lines, -3 removed lines

@@ -10,15 +10,15 @@
     'href' => "/admin/modules/createControllerMethod/{$module}/{$type}/{$controller}",
     'text' => 'Создать'
 ]);
-$class = CodeGenerator::parseClass(Modules::getModulePath($module) . '/' . $type . '/' . $controller . '.php');
+$class = CodeGenerator::parseClass(Modules::getModulePath($module).'/'.$type.'/'.$controller.'.php');
 foreach ($class->methods as $method) {
     $name = str_replace('Action', '', $method->name);
     $table->addRow([
         $name,
         [
             'class' => 'actionTd',
-            'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editControllerMethod/' . $module . '/' . $type . '/' . $controller . '/' . $name . '"><i class="glyphicon glyphicon-edit"></i></a>'
-            . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delControllerMethod/' . $module . '/' . $type . '/' . $controller . '/' . $name . '"><i class="glyphicon glyphicon-remove"></i></a>'
+            'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editControllerMethod/'.$module.'/'.$type.'/'.$controller.'/'.$name.'"><i class="glyphicon glyphicon-edit"></i></a>'
+            . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delControllerMethod/'.$module.'/'.$type.'/'.$controller.'/'.$name.'"><i class="glyphicon glyphicon-remove"></i></a>'
         ]
     ]);
 }

system/modules/Modules/appAdminControllers/ModulesController.php

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
         $config = App::$primary->config;
         $config['defaultModule'] = $module;
         Config::save('app', $config);
-        Tools::redirect('/admin/modules', 'Модулем по умолчанию установлен: ' . $module, 'success');
+        Tools::redirect('/admin/modules', 'Модулем по умолчанию установлен: '.$module, 'success');
     }
 
     public function installAction()
@@ -30,7 +30,7 @@ 
             foreach ($_GET['modules'] as $module) {
                 $this->modules->install($module);
             }
-            Tools::redirect('/admin/modules', 'Моудли ' . implode(',', $_GET['modules']) . ' установлены');
+            Tools::redirect('/admin/modules', 'Моудли '.implode(',', $_GET['modules']).' установлены');
         }
         $this->view->page();
     }
@@ -40,14 +40,14 @@ 
         $codeName = filter_input(INPUT_POST, 'codeName');
         if ($codeName && filter_input(INPUT_POST, 'name')) {
             $codeName = ucfirst($codeName);
-            if (file_exists(App::$primary->path . '/modules/' . $codeName . '.php')) {
+            if (file_exists(App::$primary->path.'/modules/'.$codeName.'.php')) {
                 Msg::add('Модуль с таким именем уже существует');
             } else {
                 $this->modules->createBlankModule(filter_input(INPUT_POST, 'name'), $codeName);
                 $config = App::$primary->config;
                 $config['modules'][] = $codeName;
                 Config::save('app', $config);
-                Tools::redirect('/admin/modules', 'Моудль ' . $codeName . ' создан и установлен');
+                Tools::redirect('/admin/modules', 'Моудль '.$codeName.' создан и установлен');
             }
         }
         $this->view->page();
@@ -55,7 +55,7 @@ 
 
     public function editorAction($module)
     {
-        if (!file_exists(Module::getModulePath($module) . '/generatorHash.php')) {
+        if (!file_exists(Module::getModulePath($module).'/generatorHash.php')) {
             Msg::add('Этот модуль был создан без помощи генератора. Возможности его изменения ограничены и могут привести к порче модуля', 'danger');
         }
         $this->view->page(['data' => compact('module')]);
@@ -63,18 +63,18 @@ 
 
     public function editModelAction($module, $modelName)
     {
-        $path = Modules::getModulePath($module) . '/models/' . $modelName . '.php';
+        $path = Modules::getModulePath($module).'/models/'.$modelName.'.php';
         if (!file_exists($path)) {
-            Tools::redirect('/admin/modules/edit/' . $module, 'Модель ' . $modelName . ' не найдена', 'danger');
+            Tools::redirect('/admin/modules/edit/'.$module, 'Модель '.$modelName.' не найдена', 'danger');
         }
-        include_once Modules::getModulePath($module) . '/models/' . $modelName . '.php';
-        $modelFullName = $module . '\\' . $modelName;
+        include_once Modules::getModulePath($module).'/models/'.$modelName.'.php';
+        $modelFullName = $module.'\\'.$modelName;
         $model = new $modelFullName;
         if (filter_input(INPUT_POST, 'codeName') && filter_input(INPUT_POST, 'name')) {
             $this->modules->generateModel($module, filter_input(INPUT_POST, 'name'), filter_input(INPUT_POST, 'codeName'), [
                 'cols' => $_POST['cols']
             ]);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Модель ' . filter_input(INPUT_POST, 'codeName') . ' была сохранена');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Модель '.filter_input(INPUT_POST, 'codeName').' была сохранена');
         }
         $this->view->page(['content' => 'modelEditor', 'data' => compact('module', 'modelName', 'modelFullName', 'model')]);
     }
@@ -85,20 +85,20 @@ 
             $this->modules->generateModel($module, filter_input(INPUT_POST, 'name'), filter_input(INPUT_POST, 'codeName'), [
                 'cols' => $_POST['cols']
             ]);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Модель ' . filter_input(INPUT_POST, 'codeName') . ' была создана');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Модель '.filter_input(INPUT_POST, 'codeName').' была создана');
         }
         $this->view->page(['content' => 'modelEditor', 'data' => compact('module')]);
     }
 
     public function delModelAction($module, $modelName)
     {
-        unlink(App::$primary->path . '/modules/' . $module . '/models/' . $modelName . '.php');
-        $config = Config::custom(App::$primary->path . '/modules/' . $module . '/generatorHash.php');
-        if (isset($config['models/' . $modelName . '.php'])) {
-            unset($config['models/' . $modelName . '.php']);
-            Config::save(App::$primary->path . '/modules/' . $module . '/generatorHash.php', $config);
+        unlink(App::$primary->path.'/modules/'.$module.'/models/'.$modelName.'.php');
+        $config = Config::custom(App::$primary->path.'/modules/'.$module.'/generatorHash.php');
+        if (isset($config['models/'.$modelName.'.php'])) {
+            unset($config['models/'.$modelName.'.php']);
+            Config::save(App::$primary->path.'/modules/'.$module.'/generatorHash.php', $config);
         }
-        Tools::redirect('/admin/modules/editor/' . $module, 'Модель ' . $modelName . ' была удалена');
+        Tools::redirect('/admin/modules/editor/'.$module, 'Модель '.$modelName.' была удалена');
     }
 
     public function createControllerAction($module)
@@ -106,7 +106,7 @@ 
         $controllerType = filter_input(INPUT_POST, 'type');
         if ($controllerType) {
             $this->modules->createController($module, $controllerType);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Контроллер был создан');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Контроллер был создан');
         }
         $this->view->page();
     }
@@ -121,7 +121,7 @@ 
         $url = filter_input(INPUT_POST, 'url');
         if ($url) {
             $this->modules->addActionToController($module, $type, $controller, $url);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Контроллер был изменен');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Контроллер был изменен');
         }
         $this->view->page(['data' => compact('module', 'type', 'controller')]);
     }

system/modules/Modules/tpls/Model.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
 class <?= $codeName; ?> extends \Model {
 //modelParams<?php
 if (!empty($name)) {
-    echo "\n    static " . '$objectName = \'' . $name . "';";
+    echo "\n    static ".'$objectName = \''.$name."';";
 }
 if (!empty($labels)) {
-    echo "\n    static " . '$labels = [' . CodeGenerator::genArray($labels, 1) . "\n    ];";
+    echo "\n    static ".'$labels = ['.CodeGenerator::genArray($labels, 1)."\n    ];";
 }
 if (!empty($cols)) {
-    echo "\n    static " . '$cols = [' . CodeGenerator::genArray($cols, 1) . "\n    ];";
+    echo "\n    static ".'$cols = ['.CodeGenerator::genArray($cols, 1)."\n    ];";
 }
 ?>
 //!modelParams

system/modules/Money/models/Reward.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function checkBlocked()
     {
         $blocked = Wallet\Block::getList(['where' => [
-                        ['data', 'reward:' . $this->id],
+                        ['data', 'reward:'.$this->id],
                         [
                             ['date_expired', '0000-00-00 00:00:00'],
                             ['date_expired', date('Y-m-d H:i:s'), '>', 'OR']

system/modules/Money/models/Transfer.php

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
 
     public static function itemName($item)
     {
-        return $item->pk() . '. ' . $item->name();
+        return $item->pk().'. '.$item->name();
     }
 
     public static $dataManagers = [
@@ -48,16 +48,16 @@ 
             ],
             'name' => 'Переводы',
             'cols' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ],
             'actions' => [
                 'Money\CancelTransfer', 'Money\CompleteTransfer'
             ],
             'sortable' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ],
             'filters' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ]
         ]
     ];
@@ -182,7 +182,7 @@ 
 
     public function name()
     {
-        return 'Перевод на сумму ' . $this->amount . ' ' . $this->currency->name . ' от ' . $this->user->name() . ' для ' . $this->toUser->name();
+        return 'Перевод на сумму '.$this->amount.' '.$this->currency->name.' от '.$this->user->name().' для '.$this->toUser->name();
     }
 
     public function cancel()
@@ -192,14 +192,14 @@ 
         }
 
         $this->canceled = 1;
-        $block = \Money\Wallet\Block::get('Money\Transfer:' . $this->id, 'data');
+        $block = \Money\Wallet\Block::get('Money\Transfer:'.$this->id, 'data');
         if ($block) {
             $block->delete();
         }
         $wallets = \App::$cur->money->getUserWallets($this->user_id);
         $text = 'Отмена перевода средств';
         $wallets[$this->currency_id]->diff($this->amount, $text);
-        \App::$cur->users->AddUserActivity($this->user_id, 4, $text . '<br />' . (float) $this->amount . ' ' . $wallets[$this->currency_id]->currency->acronym());
+        \App::$cur->users->AddUserActivity($this->user_id, 4, $text.'<br />'.(float) $this->amount.' '.$wallets[$this->currency_id]->currency->acronym());
         $this->save();
         return true;
     }
@@ -211,14 +211,14 @@ 
         }
 
         $this->complete = 1;
-        $block = \Money\Wallet\Block::get('Money\Transfer:' . $this->id, 'data');
+        $block = \Money\Wallet\Block::get('Money\Transfer:'.$this->id, 'data');
         if ($block) {
             $block->delete();
         }
         $wallets = \App::$cur->money->getUserWallets($this->to_user_id);
-        $text = 'Перевод средств от ' . $this->user->name() . '.' . ($this->comment ? ' Комментарий:' . $this->comment : '');
+        $text = 'Перевод средств от '.$this->user->name().'.'.($this->comment ? ' Комментарий:'.$this->comment : '');
         $wallets[$this->currency_id]->diff($this->amount, $text);
-        \App::$cur->users->AddUserActivity($this->to_user_id, 4, $text . '<br />' . (float) $this->amount . ' ' . $wallets[$this->currency_id]->currency->acronym());
+        \App::$cur->users->AddUserActivity($this->to_user_id, 4, $text.'<br />'.(float) $this->amount.' '.$wallets[$this->currency_id]->currency->acronym());
         $this->save();
         return true;
     }

system/modules/Money/install_script.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $currencies = [
         [
@@ -46,22 +46,22 @@ 
         [
             'name' => 'Wallet One',
             'object_name' => 'WalletOne',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/WalletOne.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/WalletOne.png')
         ],
         [
             'name' => 'Robokassa',
             'object_name' => 'Robokassa',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/Robokassa.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/Robokassa.png')
         ],
         [
             'name' => 'Payeer',
             'object_name' => 'Payeer',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/Payeer.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/Payeer.png')
         ],
         [
             'name' => 'PerfectMoney',
             'object_name' => 'PerfectMoney',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/PerfectMoney.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/PerfectMoney.png')
         ],
     ];
     $merchantsConfig = [

system/modules/Money/appControllers/MerchantsController.php

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,8 @@ 
             'callback_method' => ''

                 ], null, [

             'description' => 'Тестовый платеж',

-            'success' => 'http://' . INJI_DOMAIN_NAME . '/',

-            'false' => 'http://' . INJI_DOMAIN_NAME . '/'

+            'success' => 'http://'.INJI_DOMAIN_NAME.'/',

+            'false' => 'http://'.INJI_DOMAIN_NAME.'/'

         ]);

     }

 

@@ -122,9 +122,9 @@ 
             Tools::redirect('/', 'Валюта для этого способа оплаты не найдена', 'danger');

         }

         $merchantOptions = [

-            'description' => $pay->description ? '#' . $pay->id . ' ' . $pay->description : 'Оплата счета №' . $pay->id . ' на сайте: ' . idn_to_utf8(INJI_DOMAIN_NAME),

-            'success' => 'http://' . INJI_DOMAIN_NAME . '/',

-            'false' => 'http://' . INJI_DOMAIN_NAME . '/'

+            'description' => $pay->description ? '#'.$pay->id.' '.$pay->description : 'Оплата счета №'.$pay->id.' на сайте: '.idn_to_utf8(INJI_DOMAIN_NAME),

+            'success' => 'http://'.INJI_DOMAIN_NAME.'/',

+            'false' => 'http://'.INJI_DOMAIN_NAME.'/'

         ];

 

         $this->Money->goToMerchant($pay, $merchant, $method, $merchantOptions);