| @@ -20,8 +20,6 @@ | ||
| 20 | 20 | * @author Michael Albertsen (http://culex.dk) <[email protected]> | 
| 21 | 21 | */ | 
| 22 | 22 | |
| 23 | -use XoopsModules\Smallworld; | |
| 24 | - | |
| 25 | 23 | $moduleDirName = basename(dirname(__DIR__)); | 
| 26 | 24 | require_once __DIR__ . '/../../../include/cp_header.php'; | 
| 27 | 25 | require_once __DIR__ . '/../include/common.php'; | 
| @@ -334,7 +334,7 @@ | ||
| 334 | 334 | * Fetch content of comma separated text file | 
| 335 | 335 | * will attempt to use the fopen method first, then curl, then socket | 
| 336 | 336 | * @param string $url | 
| 337 | - * @param array $methods | |
| 337 | + * @param string[] $methods | |
| 338 | 338 | * @returns string | 
| 339 | 339 | * @return bool|false|string | 
| 340 | 340 | * @return bool|false|string | 
| @@ -41,7 +41,7 @@ | ||
| 41 | 41 | * @param int $mode | 
| 42 | 42 | * @param $redirectFile | 
| 43 | 43 | * | 
| 44 | - * @return bool|string | |
| 44 | + * @return false|string | |
| 45 | 45 | */ | 
| 46 | 46 | public static function getDirectoryStatus($path, $mode = 0777, $redirectFile = null) | 
| 47 | 47 |      { | 
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | * @param string $file_path | 
| 41 | 41 | * @param string|null $original_file_path | 
| 42 | 42 | * @param string $redirectFile | 
| 43 | - * @return bool|string | |
| 43 | + * @return false|string | |
| 44 | 44 | */ | 
| 45 | 45 | public static function getFileStatus($file_path, $original_file_path = null, $redirectFile) | 
| 46 | 46 |      { | 
| @@ -97,8 +97,8 @@ discard block | ||
| 97 | 97 | } | 
| 98 | 98 | |
| 99 | 99 | /** | 
| 100 | - * @param $file1_path | |
| 101 | - * @param $file2_path | |
| 100 | + * @param string $file1_path | |
| 101 | + * @param string $file2_path | |
| 102 | 102 | * | 
| 103 | 103 | * @return bool | 
| 104 | 104 | */ | 
| @@ -23,9 +23,7 @@ | ||
| 23 | 23 | * @author Mamba <[email protected]> | 
| 24 | 24 | */ | 
| 25 | 25 | |
| 26 | -use MyTextSanitizer; | |
| 27 | 26 | use XoopsFormDhtmlTextArea; | 
| 28 | -use XoopsFormTextArea; | |
| 29 | 27 | use XoopsModules\Smallworld; | 
| 30 | 28 | use XoopsModules\Smallworld\Helper; | 
| 31 | 29 | |
| @@ -89,8 +89,8 @@ discard block | ||
| 89 | 89 | * - Remove user image dir in uploads. | 
| 90 | 90 | * @param int $userid | 
| 91 | 91 | * @param string|bool $directory | 
| 92 | - * @param bool|int $empty | |
| 93 | - * @return true | |
| 92 | + * @param boolean $empty | |
| 93 | + * @return boolean|null | |
| 94 | 94 | */ | 
| 95 | 95 | public function smallworld_remDir($userid, $directory, $empty = false) | 
| 96 | 96 |      { | 
| @@ -131,7 +131,7 @@ discard block | ||
| 131 | 131 | * SmallworldDeleteDirectory function | 
| 132 | 132 | * - Delete images from users on delete | 
| 133 | 133 | * @param int $userid | 
| 134 | - * @return true | |
| 134 | + * @return boolean | |
| 135 | 135 | */ | 
| 136 | 136 | public function SmallworldDeleteDirectory($userid) | 
| 137 | 137 |      { | 
| @@ -43,7 +43,7 @@ discard block | ||
| 43 | 43 | /** | 
| 44 | 44 | * @param $fromUserID | 
| 45 | 45 | * @param $toUserID | 
| 46 | - * @param $event | |
| 46 | + * @param string $event | |
| 47 | 47 | * @param null|string $link | 
| 48 | 48 | * @param array $data | 
| 49 | 49 | * @throws \phpmailerException | 
| @@ -209,7 +209,7 @@ discard block | ||
| 209 | 209 | |
| 210 | 210 | /** | 
| 211 | 211 | * @param $msgid | 
| 212 | - * @return mixed | |
| 212 | + * @return string | |
| 213 | 213 | */ | 
| 214 | 214 | public function getOwnerUpdateFromMsgID($msgid) | 
| 215 | 215 |      { | 
| @@ -147,7 +147,7 @@ discard block | ||
| 147 | 147 | |
| 148 | 148 | /** | 
| 149 | 149 | * saveImage function | 
| 150 | - * @param $values | |
| 150 | + * @param string $values | |
| 151 | 151 | * @return void | 
| 152 | 152 | */ | 
| 153 | 153 | public function saveImage($values) | 
| @@ -457,7 +457,7 @@ discard block | ||
| 457 | 457 | * deleteWallMsg function | 
| 458 | 458 | * @param int $id | 
| 459 | 459 | * @param int $smallworld_msg_id | 
| 460 | - * @return true | |
| 460 | + * @return boolean | |
| 461 | 461 | */ | 
| 462 | 462 | public function deleteWallMsg($id, $smallworld_msg_id) | 
| 463 | 463 |      { | 
| @@ -476,7 +476,7 @@ discard block | ||
| 476 | 476 | * deleteWallComment function | 
| 477 | 477 | * - Delete Comments | 
| 478 | 478 | * @param int $smallworld_com_id | 
| 479 | - * @return true | |
| 479 | + * @return boolean | |
| 480 | 480 | */ | 
| 481 | 481 | public function deleteWallComment($smallworld_com_id) | 
| 482 | 482 |      { | 
| @@ -551,7 +551,7 @@ discard block | ||
| 551 | 551 | * SmallworldDeleteDirectory function | 
| 552 | 552 | * - Delete images from users on delete | 
| 553 | 553 | * @param int $userid | 
| 554 | - * @return true | |
| 554 | + * @return boolean | |
| 555 | 555 | */ | 
| 556 | 556 | public function SmallworldDeleteDirectory($userid) | 
| 557 | 557 |      { | 
| @@ -581,8 +581,8 @@ discard block | ||
| 581 | 581 | * - Remove user image dir in uploads. | 
| 582 | 582 | * @param int $userid | 
| 583 | 583 | * @param string|bool $directory | 
| 584 | - * @param bool|int $empty | |
| 585 | - * @return true | |
| 584 | + * @param boolean $empty | |
| 585 | + * @return boolean|null | |
| 586 | 586 | */ | 
| 587 | 587 | public function smallworld_remDir($userid, $directory, $empty = false) | 
| 588 | 588 |      { | 
| @@ -622,6 +622,7 @@ discard block | ||
| 622 | 622 | * Update private settings | 
| 623 | 623 | * @param int id ($userid) | 
| 624 | 624 | * @param string posts (serialized values) | 
| 625 | + * @param string $posts | |
| 625 | 626 | * @return void | 
| 626 | 627 | */ | 
| 627 | 628 | public function saveSettings($id, $posts) | 
| @@ -642,7 +643,7 @@ discard block | ||
| 642 | 643 | /** | 
| 643 | 644 | * Retrieve private settings | 
| 644 | 645 | * @param int userid | 
| 645 | - * @return serialized|string | |
| 646 | + * @return null|string | |
| 646 | 647 | */ | 
| 647 | 648 | public function GetSettings($userid) | 
| 648 | 649 |      { | 
| @@ -226,7 +226,7 @@ discard block | ||
| 226 | 226 | } | 
| 227 | 227 | |
| 228 | 228 | /** | 
| 229 | - * @param $file | |
| 229 | + * @param \stdClass $file | |
| 230 | 230 | */ | 
| 231 | 231 | protected function set_file_delete_properties($file) | 
| 232 | 232 |      { | 
| @@ -244,7 +244,7 @@ discard block | ||
| 244 | 244 | // works for sizes up to 2^32-1 bytes (4 GiB - 1): | 
| 245 | 245 | /** | 
| 246 | 246 | * @param $size | 
| 247 | - * @return float|int | |
| 247 | + * @return null|string | |
| 248 | 248 | */ | 
| 249 | 249 | protected function fix_integer_overflow($size) | 
| 250 | 250 |      { | 
| @@ -278,7 +278,7 @@ discard block | ||
| 278 | 278 | } | 
| 279 | 279 | |
| 280 | 280 | /** | 
| 281 | - * @param $file_name | |
| 281 | + * @param string $file_name | |
| 282 | 282 | * @return null|\stdClass | 
| 283 | 283 | */ | 
| 284 | 284 | protected function get_file_object($file_name) | 
| @@ -323,7 +323,7 @@ discard block | ||
| 323 | 323 | } | 
| 324 | 324 | |
| 325 | 325 | /** | 
| 326 | - * @param $file_name | |
| 326 | + * @param string $file_name | |
| 327 | 327 | * @param $version | 
| 328 | 328 | * @param $options | 
| 329 | 329 | * @return bool | 
| @@ -397,7 +397,7 @@ discard block | ||
| 397 | 397 | } | 
| 398 | 398 | |
| 399 | 399 | /** | 
| 400 | - * @param $val | |
| 400 | + * @param string $val | |
| 401 | 401 | * @return float|int | 
| 402 | 402 | */ | 
| 403 | 403 | public function get_config_bytes($val) | 
| @@ -419,7 +419,7 @@ discard block | ||
| 419 | 419 | |
| 420 | 420 | /** | 
| 421 | 421 | * @param $uploaded_file | 
| 422 | - * @param $file | |
| 422 | + * @param \stdClass $file | |
| 423 | 423 | * @param $error | 
| 424 | 424 | * @param $index | 
| 425 | 425 | * @return bool | 
| @@ -500,7 +500,7 @@ discard block | ||
| 500 | 500 | } | 
| 501 | 501 | |
| 502 | 502 | /** | 
| 503 | - * @param $name | |
| 503 | + * @param string $name | |
| 504 | 504 | * @param $type | 
| 505 | 505 | * @param $index | 
| 506 | 506 | * @param $content_range | 
| @@ -527,7 +527,7 @@ discard block | ||
| 527 | 527 | * @param $type | 
| 528 | 528 | * @param $index | 
| 529 | 529 | * @param $content_range | 
| 530 | - * @return mixed|string | |
| 530 | + * @return string | |
| 531 | 531 | */ | 
| 532 | 532 | protected function trim_file_name($name, $type, $index, $content_range) | 
| 533 | 533 |      { | 
| @@ -559,7 +559,7 @@ discard block | ||
| 559 | 559 | } | 
| 560 | 560 | |
| 561 | 561 | /** | 
| 562 | - * @param $file | |
| 562 | + * @param \stdClass $file | |
| 563 | 563 | * @param $index | 
| 564 | 564 | */ | 
| 565 | 565 | protected function handle_form_data($file, $index) | 
| @@ -568,7 +568,7 @@ discard block | ||
| 568 | 568 | } | 
| 569 | 569 | |
| 570 | 570 | /** | 
| 571 | - * @param $file_path | |
| 571 | + * @param string $file_path | |
| 572 | 572 | * @return bool | 
| 573 | 573 | */ | 
| 574 | 574 | protected function orient_image($file_path) | 
| @@ -699,7 +699,7 @@ discard block | ||
| 699 | 699 | } | 
| 700 | 700 | |
| 701 | 701 | /** | 
| 702 | - * @param $file_path | |
| 702 | + * @param string $file_path | |
| 703 | 703 | * @return false|int | 
| 704 | 704 | */ | 
| 705 | 705 | protected function readfile($file_path) | 
| @@ -708,7 +708,7 @@ discard block | ||
| 708 | 708 | } | 
| 709 | 709 | |
| 710 | 710 | /** | 
| 711 | - * @param $str | |
| 711 | + * @param string $str | |
| 712 | 712 | */ | 
| 713 | 713 | protected function body($str) | 
| 714 | 714 |      { | 
| @@ -716,7 +716,7 @@ discard block | ||
| 716 | 716 | } | 
| 717 | 717 | |
| 718 | 718 | /** | 
| 719 | - * @param $str | |
| 719 | + * @param string $str | |
| 720 | 720 | */ | 
| 721 | 721 | protected function header($str) | 
| 722 | 722 |      { | 
| @@ -765,7 +765,7 @@ discard block | ||
| 765 | 765 | } | 
| 766 | 766 | |
| 767 | 767 | /** | 
| 768 | - * @param $file_path | |
| 768 | + * @param string $file_path | |
| 769 | 769 | * @return string | 
| 770 | 770 | */ | 
| 771 | 771 | protected function get_file_type($file_path) |