@@ -10,7 +10,9 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function add(string $name, string $table, string $field, string $delete = null, string $update = null) { |
| 12 | 12 | |
| 13 | - if ((false === $this->definition->param($name)) || isset($this->list[$name])) return; |
|
| 13 | + if ((false === $this->definition->param($name)) || isset($this->list[$name])) { |
|
| 14 | + return; |
|
| 15 | + } |
|
| 14 | 16 | |
| 15 | 17 | $this->list[$name] = new Definition\Item\Foreign($name, $table, $field, $delete, $update); |
| 16 | 18 | } |
@@ -2,23 +2,23 @@ |
||
| 2 | 2 | |
| 3 | 3 | # Date formats |
| 4 | 4 | |
| 5 | -define('DATE_FORMAT_STANDART', 'd.m.Y'); |
|
| 6 | -define('DATE_FORMAT_MYSQL', 'Y-m-d'); |
|
| 7 | -define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i'); |
|
| 8 | -define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP'); |
|
| 5 | +define('DATE_FORMAT_STANDART', 'd.m.Y'); |
|
| 6 | +define('DATE_FORMAT_MYSQL', 'Y-m-d'); |
|
| 7 | +define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i'); |
|
| 8 | +define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP'); |
|
| 9 | 9 | |
| 10 | 10 | # Form fields |
| 11 | 11 | |
| 12 | -define('FORM_FIELD_HIDDEN', 'hidden'); |
|
| 13 | -define('FORM_FIELD_PASSWORD', 'password'); |
|
| 14 | -define('FORM_FIELD_CAPTCHA', 'captcha'); |
|
| 15 | -define('FORM_FIELD_TEXT', 'text'); |
|
| 16 | -define('FORM_FIELD_TEXTAREA', 'textarea'); |
|
| 12 | +define('FORM_FIELD_HIDDEN', 'hidden'); |
|
| 13 | +define('FORM_FIELD_PASSWORD', 'password'); |
|
| 14 | +define('FORM_FIELD_CAPTCHA', 'captcha'); |
|
| 15 | +define('FORM_FIELD_TEXT', 'text'); |
|
| 16 | +define('FORM_FIELD_TEXTAREA', 'textarea'); |
|
| 17 | 17 | |
| 18 | 18 | # String pools |
| 19 | 19 | |
| 20 | -define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'); |
|
| 21 | -define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
| 22 | -define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz'); |
|
| 23 | -define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
| 24 | -define('STR_POOL_NUMERIC', '0123456789'); |
|
| 20 | +define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'); |
|
| 21 | +define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
| 22 | +define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz'); |
|
| 23 | +define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'); |
|
| 24 | +define('STR_POOL_NUMERIC', '0123456789'); |
|
@@ -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); |
|
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | define('REGEX_TEMPLATE_COMPONENT_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_COMPONENT_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
| 14 | +define('REGEX_TEMPLATE_COMPONENT_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_]+)\%/'); |
|
@@ -19,7 +19,9 @@ |
||
| 19 | 19 | |
| 20 | 20 | protected static function init(string $file_name) { |
| 21 | 21 | |
| 22 | - if (is_array($range = Explorer::include($file_name))) static::$range = $range; |
|
| 22 | + if (is_array($range = Explorer::include($file_name))) { |
|
| 23 | + static::$range = $range; |
|
| 24 | + } |
|
| 23 | 25 | } |
| 24 | 26 | |
| 25 | 27 | /** |
@@ -30,7 +30,9 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public static function stringify(SimpleXMLElement $xml) { |
| 32 | 32 | |
| 33 | - if (false === ($xml = dom_import_simplexml($xml))) return false; |
|
| 33 | + if (false === ($xml = dom_import_simplexml($xml))) { |
|
| 34 | + return false; |
|
| 35 | + } |
|
| 34 | 36 | |
| 35 | 37 | $dom = $xml->ownerDocument; $dom->formatOutput = true; |
| 36 | 38 | |
@@ -47,7 +49,9 @@ discard block |
||
| 47 | 49 | |
| 48 | 50 | public static function load(string $file_name) { |
| 49 | 51 | |
| 50 | - if (false === ($contents = Explorer::getContents($file_name))) return false; |
|
| 52 | + if (false === ($contents = Explorer::getContents($file_name))) { |
|
| 53 | + return false; |
|
| 54 | + } |
|
| 51 | 55 | |
| 52 | 56 | return self::parse($contents); |
| 53 | 57 | } |
@@ -60,7 +64,9 @@ discard block |
||
| 60 | 64 | |
| 61 | 65 | public static function save(string $file_name, SimpleXMLElement $xml) { |
| 62 | 66 | |
| 63 | - if (false === ($xml = self::stringify($xml))) return false; |
|
| 67 | + if (false === ($xml = self::stringify($xml))) { |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 64 | 70 | |
| 65 | 71 | return Explorer::putContents($file_name, $xml); |
| 66 | 72 | } |
@@ -19,7 +19,9 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | private static function addPhrase(string $name, string $value) { |
| 21 | 21 | |
| 22 | - if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) self::$phrases[$name] = $value; |
|
| 22 | + if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) { |
|
| 23 | + self::$phrases[$name] = $value; |
|
| 24 | + } |
|
| 23 | 25 | } |
| 24 | 26 | |
| 25 | 27 | /** |
@@ -30,9 +32,13 @@ discard block |
||
| 30 | 32 | |
| 31 | 33 | public static function load(string $file_name) { |
| 32 | 34 | |
| 33 | - if (!is_array($phrases = Explorer::include($file_name))) return false; |
|
| 35 | + if (!is_array($phrases = Explorer::include($file_name))) { |
|
| 36 | + return false; |
|
| 37 | + } |
|
| 34 | 38 | |
| 35 | - foreach ($phrases as $name => $value) if (is_scalar($value)) self::addPhrase($name, $value); |
|
| 39 | + foreach ($phrases as $name => $value) { |
|
| 40 | + if (is_scalar($value)) self::addPhrase($name, $value); |
|
| 41 | + } |
|
| 36 | 42 | |
| 37 | 43 | # ------------------------ |
| 38 | 44 | |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | # Build query |
| 31 | 31 | |
| 32 | - $this->query = ('UPDATE ' . $table . ' SET ' . $set . ($condition ? (' WHERE (' . $condition . ')') : '')); |
|
| 32 | + $this->query = ('UPDATE '.$table.' SET '.$set.($condition ? (' WHERE ('.$condition.')') : '')); |
|
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -56,7 +56,9 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | public function getRow() { |
| 58 | 58 | |
| 59 | - if (!is_object($this->result)) return null; |
|
| 59 | + if (!is_object($this->result)) { |
|
| 60 | + return null; |
|
| 61 | + } |
|
| 60 | 62 | |
| 61 | 63 | return mysqli_fetch_assoc($this->result); |
| 62 | 64 | } |
@@ -67,9 +69,13 @@ discard block |
||
| 67 | 69 | |
| 68 | 70 | public function getRows() { |
| 69 | 71 | |
| 70 | - if (!is_object($this->result)) return []; |
|
| 72 | + if (!is_object($this->result)) { |
|
| 73 | + return []; |
|
| 74 | + } |
|
| 71 | 75 | |
| 72 | - $rows = []; while (null !== ($row = $this->getRow())) $rows[] = $row; |
|
| 76 | + $rows = []; while (null !== ($row = $this->getRow())) { |
|
| 77 | + $rows[] = $row; |
|
| 78 | + } |
|
| 73 | 79 | |
| 74 | 80 | # ------------------------ |
| 75 | 81 | |