tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

APICHANGE: give Geoip::getCountryDropDown a $withBlank parameter (bool: default as false).

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79850 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Normann Lou 2009-06-23 07:42:33 +00:00
parent e0fbc7ac83
commit 8b2a88e61e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration/Geoip.php
View File

@ -264,6 +264,7 @@ class Geoip extends Object {
'ZW' => "Zimbabwe" 'ZW' => "Zimbabwe"
); );
/** /**
* Find the country for an IP address. * Find the country for an IP address.
* *
@ -366,14 +367,18 @@ class Geoip extends Object {
} }
/** /**
* @param boolean $withBlank indicating the returned array containing blank value or not
* Returns an array of ISO Country Codes -> Country Names * Returns an array of ISO Country Codes -> Country Names
*/ */
static function getCountryDropDown() { static function getCountryDropDown($withBlank = false) {
$dropdown = Geoip::$iso_3166_countryCodes; $dropdown = Geoip::$iso_3166_countryCodes;
unset($dropdown['A1']); unset($dropdown['A1']);
unset($dropdown['A2']); unset($dropdown['A2']);
unset($dropdown['A3']); unset($dropdown['A3']);
asort($dropdown); asort($dropdown);
if($withBlank){
$dropdown = array_merge(array(""=>"Select a Country"), $dropdown);
}
return $dropdown; return $dropdown;
} }
} }