@@ -10,7 +10,9 @@ |
||
10 | 10 | |
11 | 11 | private static function checkType(string $extension, string $type) { |
12 | 12 | |
13 | - if (false === ($mime = self::get($extension))) return false; |
|
13 | + if (false === ($mime = self::get($extension))) { |
|
14 | + return false; |
|
15 | + } |
|
14 | 16 | |
15 | 17 | return (preg_match('/^' . $type . '\//', $mime) ? true : false); |
16 | 18 | } |
@@ -8,7 +8,9 @@ |
||
8 | 8 | |
9 | 9 | private static function output($image, string $mime, callable $outputter, array $params = []) { |
10 | 10 | |
11 | - if (!is_resource($image)) return false; |
|
11 | + if (!is_resource($image)) { |
|
12 | + return false; |
|
13 | + } |
|
12 | 14 | |
13 | 15 | Headers::nocache(); Headers::content($mime); |
14 | 16 |
@@ -2,60 +2,60 @@ |
||
2 | 2 | |
3 | 3 | # Status codes |
4 | 4 | |
5 | -define('STATUS_CODE_100', '100'); |
|
6 | -define('STATUS_CODE_101', '101'); |
|
7 | -define('STATUS_CODE_102', '102'); |
|
5 | +define('STATUS_CODE_100', '100'); |
|
6 | +define('STATUS_CODE_101', '101'); |
|
7 | +define('STATUS_CODE_102', '102'); |
|
8 | 8 | |
9 | -define('STATUS_CODE_200', '200'); |
|
10 | -define('STATUS_CODE_201', '201'); |
|
11 | -define('STATUS_CODE_202', '202'); |
|
12 | -define('STATUS_CODE_203', '203'); |
|
13 | -define('STATUS_CODE_204', '204'); |
|
14 | -define('STATUS_CODE_205', '205'); |
|
15 | -define('STATUS_CODE_206', '206'); |
|
16 | -define('STATUS_CODE_207', '207'); |
|
17 | -define('STATUS_CODE_226', '226'); |
|
9 | +define('STATUS_CODE_200', '200'); |
|
10 | +define('STATUS_CODE_201', '201'); |
|
11 | +define('STATUS_CODE_202', '202'); |
|
12 | +define('STATUS_CODE_203', '203'); |
|
13 | +define('STATUS_CODE_204', '204'); |
|
14 | +define('STATUS_CODE_205', '205'); |
|
15 | +define('STATUS_CODE_206', '206'); |
|
16 | +define('STATUS_CODE_207', '207'); |
|
17 | +define('STATUS_CODE_226', '226'); |
|
18 | 18 | |
19 | -define('STATUS_CODE_300', '300'); |
|
20 | -define('STATUS_CODE_301', '301'); |
|
21 | -define('STATUS_CODE_302', '302'); |
|
22 | -define('STATUS_CODE_303', '303'); |
|
23 | -define('STATUS_CODE_304', '304'); |
|
24 | -define('STATUS_CODE_305', '305'); |
|
25 | -define('STATUS_CODE_307', '307'); |
|
19 | +define('STATUS_CODE_300', '300'); |
|
20 | +define('STATUS_CODE_301', '301'); |
|
21 | +define('STATUS_CODE_302', '302'); |
|
22 | +define('STATUS_CODE_303', '303'); |
|
23 | +define('STATUS_CODE_304', '304'); |
|
24 | +define('STATUS_CODE_305', '305'); |
|
25 | +define('STATUS_CODE_307', '307'); |
|
26 | 26 | |
27 | -define('STATUS_CODE_400', '400'); |
|
28 | -define('STATUS_CODE_401', '401'); |
|
29 | -define('STATUS_CODE_402', '402'); |
|
30 | -define('STATUS_CODE_403', '403'); |
|
31 | -define('STATUS_CODE_404', '404'); |
|
32 | -define('STATUS_CODE_405', '405'); |
|
33 | -define('STATUS_CODE_406', '406'); |
|
34 | -define('STATUS_CODE_407', '407'); |
|
35 | -define('STATUS_CODE_408', '408'); |
|
36 | -define('STATUS_CODE_409', '409'); |
|
37 | -define('STATUS_CODE_410', '410'); |
|
38 | -define('STATUS_CODE_411', '411'); |
|
39 | -define('STATUS_CODE_412', '412'); |
|
40 | -define('STATUS_CODE_413', '413'); |
|
41 | -define('STATUS_CODE_414', '414'); |
|
42 | -define('STATUS_CODE_415', '415'); |
|
43 | -define('STATUS_CODE_416', '416'); |
|
44 | -define('STATUS_CODE_417', '417'); |
|
45 | -define('STATUS_CODE_422', '422'); |
|
46 | -define('STATUS_CODE_423', '423'); |
|
47 | -define('STATUS_CODE_424', '424'); |
|
48 | -define('STATUS_CODE_425', '425'); |
|
49 | -define('STATUS_CODE_426', '426'); |
|
50 | -define('STATUS_CODE_449', '449'); |
|
27 | +define('STATUS_CODE_400', '400'); |
|
28 | +define('STATUS_CODE_401', '401'); |
|
29 | +define('STATUS_CODE_402', '402'); |
|
30 | +define('STATUS_CODE_403', '403'); |
|
31 | +define('STATUS_CODE_404', '404'); |
|
32 | +define('STATUS_CODE_405', '405'); |
|
33 | +define('STATUS_CODE_406', '406'); |
|
34 | +define('STATUS_CODE_407', '407'); |
|
35 | +define('STATUS_CODE_408', '408'); |
|
36 | +define('STATUS_CODE_409', '409'); |
|
37 | +define('STATUS_CODE_410', '410'); |
|
38 | +define('STATUS_CODE_411', '411'); |
|
39 | +define('STATUS_CODE_412', '412'); |
|
40 | +define('STATUS_CODE_413', '413'); |
|
41 | +define('STATUS_CODE_414', '414'); |
|
42 | +define('STATUS_CODE_415', '415'); |
|
43 | +define('STATUS_CODE_416', '416'); |
|
44 | +define('STATUS_CODE_417', '417'); |
|
45 | +define('STATUS_CODE_422', '422'); |
|
46 | +define('STATUS_CODE_423', '423'); |
|
47 | +define('STATUS_CODE_424', '424'); |
|
48 | +define('STATUS_CODE_425', '425'); |
|
49 | +define('STATUS_CODE_426', '426'); |
|
50 | +define('STATUS_CODE_449', '449'); |
|
51 | 51 | |
52 | -define('STATUS_CODE_500', '500'); |
|
53 | -define('STATUS_CODE_501', '501'); |
|
54 | -define('STATUS_CODE_502', '502'); |
|
55 | -define('STATUS_CODE_503', '503'); |
|
56 | -define('STATUS_CODE_504', '504'); |
|
57 | -define('STATUS_CODE_505', '505'); |
|
58 | -define('STATUS_CODE_506', '506'); |
|
59 | -define('STATUS_CODE_507', '507'); |
|
60 | -define('STATUS_CODE_509', '509'); |
|
61 | -define('STATUS_CODE_510', '510'); |
|
52 | +define('STATUS_CODE_500', '500'); |
|
53 | +define('STATUS_CODE_501', '501'); |
|
54 | +define('STATUS_CODE_502', '502'); |
|
55 | +define('STATUS_CODE_503', '503'); |
|
56 | +define('STATUS_CODE_504', '504'); |
|
57 | +define('STATUS_CODE_505', '505'); |
|
58 | +define('STATUS_CODE_506', '506'); |
|
59 | +define('STATUS_CODE_507', '507'); |
|
60 | +define('STATUS_CODE_509', '509'); |
|
61 | +define('STATUS_CODE_510', '510'); |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | # Mime types |
4 | 4 | |
5 | -define('MIME_TYPE_HTML', 'html'); |
|
6 | -define('MIME_TYPE_XML', 'xml'); |
|
7 | -define('MIME_TYPE_JSON', 'json'); |
|
5 | +define('MIME_TYPE_HTML', 'html'); |
|
6 | +define('MIME_TYPE_XML', 'xml'); |
|
7 | +define('MIME_TYPE_JSON', 'json'); |
|
8 | 8 | |
9 | -define('MIME_TYPE_JPEG', 'jpeg'); |
|
10 | -define('MIME_TYPE_PNG', 'png'); |
|
11 | -define('MIME_TYPE_GIF', 'gif'); |
|
9 | +define('MIME_TYPE_JPEG', 'jpeg'); |
|
10 | +define('MIME_TYPE_PNG', 'png'); |
|
11 | +define('MIME_TYPE_GIF', 'gif'); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | define('REGEX_TEMPLATE_ITEM_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
15 | 15 | |
16 | 16 | define('REGEX_TEMPLATE_STRUCTURE', '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' . |
17 | - '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/'); |
|
17 | + '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/'); |
|
18 | 18 | |
19 | 19 | define('REGEX_TEMPLATE_VARIABLE', '/\$([a-zA-Z0-9_]+)\$/'); |
20 | 20 | define('REGEX_TEMPLATE_PHRASE', '/\%([a-zA-Z0-9_]+)\%/'); |
@@ -2,19 +2,19 @@ |
||
2 | 2 | |
3 | 3 | # Form expressions |
4 | 4 | |
5 | -define('REGEX_FORM_NAME', '/^[a-zA-Z][a-zA-Z0-9]*$/'); |
|
6 | -define('REGEX_FORM_FIELD_KEY', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
5 | +define('REGEX_FORM_NAME', '/^[a-zA-Z][a-zA-Z0-9]*$/'); |
|
6 | +define('REGEX_FORM_FIELD_KEY', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
7 | 7 | |
8 | 8 | # Language expressions |
9 | 9 | |
10 | -define('REGEX_LANGUAGE_PHRASE_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
10 | +define('REGEX_LANGUAGE_PHRASE_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
11 | 11 | |
12 | 12 | # Template expressions |
13 | 13 | |
14 | -define('REGEX_TEMPLATE_ITEM_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
14 | +define('REGEX_TEMPLATE_ITEM_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
15 | 15 | |
16 | -define('REGEX_TEMPLATE_STRUCTURE', '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' . |
|
16 | +define('REGEX_TEMPLATE_STRUCTURE', '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' . |
|
17 | 17 | '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/'); |
18 | 18 | |
19 | -define('REGEX_TEMPLATE_VARIABLE', '/\$([a-zA-Z0-9_]+)\$/'); |
|
20 | -define('REGEX_TEMPLATE_PHRASE', '/\%([a-zA-Z0-9_]+)\%/'); |
|
19 | +define('REGEX_TEMPLATE_VARIABLE', '/\$([a-zA-Z0-9_]+)\$/'); |
|
20 | +define('REGEX_TEMPLATE_PHRASE', '/\%([a-zA-Z0-9_]+)\%/'); |
@@ -2,28 +2,28 @@ |
||
2 | 2 | |
3 | 3 | # Cache limiters |
4 | 4 | |
5 | -define('CACHE_LIMITER_PRIVATE', 'private'); |
|
6 | -define('CACHE_LIMITER_PUBLIC', 'public'); |
|
5 | +define('CACHE_LIMITER_PRIVATE', 'private'); |
|
6 | +define('CACHE_LIMITER_PUBLIC', 'public'); |
|
7 | 7 | |
8 | 8 | # Date formats |
9 | 9 | |
10 | -define('DATE_FORMAT_STANDART', 'd.m.Y'); |
|
11 | -define('DATE_FORMAT_MYSQL', 'Y-m-d'); |
|
12 | -define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i'); |
|
13 | -define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP'); |
|
10 | +define('DATE_FORMAT_STANDART', 'd.m.Y'); |
|
11 | +define('DATE_FORMAT_MYSQL', 'Y-m-d'); |
|
12 | +define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i'); |
|
13 | +define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP'); |
|
14 | 14 | |
15 | 15 | # Form fields |
16 | 16 | |
17 | -define('FORM_FIELD_HIDDEN', 'hidden'); |
|
18 | -define('FORM_FIELD_PASSWORD', 'password'); |
|
19 | -define('FORM_FIELD_CAPTCHA', 'captcha'); |
|
20 | -define('FORM_FIELD_TEXT', 'text'); |
|
21 | -define('FORM_FIELD_TEXTAREA', 'textarea'); |
|
17 | +define('FORM_FIELD_HIDDEN', 'hidden'); |
|
18 | +define('FORM_FIELD_PASSWORD', 'password'); |
|
19 | +define('FORM_FIELD_CAPTCHA', 'captcha'); |
|
20 | +define('FORM_FIELD_TEXT', 'text'); |
|
21 | +define('FORM_FIELD_TEXTAREA', 'textarea'); |
|
22 | 22 | |
23 | 23 | # String pools |
24 | 24 | |
25 | -define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'); |
|
26 | -define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
27 | -define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz'); |
|
28 | -define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
29 | -define('STR_POOL_NUMERIC', '0123456789'); |
|
25 | +define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'); |
|
26 | +define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
27 | +define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz'); |
|
28 | +define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
29 | +define('STR_POOL_NUMERIC', '0123456789'); |
@@ -32,28 +32,28 @@ |
||
32 | 32 | |
33 | 33 | # Class load exception |
34 | 34 | |
35 | - class ClassLoad extends Exception { |
|
35 | + class ClassLoad extends Exception { |
|
36 | 36 | |
37 | 37 | protected $message = 'Class \'$value$\' not found'; |
38 | 38 | } |
39 | 39 | |
40 | 40 | # Database connect exception |
41 | 41 | |
42 | - class DBConnect extends Exception { |
|
42 | + class DBConnect extends Exception { |
|
43 | 43 | |
44 | 44 | protected $message = 'Unable to connect to database'; |
45 | 45 | } |
46 | 46 | |
47 | 47 | # Database select exception |
48 | 48 | |
49 | - class DBSelect extends Exception { |
|
49 | + class DBSelect extends Exception { |
|
50 | 50 | |
51 | 51 | protected $message = 'Unable to select database'; |
52 | 52 | } |
53 | 53 | |
54 | 54 | # Database charset exception |
55 | 55 | |
56 | - class DBCharset extends Exception { |
|
56 | + class DBCharset extends Exception { |
|
57 | 57 | |
58 | 58 | protected $message = 'Unable to set database charset'; |
59 | 59 | } |
@@ -26,7 +26,9 @@ |
||
26 | 26 | |
27 | 27 | public function __construct(string $message = '') { |
28 | 28 | |
29 | - if ('' !== $message) $this->message = $message; |
|
29 | + if ('' !== $message) { |
|
30 | + $this->message = $message; |
|
31 | + } |
|
30 | 32 | } |
31 | 33 | } |
32 | 34 |
@@ -8,17 +8,29 @@ discard block |
||
8 | 8 | |
9 | 9 | public static function ip() { |
10 | 10 | |
11 | - if (!empty(getenv('HTTP_CLIENT_IP'))) return getenv('HTTP_CLIENT_IP'); |
|
11 | + if (!empty(getenv('HTTP_CLIENT_IP'))) { |
|
12 | + return getenv('HTTP_CLIENT_IP'); |
|
13 | + } |
|
12 | 14 | |
13 | - if (!empty(getenv('HTTP_X_FORWARDED_FOR'))) return getenv('HTTP_X_FORWARDED_FOR'); |
|
15 | + if (!empty(getenv('HTTP_X_FORWARDED_FOR'))) { |
|
16 | + return getenv('HTTP_X_FORWARDED_FOR'); |
|
17 | + } |
|
14 | 18 | |
15 | - if (!empty(getenv('HTTP_X_FORWARDED'))) return getenv('HTTP_X_FORWARDED'); |
|
19 | + if (!empty(getenv('HTTP_X_FORWARDED'))) { |
|
20 | + return getenv('HTTP_X_FORWARDED'); |
|
21 | + } |
|
16 | 22 | |
17 | - if (!empty(getenv('HTTP_FORWARDED_FOR'))) return getenv('HTTP_FORWARDED_FOR'); |
|
23 | + if (!empty(getenv('HTTP_FORWARDED_FOR'))) { |
|
24 | + return getenv('HTTP_FORWARDED_FOR'); |
|
25 | + } |
|
18 | 26 | |
19 | - if (!empty(getenv('HTTP_FORWARDED'))) return getenv('HTTP_FORWARDED'); |
|
27 | + if (!empty(getenv('HTTP_FORWARDED'))) { |
|
28 | + return getenv('HTTP_FORWARDED'); |
|
29 | + } |
|
20 | 30 | |
21 | - if (!empty(getenv('REMOTE_ADDR'))) return getenv('REMOTE_ADDR'); |
|
31 | + if (!empty(getenv('REMOTE_ADDR'))) { |
|
32 | + return getenv('REMOTE_ADDR'); |
|
33 | + } |
|
22 | 34 | |
23 | 35 | # ------------------------ |
24 | 36 | |
@@ -50,9 +62,11 @@ discard block |
||
50 | 62 | |
51 | 63 | $file_name = (DIR_TEMPLATES . 'Exception.tpl'); |
52 | 64 | |
53 | - if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc); |
|
54 | - |
|
55 | - else $output = $parse_contents($contents); |
|
65 | + if (false === ($contents = @file_get_contents($file_name))) { |
|
66 | + $output = nl2br($exc); |
|
67 | + } else { |
|
68 | + $output = $parse_contents($contents); |
|
69 | + } |
|
56 | 70 | |
57 | 71 | # Set headers |
58 | 72 |
@@ -29,7 +29,9 @@ |
||
29 | 29 | |
30 | 30 | public static function get(string $type, int $id = 0) { |
31 | 31 | |
32 | - if (!isset(self::$classes[$type])) throw new Exception\General(self::$error_message); |
|
32 | + if (!isset(self::$classes[$type])) { |
|
33 | + throw new Exception\General(self::$error_message); |
|
34 | + } |
|
33 | 35 | |
34 | 36 | $cached = isset(self::$cache[$type][$id]); |
35 | 37 |