@@ -80,7 +80,7 @@ |
||
| 80 | 80 | /** |
| 81 | 81 | * Handles retrieving previews of news items, newsletters, signatures and warnings. |
| 82 | 82 | * Calls the appropriate function based on $_POST['item'] |
| 83 | - * @return void|bool Returns false if $_POST['item'] isn't set or isn't valid |
|
| 83 | + * @return false|null Returns false if $_POST['item'] isn't set or isn't valid |
|
| 84 | 84 | */ |
| 85 | 85 | function RetrievePreview() |
| 86 | 86 | { |
@@ -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 | { |
@@ -227,7 +227,7 @@ |
||
| 227 | 227 | * @param int|string $verify_id The verification control ID |
| 228 | 228 | * @param string $display_type What type to display. Can be 'single' to only show one verification option or 'all' to show all of them |
| 229 | 229 | * @param bool $reset Whether to reset the internal tracking counter |
| 230 | - * @return bool False if there's nothing else to show, true if $display_type is 'single', nothing otherwise |
|
| 230 | + * @return boolean|null False if there's nothing else to show, true if $display_type is 'single', nothing otherwise |
|
| 231 | 231 | */ |
| 232 | 232 | function template_control_verification($verify_id, $display_type = 'all', $reset = false) |
| 233 | 233 | { |
@@ -83,6 +83,7 @@ |
||
| 83 | 83 | * Redirection topic options |
| 84 | 84 | * |
| 85 | 85 | * @var string $type What type of topic this is for - currently 'merge' or 'move'. Used to display appropriate text strings... |
| 86 | + * @param string $type |
|
| 86 | 87 | */ |
| 87 | 88 | function template_redirect_options($type) |
| 88 | 89 | { |
@@ -1096,7 +1096,7 @@ |
||
| 1096 | 1096 | /** |
| 1097 | 1097 | * CHMOD control form |
| 1098 | 1098 | * |
| 1099 | - * @return bool False if nothing to do. |
|
| 1099 | + * @return false|null False if nothing to do. |
|
| 1100 | 1100 | */ |
| 1101 | 1101 | function template_control_chmod() |
| 1102 | 1102 | { |
@@ -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 | { |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | /** |
| 82 | 82 | * Make files writable. First try to use regular chmod, but if that fails, try to use FTP. |
| 83 | 83 | * |
| 84 | - * @param $files |
|
| 84 | + * @param string[] $files |
|
| 85 | 85 | * @return bool |
| 86 | 86 | */ |
| 87 | 87 | function makeFilesWritable(&$files) |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | /** |
| 323 | 323 | * Prints an error to stderr. |
| 324 | 324 | * |
| 325 | - * @param $message |
|
| 325 | + * @param string $message |
|
| 326 | 326 | * @param bool $fatal |
| 327 | 327 | */ |
| 328 | 328 | function print_error($message, $fatal = false) |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | /** |
| 342 | 342 | * Throws a graphical error message. |
| 343 | 343 | * |
| 344 | - * @param $message |
|
| 344 | + * @param string $message |
|
| 345 | 345 | * @return bool |
| 346 | 346 | */ |
| 347 | 347 | function throw_error($message) |
@@ -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 | { |
@@ -540,6 +540,7 @@ |
||
| 540 | 540 | * @param string $xml_format The format to use ('atom', 'rss', 'rss2' or empty for plain XML) |
| 541 | 541 | * @param array $forceCdataKeys A list of keys on which to force cdata wrapping (used by mods, maybe) |
| 542 | 542 | * @param array $nsKeys Key-value pairs of namespace prefixes to pass to cdata_parse() (used by mods, maybe) |
| 543 | + * @param string $tag |
|
| 543 | 544 | */ |
| 544 | 545 | function dumpTags($data, $i, $tag = null, $xml_format = '', $forceCdataKeys = array(), $nsKeys = array()) |
| 545 | 546 | { |