Completed
Pull Request — master (#3)
by
unknown
05:51
created
system/modules/Money/Money.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -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;
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         $rootUser = $rootUser ? $rootUser : \Users\User::$cur;
167 167
         $reward = \Money\Reward::get($reward_id);
168 168
         $reward->checkBlocked();
169
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id ]]);
169
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
170 170
         if ($reward_count >= $reward->quantity && $reward->quantity)
171 171
             return false;
172 172
         $types = $this->getSnippets('rewardType');
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
188 188
                 $amount = 0;
189 189
                 foreach ($recives as $recive) {
190
-                    $amount+=$recive->amount;
190
+                    $amount += $recive->amount;
191 191
                 }
192 192
                 if ($amount >= $reward->peruser) {
193 193
                     continue;
Please login to merge, or discard this patch.
system/modules/Users/Users.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
         ]);
298 298
         $info->save();
299 299
         if (isset($inviter))
300
-            $this->AddUserActivity($inviter, 2, "По вашей ссылке зарегистрировался новый партнер, {$info->first_name} {$info->last_name} (id: {$user->id})" );
300
+            $this->AddUserActivity($inviter, 2, "По вашей ссылке зарегистрировался новый партнер, {$info->first_name} {$info->last_name} (id: {$user->id})");
301 301
         if ($autorization) {
302 302
             $this->autorization($user_mail, $pass, 'mail');
303 303
         }
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
             $to = $user_mail;
307 307
             $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
308 308
             $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
309
-            $text .='<br />';
309
+            $text .= '<br />';
310 310
             $text .= '<br />';
311 311
             $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
312 312
             Tools::sendMail($from, $to, $subject, $text);
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
         return $return;
360 360
     }
361 361
 
362
-    public function addUserActivity($user_id, $cat_id , $text = '')
362
+    public function addUserActivity($user_id, $cat_id, $text = '')
363 363
     {
364 364
         $ua = new Users\Activity([
365 365
             'user_id' => $user_id,
Please login to merge, or discard this patch.