@@ -169,6 +169,10 @@ discard block |
||
| 169 | 169 | * @return bool |
| 170 | 170 | */ |
| 171 | 171 | // OK v4.5 |
| 172 | + |
|
| 173 | + /** |
|
| 174 | + * @param string $account_name_unsafe |
|
| 175 | + */ |
|
| 172 | 176 | public function db_get_by_name($account_name_unsafe) { |
| 173 | 177 | $this->reset(); |
| 174 | 178 | |
@@ -203,6 +207,11 @@ discard block |
||
| 203 | 207 | * |
| 204 | 208 | */ |
| 205 | 209 | // OK v4.5 |
| 210 | + |
|
| 211 | + /** |
|
| 212 | + * @param string $account_name_unsafe |
|
| 213 | + * @param string $email_unsafe |
|
| 214 | + */ |
|
| 206 | 215 | public function db_get_by_name_or_email($account_name_unsafe, $email_unsafe) { |
| 207 | 216 | $this->reset(); |
| 208 | 217 | |
@@ -218,6 +227,13 @@ discard block |
||
| 218 | 227 | * @throws Exception |
| 219 | 228 | */ |
| 220 | 229 | // OK v4.5 |
| 230 | + |
|
| 231 | + /** |
|
| 232 | + * @param string $account_name_unsafe |
|
| 233 | + * @param string $password_raw |
|
| 234 | + * @param string $email_unsafe |
|
| 235 | + * @param string $language_unsafe |
|
| 236 | + */ |
|
| 221 | 237 | public function db_create($account_name_unsafe, $password_raw, $email_unsafe, $language_unsafe = null, $salt_unsafe = null) { |
| 222 | 238 | $this->reset(); |
| 223 | 239 | |
@@ -312,6 +328,10 @@ discard block |
||
| 312 | 328 | * @return int|string |
| 313 | 329 | */ |
| 314 | 330 | // OK 4.8 |
| 331 | + |
|
| 332 | + /** |
|
| 333 | + * @param double $metamatter |
|
| 334 | + */ |
|
| 315 | 335 | protected function db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe) { |
| 316 | 336 | $provider_id_safe = intval(core_auth::$main_provider->provider_id); |
| 317 | 337 | //$account_id_safe = $this->db->db_escape($this->account_id); |
@@ -209,6 +209,10 @@ discard block |
||
| 209 | 209 | * @return array|bool|resource |
| 210 | 210 | */ |
| 211 | 211 | // OK v4.5 |
| 212 | + |
|
| 213 | + /** |
|
| 214 | + * @param string $salt_unsafe |
|
| 215 | + */ |
|
| 212 | 216 | public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) { |
| 213 | 217 | $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe); |
| 214 | 218 | if($result) { |
@@ -218,6 +222,9 @@ discard block |
||
| 218 | 222 | return $result; |
| 219 | 223 | } |
| 220 | 224 | |
| 225 | + /** |
|
| 226 | + * @param Account $account_to_impersonate |
|
| 227 | + */ |
|
| 221 | 228 | public function impersonate($account_to_impersonate) { |
| 222 | 229 | $this->cookie_set($account_to_impersonate); |
| 223 | 230 | } |
@@ -81,6 +81,10 @@ discard block |
||
| 81 | 81 | // ------------------------------------------------------------------------- |
| 82 | 82 | // Here comes low-level functions - those that directly works with cacher engines |
| 83 | 83 | // ------------------------------------------------------------------------- |
| 84 | + |
|
| 85 | + /** |
|
| 86 | + * @param string $name |
|
| 87 | + */ |
|
| 84 | 88 | public function __set($name, $value) { |
| 85 | 89 | switch ($name) { |
| 86 | 90 | case '_MODE': |
@@ -132,6 +136,9 @@ discard block |
||
| 132 | 136 | return null; |
| 133 | 137 | } |
| 134 | 138 | |
| 139 | + /** |
|
| 140 | + * @param string $name |
|
| 141 | + */ |
|
| 135 | 142 | public function __isset($name) { |
| 136 | 143 | switch (self::$mode) { |
| 137 | 144 | case CACHER_NO_CACHE: |
@@ -332,6 +339,9 @@ discard block |
||
| 332 | 339 | return self::$cacheObject; |
| 333 | 340 | } |
| 334 | 341 | |
| 342 | + /** |
|
| 343 | + * @param string $index |
|
| 344 | + */ |
|
| 335 | 345 | public function db_loadItem($index) { |
| 336 | 346 | $result = null; |
| 337 | 347 | if($index) { |
@@ -371,6 +381,9 @@ discard block |
||
| 371 | 381 | $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null))); |
| 372 | 382 | } |
| 373 | 383 | |
| 384 | + /** |
|
| 385 | + * @param integer $value |
|
| 386 | + */ |
|
| 374 | 387 | public function db_saveItem($item_list, $value = NULL) { |
| 375 | 388 | if(empty($item_list)) { |
| 376 | 389 | return; |
@@ -18,6 +18,11 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!! |
| 20 | 20 | // TODO - OK 4.6 |
| 21 | + |
|
| 22 | + /** |
|
| 23 | + * @param integer $confirmation_type_safe |
|
| 24 | + * @param string $email_unsafe |
|
| 25 | + */ |
|
| 21 | 26 | public function db_confirmation_get_latest_by_type_and_email($confirmation_type_safe, $email_unsafe) { |
| 22 | 27 | $email_safe = $this->db->db_escape($email_unsafe); |
| 23 | 28 | |
@@ -26,12 +31,21 @@ discard block |
||
| 26 | 31 | `type` = {$confirmation_type_safe} AND `email` = '{$email_safe}' ORDER BY create_time DESC LIMIT 1;", true); |
| 27 | 32 | } |
| 28 | 33 | // TODO - OK 4.6 |
| 34 | + |
|
| 35 | + /** |
|
| 36 | + * @param integer $confirmation_type_safe |
|
| 37 | + */ |
|
| 29 | 38 | public function db_confirmation_delete_by_type_and_email($confirmation_type_safe, $email_unsafe) { |
| 30 | 39 | $email_safe = $this->db->db_escape($email_unsafe); |
| 31 | 40 | |
| 32 | 41 | return $this->db->doquery("DELETE FROM {{confirmations}} WHERE `type` = {$confirmation_type_safe} AND `email` = '{$email_safe}'"); |
| 33 | 42 | } |
| 34 | 43 | // TODO - OK 4.6 |
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * @param integer $confirmation_type_safe |
|
| 47 | + * @param string $email_unsafe |
|
| 48 | + */ |
|
| 35 | 49 | public function db_confirmation_get_unique_code_by_type_and_email($confirmation_type_safe, $email_unsafe) { |
| 36 | 50 | $email_safe = $this->db->db_escape($email_unsafe); |
| 37 | 51 | |
@@ -50,6 +64,11 @@ discard block |
||
| 50 | 64 | return $confirm_code_unsafe; |
| 51 | 65 | } |
| 52 | 66 | // TODO - OK 4.6 |
| 67 | + |
|
| 68 | + /** |
|
| 69 | + * @param integer $confirmation_type_safe |
|
| 70 | + * @param string $confirmation_code_unsafe |
|
| 71 | + */ |
|
| 53 | 72 | public function db_confirmation_get_by_type_and_code($confirmation_type_safe, $confirmation_code_unsafe) { |
| 54 | 73 | $confirmation_code_safe = $this->db->db_escape($confirmation_code_unsafe); |
| 55 | 74 | |
@@ -829,10 +829,17 @@ |
||
| 829 | 829 | |
| 830 | 830 | // OK v4.5 |
| 831 | 831 | // TODO - REMEMBER_ME |
| 832 | + |
|
| 833 | + /** |
|
| 834 | + * @param integer $period |
|
| 835 | + */ |
|
| 832 | 836 | protected static function cookie_set($value, $impersonate = false, $period = null) { |
| 833 | 837 | sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE); |
| 834 | 838 | } |
| 835 | 839 | |
| 840 | + /** |
|
| 841 | + * @param string $message |
|
| 842 | + */ |
|
| 836 | 843 | protected static function flog($message, $die = false) { |
| 837 | 844 | if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
| 838 | 845 | return; |
@@ -180,6 +180,9 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
| 183 | + /** |
|
| 184 | + * @param string $query |
|
| 185 | + */ |
|
| 183 | 186 | function security_watch_user_queries($query) { |
| 184 | 187 | // TODO Заменить это на новый логгер |
| 185 | 188 | global $config, $is_watching, $user, $debug; |
@@ -202,6 +205,9 @@ discard block |
||
| 202 | 205 | } |
| 203 | 206 | |
| 204 | 207 | |
| 208 | + /** |
|
| 209 | + * @param string $query |
|
| 210 | + */ |
|
| 205 | 211 | function security_query_check_bad_words($query) { |
| 206 | 212 | global $user, $dm_change_legit, $mm_change_legit; |
| 207 | 213 | |
@@ -55,6 +55,9 @@ |
||
| 55 | 55 | return true; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | + /** |
|
| 59 | + * @param string $query_string |
|
| 60 | + */ |
|
| 58 | 61 | function mysql_query($query_string) { |
| 59 | 62 | return mysql_query($query_string, $this->link); |
| 60 | 63 | } |
@@ -47,6 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * constuctor |
| 50 | + * @param template $template |
|
| 50 | 51 | */ |
| 51 | 52 | function template_compile(&$template) |
| 52 | 53 | { |
@@ -463,6 +464,7 @@ discard block |
||
| 463 | 464 | * Compile IF tags - much of this is from Smarty with |
| 464 | 465 | * some adaptions for our block level methods |
| 465 | 466 | * @access private |
| 467 | + * @param boolean $elseif |
|
| 466 | 468 | */ |
| 467 | 469 | function compile_tag_if($tag_args, $elseif) |
| 468 | 470 | { |
@@ -620,6 +622,7 @@ discard block |
||
| 620 | 622 | /** |
| 621 | 623 | * Compile DEFINE tags |
| 622 | 624 | * @access private |
| 625 | + * @param boolean $op |
|
| 623 | 626 | */ |
| 624 | 627 | function compile_tag_define($tag_args, $op) |
| 625 | 628 | { |
@@ -698,6 +701,7 @@ discard block |
||
| 698 | 701 | * parse expression |
| 699 | 702 | * This is from Smarty |
| 700 | 703 | * @access private |
| 704 | + * @param string $is_arg |
|
| 701 | 705 | */ |
| 702 | 706 | function _parse_is_expr($is_arg, $tokens) |
| 703 | 707 | { |
@@ -794,6 +798,8 @@ discard block |
||
| 794 | 798 | * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above. |
| 795 | 799 | * NOTE: does not expect a trailing "." on the blockname. |
| 796 | 800 | * @access private |
| 801 | + * @param string $blockname |
|
| 802 | + * @param boolean $include_last_iterator |
|
| 797 | 803 | */ |
| 798 | 804 | function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) |
| 799 | 805 | { |
@@ -832,6 +838,7 @@ discard block |
||
| 832 | 838 | /** |
| 833 | 839 | * Write compiled file to cache directory |
| 834 | 840 | * @access private |
| 841 | + * @param string $data |
|
| 835 | 842 | */ |
| 836 | 843 | function compile_write($handle, $data) |
| 837 | 844 | { |
@@ -857,6 +864,7 @@ discard block |
||
| 857 | 864 | /** |
| 858 | 865 | * Minifies template w/i PHP code by removing extra spaces |
| 859 | 866 | * @access private |
| 867 | + * @return string |
|
| 860 | 868 | */ |
| 861 | 869 | function minify($html) |
| 862 | 870 | { |
@@ -66,8 +66,7 @@ discard block |
||
| 66 | 66 | { |
| 67 | 67 | return; |
| 68 | 68 | trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR); |
| 69 | - } |
|
| 70 | - else |
|
| 69 | + } else |
|
| 71 | 70 | { |
| 72 | 71 | $this->template->files[$handle] = $this->template->files_inherit[$handle]; |
| 73 | 72 | } |
@@ -225,15 +224,13 @@ discard block |
||
| 225 | 224 | $var = substr($temp, 2, -1); |
| 226 | 225 | //$file = $this->template->_tpldata['DEFINE']['.'][$var]; |
| 227 | 226 | $temp = "\$this->_tpldata['DEFINE']['.']['$var']"; |
| 228 | - } |
|
| 229 | - else |
|
| 227 | + } else |
|
| 230 | 228 | { |
| 231 | 229 | $var = substr($temp, 1, -1); |
| 232 | 230 | //$file = $this->template->_rootref[$var]; |
| 233 | 231 | $temp = "\$this->_rootref['$var']"; |
| 234 | 232 | } |
| 235 | - } |
|
| 236 | - else |
|
| 233 | + } else |
|
| 237 | 234 | { |
| 238 | 235 | $file = $temp; |
| 239 | 236 | } |
@@ -381,8 +378,7 @@ discard block |
||
| 381 | 378 | if ($match[2] < 0) |
| 382 | 379 | { |
| 383 | 380 | $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')'; |
| 384 | - } |
|
| 385 | - else |
|
| 381 | + } else |
|
| 386 | 382 | { |
| 387 | 383 | $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')'; |
| 388 | 384 | } |
@@ -390,17 +386,14 @@ discard block |
||
| 390 | 386 | if (strlen($match[3]) < 1 || $match[3] == -1) |
| 391 | 387 | { |
| 392 | 388 | $loop_end = '$_' . $tag_args . '_count'; |
| 393 | - } |
|
| 394 | - else if ($match[3] >= 0) |
|
| 389 | + } else if ($match[3] >= 0) |
|
| 395 | 390 | { |
| 396 | 391 | $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')'; |
| 397 | - } |
|
| 398 | - else //if ($match[3] < -1) |
|
| 392 | + } else //if ($match[3] < -1) |
|
| 399 | 393 | { |
| 400 | 394 | $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1); |
| 401 | 395 | } |
| 402 | - } |
|
| 403 | - else |
|
| 396 | + } else |
|
| 404 | 397 | { |
| 405 | 398 | $loop_start = 0; |
| 406 | 399 | $loop_end = '$_' . $tag_args . '_count'; |
@@ -413,8 +406,7 @@ discard block |
||
| 413 | 406 | { |
| 414 | 407 | // We need to implode $no_nesting times from the end... |
| 415 | 408 | $block = array_slice($this->block_names, -$no_nesting); |
| 416 | - } |
|
| 417 | - else |
|
| 409 | + } else |
|
| 418 | 410 | { |
| 419 | 411 | $block = $this->block_names; |
| 420 | 412 | } |
@@ -424,8 +416,7 @@ discard block |
||
| 424 | 416 | // Block is not nested. |
| 425 | 417 | $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;"; |
| 426 | 418 | $varref = "\$this->_tpldata['$tag_args']"; |
| 427 | - } |
|
| 428 | - else |
|
| 419 | + } else |
|
| 429 | 420 | { |
| 430 | 421 | // This block is nested. |
| 431 | 422 | // Generate a namespace string for this block. |
@@ -573,8 +564,7 @@ discard block |
||
| 573 | 564 | if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs)) |
| 574 | 565 | { |
| 575 | 566 | $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']'); |
| 576 | - } |
|
| 577 | - else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs)) |
|
| 567 | + } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs)) |
|
| 578 | 568 | { |
| 579 | 569 | // Allow checking if loops are set with .loopname |
| 580 | 570 | // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example |
@@ -590,8 +580,7 @@ discard block |
||
| 590 | 580 | |
| 591 | 581 | // Add the block reference for the last child. |
| 592 | 582 | $varref .= "['" . $block . "']"; |
| 593 | - } |
|
| 594 | - else |
|
| 583 | + } else |
|
| 595 | 584 | { |
| 596 | 585 | $varref = '$this->_tpldata'; |
| 597 | 586 | |
@@ -599,8 +588,7 @@ discard block |
||
| 599 | 588 | $varref .= "['" . $blocks[0] . "']"; |
| 600 | 589 | } |
| 601 | 590 | $token = "sizeof($varref)"; |
| 602 | - } |
|
| 603 | - else if (!empty($token)) |
|
| 591 | + } else if (!empty($token)) |
|
| 604 | 592 | { |
| 605 | 593 | $token = '(' . $token . ')'; |
| 606 | 594 | } |
@@ -645,8 +633,7 @@ discard block |
||
| 645 | 633 | |
| 646 | 634 | // Now replace the php code |
| 647 | 635 | $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'"; |
| 648 | - } |
|
| 649 | - else |
|
| 636 | + } else |
|
| 650 | 637 | { |
| 651 | 638 | preg_match('#true|false|\.#i', $match[4], $type); |
| 652 | 639 | |
@@ -708,8 +695,7 @@ discard block |
||
| 708 | 695 | { |
| 709 | 696 | $negate_expr = true; |
| 710 | 697 | $expr_type = array_shift($tokens); |
| 711 | - } |
|
| 712 | - else |
|
| 698 | + } else |
|
| 713 | 699 | { |
| 714 | 700 | $expr_type = $first_token; |
| 715 | 701 | } |
@@ -722,8 +708,7 @@ discard block |
||
| 722 | 708 | $expr_end++; |
| 723 | 709 | $expr_arg = $tokens[$expr_end++]; |
| 724 | 710 | $expr = "!(($is_arg / $expr_arg) % $expr_arg)"; |
| 725 | - } |
|
| 726 | - else |
|
| 711 | + } else |
|
| 727 | 712 | { |
| 728 | 713 | $expr = "!($is_arg & 1)"; |
| 729 | 714 | } |
@@ -735,8 +720,7 @@ discard block |
||
| 735 | 720 | $expr_end++; |
| 736 | 721 | $expr_arg = $tokens[$expr_end++]; |
| 737 | 722 | $expr = "(($is_arg / $expr_arg) % $expr_arg)"; |
| 738 | - } |
|
| 739 | - else |
|
| 723 | + } else |
|
| 740 | 724 | { |
| 741 | 725 | $expr = "($is_arg & 1)"; |
| 742 | 726 | } |
@@ -818,12 +802,10 @@ discard block |
||
| 818 | 802 | $varref .= '[$_' . $blocks[$blockcount] . '_i]'; |
| 819 | 803 | } |
| 820 | 804 | return $varref; |
| 821 | - } |
|
| 822 | - else if ($include_last_iterator) |
|
| 805 | + } else if ($include_last_iterator) |
|
| 823 | 806 | { |
| 824 | 807 | return '$_'. $blocks[$blockcount] . '_val'; |
| 825 | - } |
|
| 826 | - else |
|
| 808 | + } else |
|
| 827 | 809 | { |
| 828 | 810 | return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']'; |
| 829 | 811 | } |
@@ -173,6 +173,9 @@ |
||
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
| 176 | + /** |
|
| 177 | + * @param string $path |
|
| 178 | + */ |
|
| 176 | 179 | protected function lng_try_filepath($path, $file_path_relative) { |
| 177 | 180 | $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative; |
| 178 | 181 | return file_exists($file_path) ? $file_path : false; |