injitools / cms-Inji

system/modules/Money/objects/MerchantHelper/Robokassa.php

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
             'SignatureValue' => $hash
         ];
         if (empty($config['test'])) {
-            \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?' . http_build_query($data));
+            \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?'.http_build_query($data));
         } else {
-            \Tools::redirect('http://test.robokassa.ru/Index.aspx?' . http_build_query($data));
+            \Tools::redirect('http://test.robokassa.ru/Index.aspx?'.http_build_query($data));
         }
     }
 

system/modules/Money/snippets/rewardType/currency.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
     'procent' => 'Процент',

     'amount' => 'Сумма',

 ];

-return $levelTypes[$level->params['type']->value] . ': ' . $level->params['amount']->value . ' ' . ($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : ''));

+return $levelTypes[$level->params['type']->value].': '.$level->params['amount']->value.' '.($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : ''));

 },

     'rewarder' => function($reward, $sums, $user, $rootUser, $level, $rewardGet) {

 $wallets = \App::$cur->money->getUserWallets($user->id);

@@ -63,9 +63,9 @@ 
         return 0;

     }

 

-    $text = 'Вознаграждение по программе "' . $reward->name . '"';

+    $text = 'Вознаграждение по программе "'.$reward->name.'"';

     if ($rootUser->id != $user->id) {

-        $text .= ' от ' . $rootUser->name();

+        $text .= ' от '.$rootUser->name();

     }

 

     if (!$rewardGet && $reward->block) {

@@ -73,7 +73,7 @@ 
         $block->wallet_id = $wallets[$level->params['currency_id']->value]->id;

         $block->amount = $amount;

         $block->comment = $text;

-        $block->data = 'reward:' . $reward->id;

+        $block->data = 'reward:'.$reward->id;

         $dateGenerators = \App::$cur->money->getSnippets('expiredDateGenerator');

         if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {

             $date = $dateGenerators[$reward->block_date_expired]($reward, $user);

@@ -88,7 +88,7 @@ 
     } else {

         $wallets[$level->params['currency_id']->value]->diff($amount, $text);

     }

-    \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym());

+    \App::$cur->users->AddUserActivity($user->id, 4, $text.'<br />'.$amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym());

 }

 return $amount;

 }

system/modules/Money/Money.php

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
             default:
                 $sum = $pay->sum;
         }
-        $className = 'Money\MerchantHelper\\' . $objectName;
+        $className = 'Money\MerchantHelper\\'.$objectName;
         return $className::goToMerchant($pay->id, $sum, $method['currency'], $merchantOptions['description'], $merchantOptions['success'], $merchantOptions['false']);
     }
 
@@ -59,7 +59,7 @@ 
         if ($merchant) {
             $this->currentMerchant = $system;
         }
-        $className = 'Money\MerchantHelper\\' . $this->currentMerchant;
+        $className = 'Money\MerchantHelper\\'.$this->currentMerchant;
         $result = $className::reciver($data, $status);
         $result['pay'] = null;
         if (!empty($result['payId'])) {
@@ -102,7 +102,7 @@ 
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
             } else {
-                $blocks[$block->wallet->currency_id]+= $block->amount;
+                $blocks[$block->wallet->currency_id] += $block->amount;
             }
         }
         return $blocks;
@@ -171,7 +171,7 @@ 
             return false;
         }
         $reward->checkBlocked();
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
         if ($reward_count >= $reward->quantity && $reward->quantity) {
             return false;
         }
@@ -211,7 +211,7 @@ 
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
                 $amount = 0;
                 foreach ($recives as $recive) {
-                    $amount+=$recive->amount;
+                    $amount += $recive->amount;
                 }
                 if ($amount >= $reward->peruser) {
                     continue;

system/modules/Db/objects/Mysql/Mysql.php

Spacing +6 added lines, -6 removed lines

@@ -13,11 +13,11 @@ 
 
 class Mysql extends \Object
 {
-    public $config = [];       // настройки подключения выбраной базы
-    public $connect = FALSE;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = []; // настройки подключения выбраной базы
+    public $connect = FALSE; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = NULL;
     public $lastQuery = '';
     public $last_error = '';
@@ -71,7 +71,7 @@ 
         $this->table_prefix = '';
 
         $query->where('TABLE_SCHEMA', $old_db);
-        $query->where('TABLE_NAME', $old_prefix . $table_name);
+        $query->where('TABLE_NAME', $old_prefix.$table_name);
         $result = $query->select('COLUMNS');
         $this->db_name = $old_db;
         $this->table_prefix = $old_prefix;

system/modules/Db/objects/Mysql/Query.php

Spacing +14 added lines, -14 removed lines

@@ -190,15 +190,15 @@ 
                     $newValue = '';
                     foreach ($value as $item) {
                         if ($newValue) {
-                            $newValue.=',';
+                            $newValue .= ',';
                         }
                         if (is_string($item)) {
-                            $newValue .='"' . $item . '"';
+                            $newValue .= '"'.$item.'"';
                         } else {
-                            $newValue .=$item;
+                            $newValue .= $item;
                         }
                     }
-                    $value = '(' . $newValue . ')';
+                    $value = '('.$newValue.')';
                 } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value))
                     $value = "({$value})";
                 elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value))
