@@ -54,12 +54,12 @@ |
||
| 54 | 54 | |
| 55 | 55 | if (!function_exists('sanitize_path')) { |
| 56 | 56 | /** |
| 57 | - * Удаление из строки символов, определяющих перемещение вверх по дереву каталогов |
|
| 58 | - * @see https://github.com/modxcms/revolution/commit/10248d06ebb7c933d33129272623d0a64d528a82#diff-9ec30f895e27297f4307c80efb483bb8 |
|
| 59 | - * |
|
| 60 | - * @param string $path путь к папке |
|
| 61 | - * @return string |
|
| 62 | - */ |
|
| 57 | + * Удаление из строки символов, определяющих перемещение вверх по дереву каталогов |
|
| 58 | + * @see https://github.com/modxcms/revolution/commit/10248d06ebb7c933d33129272623d0a64d528a82#diff-9ec30f895e27297f4307c80efb483bb8 |
|
| 59 | + * |
|
| 60 | + * @param string $path путь к папке |
|
| 61 | + * @return string |
|
| 62 | + */ |
|
| 63 | 63 | function sanitize_path($path ){ |
| 64 | 64 | return preg_replace(array("/\.*[\/|\\\]/i", "/[\/|\\\]+/i"), array('/', '/'), $path); |
| 65 | 65 | } |
@@ -327,12 +327,12 @@ |
||
| 327 | 327 | * @param array $array исходный массив со значениями |
| 328 | 328 | * @return array |
| 329 | 329 | */ |
| 330 | - function array_copy_key(array $data = array()){ |
|
| 330 | + function array_copy_key(array $data = array()){ |
|
| 331 | 331 | $data = array_filter($data, function($val){ |
| 332 | 332 | return is_scalar($val); |
| 333 | 333 | }); |
| 334 | - return array_combine($data, $data); |
|
| 335 | - } |
|
| 334 | + return array_combine($data, $data); |
|
| 335 | + } |
|
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | if(!function_exists('make_tree')){ |
@@ -561,6 +561,6 @@ |
||
| 561 | 561 | * @return bool |
| 562 | 562 | */ |
| 563 | 563 | function in_ip_range($ip, $lower, $upper){ |
| 564 | - return (ip2long($lower) <= ip2long($ip) && ip2long($upper) >= ip2long($ip)) ? TRUE : FALSE; |
|
| 565 | - } |
|
| 564 | + return (ip2long($lower) <= ip2long($ip) && ip2long($upper) >= ip2long($ip)) ? TRUE : FALSE; |
|
| 565 | + } |
|
| 566 | 566 | } |
| 567 | 567 | \ No newline at end of file |
@@ -293,11 +293,11 @@ |
||
| 293 | 293 | */ |
| 294 | 294 | function clear_html($html){
|
| 295 | 295 | $filters = array( |
| 296 | - '/<!--([^\[|(<!)].*)-->/i' => '', // Remove HTML Comments (breaks with HTML5 Boilerplate) |
|
| 297 | - '/(?<!\S)\/\/\s*[^\r\n]*/' => '', // Remove comments in the form /* */ |
|
| 298 | - '/\s{2,}/' => ' ', // Shorten multiple white spaces
|
|
| 299 | - '/(\r?\n)/' => '', // Collapse new lines |
|
| 300 | - ); |
|
| 296 | + '/<!--([^\[|(<!)].*)-->/i' => '', // Remove HTML Comments (breaks with HTML5 Boilerplate) |
|
| 297 | + '/(?<!\S)\/\/\s*[^\r\n]*/' => '', // Remove comments in the form /* */ |
|
| 298 | + '/\s{2,}/' => ' ', // Shorten multiple white spaces
|
|
| 299 | + '/(\r?\n)/' => '', // Collapse new lines |
|
| 300 | + ); |
|
| 301 | 301 | return is_scalar($html) ? preg_replace(array_keys($filters), array_values($filters), $html) : ''; |
| 302 | 302 | } |
| 303 | 303 | } |
| 304 | 304 | \ No newline at end of file |