@@ -92,6 +92,9 @@ discard block |
||
92 | 92 | } |
93 | 93 | } |
94 | 94 | |
95 | + /** |
|
96 | + * @param string $user_mail |
|
97 | + */ |
|
95 | 98 | public function passre($user_mail) |
96 | 99 | { |
97 | 100 | $user = $this->get($user_mail, 'mail'); |
@@ -322,6 +325,9 @@ discard block |
||
322 | 325 | return $user->id; |
323 | 326 | } |
324 | 327 | |
328 | + /** |
|
329 | + * @param string $pass |
|
330 | + */ |
|
325 | 331 | public function hashpass($pass) |
326 | 332 | { |
327 | 333 | return password_hash($pass, PASSWORD_DEFAULT); |
@@ -359,6 +365,9 @@ discard block |
||
359 | 365 | return $return; |
360 | 366 | } |
361 | 367 | |
368 | + /** |
|
369 | + * @param integer $cat_id |
|
370 | + */ |
|
362 | 371 | public function addUserActivity($user_id, $cat_id , $text = '') |
363 | 372 | { |
364 | 373 | $ua = new Users\Activity([ |
@@ -196,17 +196,20 @@ |
||
196 | 196 | */ |
197 | 197 | public function get($idn, $ltype = 'id') |
198 | 198 | { |
199 | - if (!$idn) |
|
200 | - return false; |
|
199 | + if (!$idn) { |
|
200 | + return false; |
|
201 | + } |
|
201 | 202 | |
202 | - if (is_numeric($idn) && $ltype != 'login') |
|
203 | - $user = Users\User::get($idn, 'id'); |
|
204 | - elseif ($ltype == 'login') |
|
205 | - $user = Users\User::get($idn, 'login'); |
|
206 | - else |
|
207 | - $user = Users\User::get($idn, 'mail'); |
|
208 | - if (!$user) |
|
209 | - return []; |
|
203 | + if (is_numeric($idn) && $ltype != 'login') { |
|
204 | + $user = Users\User::get($idn, 'id'); |
|
205 | + } elseif ($ltype == 'login') { |
|
206 | + $user = Users\User::get($idn, 'login'); |
|
207 | + } else { |
|
208 | + $user = Users\User::get($idn, 'mail'); |
|
209 | + } |
|
210 | + if (!$user) { |
|
211 | + return []; |
|
212 | + } |
|
210 | 213 | |
211 | 214 | return $user; |
212 | 215 | } |
@@ -167,8 +167,9 @@ |
||
167 | 167 | $reward = \Money\Reward::get($reward_id); |
168 | 168 | $reward->checkBlocked(); |
169 | 169 | $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id ]]); |
170 | - if ($reward_count >= $reward->quantity && $reward->quantity) |
|
171 | - return false; |
|
170 | + if ($reward_count >= $reward->quantity && $reward->quantity) { |
|
171 | + return false; |
|
172 | + } |
|
172 | 173 | $types = $this->getSnippets('rewardType'); |
173 | 174 | foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) { |
174 | 175 | $user = $rootUser; |