@@ -262,8 +262,8 @@ 
 
         switch ($this->operation) {
             case 'SELECT':
-                $query .= ' ' . ($this->distinct ? 'DISTINCT' : '');
-                $query .= ' ' . (!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
+                $query .= ' '.($this->distinct ? 'DISTINCT' : '');
+                $query .= ' '.(!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
             case 'DELETE':
                 $query .= ' FROM';
                 break;
@@ -280,9 +280,9 @@ 
                 $this->params = array_merge($this->params, array_values($this->cols));
                 $colsStr = '';
                 if ($this->cols) {
-                    $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
+                    $colsStr = '`'.implode('`,`', array_keys($this->cols)).'`';
                 }
-                $query .= ' (' . $colsStr . ') VALUES (' . rtrim(str_repeat('?,', count($this->cols)), ',') . ')';
+                $query .= ' ('.$colsStr.') VALUES ('.rtrim(str_repeat('?,', count($this->cols)), ',').')';
                 break;
             case 'CREATE TABLE':
                 $query .= " (";
@@ -294,7 +294,7 @@ 
                 }
                 $query = rtrim($query, ',');
                 if ($this->indexes) {
-                    $query .= ', ' . implode(',', $this->indexes);
+                    $query .= ', '.implode(',', $this->indexes);
                 }
                 $query .= ") ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci";
                 break;
@@ -309,23 +309,23 @@ 
                     }
                 }
                 $update = implode(',', $updates);
-                $query .=" SET {$update}";
+                $query .= " SET {$update}";
             case 'SELECT':
             case 'DELETE':
                 $this->buildWhere($this->where);
                 if ($this->whereString) {
-                    $query .= ' ' . $this->whereString;
+                    $query .= ' '.$this->whereString;
                 }
                 break;
         }
         if ($this->group) {
-            $query .= ' GROUP BY ' . implode(',', $this->group);
+            $query .= ' GROUP BY '.implode(',', $this->group);
         }
         if ($this->order) {
-            $query .= ' ORDER BY ' . implode(',', $this->order);
+            $query .= ' ORDER BY '.implode(',', $this->order);
         }
         if ($this->limit) {
-            $query .= ' ' . $this->limit;
+            $query .= ' '.$this->limit;
         }
         return ['query' => $query, 'params' => $this->params];
     }

system/modules/Db/Db.php

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
         } else {
             $db = $param;
         }
-        $className = 'Db\\' . $db['driver'];
+        $className = 'Db\\'.$db['driver'];
         $this->connection = new $className();
         $this->connection->init($db);
         $this->connection->dbInstance = $this;
         $this->connect = $this->connection->connect;
         $this->dbConfig = $db;
 
-        $this->className = 'Db\\' . $this->dbConfig['driver'];
-        $this->QueryClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Query';
-        $this->ResultClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Result';
+        $this->className = 'Db\\'.$this->dbConfig['driver'];
+        $this->QueryClassName = 'Db\\'.$this->dbConfig['driver'].'\\Query';
+        $this->ResultClassName = 'Db\\'.$this->dbConfig['driver'].'\\Result';
     }
 
     public function __call($name, $params)
@@ -55,7 +55,7 @@ 
 
     public function newQuery()
     {
-        if($this->QueryClassName) {
+        if ($this->QueryClassName) {
             return new $this->QueryClassName($this->connection);
         }
         return false;

system/modules/Materials/models/Category.php

Spacing +2 added lines, -2 removed lines

@@ -102,10 +102,10 @@
         if ($treePath) {
             $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
             foreach ($categorys as $category) {
-                $href .="/{$category->alias}";
+                $href .= "/{$category->alias}";
             }
         }
-        return $href . "/" . ($this->alias ? $this->alias : $this->pk());
+        return $href."/".($this->alias ? $this->alias : $this->pk());
     }
 
     public static function relations()

system/modules/Materials/appControllers/MaterialsController.php

Spacing +7 added lines, -7 removed lines

@@ -97,8 +97,8 @@ 
         } else {
             $this->view->setTitle($category->name);
 
-            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE']]), 'limit' => 10]);
-            $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]);
+            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE']]), 'limit' => 10]);
+            $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]);
 
             $this->view->page(['page' => $category->resolveTemplate(), 'content' => $category->resolveViewer(), 'data' => compact('materials', 'pages', 'category')]);
         }
@@ -132,17 +132,17 @@ 
             $this->view->addMetaTag(['name' => 'description', 'content' => $material->description]);
         }
         $this->view->addMetaTag(['property' => 'og:title', 'content' => $material->name]);
-        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->alias]);
+        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->alias]);
         if ($material->description) {
-            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->description]);
+            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->description]);
         }
         if ($material->image) {
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $material->image->path]);
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$material->image->path]);
         } elseif ($logo = Files\File::get('site_logo', 'code')) {
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $logo->path]);
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$logo->path]);
         }
         $this->view->setTitle($material->name);
-        $bread[] = ['text' => $material->name, 'href' => '/' . $material->alias];
+        $bread[] = ['text' => $material->name, 'href' => '/'.$material->alias];
         $this->view->page([
             'page' => $material->resolveTemplate(),
             'content' => $material->resolveViewer(),

system/modules/Materials/Materials.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -76,7 +76,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;