@@ -8,7 +8,8 @@ |
||
8 | 8 | namespace PH7; |
9 | 9 | defined('PH7') or exit('Restricted access'); |
10 | 10 | |
11 | -use PH7\Framework\Mvc\Request\Http, PH7\Framework\Mvc\Model\Design; |
|
11 | +use PH7\Framework\Mvc\Request\Http; |
|
12 | +use PH7\Framework\Mvc\Model\Design; |
|
12 | 13 | |
13 | 14 | class AdsAjax |
14 | 15 | { |
@@ -969,7 +969,6 @@ discard block |
||
969 | 969 | * Return file info or false on error |
970 | 970 | * |
971 | 971 | * @param string $hash file hash |
972 | - * @param bool $realpath add realpath field to file info |
|
973 | 972 | * @return array|false |
974 | 973 | * @author Dmitry (dio) Levashov |
975 | 974 | **/ |
@@ -991,7 +990,6 @@ discard block |
||
991 | 990 | * Return folder info |
992 | 991 | * |
993 | 992 | * @param string $hash folder hash |
994 | - * @param bool $hidden return hidden file info |
|
995 | 993 | * @return array|false |
996 | 994 | * @author Dmitry (dio) Levashov |
997 | 995 | **/ |
@@ -1311,7 +1309,6 @@ discard block |
||
1311 | 1309 | * |
1312 | 1310 | * @param Resource $fp file pointer |
1313 | 1311 | * @param string $dst destination folder hash |
1314 | - * @param string $src file name |
|
1315 | 1312 | * @param string $tmpname file tmp name - required to detect mime type |
1316 | 1313 | * @return array|false |
1317 | 1314 | * @author Dmitry (dio) Levashov |
@@ -1399,7 +1396,6 @@ discard block |
||
1399 | 1396 | * Paste files |
1400 | 1397 | * |
1401 | 1398 | * @param Object $volume source volume |
1402 | - * @param string $source file hash |
|
1403 | 1399 | * @param string $dst destination dir hash |
1404 | 1400 | * @param bool $rmSrc remove source after copy? |
1405 | 1401 | * @return array|false |
@@ -1497,7 +1493,7 @@ discard block |
||
1497 | 1493 | * Return file contents |
1498 | 1494 | * |
1499 | 1495 | * @param string $hash file hash |
1500 | - * @return string|false |
|
1496 | + * @return boolean|string |
|
1501 | 1497 | * @author Dmitry (dio) Levashov |
1502 | 1498 | **/ |
1503 | 1499 | public function getContents($hash) { |
@@ -1721,7 +1717,7 @@ discard block |
||
1721 | 1717 | * Return image dimensions |
1722 | 1718 | * |
1723 | 1719 | * @param string $hash file hash |
1724 | - * @return array |
|
1720 | + * @return false|string |
|
1725 | 1721 | * @author Dmitry (dio) Levashov |
1726 | 1722 | **/ |
1727 | 1723 | public function dimensions($hash) { |
@@ -1817,7 +1813,8 @@ discard block |
||
1817 | 1813 | * Not implemented |
1818 | 1814 | * |
1819 | 1815 | * @param string path |
1820 | - * @return mixed |
|
1816 | + * @param string $path |
|
1817 | + * @return string |
|
1821 | 1818 | * @author Dmitry (dio) Levashov |
1822 | 1819 | **/ |
1823 | 1820 | protected function crypt($path) { |
@@ -1829,7 +1826,8 @@ discard block |
||
1829 | 1826 | * Not implemented |
1830 | 1827 | * |
1831 | 1828 | * @param mixed hash |
1832 | - * @return mixed |
|
1829 | + * @param string $hash |
|
1830 | + * @return string |
|
1833 | 1831 | * @author Dmitry (dio) Levashov |
1834 | 1832 | **/ |
1835 | 1833 | protected function uncrypt($hash) { |
@@ -1857,7 +1855,6 @@ discard block |
||
1857 | 1855 | /** |
1858 | 1856 | * Return new unique name based on file name and suffix |
1859 | 1857 | * |
1860 | - * @param string $path file path |
|
1861 | 1858 | * @param string $suffix suffix append to name |
1862 | 1859 | * @return string |
1863 | 1860 | * @author Dmitry (dio) Levashov |
@@ -2329,7 +2326,7 @@ discard block |
||
2329 | 2326 | * @param string $src source path |
2330 | 2327 | * @param string $dst destination dir path |
2331 | 2328 | * @param string $name new file name (optionaly) |
2332 | - * @return string|false |
|
2329 | + * @return string|boolean |
|
2333 | 2330 | * @author Dmitry (dio) Levashov |
2334 | 2331 | **/ |
2335 | 2332 | protected function copy($src, $dst, $name) { |
@@ -2378,7 +2375,7 @@ discard block |
||
2378 | 2375 | * @param string $src source path |
2379 | 2376 | * @param string $dst destination dir path |
2380 | 2377 | * @param string $name new file name |
2381 | - * @return string|false |
|
2378 | + * @return string|boolean |
|
2382 | 2379 | * @author Dmitry (dio) Levashov |
2383 | 2380 | **/ |
2384 | 2381 | protected function move($src, $dst, $name) { |
@@ -2402,7 +2399,7 @@ discard block |
||
2402 | 2399 | * @param string $src source file hash |
2403 | 2400 | * @param string $destination destination dir path |
2404 | 2401 | * @param string $name file name |
2405 | - * @return string|false |
|
2402 | + * @return boolean|string |
|
2406 | 2403 | * @author Dmitry (dio) Levashov |
2407 | 2404 | **/ |
2408 | 2405 | protected function copyFrom($volume, $src, $destination, $name) { |
@@ -2543,7 +2540,7 @@ discard block |
||
2543 | 2540 | * |
2544 | 2541 | * @param string $path thumnbnail path |
2545 | 2542 | * @param array $stat file stat |
2546 | - * @return string|bool |
|
2543 | + * @return boolean |
|
2547 | 2544 | * @author Dmitry (dio) Levashov |
2548 | 2545 | **/ |
2549 | 2546 | protected function canCreateTmb($path, $stat) { |
@@ -2560,7 +2557,7 @@ discard block |
||
2560 | 2557 | * |
2561 | 2558 | * @param string $path thumnbnail path |
2562 | 2559 | * @param array $stat file stat |
2563 | - * @return string|bool |
|
2560 | + * @return boolean |
|
2564 | 2561 | * @author Dmitry (dio) Levashov |
2565 | 2562 | **/ |
2566 | 2563 | protected function canResize($path, $stat) { |
@@ -2571,7 +2568,6 @@ discard block |
||
2571 | 2568 | * Create thumnbnail and return it's URL on success |
2572 | 2569 | * |
2573 | 2570 | * @param string $path file path |
2574 | - * @param string $mime file mime type |
|
2575 | 2571 | * @return string|false |
2576 | 2572 | * @author Dmitry (dio) Levashov |
2577 | 2573 | **/ |
@@ -2988,7 +2984,7 @@ discard block |
||
2988 | 2984 | * |
2989 | 2985 | * @param string $command command line |
2990 | 2986 | * @param array $output stdout strings |
2991 | - * @param array $return_var process exit code |
|
2987 | + * @param integer $return_var process exit code |
|
2992 | 2988 | * @param array $error_output stderr strings |
2993 | 2989 | * @return int exit code |
2994 | 2990 | * @author Alexey Sukhotin |
@@ -3027,7 +3023,6 @@ discard block |
||
3027 | 3023 | /** |
3028 | 3024 | * Remove thumbnail |
3029 | 3025 | * |
3030 | - * @param string $path file path |
|
3031 | 3026 | * @return void |
3032 | 3027 | * @author Dmitry (dio) Levashov |
3033 | 3028 | **/ |
@@ -3064,7 +3059,7 @@ discard block |
||
3064 | 3059 | * @param string $haystack The string being checked. |
3065 | 3060 | * @param string $needle The string to find in haystack. |
3066 | 3061 | * @param int $offset The search offset. If it is not specified, 0 is used. |
3067 | - * @return int|bool |
|
3062 | + * @return integer |
|
3068 | 3063 | * @author Alexey Sukhotin |
3069 | 3064 | **/ |
3070 | 3065 | protected function stripos($haystack , $needle , $offset = 0) { |
@@ -3216,7 +3211,6 @@ discard block |
||
3216 | 3211 | * Open file and return file pointer |
3217 | 3212 | * |
3218 | 3213 | * @param string $path file path |
3219 | - * @param bool $write open file for writing |
|
3220 | 3214 | * @return resource|false |
3221 | 3215 | * @author Dmitry (dio) Levashov |
3222 | 3216 | **/ |
@@ -3269,7 +3263,7 @@ discard block |
||
3269 | 3263 | * Copy file into another file (only inside one volume) |
3270 | 3264 | * |
3271 | 3265 | * @param string $source source file path |
3272 | - * @param string $target target dir path |
|
3266 | + * @param string $targetDir target dir path |
|
3273 | 3267 | * @param string $name file name |
3274 | 3268 | * @return bool |
3275 | 3269 | * @author Dmitry (dio) Levashov |
@@ -3281,7 +3275,7 @@ discard block |
||
3281 | 3275 | * Return new file path or false. |
3282 | 3276 | * |
3283 | 3277 | * @param string $source source file path |
3284 | - * @param string $target target dir path |
|
3278 | + * @param string $targetDir target dir path |
|
3285 | 3279 | * @param string $name file name |
3286 | 3280 | * @return string|bool |
3287 | 3281 | * @author Dmitry (dio) Levashov |
@@ -391,7 +391,6 @@ discard block |
||
391 | 391 | * Open file and return file pointer |
392 | 392 | * |
393 | 393 | * @param string $path file path |
394 | - * @param bool $write open file for writing |
|
395 | 394 | * @return resource|false |
396 | 395 | * @author Dmitry (dio) Levashov |
397 | 396 | **/ |
@@ -417,7 +416,7 @@ discard block |
||
417 | 416 | * |
418 | 417 | * @param string $path parent dir path |
419 | 418 | * @param string $name new directory name |
420 | - * @return string|bool |
|
419 | + * @return string|false |
|
421 | 420 | * @author Dmitry (dio) Levashov |
422 | 421 | **/ |
423 | 422 | protected function _mkdir($path, $name) { |
@@ -436,7 +435,7 @@ discard block |
||
436 | 435 | * |
437 | 436 | * @param string $path parent dir path |
438 | 437 | * @param string $name new file name |
439 | - * @return string|bool |
|
438 | + * @return string|false |
|
440 | 439 | * @author Dmitry (dio) Levashov |
441 | 440 | **/ |
442 | 441 | protected function _mkfile($path, $name) { |
@@ -481,9 +480,9 @@ discard block |
||
481 | 480 | * Return new file path or false. |
482 | 481 | * |
483 | 482 | * @param string $source source file path |
484 | - * @param string $target target dir path |
|
483 | + * @param string $targetDir target dir path |
|
485 | 484 | * @param string $name file name |
486 | - * @return string|bool |
|
485 | + * @return string|false |
|
487 | 486 | * @author Dmitry (dio) Levashov |
488 | 487 | **/ |
489 | 488 | protected function _move($source, $targetDir, $name) { |
@@ -520,7 +519,7 @@ discard block |
||
520 | 519 | * @param resource $fp file pointer |
521 | 520 | * @param string $dir target dir path |
522 | 521 | * @param string $name file name |
523 | - * @return bool|string |
|
522 | + * @return false|string |
|
524 | 523 | * @author Dmitry (dio) Levashov |
525 | 524 | **/ |
526 | 525 | protected function _save($fp, $dir, $name, $mime, $w, $h) { |
@@ -543,7 +542,7 @@ discard block |
||
543 | 542 | * Get file contents |
544 | 543 | * |
545 | 544 | * @param string $path file path |
546 | - * @return string|false |
|
545 | + * @return string |
|
547 | 546 | * @author Dmitry (dio) Levashov |
548 | 547 | **/ |
549 | 548 | protected function _getContents($path) { |
@@ -816,7 +815,7 @@ discard block |
||
816 | 815 | * @param array $files files names list |
817 | 816 | * @param string $name archive name |
818 | 817 | * @param array $arc archiver options |
819 | - * @return string|bool |
|
818 | + * @return string|false |
|
820 | 819 | * @author Dmitry (dio) Levashov, |
821 | 820 | * @author Alexey Sukhotin |
822 | 821 | **/ |
@@ -228,7 +228,6 @@ discard block |
||
228 | 228 | * @param string $hash image file |
229 | 229 | * @param int $width new width |
230 | 230 | * @param int $height new height |
231 | - * @param bool $crop crop image |
|
232 | 231 | * @return array|false |
233 | 232 | * @author Dmitry (dio) Levashov |
234 | 233 | * @author Alexey Sukhotin |
@@ -629,7 +628,7 @@ discard block |
||
629 | 628 | * Close opened file |
630 | 629 | * |
631 | 630 | * @param resource $fp file pointer |
632 | - * @return bool |
|
631 | + * @return boolean|null |
|
633 | 632 | * @author Dmitry (dio) Levashov |
634 | 633 | **/ |
635 | 634 | protected function _fclose($fp, $path='') { |
@@ -646,7 +645,7 @@ discard block |
||
646 | 645 | * |
647 | 646 | * @param string $path parent dir path |
648 | 647 | * @param string $name new directory name |
649 | - * @return string|bool |
|
648 | + * @return string|false |
|
650 | 649 | * @author Dmitry (dio) Levashov |
651 | 650 | **/ |
652 | 651 | protected function _mkdir($path, $name) { |
@@ -658,7 +657,7 @@ discard block |
||
658 | 657 | * |
659 | 658 | * @param string $path parent dir path |
660 | 659 | * @param string $name new file name |
661 | - * @return string|bool |
|
660 | + * @return string|false |
|
662 | 661 | * @author Dmitry (dio) Levashov |
663 | 662 | **/ |
664 | 663 | protected function _mkfile($path, $name) { |
@@ -702,9 +701,9 @@ discard block |
||
702 | 701 | * Return new file path or false. |
703 | 702 | * |
704 | 703 | * @param string $source source file path |
705 | - * @param string $target target dir path |
|
704 | + * @param string $targetDir target dir path |
|
706 | 705 | * @param string $name file name |
707 | - * @return string|bool |
|
706 | + * @return boolean |
|
708 | 707 | * @author Dmitry (dio) Levashov |
709 | 708 | **/ |
710 | 709 | protected function _move($source, $targetDir, $name) { |
@@ -872,7 +871,7 @@ discard block |
||
872 | 871 | * |
873 | 872 | * @param string $path archive path |
874 | 873 | * @param array $arc archiver command and arguments (same as in $this->archivers) |
875 | - * @return true |
|
874 | + * @return boolean |
|
876 | 875 | * @author Dmitry (dio) Levashov, |
877 | 876 | * @author Alexey Sukhotin |
878 | 877 | **/ |
@@ -887,7 +886,7 @@ discard block |
||
887 | 886 | * @param array $files files names list |
888 | 887 | * @param string $name archive name |
889 | 888 | * @param array $arc archiver options |
890 | - * @return string|bool |
|
889 | + * @return boolean |
|
891 | 890 | * @author Dmitry (dio) Levashov, |
892 | 891 | * @author Alexey Sukhotin |
893 | 892 | **/ |
@@ -8,7 +8,8 @@ |
||
8 | 8 | namespace PH7; |
9 | 9 | defined('PH7') or die('Restricted access'); |
10 | 10 | |
11 | -use PH7\Framework\Url\Header, PH7\Framework\Mvc\Router\Uri; |
|
11 | +use PH7\Framework\Url\Header; |
|
12 | +use PH7\Framework\Mvc\Router\Uri; |
|
12 | 13 | |
13 | 14 | class Permission extends PermissionCore |
14 | 15 | { |
@@ -9,10 +9,9 @@ |
||
9 | 9 | */ |
10 | 10 | namespace PH7; |
11 | 11 | |
12 | -use |
|
13 | -PH7\Framework\Navigation\Page, |
|
14 | -PH7\Framework\Url\Header, |
|
15 | -PH7\Framework\Mvc\Router\Uri; |
|
12 | +use PH7\Framework\Navigation\Page; |
|
13 | +use PH7\Framework\Url\Header; |
|
14 | +use PH7\Framework\Mvc\Router\Uri; |
|
16 | 15 | |
17 | 16 | class AdminController extends Controller |
18 | 17 | { |
@@ -7,7 +7,9 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use PH7\Framework\Url\Header, PH7\Framework\Mvc\Router\Uri, PH7\Framework\Navigation\Page; |
|
10 | +use PH7\Framework\Url\Header; |
|
11 | +use PH7\Framework\Mvc\Router\Uri; |
|
12 | +use PH7\Framework\Navigation\Page; |
|
11 | 13 | |
12 | 14 | class ModeratorController extends Controller |
13 | 15 | { |
@@ -7,7 +7,9 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use PH7\Framework\Navigation\Page, PH7\Framework\Url\Header, PH7\Framework\Mvc\Router\Uri; |
|
10 | +use PH7\Framework\Navigation\Page; |
|
11 | +use PH7\Framework\Url\Header; |
|
12 | +use PH7\Framework\Mvc\Router\Uri; |
|
11 | 13 | |
12 | 14 | class SettingController extends Controller |
13 | 15 | { |
@@ -10,10 +10,9 @@ |
||
10 | 10 | */ |
11 | 11 | namespace PH7; |
12 | 12 | |
13 | -use |
|
14 | -PH7\Framework\Mvc\Model\Engine as D, |
|
15 | -PH7\Framework\Url\Header, |
|
16 | -PH7\Framework\Mvc\Router\Uri; |
|
13 | +use PH7\Framework\Mvc\Model\Engine as D; |
|
14 | +use PH7\Framework\Url\Header; |
|
15 | +use PH7\Framework\Mvc\Router\Uri; |
|
17 | 16 | |
18 | 17 | class ToolController extends Controller |
19 | 18 | { |