injitools / cms-Inji

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

Spacing +10 added lines, -10 removed lines

@@ -21,8 +21,8 @@ 
 
         function print_answer($result, $description)
         {
-            $print = "WMI_RESULT=" . strtoupper($result) . "&";
-            $print .= "WMI_DESCRIPTION=" . urlencode($description);
+            $print = "WMI_RESULT=".strtoupper($result)."&";
+            $print .= "WMI_DESCRIPTION=".urlencode($description);
             return $print;
         }
 
@@ -59,24 +59,24 @@ 
 
         // Формирование подписи для сравнения ее с параметром WMI_SIGNATURE
 
-        $signature = base64_encode(pack("H*", md5($values . $skey)));
+        $signature = base64_encode(pack("H*", md5($values.$skey)));
 
         //Сравнение полученной подписи с подписью W1
 
         if (!empty($data["WMI_SIGNATURE"]) && $signature == $data["WMI_SIGNATURE"]) {
             if (strtoupper($data["WMI_ORDER_STATE"]) == "ACCEPTED") {
                 // вызываем функцию обработки в случае успеха
-                $result['callback'] = print_answer("Ok", "Заказ #" . $data["WMI_PAYMENT_NO"] . " оплачен!");
+                $result['callback'] = print_answer("Ok", "Заказ #".$data["WMI_PAYMENT_NO"]." оплачен!");
                 $result['payId'] = $data["WMI_PAYMENT_NO"];
                 $result['status'] = 'success';
                 return $result;
             } else {
                 // Случилось что-то странное, пришло неизвестное состояние заказа
-                $result['callback'] = print_answer("Retry", "Неверное состояние " . $data["WMI_ORDER_STATE"]);
+                $result['callback'] = print_answer("Retry", "Неверное состояние ".$data["WMI_ORDER_STATE"]);
             }
         } else {
             // Подпись не совпадает, возможно вы поменяли настройки интернет-магазина
-            $result['callback'] = print_answer("Retry", "Неверная подпись " . (!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty'));
+            $result['callback'] = print_answer("Retry", "Неверная подпись ".(!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty'));
         }
         return $result;
     }
@@ -87,7 +87,7 @@ 
         $merchantCurrency = static::getMerchantCurrency($currency);
         
         if (!$description)
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+            $description = "Оплата заказа на сайте ".idn_to_utf8(INJI_DOMAIN_NAME);
 
         //Секретный ключ интернет-магазина
         $key = $config['secret'];
@@ -99,7 +99,7 @@ 
         $fields["WMI_PAYMENT_AMOUNT"] = number_format($amount, 0, '.', '');
         $fields["WMI_CURRENCY_ID"] = $merchantCurrency->code;
         $fields["WMI_PAYMENT_NO"] = $payId;
-        $fields["WMI_DESCRIPTION"] = "BASE64:" . base64_encode($description);
+        $fields["WMI_DESCRIPTION"] = "BASE64:".base64_encode($description);
         $fields["WMI_EXPIRED_DATE"] = "2019-12-31T23:59:59";
         $fields["WMI_SUCCESS_URL"] = $success;
         $fields["WMI_FAIL_URL"] = $false;
@@ -135,7 +135,7 @@ 
         // вычисления отпечатка, сформированного выше сообщения,
         // по алгоритму MD5 и представление его в Base64
 
-        $signature = base64_encode(pack("H*", md5($fieldValues . $key)));
+        $signature = base64_encode(pack("H*", md5($fieldValues.$key)));
 
         //Добавление параметра WMI_SIGNATURE в словарь параметров формы
 
@@ -155,7 +155,7 @@ 
 
           print "<input type=\"submit\"/></form>";
          */
-        \Tools::redirect('https://www.walletone.com/checkout/default.aspx?' . http_build_query($fields));
+        \Tools::redirect('https://www.walletone.com/checkout/default.aspx?'.http_build_query($fields));
     }
 
 }

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/')
     {
         $wallets = \App::$cur->money->getUserWallets();
-        \Tools::redirect('/money/walletPay/' . $payId . '/' . $wallets[$currency->id]->id);
+        \Tools::redirect('/money/walletPay/'.$payId.'/'.$wallets[$currency->id]->id);
     }
 
 }

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

Spacing +2 added lines, -2 removed lines

@@ -20,14 +20,14 @@
 
     public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/')
     {
-        \Tools::redirect('/money/primaryPay/' . $payId . '/' . $currency->id);
+        \Tools::redirect('/money/primaryPay/'.$payId.'/'.$currency->id);
     }
 
     public static function getFinalSum($pay, $method)
     {
         $sum = parent::getFinalSum($pay, $method);
         if ($pay->data && $cart = \Ecommerce\Cart::get($pay->data)) {
-            $extra = '0.' . (strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id);
+            $extra = '0.'.(strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id);
         } else {
             $extra = 0;
         }

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

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
             $data['m_key']
         );
         $data['m_sign'] = strtoupper(hash('sha256', implode(':', $arHash)));
-        \Tools::redirect('http://payeer.com/merchant/?' . http_build_query($data));
+        \Tools::redirect('http://payeer.com/merchant/?'.http_build_query($data));
     }
 
     public static function reciver($data, $status)
@@ -57,11 +57,11 @@ 
                 $m_key);
             $sign_hash = strtoupper(hash('sha256', implode(':', $arHash)));
             if ($_POST['m_sign'] == $sign_hash && $_POST['m_status'] == 'success') {
-                $result['callback'] = $_POST['m_orderid'] . '|success';
+                $result['callback'] = $_POST['m_orderid'].'|success';
                 $result['payId'] = $data["m_orderid"];
                 $result['status'] = 'success';
             } else {
-                $result['callback'] = $_POST['m_orderid'] . '|error';
+                $result['callback'] = $_POST['m_orderid'].'|error';
             }
         }
 

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

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
         $request['PAYMENT_AMOUNT'] = $amount;
         $request['PAYMENT_UNITS'] = $merchantCurrency->code;
         $request['SUGGESTED_MEMO'] = $description;
-        $request['STATUS_URL'] = 'http://' . INJI_DOMAIN_NAME . '/money/merchants/reciver/PerfectMoney';
+        $request['STATUS_URL'] = 'http://'.INJI_DOMAIN_NAME.'/money/merchants/reciver/PerfectMoney';
         $request['PAYMENT_URL'] = $success;
         $request['NOPAYMENT_URL'] = $false;
         $request['PAYMENT_METHOD'] = 'PerfectMoney account';
@@ -50,10 +50,10 @@ 
 
         $config = static::getConfig();
 
-        $string = $_POST['PAYMENT_ID'] . ':' . $_POST['PAYEE_ACCOUNT'] . ':' .
-                $_POST['PAYMENT_AMOUNT'] . ':' . $_POST['PAYMENT_UNITS'] . ':' .
-                $_POST['PAYMENT_BATCH_NUM'] . ':' .
-                $_POST['PAYER_ACCOUNT'] . ':' . strtoupper(md5($config['secret'])) . ':' .
+        $string = $_POST['PAYMENT_ID'].':'.$_POST['PAYEE_ACCOUNT'].':'.
+                $_POST['PAYMENT_AMOUNT'].':'.$_POST['PAYMENT_UNITS'].':'.
+                $_POST['PAYMENT_BATCH_NUM'].':'.
+                $_POST['PAYER_ACCOUNT'].':'.strtoupper(md5($config['secret'])).':'.
                 $_POST['TIMESTAMPGMT'];
 
         $hash = strtoupper(md5($string));

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/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];
     }