Subversion Repositories oidinfo_api

Compare Revisions

Regard whitespace Rev 32 → Rev 33

/trunk/oidinfo_api.inc.phps
77,8 → 77,7
if (!self::strictCheckSyntax($oid)) return false;
 
$pingResult = $this->pingOID($oid);
$ret = $pingResult[self::PING_IDX_EXISTS] >= 1;
return $ret;
return $pingResult[self::PING_IDX_EXISTS] >= 1;
}
 
public function checkOnlineAvailable($oid) {
85,8 → 84,7
if (!self::strictCheckSyntax($oid)) return false;
 
$pingResult = $this->pingOID($oid);
$ret = $pingResult[self::PING_IDX_EXISTS] == 2;
return $ret;
return $pingResult[self::PING_IDX_EXISTS] == 2;
}
 
public function checkOnlineAllowed($oid) {
219,9 → 217,7
// HL7 registry has included this accidently
$phone = str_replace('"', '', $phone);
 
$phone = trim($phone);
 
return $phone;
return trim($phone);
}
 
private static function strip_to_xhtml_light($str, $allow_strong_text=false) {
238,7 → 234,7
$str = preg_replace('@<\s*script.+<\s*/script.*>@isU', '', $str);
$str = preg_replace('@<\s*style.+<\s*/style.*>@isU', '', $str);
 
$str = preg_replace_callback(
return preg_replace_callback(
'@<(\s*/{0,1}\d*)([^\s/>]+)(\s*[^>]*)>@i',
function ($treffer) {
// see http://oid-info.com/xhtml-light.xsd
253,8 → 249,6
return '';
}
}, $str);
 
return $str;
}
 
const OIDINFO_CORRECT_DESC_OPTIONAL_ENDING_DOT = 0;
409,9 → 403,7
}
 
// Required for XML importer of oid-info.com (E-Mail 09.12.2021)
$desc = str_replace('&amp;', '&amp;amp;', $desc);
 
return $desc;
return str_replace('&amp;', '&amp;amp;', $desc);
}
 
public function xmlAddHeader($firstName, $lastName, $email) {
613,6 → 605,7
throw new OIDInfoException("Unexpected soft-correction behavior for ASN.1 IDs");
}
}
unset($synid);
}
 
// ATTENTION: the XML-generator will always add <dotted-oid> , but what will happen if additionally an
630,6 → 623,7
// Do not allow Numeric-only. It would only be valid in an IRI path, but not in a single identifier
if (!iri_arc_valid($iri, false)) $iri = null;
}
unset($iri);
}
 
if (isset($elements['first-registrant']['phone']))
1029,7 → 1023,7
 
$ary = explode(':', $this->addr); // TODO: does not work with an IPv6 address
$host = $ary[0];
$service_port = isset($ary[1]) ? $ary[1] : self::DEFAULT_PORT;
$service_port = $ary[1] ?? self::DEFAULT_PORT;
 
$is_ip = filter_var($host, FILTER_VALIDATE_IP) !== false;
if (!$is_ip) {
1063,7 → 1057,7
}
 
protected function spp_reader_avail($oid, $failcount=0) {
$in = "${oid}\n\0"; // PHP's socket_send() does not send a trailing \n . There needs to be something after the \n ... :(
$in = "$oid\n\0"; // PHP's socket_send() does not send a trailing \n . There needs to be something after the \n ... :(
 
if ($failcount >= self::SPP_MAX_CONNECTION_ATTEMPTS) {
$msg = "Query $oid: CONNECTION TO SIMPLE PING PROVIDER FAILED!\n";
1109,11 → 1103,11
}
 
public function disconnect() {
return $this->spp_reader_uninit();
$this->spp_reader_uninit();
}
 
public function connect() {
return $this->spp_reader_init();
$this->spp_reader_init();
}
 
function __construct($addr='localhost:49500') {
/trunk/uuid_utils.inc.phps
2,8 → 2,8
 
/*
* UUID utils for PHP
* Copyright 2011 - 2022 Daniel Marschall, ViaThinkSoft
* Version 2022-01-06
* Copyright 2011 - 2023 Daniel Marschall, ViaThinkSoft
* Version 2023-04-29
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
162,7 → 162,7
 
if (function_exists('decode_mac')) {
echo "\nIn case that this Node ID is a MAC address, here is the interpretation of that MAC address:\n";
echo decode_mac($nodeid);
decode_mac($nodeid);
}
 
break;
220,7 → 220,7
 
if (function_exists('decode_mac')) {
echo "\nIn case that this Node ID is a MAC address, here is the interpretation of that MAC address:\n";
echo decode_mac($nodeid);
decode_mac($nodeid);
}
 
break;
/trunk/xml_utils.inc.phps
141,7 → 141,7
}
 
function html_named_to_numeric_entities($str) {
if (!mb_detect_encoding($str, 'UTF-8', true)) $str = utf8_encode($str);
$str = mb_convert_encoding($str, 'UTF-8');
return mb_htmlentities(decodeNamedEntities($str));
}