@@ -474,7 +474,7 @@ |
||
| 474 | 474 | * Used by fatal_error(), fatal_lang_error() |
| 475 | 475 | * |
| 476 | 476 | * @param string $error The error |
| 477 | - * @param array $sprintf An array of data to be sprintf()'d into the specified message |
|
| 477 | + * @param boolean $sprintf An array of data to be sprintf()'d into the specified message |
|
| 478 | 478 | */ |
| 479 | 479 | function log_error_online($error, $sprintf = array()) |
| 480 | 480 | { |
@@ -807,7 +807,7 @@ |
||
| 807 | 807 | /** |
| 808 | 808 | * Send a group of emails from the mail queue. |
| 809 | 809 | * |
| 810 | - * @param bool|int $number The number to send each loop through or false to use the standard limits |
|
| 810 | + * @param integer $number The number to send each loop through or false to use the standard limits |
|
| 811 | 811 | * @param bool $override_limit Whether to bypass the limit |
| 812 | 812 | * @param bool $force_send Whether to forcibly send the messages now (useful when using cron jobs) |
| 813 | 813 | * @return bool Whether things were sent |
@@ -1717,7 +1717,7 @@ discard block |
||
| 1717 | 1717 | /** |
| 1718 | 1718 | * Show today's birthdays. |
| 1719 | 1719 | * @param string $output_method The output method. If 'echo', displays a list of users, otherwise returns an array of info about them. |
| 1720 | - * @return void|array Displays a list of users or returns an array of info about them depending on output_method. |
|
| 1720 | + * @return null|string Displays a list of users or returns an array of info about them depending on output_method. |
|
| 1721 | 1721 | */ |
| 1722 | 1722 | function ssi_todaysBirthdays($output_method = 'echo') |
| 1723 | 1723 | { |
@@ -1746,7 +1746,7 @@ discard block |
||
| 1746 | 1746 | /** |
| 1747 | 1747 | * Shows today's holidays. |
| 1748 | 1748 | * @param string $output_method The output method. If 'echo', displays a list of holidays, otherwise returns an array of info about them. |
| 1749 | - * @return void|array Displays a list of holidays or returns an array of info about them depending on output_method |
|
| 1749 | + * @return null|string Displays a list of holidays or returns an array of info about them depending on output_method |
|
| 1750 | 1750 | */ |
| 1751 | 1751 | function ssi_todaysHolidays($output_method = 'echo') |
| 1752 | 1752 | { |
@@ -1773,7 +1773,7 @@ discard block |
||
| 1773 | 1773 | |
| 1774 | 1774 | /** |
| 1775 | 1775 | * @param string $output_method The output method. If 'echo', displays a list of events, otherwise returns an array of info about them. |
| 1776 | - * @return void|array Displays a list of events or returns an array of info about them depending on output_method |
|
| 1776 | + * @return null|string Displays a list of events or returns an array of info about them depending on output_method |
|
| 1777 | 1777 | */ |
| 1778 | 1778 | function ssi_todaysEvents($output_method = 'echo') |
| 1779 | 1779 | { |
@@ -1807,7 +1807,7 @@ discard block |
||
| 1807 | 1807 | /** |
| 1808 | 1808 | * Shows today's calendar items (events, birthdays and holidays) |
| 1809 | 1809 | * @param string $output_method The output method. If 'echo', displays a list of calendar items, otherwise returns an array of info about them. |
| 1810 | - * @return void|array Displays a list of calendar items or returns an array of info about them depending on output_method |
|
| 1810 | + * @return null|string Displays a list of calendar items or returns an array of info about them depending on output_method |
|
| 1811 | 1811 | */ |
| 1812 | 1812 | function ssi_todaysCalendar($output_method = 'echo') |
| 1813 | 1813 | { |
@@ -2198,7 +2198,7 @@ discard block |
||
| 2198 | 2198 | * @param int|string $id The ID or username of a user |
| 2199 | 2199 | * @param string $password The password to check |
| 2200 | 2200 | * @param bool $is_username If true, treats $id as a username rather than a user ID |
| 2201 | - * @return bool Whether or not the password is correct. |
|
| 2201 | + * @return null|boolean Whether or not the password is correct. |
|
| 2202 | 2202 | */ |
| 2203 | 2203 | function ssi_checkPassword($id = null, $password = null, $is_username = false) |
| 2204 | 2204 | { |
@@ -273,7 +273,6 @@ |
||
| 273 | 273 | * Modify any setting related to topics. |
| 274 | 274 | * Requires the admin_forum permission. |
| 275 | 275 | * Accessed from ?action=admin;area=postsettings;sa=topics. |
| 276 | - |
|
| 277 | 276 | * @param bool $return_config Whether or not to return the config_vars array (used for admin search) |
| 278 | 277 | * @return void|array Returns nothing or returns $config_vars if $return_config is true |
| 279 | 278 | * @uses Admin template, edit_topic_settings sub-template. |
@@ -694,7 +694,6 @@ |
||
| 694 | 694 | * It shows as the maintain_forum admin area. |
| 695 | 695 | * It is accessed from ?action=admin;area=maintain;sa=database;activity=optimize. |
| 696 | 696 | * It also updates the optimize scheduled task such that the tables are not automatically optimized again too soon. |
| 697 | - |
|
| 698 | 697 | * @uses the optimize sub template |
| 699 | 698 | */ |
| 700 | 699 | function OptimizeTables() |
@@ -393,6 +393,9 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | // Used to direct the user to another location. |
| 396 | +/** |
|
| 397 | + * @param string $location |
|
| 398 | + */ |
|
| 396 | 399 | function redirectLocation($location, $addForm = true) |
| 397 | 400 | { |
| 398 | 401 | global $upgradeurl, $upcontext, $command_line; |
@@ -1573,6 +1576,9 @@ discard block |
||
| 1573 | 1576 | return addslashes(preg_replace(array('~^\.([/\\\]|$)~', '~[/]+~', '~[\\\]+~', '~[/\\\]$~'), array($install_path . '$1', '/', '\\', ''), $path)); |
| 1574 | 1577 | } |
| 1575 | 1578 | |
| 1579 | +/** |
|
| 1580 | + * @param string $filename |
|
| 1581 | + */ |
|
| 1576 | 1582 | function parse_sql($filename) |
| 1577 | 1583 | { |
| 1578 | 1584 | global $db_prefix, $db_collation, $boarddir, $boardurl, $command_line, $file_steps, $step_progress, $custom_warning; |
@@ -1607,6 +1613,10 @@ discard block |
||
| 1607 | 1613 | |
| 1608 | 1614 | // Our custom error handler - does nothing but does stop public errors from XML! |
| 1609 | 1615 | set_error_handler( |
| 1616 | + |
|
| 1617 | + /** |
|
| 1618 | + * @param string $errno |
|
| 1619 | + */ |
|
| 1610 | 1620 | function ($errno, $errstr, $errfile, $errline) use ($support_js) |
| 1611 | 1621 | { |
| 1612 | 1622 | if ($support_js) |
@@ -1853,6 +1863,9 @@ discard block |
||
| 1853 | 1863 | return true; |
| 1854 | 1864 | } |
| 1855 | 1865 | |
| 1866 | +/** |
|
| 1867 | + * @param string $string |
|
| 1868 | + */ |
|
| 1856 | 1869 | function upgrade_query($string, $unbuffered = false) |
| 1857 | 1870 | { |
| 1858 | 1871 | global $db_connection, $db_server, $db_user, $db_passwd, $db_type, $command_line, $upcontext, $upgradeurl, $modSettings; |
@@ -4512,7 +4525,7 @@ discard block |
||
| 4512 | 4525 | * @param int $setSize The amount of entries after which to update the database. |
| 4513 | 4526 | * |
| 4514 | 4527 | * newCol needs to be a varbinary(16) null able field |
| 4515 | - * @return bool |
|
| 4528 | + * @return boolean|null |
|
| 4516 | 4529 | */ |
| 4517 | 4530 | function MySQLConvertOldIp($targetTable, $oldCol, $newCol, $limit = 50000, $setSize = 100) |
| 4518 | 4531 | { |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | |
| 83 | 83 | // The helper is crucial. Include it first thing. |
| 84 | 84 | if (!file_exists($upgrade_path . '/upgrade-helper.php')) |
| 85 | - die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.'); |
|
| 85 | + die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.'); |
|
| 86 | 86 | |
| 87 | 87 | require_once($upgrade_path . '/upgrade-helper.php'); |
| 88 | 88 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * Display a list of upcoming events, birthdays, and holidays. |
| 69 | 69 | * |
| 70 | 70 | * @param string $grid_name The grid name |
| 71 | - * @return void|bool Returns false if the grid doesn't exist. |
|
| 71 | + * @return false|null Returns false if the grid doesn't exist. |
|
| 72 | 72 | */ |
| 73 | 73 | function template_show_upcoming_list($grid_name) |
| 74 | 74 | { |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | * |
| 239 | 239 | * @param string $grid_name The grid name |
| 240 | 240 | * @param bool $is_mini Is this a mini grid? |
| 241 | - * @return void|bool Returns false if the grid doesn't exist. |
|
| 241 | + * @return false|null Returns false if the grid doesn't exist. |
|
| 242 | 242 | */ |
| 243 | 243 | function template_show_month_grid($grid_name, $is_mini = false) |
| 244 | 244 | { |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | * Shows a weekly grid |
| 524 | 524 | * |
| 525 | 525 | * @param string $grid_name The name of the grid |
| 526 | - * @return void|bool Returns false if the grid doesn't exist |
|
| 526 | + * @return false|null Returns false if the grid doesn't exist |
|
| 527 | 527 | */ |
| 528 | 528 | function template_show_week_grid($grid_name) |
| 529 | 529 | { |
@@ -437,9 +437,9 @@ discard block |
||
| 437 | 437 | { |
| 438 | 438 | // Sort events by start time (all day events will be listed first) |
| 439 | 439 | uasort($day['events'], function($a, $b) { |
| 440 | - if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 441 | - return 0; |
|
| 442 | - return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 440 | + if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 441 | + return 0; |
|
| 442 | + return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 443 | 443 | }); |
| 444 | 444 | |
| 445 | 445 | echo ' |
@@ -619,9 +619,9 @@ discard block |
||
| 619 | 619 | { |
| 620 | 620 | // Sort events by start time (all day events will be listed first) |
| 621 | 621 | uasort($day['events'], function($a, $b) { |
| 622 | - if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 623 | - return 0; |
|
| 624 | - return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 622 | + if ($a['start_timestamp'] == $b['start_timestamp']) |
|
| 623 | + return 0; |
|
| 624 | + return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1; |
|
| 625 | 625 | }); |
| 626 | 626 | |
| 627 | 627 | foreach ($day['events'] as $event) |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | * - caches the formatting data from the setting for optimization. |
| 677 | 677 | * |
| 678 | 678 | * @param float $number A number |
| 679 | - * @param bool|int $override_decimal_count If set, will use the specified number of decimal places. Otherwise it's automatically determined |
|
| 679 | + * @param integer $override_decimal_count If set, will use the specified number of decimal places. Otherwise it's automatically determined |
|
| 680 | 680 | * @return string A formatted number |
| 681 | 681 | */ |
| 682 | 682 | function comma_format($number, $override_decimal_count = false) |
@@ -5527,7 +5527,7 @@ discard block |
||
| 5527 | 5527 | * It assumes the data is already a string. |
| 5528 | 5528 | * @param string $data The data to print |
| 5529 | 5529 | * @param string $type The content type. Defaults to Json. |
| 5530 | - * @return void |
|
| 5530 | + * @return false|null |
|
| 5531 | 5531 | */ |
| 5532 | 5532 | function smf_serverResponse($data = '', $type = 'Content-Type: application/json') |
| 5533 | 5533 | { |
@@ -5475,7 +5475,6 @@ discard block |
||
| 5475 | 5475 | |
| 5476 | 5476 | /** |
| 5477 | 5477 | * Tries different modes to make file/dirs writable. Wrapper function for chmod() |
| 5478 | - |
|
| 5479 | 5478 | * @param string $file The file/dir full path. |
| 5480 | 5479 | * @param int $value Not needed, added for legacy reasons. |
| 5481 | 5480 | * @return boolean true if the file/dir is already writable or the function was able to make it writable, false if the function couldn't make the file/dir writable. |
@@ -5515,7 +5514,6 @@ discard block |
||
| 5515 | 5514 | |
| 5516 | 5515 | /** |
| 5517 | 5516 | * Wrapper function for json_decode() with error handling. |
| 5518 | - |
|
| 5519 | 5517 | * @param string $json The string to decode. |
| 5520 | 5518 | * @param bool $returnAsArray To return the decoded string as an array or an object, SMF only uses Arrays but to keep on compatibility with json_decode its set to false as default. |
| 5521 | 5519 | * @param bool $logIt To specify if the error will be logged if theres any. |
@@ -6006,7 +6004,7 @@ discard block |
||
| 6006 | 6004 | $cont = stream_context_get_params($read); |
| 6007 | 6005 | $result = isset($cont["options"]["ssl"]["peer_certificate"]) ? true : false; |
| 6008 | 6006 | } |
| 6009 | - return $result; |
|
| 6007 | + return $result; |
|
| 6010 | 6008 | } |
| 6011 | 6009 | |
| 6012 | 6010 | /** |
@@ -2259,9 +2259,9 @@ discard block |
||
| 2259 | 2259 | * |
| 2260 | 2260 | * @uses the template_include() function to include the file. |
| 2261 | 2261 | * @param string $template_name The name of the template to load |
| 2262 | - * @param array|string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load |
|
| 2262 | + * @param string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load |
|
| 2263 | 2263 | * @param bool $fatal If true, dies with an error message if the template cannot be found |
| 2264 | - * @return boolean Whether or not the template was loaded |
|
| 2264 | + * @return boolean|null Whether or not the template was loaded |
|
| 2265 | 2265 | */ |
| 2266 | 2266 | function loadTemplate($template_name, $style_sheets = array(), $fatal = true) |
| 2267 | 2267 | { |
@@ -2444,7 +2444,7 @@ discard block |
||
| 2444 | 2444 | * - all code added with this function is added to the same <style> tag so do make sure your css is valid! |
| 2445 | 2445 | * |
| 2446 | 2446 | * @param string $css Some css code |
| 2447 | - * @return void|bool Adds the CSS to the $context['css_header'] array or returns if no CSS is specified |
|
| 2447 | + * @return false|null Adds the CSS to the $context['css_header'] array or returns if no CSS is specified |
|
| 2448 | 2448 | */ |
| 2449 | 2449 | function addInlineCss($css) |
| 2450 | 2450 | { |
@@ -2558,7 +2558,7 @@ discard block |
||
| 2558 | 2558 | * |
| 2559 | 2559 | * @param string $javascript Some JS code |
| 2560 | 2560 | * @param bool $defer Whether the script should load in <head> or before the closing <html> tag |
| 2561 | - * @return void|bool Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified |
|
| 2561 | + * @return false|null Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified |
|
| 2562 | 2562 | */ |
| 2563 | 2563 | function addInlineJavaScript($javascript, $defer = false) |
| 2564 | 2564 | { |
@@ -2791,7 +2791,7 @@ discard block |
||
| 2791 | 2791 | * It will try to choose only utf8 or non-utf8 languages. |
| 2792 | 2792 | * |
| 2793 | 2793 | * @param bool $use_cache Whether or not to use the cache |
| 2794 | - * @return array An array of information about available languages |
|
| 2794 | + * @return string An array of information about available languages |
|
| 2795 | 2795 | */ |
| 2796 | 2796 | function getLanguages($use_cache = true) |
| 2797 | 2797 | { |