Completed
Push — master ( 0fc305...2f7f6c )
by Alexey
06:05
created
system/modules/Money/objects/MerchantHelper/Payeer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
             $data['m_key']
35 35
         );
36 36
         $data['m_sign'] = strtoupper(hash('sha256', implode(':', $arHash)));
37
-        \Tools::redirect('http://payeer.com/merchant/?' . http_build_query($data));
37
+        \Tools::redirect('http://payeer.com/merchant/?'.http_build_query($data));
38 38
     }
39 39
 
40 40
     public static function reciver($data, $status)
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
                 $m_key);
58 58
             $sign_hash = strtoupper(hash('sha256', implode(':', $arHash)));
59 59
             if ($_POST['m_sign'] == $sign_hash && $_POST['m_status'] == 'success') {
60
-                $result['callback'] = $_POST['m_orderid'] . '|success';
60
+                $result['callback'] = $_POST['m_orderid'].'|success';
61 61
                 $result['payId'] = $data["m_orderid"];
62 62
                 $result['status'] = 'success';
63 63
             } else {
64
-                $result['callback'] = $_POST['m_orderid'] . '|error';
64
+                $result['callback'] = $_POST['m_orderid'].'|error';
65 65
             }
66 66
         }
67 67
 
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/PerfectMoney.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         $request['PAYMENT_AMOUNT'] = $amount;
26 26
         $request['PAYMENT_UNITS'] = $merchantCurrency->code;
27 27
         $request['SUGGESTED_MEMO'] = $description;
28
-        $request['STATUS_URL'] = 'http://' . INJI_DOMAIN_NAME . '/money/merchants/reciver/PerfectMoney';
28
+        $request['STATUS_URL'] = 'http://'.INJI_DOMAIN_NAME.'/money/merchants/reciver/PerfectMoney';
29 29
         $request['PAYMENT_URL'] = $success;
30 30
         $request['NOPAYMENT_URL'] = $false;
31 31
         $request['PAYMENT_METHOD'] = 'PerfectMoney account';
@@ -50,10 +50,10 @@  discard block
 block discarded – undo
50 50
 
51 51
         $config = static::getConfig();
52 52
 
53
-        $string = $_POST['PAYMENT_ID'] . ':' . $_POST['PAYEE_ACCOUNT'] . ':' .
54
-                $_POST['PAYMENT_AMOUNT'] . ':' . $_POST['PAYMENT_UNITS'] . ':' .
55
-                $_POST['PAYMENT_BATCH_NUM'] . ':' .
56
-                $_POST['PAYER_ACCOUNT'] . ':' . strtoupper(md5($config['secret'])) . ':' .
53
+        $string = $_POST['PAYMENT_ID'].':'.$_POST['PAYEE_ACCOUNT'].':'.
54
+                $_POST['PAYMENT_AMOUNT'].':'.$_POST['PAYMENT_UNITS'].':'.
55
+                $_POST['PAYMENT_BATCH_NUM'].':'.
56
+                $_POST['PAYER_ACCOUNT'].':'.strtoupper(md5($config['secret'])).':'.
57 57
                 $_POST['TIMESTAMPGMT'];
58 58
 
59 59
         $hash = strtoupper(md5($string));
Please login to merge, or discard this patch.
system/modules/Money/snippets/rewardType/currency.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     'procent' => 'Процент',
22 22
     'amount' => 'Сумма',
23 23
 ];
24
-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() : ''));
24
+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() : ''));
25 25
 },
26 26
     'rewarder' => function($reward, $sums, $user, $rootUser, $level, $rewardGet) {
27 27
 $wallets = \App::$cur->money->getUserWallets($user->id);
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
         return 0;
64 64
     }
65 65
 
66
-    $text = 'Вознаграждение по программе "' . $reward->name . '"';
66
+    $text = 'Вознаграждение по программе "'.$reward->name.'"';
67 67
     if ($rootUser->id != $user->id) {
68
-        $text .= ' от ' . $rootUser->name();
68
+        $text .= ' от '.$rootUser->name();
69 69
     }
70 70
 
71 71
     if (!$rewardGet && $reward->block) {
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $block->wallet_id = $wallets[$level->params['currency_id']->value]->id;
74 74
         $block->amount = $amount;
75 75
         $block->comment = $text;
76
-        $block->data = 'reward:' . $reward->id;
76
+        $block->data = 'reward:'.$reward->id;
77 77
         $dateGenerators = \App::$cur->money->getSnippets('expiredDateGenerator');
78 78
         if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {
79 79
             $date = $dateGenerators[$reward->block_date_expired]($reward, $user);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     } else {
89 89
         $wallets[$level->params['currency_id']->value]->diff($amount, $text);
90 90
     }
91
-    \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym());
91
+    \App::$cur->users->AddUserActivity($user->id, 4, $text.'<br />'.$amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym());
92 92
 }
93 93
 return $amount;
94 94
 }
Please login to merge, or discard this patch.
system/modules/Money/Money.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             default:
46 46
                 $sum = $pay->sum;
47 47
         }
48
-        $className = 'Money\MerchantHelper\\' . $objectName;
48
+        $className = 'Money\MerchantHelper\\'.$objectName;
49 49
         return $className::goToMerchant($pay->id, $sum, $method['currency'], $merchantOptions['description'], $merchantOptions['success'], $merchantOptions['false']);
50 50
     }
51 51
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         if ($merchant) {
60 60
             $this->currentMerchant = $system;
61 61
         }
62
-        $className = 'Money\MerchantHelper\\' . $this->currentMerchant;
62
+        $className = 'Money\MerchantHelper\\'.$this->currentMerchant;
63 63
         $result = $className::reciver($data, $status);
