@@ -207,6 +207,9 @@ discard block |
||
207 | 207 | // MD5 Encryption. |
208 | 208 | if (!function_exists('md5_hmac')) |
209 | 209 | { |
210 | + /** |
|
211 | + * @param string $key |
|
212 | + */ |
|
210 | 213 | function md5_hmac($data, $key) |
211 | 214 | { |
212 | 215 | if (strlen($key) > 64) |
@@ -441,6 +444,9 @@ discard block |
||
441 | 444 | } |
442 | 445 | |
443 | 446 | // Used to direct the user to another location. |
447 | +/** |
|
448 | + * @param string $location |
|
449 | + */ |
|
444 | 450 | function redirectLocation($location, $addForm = true) |
445 | 451 | { |
446 | 452 | global $upgradeurl, $upcontext, $command_line; |
@@ -2128,6 +2134,9 @@ discard block |
||
2128 | 2134 | return addslashes(preg_replace(array('~^\.([/\\\]|$)~', '~[/]+~', '~[\\\]+~', '~[/\\\]$~'), array($install_path . '$1', '/', '\\', ''), $path)); |
2129 | 2135 | } |
2130 | 2136 | |
2137 | +/** |
|
2138 | + * @param string $filename |
|
2139 | + */ |
|
2131 | 2140 | function parse_sql($filename) |
2132 | 2141 | { |
2133 | 2142 | global $db_prefix, $db_collation, $boarddir, $boardurl, $command_line, $file_steps, $step_progress, $custom_warning; |
@@ -2414,6 +2423,9 @@ discard block |
||
2414 | 2423 | return true; |
2415 | 2424 | } |
2416 | 2425 | |
2426 | +/** |
|
2427 | + * @param string $string |
|
2428 | + */ |
|
2417 | 2429 | function upgrade_query($string, $unbuffered = false) |
2418 | 2430 | { |
2419 | 2431 | global $db_connection, $db_server, $db_user, $db_passwd, $db_type, $command_line, $upcontext, $upgradeurl, $modSettings; |
@@ -3043,6 +3055,9 @@ discard block |
||
3043 | 3055 | $upcontext['current_step'] = 1; |
3044 | 3056 | } |
3045 | 3057 | |
3058 | +/** |
|
3059 | + * @param string $message |
|
3060 | + */ |
|
3046 | 3061 | function print_error($message, $fatal = false) |
3047 | 3062 | { |
3048 | 3063 | static $fp = null; |
@@ -3056,6 +3071,9 @@ discard block |
||
3056 | 3071 | exit; |
3057 | 3072 | } |
3058 | 3073 | |
3074 | +/** |
|
3075 | + * @param string $message |
|
3076 | + */ |
|
3059 | 3077 | function throw_error($message) |
3060 | 3078 | { |
3061 | 3079 | global $upcontext; |
@@ -3489,95 +3489,95 @@ |
||
3489 | 3489 | // Translation table for the character sets not native for MySQL. |
3490 | 3490 | $translation_tables = array( |
3491 | 3491 | 'windows-1255' => array( |
3492 | - '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
3493 | - '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
3494 | - '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
3495 | - '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
3496 | - '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
3497 | - '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
3498 | - '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '\'\'', |
|
3499 | - '0xFC' => '\'\'', '0xFF' => '\'\'', '0xC2' => '0xFF', |
|
3500 | - '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
3501 | - '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
3502 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
3503 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
3504 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
3505 | - '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
3506 | - '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
3507 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
3508 | - '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
3509 | - '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
3510 | - '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
3511 | - '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
3512 | - '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
3513 | - '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
3514 | - '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
3515 | - '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
3516 | - '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
3517 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
3518 | - '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
3519 | - '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
3520 | - '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
3521 | - '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
3522 | - '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
3523 | - '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
3524 | - '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
3525 | - '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
3526 | - '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
3527 | - '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
3528 | - '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
3529 | - '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
3530 | - '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
3531 | - '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
3532 | - '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
3533 | - '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
3534 | - '0xFA' => '0xD7AA', '0xFF' => '0xD6B2', '0xFC' => '0xE282AC', |
|
3492 | + '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
3493 | + '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
3494 | + '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
3495 | + '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
3496 | + '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
3497 | + '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
3498 | + '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '\'\'', |
|
3499 | + '0xFC' => '\'\'', '0xFF' => '\'\'', '0xC2' => '0xFF', |
|
3500 | + '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
3501 | + '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
3502 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
3503 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
3504 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
3505 | + '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
3506 | + '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
3507 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
3508 | + '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
3509 | + '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
3510 | + '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
3511 | + '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
3512 | + '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
3513 | + '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
3514 | + '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
3515 | + '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
3516 | + '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
3517 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
3518 | + '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
3519 | + '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
3520 | + '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
3521 | + '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
3522 | + '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
3523 | + '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
3524 | + '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
3525 | + '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
3526 | + '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
3527 | + '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
3528 | + '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
3529 | + '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
3530 | + '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
3531 | + '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
3532 | + '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
3533 | + '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
3534 | + '0xFA' => '0xD7AA', '0xFF' => '0xD6B2', '0xFC' => '0xE282AC', |
|
3535 | 3535 | '0xFB' => '0xD792', |
3536 | 3536 | ), |
3537 | 3537 | 'windows-1253' => array( |
3538 | - '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
3539 | - '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
3540 | - '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
3541 | - '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
3542 | - '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
3543 | - '0xD2' => '\'\'', '0xFF' => '\'\'', '0xCE' => '0xCE9E', |
|
3544 | - '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
3545 | - '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
3546 | - '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
3547 | - '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
3548 | - '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
3549 | - '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
3550 | - '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
3551 | - '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
3552 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
3553 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
3554 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
3555 | - '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
3556 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
3557 | - '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
3558 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
3559 | - '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
3560 | - '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
3561 | - '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
3562 | - '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
3563 | - '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
3564 | - '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
3565 | - '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
3566 | - '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
3567 | - '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
3568 | - '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
3569 | - '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
3570 | - '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
3571 | - '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
3572 | - '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
3573 | - '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
3574 | - '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
3575 | - '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
3576 | - '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
3577 | - '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
3578 | - '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
3579 | - '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
3580 | - '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', '0xFF' => '0xCE92', |
|
3538 | + '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
3539 | + '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
3540 | + '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
3541 | + '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
3542 | + '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
3543 | + '0xD2' => '\'\'', '0xFF' => '\'\'', '0xCE' => '0xCE9E', |
|
3544 | + '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
3545 | + '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
3546 | + '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
3547 | + '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
3548 | + '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
3549 | + '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
3550 | + '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
3551 | + '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
3552 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
3553 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
3554 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
3555 | + '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
3556 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
3557 | + '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
3558 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
3559 | + '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
3560 | + '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
3561 | + '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
3562 | + '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
3563 | + '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
3564 | + '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
3565 | + '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
3566 | + '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
3567 | + '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
3568 | + '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
3569 | + '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
3570 | + '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
3571 | + '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
3572 | + '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
3573 | + '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
3574 | + '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
3575 | + '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
3576 | + '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
3577 | + '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
3578 | + '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
3579 | + '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
3580 | + '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', '0xFF' => '0xCE92', |
|
3581 | 3581 | '0xD2' => '0xE282AC', |
3582 | 3582 | ), |
3583 | 3583 | ); |
@@ -180,7 +180,7 @@ |
||
180 | 180 | * |
181 | 181 | * @access public |
182 | 182 | * @param string $dir A valid path |
183 | - * @return boolean If this was successful or not. |
|
183 | + * @return boolean|null If this was successful or not. |
|
184 | 184 | */ |
185 | 185 | public function setCachedir($dir = null) |
186 | 186 | { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * Start the curl object |
63 | 63 | * - allow for user override values |
64 | 64 | * |
65 | - * @param array $options An array of cURL options |
|
65 | + * @param integer[] $options An array of cURL options |
|
66 | 66 | * @param int $max_redirect Maximum number of redirects |
67 | 67 | * @return void |
68 | 68 | */ |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | * - calls set_options to set the curl opts array values based on the defaults and user input |
82 | 82 | * |
83 | 83 | * @param string $url the site we are going to fetch |
84 | - * @param array $post_data any post data as form name => value |
|
85 | - * @return object An instance of the curl_fetch_web_data class |
|
84 | + * @param string $post_data any post data as form name => value |
|
85 | + * @return curl_fetch_web_data An instance of the curl_fetch_web_data class |
|
86 | 86 | */ |
87 | 87 | public function get_url_data($url, $post_data = array()) |
88 | 88 | { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | * |
107 | 107 | * @param string $url The site to fetch |
108 | 108 | * @param bool $redirect Whether or not this was a redirect request |
109 | - * @return void|bool Sets various properties of the class or returns false if the URL isn't specified |
|
109 | + * @return false|null Sets various properties of the class or returns false if the URL isn't specified |
|
110 | 110 | */ |
111 | 111 | private function curl_request($url, $redirect = false) |
112 | 112 | { |
@@ -44,6 +44,10 @@ discard block |
||
44 | 44 | $this->Buf = range(0, 279); |
45 | 45 | } |
46 | 46 | |
47 | + /** |
|
48 | + * @param string $data |
|
49 | + * @param integer $datLen |
|
50 | + */ |
|
47 | 51 | public function decompress($data, &$datLen) |
48 | 52 | { |
49 | 53 | $stLen = strlen($data); |
@@ -63,6 +67,11 @@ discard block |
||
63 | 67 | return $ret; |
64 | 68 | } |
65 | 69 | |
70 | + /** |
|
71 | + * @param boolean $bInit |
|
72 | + * |
|
73 | + * @return integer |
|
74 | + */ |
|
66 | 75 | public function LZWCommand(&$data, $bInit) |
67 | 76 | { |
68 | 77 | if ($bInit) |
@@ -253,6 +262,10 @@ discard block |
||
253 | 262 | unset($this->m_nColors, $this->m_arColors); |
254 | 263 | } |
255 | 264 | |
265 | + /** |
|
266 | + * @param string $lpData |
|
267 | + * @param integer $num |
|
268 | + */ |
|
256 | 269 | public function load($lpData, $num) |
257 | 270 | { |
258 | 271 | $this->m_nColors = 0; |
@@ -324,6 +337,9 @@ discard block |
||
324 | 337 | unset($this->m_bSorted, $this->m_nTableSize, $this->m_nBgColor, $this->m_nPixelRatio, $this->m_colorTable); |
325 | 338 | } |
326 | 339 | |
340 | + /** |
|
341 | + * @param integer $hdrLen |
|
342 | + */ |
|
327 | 343 | public function load($lpData, &$hdrLen) |
328 | 344 | { |
329 | 345 | $hdrLen = 0; |
@@ -370,6 +386,10 @@ discard block |
||
370 | 386 | unset($this->m_bInterlace, $this->m_bSorted, $this->m_nTableSize, $this->m_colorTable); |
371 | 387 | } |
372 | 388 | |
389 | + /** |
|
390 | + * @param string $lpData |
|
391 | + * @param integer $hdrLen |
|
392 | + */ |
|
373 | 393 | public function load($lpData, &$hdrLen) |
374 | 394 | { |
375 | 395 | $hdrLen = 0; |
@@ -412,6 +432,10 @@ discard block |
||
412 | 432 | $this->m_lzw = new gif_lzw_compression(); |
413 | 433 | } |
414 | 434 | |
435 | + /** |
|
436 | + * @param string $data |
|
437 | + * @param integer $datLen |
|
438 | + */ |
|
415 | 439 | public function load($data, &$datLen) |
416 | 440 | { |
417 | 441 | $datLen = 0; |
@@ -464,6 +488,10 @@ discard block |
||
464 | 488 | return false; |
465 | 489 | } |
466 | 490 | |
491 | + /** |
|
492 | + * @param string $data |
|
493 | + * @param integer $extLen |
|
494 | + */ |
|
467 | 495 | public function skipExt(&$data, &$extLen) |
468 | 496 | { |
469 | 497 | $extLen = 0; |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | $this->MAX_LZW_BITS = 12; |
39 | 39 | unset($this->Next, $this->Vals, $this->Stack, $this->Buf); |
40 | 40 | |
41 | - $this->Next = range(0, (1 << $this->MAX_LZW_BITS) - 1); |
|
42 | - $this->Vals = range(0, (1 << $this->MAX_LZW_BITS) - 1); |
|
41 | + $this->Next = range(0, (1 << $this->MAX_LZW_BITS) - 1); |
|
42 | + $this->Vals = range(0, (1 << $this->MAX_LZW_BITS) - 1); |
|
43 | 43 | $this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1); |
44 | 44 | $this->Buf = range(0, 279); |
45 | 45 | } |
@@ -278,9 +278,9 @@ discard block |
||
278 | 278 | for ($i = 0; $i < $this->m_nColors; $i++) |
279 | 279 | { |
280 | 280 | $ret .= |
281 | - chr(($this->m_arColors[$i] & 0x000000FF)) . // R |
|
282 | - chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G |
|
283 | - chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B |
|
281 | + chr(($this->m_arColors[$i] & 0x000000FF)) . // R |
|
282 | + chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G |
|
283 | + chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | return $ret; |
@@ -290,14 +290,14 @@ discard block |
||
290 | 290 | { |
291 | 291 | $rgb = intval($rgb) & 0xFFFFFF; |
292 | 292 | $r1 = ($rgb & 0x0000FF); |
293 | - $g1 = ($rgb & 0x00FF00) >> 8; |
|
293 | + $g1 = ($rgb & 0x00FF00) >> 8; |
|
294 | 294 | $b1 = ($rgb & 0xFF0000) >> 16; |
295 | 295 | $idx = -1; |
296 | 296 | |
297 | 297 | for ($i = 0; $i < $this->m_nColors; $i++) |
298 | 298 | { |
299 | 299 | $r2 = ($this->m_arColors[$i] & 0x000000FF); |
300 | - $g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8; |
|
300 | + $g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8; |
|
301 | 301 | $b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16; |
302 | 302 | $d = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1); |
303 | 303 |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | * of elements, an array of xmlArray's is returned for use with foreach. |
258 | 258 | * Example use: |
259 | 259 | * foreach ($xml->set('html/body/p') as $p) |
260 | - * @param $path string The path to search for. |
|
260 | + * @param string $path string The path to search for. |
|
261 | 261 | * @return array An array of xmlArray objects |
262 | 262 | */ |
263 | 263 | public function set($path) |
@@ -855,7 +855,7 @@ discard block |
||
855 | 855 | * Changes a files atrributes (chmod) |
856 | 856 | * |
857 | 857 | * @param string $ftp_file The file to CHMOD |
858 | - * @param int|string $chmod The value for the CHMOD operation |
|
858 | + * @param integer $chmod The value for the CHMOD operation |
|
859 | 859 | * @return boolean Whether or not the operation was successful |
860 | 860 | */ |
861 | 861 | public function chmod($ftp_file, $chmod) |
@@ -1025,7 +1025,7 @@ discard block |
||
1025 | 1025 | * |
1026 | 1026 | * @param string $ftp_path The path to the directory |
1027 | 1027 | * @param bool $search Whether or not to get a recursive directory listing |
1028 | - * @return string|boolean The results of the command or false if unsuccessful |
|
1028 | + * @return false|string The results of the command or false if unsuccessful |
|
1029 | 1029 | */ |
1030 | 1030 | public function list_dir($ftp_path = '', $search = false) |
1031 | 1031 | { |
@@ -1070,7 +1070,7 @@ discard block |
||
1070 | 1070 | * |
1071 | 1071 | * @param string $file The name of a file |
1072 | 1072 | * @param string $listing A directory listing or null to generate one |
1073 | - * @return string|boolean The name of the file or false if it wasn't found |
|
1073 | + * @return string|false The name of the file or false if it wasn't found |
|
1074 | 1074 | */ |
1075 | 1075 | public function locate($file, $listing = null) |
1076 | 1076 | { |
@@ -56,6 +56,7 @@ discard block |
||
56 | 56 | * @param array $wordsSearch Search words |
57 | 57 | * @param array $wordsExclude Words to exclude |
58 | 58 | * @param bool $isExcluded Whether the specfied word should be excluded |
59 | + * @return void |
|
59 | 60 | */ |
60 | 61 | public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude, $isExcluded); |
61 | 62 | |
@@ -130,7 +131,7 @@ discard block |
||
130 | 131 | * @param array $excludedIndexWords Indexed words that should be excluded |
131 | 132 | * @param array $participants |
132 | 133 | * @param array $searchArray |
133 | - * @return mixed |
|
134 | + * @return integer |
|
134 | 135 | */ |
135 | 136 | public function searchQuery(array $query_params, array $searchWords, array $excludedIndexWords, array &$participants, array &$searchArray); |
136 | 137 | } |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | /** |
280 | 280 | * Generate the timestamp for the calculation |
281 | 281 | * |
282 | - * @return integer Timestamp |
|
282 | + * @return double Timestamp |
|
283 | 283 | */ |
284 | 284 | public function generateTimestamp() |
285 | 285 | { |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | * Truncate the given hash down to just what we need |
291 | 291 | * |
292 | 292 | * @param string $hash Hash to truncate |
293 | - * @return string Truncated hash value |
|
293 | + * @return integer Truncated hash value |
|
294 | 294 | */ |
295 | 295 | public function truncateHash($hash) |
296 | 296 | { |
@@ -518,7 +518,7 @@ |
||
518 | 518 | * @param array $parameters Not used? |
519 | 519 | * @param string $if_exists What to do if the index exists. If 'update', the definition will be updated. |
520 | 520 | * @param string $error |
521 | - * @return boolean Whether or not the operation was successful |
|
521 | + * @return false|null Whether or not the operation was successful |
|
522 | 522 | */ |
523 | 523 | function smf_db_add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal') |
524 | 524 | { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * |
176 | 176 | * @param string $post_errors A string of info about errors encountered trying to save this draft |
177 | 177 | * @param array $recipientList An array of data about who this PM is being sent to |
178 | - * @return boolean false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise |
|
178 | + * @return boolean|null false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise |
|
179 | 179 | */ |
180 | 180 | function SavePMDraft(&$post_errors, $recipientList) |
181 | 181 | { |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | * |
394 | 394 | * @param int $id_draft The ID of the draft to delete |
395 | 395 | * @param boolean $check Whether or not to check that the draft belongs to the current user |
396 | - * @return boolean False if it couldn't be deleted (doesn't return anything otherwise) |
|
396 | + * @return false|null False if it couldn't be deleted (doesn't return anything otherwise) |
|
397 | 397 | */ |
398 | 398 | function DeleteDraft($id_draft, $check = true) |
399 | 399 | { |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | * @param int $member_id ID of the member to show drafts for |
428 | 428 | * @param boolean|integer If $type is 1, this can be set to only load drafts for posts in the specific topic |
429 | 429 | * @param int $draft_type The type of drafts to show - 0 for post drafts, 1 for PM drafts |
430 | - * @return boolean False if the drafts couldn't be loaded, nothing otherwise |
|
430 | + * @return false|null False if the drafts couldn't be loaded, nothing otherwise |
|
431 | 431 | */ |
432 | 432 | function ShowDrafts($member_id, $topic = false, $draft_type = 0) |
433 | 433 | { |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | * Allows for the deleting and loading/editing of drafts |
512 | 512 | * |
513 | 513 | * @param type $memID |
514 | - * @param type $draft_type |
|
514 | + * @param integer $draft_type |
|
515 | 515 | */ |
516 | 516 | function showProfileDrafts($memID, $draft_type = 0) |
517 | 517 | { |
@@ -664,7 +664,7 @@ discard block |
||
664 | 664 | * Uses the showpmdraft template |
665 | 665 | * Allows for the deleting and loading/editing of drafts |
666 | 666 | * |
667 | - * @param type $memID |
|
667 | + * @param integer $memID |
|
668 | 668 | */ |
669 | 669 | function showPMDrafts($memID = -1) |
670 | 670 | { |