From a65ce5d3b07deb578cc4c4aba5695bcea8c07a87 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 27 Aug 2012 06:23:30 -0400
Subject: [PATCH] Rename ip_check to check_ip, add IP checking tests
---
program/include/rcube_utils.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index defb2ae..aa748dc 100644
--- a/program/include/rcube_utils.php
+++ b/program/include/rcube_utils.php
@@ -94,7 +94,7 @@
// Validate domain part
if (preg_match('/^\[((IPv6:[0-9a-f:.]+)|([0-9.]+))\]$/i', $domain_part, $matches)) {
- return self::ip_check(preg_replace('/^IPv6:/i', '', $matches[1])); // valid IPv4 or IPv6 address
+ return self::check_ip(preg_replace('/^IPv6:/i', '', $matches[1])); // valid IPv4 or IPv6 address
}
else {
// If not an IP address
@@ -154,7 +154,7 @@
*
* @return bool True if the address is valid
*/
- public static function ip_check($ip)
+ public static function check_ip($ip)
{
// IPv6, but there's no build-in IPv6 support
if (strpos($ip, ':') !== false && !defined('AF_INET6')) {
--
Gitblit v1.9.1