lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated is_ip comment and added a test for is_ip function

Browse Source
This commit is contained in:
Marcos García de La Fuente 2014-07-17 21:19:03 +02:00
parent cdc40ca76f
commit 37d4d303b3
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions2.lib.php
View File

@ -1364,10 +1364,8 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
/**
* This function evaluates a string that should be a valid IPv4
*
* @param string $ip IP Address
* @return It returns 0 if $ip is not a valid IPv4
* It returns 1 if $ip is a valid IPv4 and is a public IP
* It returns 2 if $ip is a valid IPv4 and is a private lan IP
* @param string $ip IP Address
* @return int 0 if not valid, 1 if valid and public IP, 2 if valid and private range IP
*/
function is_ip($ip)
{

19
test/phpunit/Functions2LibTest.php
View File

@ -154,4 +154,23 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
$this->assertEquals(0,$result);
}
/**
* is_ip
*
* @return void
*/
public function testIsIp() {
//Test not valid IP
$result = is_ip('192.168.1.267');
$this->assertEquals(0, $result);
//Test private range IP
$result = is_ip('192.168.1.1');
$this->assertEquals(2, $result);
//Test public range IP
$result = is_ip('91.121.33.228');
$this->assertEquals(1, $result);
}
}