diff options
Diffstat (limited to 'it.class')
| -rw-r--r-- | it.class | 51 |
1 files changed, 36 insertions, 15 deletions
@@ -75,9 +75,9 @@ static function &cloneobj(&$object) static function log($name /* ... */) { $args = func_get_args(); - $line = it::date("Y-m-d H:i:s") . "\t" . implode("\t", array_slice($args, 1)) . "\n"; + $line = date("Y-m-d H:i:s") . "\t" . implode("\t", array_slice($args, 1)) . "\n"; $basefn = substr($name, 0, 1) == "/" ? $name : $GLOBALS['ULTRAHOME'] . "/log/$name"; - $fullfn = $basefn . "-" . it::date('Ymd'); + $fullfn = $basefn . "-" . date('Ymd'); if (substr($fullfn, 0, 1) == "/") { @@ -114,7 +114,7 @@ static function timerlog($label = '') * Send verbose error report to browser or (if display_errors is off) by email to .diffnotice gods, file owner or SERVER_ADMIN * @param $p either error title or assoc array of params, see below * @param $p['title'] error title, one line - * @param $p['body'] error body, multiline + * @param $p['body'] error body, multiline string or any data type (will be dumped) * @param $p['to'] comma separated recipient list * @param $p['id'] identifier of error. if given, only subsequent errors of same id will trigger message * @param $p['graceperiod'] number of seconds within which additional errors are ignored if id is set [60] @@ -244,13 +244,13 @@ static function error($p = array()) else if ($_SERVER['REMOTE_ADDR']) # toscreen mode: web echo "<pre style='z-index:10000; position:relative; background:white'>" . htmlspecialchars($p['title'] . "\n" . rtrim($body), ENT_COMPAT, "iso-8859-1") . "</pre>"; # works with iso-8859-1 or utf-8, UTF8SAFE else # toscreen mode: shell (outputs to stderr) - error_log(substr($p['title'], 0, 100000) . " in " . ($trace ? $trace : "{$p['file']}:{$p['line']} Url: $url") . " " . (EDC('verboseerrors') ? D($p['locals']) : "")); + error_log(substr($p['title'], 0, 100000) . " in " . ($trace ? $trace : " {$p['file']}:{$p['line']}") . " Url: $url " . (EDC('verboseerrors') ? D($p['locals']) : "")); } if ($_SERVER['REMOTE_ADDR']) # additional entry in log/error_log error_log("it::error: " . $p['title'] . " Url: $url"); - file_put_contents("/tmp/alertdata/alert.log", it::date() . " " . $p['title'] . " in " . ($trace ? $trace : "{$p['file']}:{$p['line']} Url: $url") . "\n", FILE_APPEND); + file_put_contents("/tmp/alertdata/alert.log", it::date() . " " . $p['title'] . " in " . ($trace ? $trace : "{$p['file']}:{$p['line']}") . " Url: $url\n", FILE_APPEND); @chmod("/tmp/alertdata/alert.log", 0777); return null; @@ -315,6 +315,31 @@ static function toascii($text) /** + * Check whether an IP adress lies within a given range. Supports IPv4 and IPv6 + * @param $ip IP address (192.168.42.123) + * @param $cidrs IP range in CIDR notation (192.168.42.64/26) or array of ranges + * @return true if $ip is within $cidr + */ +function cidr_match($ip, $cidrs) +{ + foreach ((array)$cidrs as $cidr) + { + list($subnet, $mask) = explode('/', $cidr); + $ip_bin = inet_pton($ip); + $subnet_bin = inet_pton($subnet); + $valid_bytes = $mask ? $mask >> 3 : 42; + $bitmask = 256 - (1 << (8 - ($mask & 7))); + $lastbyte_matched = $bitmask ? (ord($ip_bin{$valid_bytes}) & $bitmask) == (ord($subnet_bin{$valid_bytes}) & $bitmask) : true; + + if (substr($ip_bin, 0, $valid_bytes) == substr($subnet_bin, 0, $valid_bytes) && $lastbyte_matched) + return true; + } + + return false; +} + + +/** * Convert regex for preg (adds and escapes delimiter, adds modifiers) * @param $pattern Regex to convert * @param $p['casesensitive'] Regex is case sensitive (omit modifier i) @@ -509,7 +534,7 @@ static function filter_keys($array, $keys, $p = array()) * Construct shell command using it::shell_command, log it, execute it and return output as string. * {keyword} quotes and inserts value from assoc array like ET() * {0} .. {n} quotes and inserts positional arguments - * {-opts} takes an array and inserts options a la it_html attributes (value, true, false or null) + * {-opts} array of opts => {value,true,false,null}: it::exec('ls {-opts}', ['-opts' => ["-l" => true]]); * @param $cmd Format string with {keywords} a la ET() * @param $values (zero, one or more arrays can be passed) * @return output of command. shell errors not detectable, see error_log in /www/server/logs @@ -529,12 +554,8 @@ static function exec(/* $cmd, $values1 = array(), ... */) /** * Construct shell command using it::shell_command, log it, execute it and return exit code. - * stdout/stderr is forwarded to stdout/stderror of calling script - * {keyword} quotes and inserts value from assoc array like ET() - * {0} .. {n} quotes and inserts positional arguments - * {-opts} takes an array and inserts options a la it_html attributes (value, true, false or null) - * @param $cmd Format string with {keywords} a la ET() - * @param $values (zero, one or more arrays can be passed) + * stdout/stderr is forwarded to stdout/stderror of calling script. + * See ::exec above for usage * @return exit code of command. */ static function system(/* $cmd, $values1 = array(), ... */) @@ -555,8 +576,8 @@ static function system(/* $cmd, $values1 = array(), ... */) /** * Construct shell command - * Keywords {keyword} are replace a la ET(), {-opts} takes an array and - * inserts options a la it_html attributes (value, true, false or null) + * Keywords {keyword} are replace a la ET(), + * {-opts} array of opts => {value,true,false,null}: it::exec('ls {-opts}', ['-opts' => ["-l" => true]]); * @param $cmd Format string with {keywords} replace a la ET() * @param $values (zero, one or more arrays can be passed) * @return output of command. shell errors not detectable, see error_log in /www/server/logs @@ -745,7 +766,7 @@ static function getopt($usage, $p = array()) list($shortoptname, $shortoptarg) = $matches; } - if ($default = it::match('\[(.*)\]\s*$', $usageline)) + if (($default = it::match('\[(.*)\]\s*$', $usageline)) !== null) { if ($longoptarg || $shortoptarg) $defaults[$longoptname ? $longoptname : $shortoptname] = it::replace(array('^default:?\s*' => ""), trim($default)); |