@@ -228,6 +228,9 @@ |
||
228 | 228 | return $str; |
229 | 229 | } |
230 | 230 | |
231 | +/** |
|
232 | + * @param string $str |
|
233 | + */ |
|
231 | 234 | function lf2crlf($str) |
232 | 235 | { |
233 | 236 | return mb_ereg_replace("\r\r\n", "\r\n", mb_ereg_replace("\n", "\r\n", $str)); |
@@ -28,6 +28,9 @@ discard block |
||
28 | 28 | $this->translator = $this->initTranslator($translator); |
29 | 29 | } |
30 | 30 | |
31 | + /** |
|
32 | + * @param boolean $request |
|
33 | + */ |
|
31 | 34 | private function initRequest($request) |
32 | 35 | { |
33 | 36 | if ($request) { |
@@ -37,6 +40,9 @@ discard block |
||
37 | 40 | return new RequestHttp(); |
38 | 41 | } |
39 | 42 | |
43 | + /** |
|
44 | + * @param boolean $translator |
|
45 | + */ |
|
40 | 46 | private function initTranslator($translator) |
41 | 47 | { |
42 | 48 | if ($translator) { |
@@ -7,34 +7,34 @@ |
||
7 | 7 | * Common error messages |
8 | 8 | ***************************************************************************/ |
9 | 9 | |
10 | - define('ERROR_UNKNOWN', 1000); |
|
11 | - define('ERROR_TEMPLATE_NOT_FOUND', 1001); |
|
12 | - define('ERROR_COMPILATION_FAILED', 1002); |
|
13 | - define('ERROR_NO_ACCESS', 1003); |
|
14 | - define('ERROR_INVALID_OPERATION', 1004); |
|
15 | - define('ERROR_LOGIN_REQUIRED', 1005); |
|
16 | - define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006); |
|
17 | - define('ERROR_NO_COOKIES', 1007); |
|
18 | - define('ERROR_ALREADY_LOGGEDIN', 1008); |
|
19 | - define('ERROR_USER_NOT_ACTIVE', 1009); |
|
20 | - define('ERROR_USER_NO_EMAIL', 1010); |
|
21 | - define('ERROR_CACHE_NOT_PUBLISHED', 1011); |
|
22 | - define('ERROR_CACHE_LOCKED', 1012); |
|
10 | + define('ERROR_UNKNOWN', 1000); |
|
11 | + define('ERROR_TEMPLATE_NOT_FOUND', 1001); |
|
12 | + define('ERROR_COMPILATION_FAILED', 1002); |
|
13 | + define('ERROR_NO_ACCESS', 1003); |
|
14 | + define('ERROR_INVALID_OPERATION', 1004); |
|
15 | + define('ERROR_LOGIN_REQUIRED', 1005); |
|
16 | + define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006); |
|
17 | + define('ERROR_NO_COOKIES', 1007); |
|
18 | + define('ERROR_ALREADY_LOGGEDIN', 1008); |
|
19 | + define('ERROR_USER_NOT_ACTIVE', 1009); |
|
20 | + define('ERROR_USER_NO_EMAIL', 1010); |
|
21 | + define('ERROR_CACHE_NOT_PUBLISHED', 1011); |
|
22 | + define('ERROR_CACHE_LOCKED', 1012); |
|
23 | 23 | |
24 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013); |
|
25 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014); |
|
26 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015); |
|
24 | + define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013); |
|
25 | + define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014); |
|
26 | + define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015); |
|
27 | 27 | |
28 | - define('ERROR_DB_COULD_NOT_RECONNECT', 1016); |
|
29 | - define('ERROR_DB_NO_ROOT', 1017); |
|
28 | + define('ERROR_DB_COULD_NOT_RECONNECT', 1016); |
|
29 | + define('ERROR_DB_NO_ROOT', 1017); |
|
30 | 30 | |
31 | - define('ERROR_USER_NOT_EXISTS', 1018); |
|
32 | - define('ERROR_CACHE_NOT_EXISTS', 1019); |
|
33 | - define('ERROR_CACHELOG_NOT_EXISTS', 1020); |
|
34 | - define('ERROR_PICTURE_NOT_EXISTS', 1021); |
|
31 | + define('ERROR_USER_NOT_EXISTS', 1018); |
|
32 | + define('ERROR_CACHE_NOT_EXISTS', 1019); |
|
33 | + define('ERROR_CACHELOG_NOT_EXISTS', 1020); |
|
34 | + define('ERROR_PICTURE_NOT_EXISTS', 1021); |
|
35 | 35 | |
36 | - define('ERROR_UPLOAD_ERR_NO_FILE', 1022); |
|
37 | - define('ERROR_UPLOAD_ERR_SIZE', 1023); |
|
38 | - define('ERROR_UPLOAD_ERR_TYPE', 1024); |
|
39 | - define('ERROR_UPLOAD_UNKNOWN', 1025); |
|
40 | - define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026); |
|
36 | + define('ERROR_UPLOAD_ERR_NO_FILE', 1022); |
|
37 | + define('ERROR_UPLOAD_ERR_SIZE', 1023); |
|
38 | + define('ERROR_UPLOAD_ERR_TYPE', 1024); |
|
39 | + define('ERROR_UPLOAD_UNKNOWN', 1025); |
|
40 | + define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | 'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'], |
34 | 34 | 'DEBUG' => ($opt['debug'] & DEBUG_DEVELOPER != 0), |
35 | 35 | 'DEBUG_PREVENT_SEMAPHORES' |
36 | - => !$opt['php']['semaphores'], # not available on old developer system |
|
36 | + => !$opt['php']['semaphores'], # not available on old developer system |
|
37 | 37 | 'DB_SERVER' => $opt['db']['servername'], |
38 | 38 | 'DB_NAME' => $opt['db']['placeholder']['db'], |
39 | 39 | 'DB_USERNAME' => $opt['db']['username'], |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'OC_NODE_ID' => $opt['logic']['node']['id'], |
55 | 55 | 'OC_COOKIE_NAME' => $opt['session']['cookiename'] . 'data', |
56 | 56 | 'OCDE_HTML_PURIFIER_SETTINGS' |
57 | - => $opt['html_purifier'], |
|
57 | + => $opt['html_purifier'], |
|
58 | 58 | 'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'], |
59 | 59 | ); |
60 | 60 | } |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | * @param $filename |
285 | 285 | * @param $maxLength |
286 | 286 | * |
287 | - * @return bool|string |
|
287 | + * @return false|string |
|
288 | 288 | */ |
289 | 289 | function read_file($filename, $maxLength = 4096) |
290 | 290 | { |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | * |
454 | 454 | * @param $n |
455 | 455 | * |
456 | - * @return mixed|string |
|
456 | + * @return string |
|
457 | 457 | */ |
458 | 458 | function number1000($n) |
459 | 459 | { |
@@ -506,6 +506,9 @@ |
||
506 | 506 | return mysql_fetch_assoc($rs); |
507 | 507 | } |
508 | 508 | |
509 | +/** |
|
510 | + * @param resource $rs |
|
511 | + */ |
|
509 | 512 | function sql_fetch_row($rs) |
510 | 513 | { |
511 | 514 | return mysql_fetch_row($rs); |
@@ -34,8 +34,7 @@ |
||
34 | 34 | public $cdir = []; |
35 | 35 | |
36 | 36 | /** constructor |
37 | - |
|
38 | -* |
|
37 | + * |
|
39 | 38 | *@param string $zipFile if not empty must contain path to valid zip file, ss_zip will try to open and parse it. |
40 | 39 | * If this parameter is empty, the new empty zip archive is created. This parameter has no meaning in |
41 | 40 | * LIGHT verion, please upgrade to PROfessional version. |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | } |
693 | 693 | |
694 | 694 | /** |
695 | - * @return bool|string |
|
695 | + * @return string|false |
|
696 | 696 | */ |
697 | 697 | public function getPageLink() |
698 | 698 | { |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | /** |
725 | 725 | * @param $tmpFile |
726 | 726 | * @param $longSideSize |
727 | - * @return bool |
|
727 | + * @return null|boolean |
|
728 | 728 | */ |
729 | 729 | public function rotate_and_shrink($tmpFile, $longSideSize) |
730 | 730 | { |
@@ -205,7 +205,7 @@ |
||
205 | 205 | |
206 | 206 | /** |
207 | 207 | * @param string $str |
208 | - * @return mixed |
|
208 | + * @return string |
|
209 | 209 | */ |
210 | 210 | function lf2crlf($str) |
211 | 211 | { |