64 64
         $result['pay'] = null;
65 65
         if (!empty($result['payId'])) {
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             if (empty($blocks[$block->wallet->currency_id])) {
103 103
                 $blocks[$block->wallet->currency_id] = $block->amount;
104 104
             } else {
105
-                $blocks[$block->wallet->currency_id]+= $block->amount;
105
+                $blocks[$block->wallet->currency_id] += $block->amount;
106 106
             }
107 107
         }
108 108
         return $blocks;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
             return false;
172 172
         }
173 173
         $reward->checkBlocked();
174
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
174
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
175 175
         if ($reward_count >= $reward->quantity && $reward->quantity) {
176 176
             return false;
177 177
         }
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
212 212
                 $amount = 0;
213 213
                 foreach ($recives as $recive) {
214
-                    $amount+=$recive->amount;
214
+                    $amount += $recive->amount;
215 215
                 }
216 216
                 if ($amount >= $reward->peruser) {
217 217
                     continue;
Please login to merge, or discard this patch.
system/modules/Materials/models/Category.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,10 +102,10 @@
 block discarded – undo
102 102
         if ($treePath) {
103 103
             $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
104 104
             foreach ($categorys as $category) {
105
-                $href .="/{$category->alias}";
105
+                $href .= "/{$category->alias}";
106 106
             }
107 107
         }
108
-        return $href . "/" . ($this->alias ? $this->alias : $this->pk());
108
+        return $href."/".($this->alias ? $this->alias : $this->pk());
109 109
     }
110 110
 
111 111
     public static function relations()
Please login to merge, or discard this patch.
system/modules/Materials/appControllers/MaterialsController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
         } else {
98 98
             $this->view->setTitle($category->name);
99 99
 
100
-            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE']]), 'limit' => 10]);
101
-            $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']]);
100
+            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE']]), 'limit' => 10]);
101
+            $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']]);
102 102
 
103 103
             $this->view->page(['page' => $category->resolveTemplate(), 'content' => $category->resolveViewer(), 'data' => compact('materials', 'pages', 'category')]);
104 104
         }
@@ -132,17 +132,17 @@  discard block
 block discarded – undo
132 132
             $this->view->addMetaTag(['name' => 'description', 'content' => $material->description]);
133 133
         }
134 134
         $this->view->addMetaTag(['property' => 'og:title', 'content' => $material->name]);
135
-        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->alias]);
135
+        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->alias]);
136 136
         if ($material->description) {
137
-            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->description]);
137
+            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->description]);
138 138
         }
139 139
         if ($material->image) {
140
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $material->image->path]);
140
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$material->image->path]);
141 141
         } elseif ($logo = Files\File::get('site_logo', 'code')) {
142
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $logo->path]);
142
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$logo->path]);
143 143
         }
144 144
         $this->view->setTitle($material->name);
145
-        $bread[] = ['text' => $material->name, 'href' => '/' . $material->alias];
145
+        $bread[] = ['text' => $material->name, 'href' => '/'.$material->alias];
146 146
         $this->view->page([
147 147
             'page' => $material->resolveTemplate(),
148 148
             'content' => $material->resolveViewer(),
Please login to merge, or discard this patch.
system/modules/Materials/Materials.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
         if (!empty($conf['files']['aditionTemplateFiels'])) {
42 42
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
43
-                $return[$file['file']] = '- ' . $file['name'];
43
+                $return[$file['file']] = '- '.$file['name'];
44 44
             }
45 45
         }
46 46
         return $return;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         if (!empty($conf['files']['aditionTemplateFiels'])) {
78 78
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
79
-                $return[$file['file']] = '- ' . $file['name'];
79
+                $return[$file['file']] = '- '.$file['name'];
80 80
             }
81 81
         }
82 82
         return $return;
Please login to merge, or discard this patch.
system/objects/CodeGenerator/Property.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,13 +20,13 @@
 block discarded – undo
20 20
 
21 21
     public function generate()
22 22
     {
23
-        $code = $this->security . ' ';
23
+        $code = $this->security.' ';
24 24
         $code .= $this->static ? 'static ' : '';
25
-        $code .= '$' . $this->name . ' = ';
25
+        $code .= '$'.$this->name.' = ';
26 26
         if (is_array($this->value)) {
27 27
             $code .= \CodeGenerator::genArray($this->value);
28 28
         } else {
29
-            $code .= '"' . str_replace('"', '\"', $this->value) . '";';
29
+            $code .= '"'.str_replace('"', '\"', $this->value).'";';
30 30
         }
31 31
         return $code;
32 32
     }
Please login to merge, or discard this patch.
system/objects/CodeGenerator/Method.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,16 +21,16 @@
 block discarded – undo
21 21
 
22 22
     public function generate()
23 23
     {
24
-        $code = $this->security . ' ';
24
+        $code = $this->security.' ';
25 25
         $code .= $this->static ? 'static ' : '';
26
-        $code .= 'function ' . $this->name . '(';
26
+        $code .= 'function '.$this->name.'(';
27 27
         foreach ($this->propertys as $param) {
28
-            $code .= '$' . $param . ',';
28
+            $code .= '$'.$param.',';
29 29
         }
30 30
         $code = rtrim($code, ',');
31
-        $code.= ") {\n";
32
-        $code.= '    ' . str_replace("\n", "\n    ", $this->body);
33
-        $code .="\n}";
31
+        $code .= ") {\n";
32
+        $code .= '    '.str_replace("\n", "\n    ", $this->body);
33
+        $code .= "\n}";
34 34
         return $code;
35 35
     }
36 36
 
Please login to merge, or discard this patch.