Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3815538
D1627.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D1627.diff
View Options
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
"global functions"
],
"require": {
- "php": ">=5.4.0"
+ "php": ">=7.1.0",
+ "keruald/omnitools": "^0.2.0"
},
"require-dev": {
"phpunit/phpunit": "^7"
diff --git a/core.php b/core.php
--- a/core.php
+++ b/core.php
@@ -2,6 +2,13 @@
namespace Keruald;
+use Keruald\OmniTools\Debug\Debugger;
+use Keruald\OmniTools\Identifiers\UUID;
+use Keruald\OmniTools\Network\IP;
+use Keruald\OmniTools\HTTP\Requests\RemoteAddress;
+use Keruald\OmniTools\HTTP\Requests\Request;
+use Keruald\OmniTools\Strings\Multibyte\StringUtilities;
+
/**
* Keruald, core libraries for Pluton and Xen engines.
*
@@ -22,40 +29,10 @@
* @param string $encoding the character encoding (optional)
*
* @return string the padded string
- *
+ * @deprecated Use Keruald\OmniTools\Strings\Multibyte\StringUtilities::pad
*/
function mb_str_pad($input, $pad_length, $pad_string = ' ', $pad_type = STR_PAD_RIGHT, $encoding = null) {
- // Inspired by Ronald Ulysses Swanson method
- // http://stackoverflow.com/a/27194169/1930997
- // who followed the str_pad PHP implementation.
-
- if ($encoding === null) {
- $encoding = mb_internal_encoding();
- }
-
- $padBefore = $pad_type === STR_PAD_BOTH || $pad_type === STR_PAD_LEFT;
- $padAfter = $pad_type === STR_PAD_BOTH || $pad_type === STR_PAD_RIGHT;
-
- $pad_length -= mb_strlen($input, $encoding);
- if ($padBefore && $padAfter) {
- $targetLength = $pad_length / 2;
- } else {
- $targetLength = $pad_length;
- }
- $strToRepeatLength = mb_strlen($pad_string, $encoding);
- $repeatTimes = ceil($targetLength / $strToRepeatLength);
- $repeatedString = str_repeat($pad_string, max(0, $repeatTimes)); // safe if used with valid Unicode sequences (any charset)
-
- $paddedString = '';
- if ($padBefore) {
- $paddedString = mb_substr($repeatedString, 0, floor($targetLength), $encoding);
- }
- $paddedString .= $input;
- if ($padAfter) {
- $paddedString .= mb_substr($repeatedString, 0, ceil($targetLength), $encoding);
- }
-
- return $paddedString;
+ return StringUtilities::pad($input, $pad_length, $pad_string, $pad_type, $encoding);
}
/**
@@ -63,9 +40,10 @@
*
* @param string $string the string to validate as an IP
* @return bool true if the specified string is a valid IP address; otherwise, false
+ * @deprecated Use Keruald\OmniTools\Network\IP::isIP
*/
function is_ip ($string) {
- return is_ipv4($string) || is_ipv6($string);
+ return IP::isIP($string);
}
/**
@@ -73,9 +51,10 @@
*
* @param string $string the string to validate as an IP
* @return bool true if the specified string is a valid IPv4 address; otherwise, false
+ * @deprecated Use Keruald\OmniTools\Network\IP::isIPv4
*/
function is_ipv4 ($string) {
- return filter_var($string, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
+ return IP::isIPv4($string);
}
/**
@@ -83,9 +62,10 @@
*
* @param string $string the string to validate as an IP
* @return bool true if the specified string is a valid IPv6 address; otherwise, false
+ * @deprecated Use Keruald\OmniTools\Network\IP::isIPv6
*/
function is_ipv6 ($string) {
- return filter_var($string, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
+ return IP::isIPv6($string);
}
@@ -97,33 +77,10 @@
* Generates a RFC 4211 compliant v4 UUID (random-based)
*
* @return string the UUID
+ * @deprecated Use Keruald\OmniTools\Identifiers\UUID::UUIDv4
*/
function uuid () {
- //Code by Andrew Moore
- //See http://php.net/manual/en/function.uniqid.php#94959
- // https://www.ietf.org/rfc/rfc4122.txt
-
- return sprintf(
- '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-
- // 32 bits for "time_low"
- mt_rand(0, 0xffff), mt_rand(0, 0xffff),
-
- // 16 bits for "time_mid"
- mt_rand(0, 0xffff),
-
- // 16 bits for "time_hi_and_version",
- // four most significant bits holds version number 4
- mt_rand(0, 0x0fff) | 0x4000,
-
- // 16 bits, 8 bits for "clk_seq_hi_res",
- // 8 bits for "clk_seq_low",
- // two most significant bits holds zero and one for variant DCE1.1
- mt_rand(0, 0x3fff) | 0x8000,
-
- // 48 bits for "node"
- mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
- );
+ return UUID::UUIDv4();
}
///
@@ -136,9 +93,7 @@
* @param mixed $variable the variable to dump
*/
function dprint_r ($variable) {
- echo '<pre>';
- print_r($variable);
- echo '</pre>';
+ Debugger::printVariable($variable);
}
/**
@@ -148,9 +103,8 @@
* @param mixed $variable the variable to dump
*/
function dieprint_r ($variable) {
- dprint_r($variable);
- die;
-};
+ Debugger::printVariableAndDie($variable);
+}
///
/// Client information
@@ -161,17 +115,10 @@
*
* @param string $value the header value
* @return string the IP part
+ * @deprecated
*/
function extract_client_ip_from_header ($value) {
- if (strpos($value, ',') !== false) {
- //Header contains 'clientIP, proxyIP, anotherProxyIP'
- //The first value is so the one to return.
- //See draft-ietf-appsawg-http-forwarded-10.
- $ips = explode(',', $value, 2);
- return trim($ips[0]);
- }
-
- return $value;
+ return (new RemoteAddress($value))->getClientAddress();
}
/**
@@ -181,28 +128,8 @@
* which takes in consideration proxy values, blindly trusted.
*
* @return string the remote address
+ * @deprecated Use Keruald\OmniTools\HTTP\Requests\Request::getRemoteAddress()
*/
function get_remote_addr () {
- $candidates = [
- //Standard header provided by draft-ietf-appsawg-http-forwarded-10
- 'HTTP_X_FORWARDED_FOR',
-
- //Legacy headers
- 'HTTP_CLIENT_IP',
- 'HTTP_FORWARDED',
- 'HTTP_FORWARDED_FOR',
- 'HTTP_X_CLUSTER_CLIENT_IP',
- 'HTTP_X_FORWARDED',
-
- //Default header if no proxy information could be detected
- 'REMOTE_ADDR',
- ];
-
- foreach ($candidates as $candidate) {
- if (array_key_exists($candidate, $_SERVER)) {
- return extract_client_ip_from_header($_SERVER[$candidate]);
- }
- }
-
- return '';
+ return Request::getRemoteAddress();
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Dec 3, 03:15 (21 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2276811
Default Alt Text
D1627.diff (6 KB)
Attached To
Mode
D1627: Merge branch 'transition-to-omnitools'
Attached
Detach File
Event Timeline
Log In to Comment