From 386bcd6c6b50fc2c1468e7c947d9980efb4c0814 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Tue, 22 Aug 2006 18:57:07 +0000 Subject: [PATCH 01/63] Initial revision for PECL GeoIP documentation git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@218685 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 191 ++++++++++++++++++ .../functions/geoip-country-code-by-name.xml | 103 ++++++++++ .../functions/geoip-country-code3-by-name.xml | 103 ++++++++++ .../functions/geoip-country-name-by-name.xml | 103 ++++++++++ .../geoip/functions/geoip-database-info.xml | 97 +++++++++ .../geoip/functions/geoip-id-by-name.xml | 133 ++++++++++++ .../geoip/functions/geoip-org-by-name.xml | 98 +++++++++ .../geoip/functions/geoip-record-by-name.xml | 156 ++++++++++++++ .../geoip/functions/geoip-region-by-name.xml | 120 +++++++++++ reference/geoip/reference.xml | 74 +++++++ 10 files changed, 1178 insertions(+) create mode 100644 reference/geoip/constants.xml create mode 100644 reference/geoip/functions/geoip-country-code-by-name.xml create mode 100644 reference/geoip/functions/geoip-country-code3-by-name.xml create mode 100644 reference/geoip/functions/geoip-country-name-by-name.xml create mode 100644 reference/geoip/functions/geoip-database-info.xml create mode 100644 reference/geoip/functions/geoip-id-by-name.xml create mode 100644 reference/geoip/functions/geoip-org-by-name.xml create mode 100644 reference/geoip/functions/geoip-record-by-name.xml create mode 100644 reference/geoip/functions/geoip-region-by-name.xml create mode 100644 reference/geoip/reference.xml diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml new file mode 100644 index 0000000..42b601b --- /dev/null +++ b/reference/geoip/constants.xml @@ -0,0 +1,191 @@ + + +
+ &reftitle.constants; + &extension.constants; + + + + GEOIP_COUNTRY_EDITION + (integer) + + + + + + + + + + GEOIP_REGION_EDITION_REV0 + (integer) + + + + + + + + + + GEOIP_CITY_EDITION_REV0 + (integer) + + + + + + + + + + GEOIP_ORG_EDITION + (integer) + + + + + + + + + + GEOIP_ISP_EDITION + (integer) + + + + + + + + + + GEOIP_CITY_EDITION_REV1 + (integer) + + + + + + + + + + GEOIP_REGION_EDITION_REV1 + (integer) + + + + + + + + + + GEOIP_PROXY_EDITION + (integer) + + + + + + + + + + GEOIP_ASNUM_EDITION + (integer) + + + + + + + + + + GEOIP_NETSPEED_EDITION + (integer) + + + + + + + + + + GEOIP_DOMAIN_EDITION + (integer) + + + + + + + + + + The following constants are for net speed: + + + + + GEOIP_UNKNOWN_SPEED + (integer) + + + + + + + + GEOIP_DIALUP_SPEED + (integer) + + + + + + + + GEOIP_CABLEDSL_SPEED + (integer) + + + + + + + + GEOIP_CORPORATE_SPEED + (integer) + + + + + + +
+ + diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml new file mode 100644 index 0000000..f394d21 --- /dev/null +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -0,0 +1,103 @@ + + + + + geoip_country_code_by_name + Get the two letter country code + + + &reftitle.description; + + stringgeoip_country_code_by_name + stringhostname + + + + The geoip_country_code_by_name function will return + the two letter country code corresponding to a hostname or an IP address. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the two letter ISO country code on success, or &false; + if the address cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_country_code_by_name</function> example + + This will print where the host example.com is located. + + + +]]> + + &example.outputs; + + + + + + + + + &reftitle.seealso; + + + geoip_country_code3_by_name + geoip_country_name_by_name + + + + + + + diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml new file mode 100644 index 0000000..3bb983e --- /dev/null +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -0,0 +1,103 @@ + + + + + geoip_country_code3_by_name + Get the three letter country code + + + &reftitle.description; + + stringgeoip_country_code3_by_name + stringhostname + + + + The geoip_country_code3_by_name function will return the + three letter country code corresponding to a hostname or an IP address. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the three letter country code on success, or &false; + if the address cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_country_code3_by_name</function> example + + This will print where the host example.com is located. + + + +]]> + + &example.outputs; + + + + + + + + + &reftitle.seealso; + + + geoip_country_code_by_name + geoip_country_name_by_name + + + + + + + diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml new file mode 100644 index 0000000..6f0893f --- /dev/null +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -0,0 +1,103 @@ + + + + + geoip_country_name_by_name + Get the full country name + + + &reftitle.description; + + stringgeoip_country_name_by_name + stringhostname + + + + The geoip_country_name_by_name function will return the + full country name corresponding to a hostname or an IP address. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the country name on success, or &false; if the address cannot + be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_country_name_by_name</function> example + + This will print where the host example.com is located. + + + +]]> + + &example.outputs; + + + + + + + + + &reftitle.seealso; + + + geoip_country_code_by_name + geoip_country_code3_by_name + + + + + + + diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml new file mode 100644 index 0000000..60c192b --- /dev/null +++ b/reference/geoip/functions/geoip-database-info.xml @@ -0,0 +1,97 @@ + + + + + geoip_database_info + Get GeoIP Database information + + + &reftitle.description; + + stringgeoip_database_info + intdatabase + + + + The geoip_database_info function returns the corresponding + GeoIP Database version as it is defined inside the binary file. + + + + If this function is called without arguments, it returns the version + of the GeoIP Free Country Edition. + + + + + &reftitle.parameters; + + + + database + + + The database type as an integer. You can use the + various constants defined with + this extension (ie: GEOIP_*_EDITION). + + + + + + + + + &reftitle.returnvalues; + + Returns the corresponding database version, or &null; on error. + + + + + &reftitle.examples; + + + A <function>geoip_region_by_name</function> example + + This will output the current database version string. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml new file mode 100644 index 0000000..9ed801f --- /dev/null +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -0,0 +1,133 @@ + + + + + geoip_id_by_name + Get the Internet connection speed + + + &reftitle.description; + + integergeoip_id_by_name + stringhostname + + + + The geoip_id_by_name function will return the country + and region corresponding to a hostname or an IP address. + + + The return value is numeric and can be compared to the following constants: + + + + + + GEOIP_UNKNOWN_SPEED + + + + + GEOIP_DIALUP_SPEED + + + + + GEOIP_CABLEDSL_SPEED + + + + + GEOIP_CORPORATE_SPEED + + + + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose net speed is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the net speed. + + + + + &reftitle.examples; + + + A <function>geoip_id_by_name</function> example + + This will output the net speed of the host example.com. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml new file mode 100644 index 0000000..4207ec2 --- /dev/null +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -0,0 +1,98 @@ + + + + + geoip_org_by_name + Get the organization name + + + &reftitle.description; + + stringgeoip_org_by_name + stringhostname + + + + The geoip_org_by_name function will return the name of + the organization that an IP is assigned to. + + + This function is currently only available to users who have bought a commercial + GeoIP Organization, ISP or AS Edition. A warning will be issued if the proper + database cannot be located. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address. + + + + + + + + &reftitle.returnvalues; + + Returns the organization name on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_org_by_name</function> example + + This will print to whom the host example.com IP is allocated. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml new file mode 100644 index 0000000..3e83801 --- /dev/null +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -0,0 +1,156 @@ + + + + + geoip_record_by_name + Returns the detailed City information found in the GeoIP Database + + + &reftitle.description; + + arraygeoip_record_by_name + stringhostname + + + + The geoip_record_by_name function will return the + record information corresponding to a hostname or an IP address. + + + This function is available for both GeoLite City Edition and commercial GeoIP + City Edition. A warning will be issued if the proper database cannot be + located. + + + The names of the different keys of the returning associative array are as follows: + + + + + + "country_code" -- Two letter country code (see + geoip_country_code_by_name) + + + + + "region" -- The region code (ex: CA for California) + + + + + "city" -- The city. + + + + + "postal_code" -- The Postal Code, FSA or Zip Code. + + + + + "latitude" -- The Latitude as signed double. + + + + + "longitude" -- The Longitude as signed double. + + + + + "dma_code" + + + + + "area_code" -- The PSTN area code (ex: 212) + + + + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose record is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the associative array on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_record_by_name</function> example + + This will print the array containing the record of host example.com. + + + +]]> + + &example.outputs; + + US + [region] => CA + [city] => Marina Del Rey + [postal_code] => + [latitude] => 33.9776992798 + [longitude] => -118.435096741 + [dma_code] => 803 + [area_code] => 310 +) +]]> + + + + + + + + diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml new file mode 100644 index 0000000..66b17f7 --- /dev/null +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -0,0 +1,120 @@ + + + + + geoip_region_by_name + Get the country code and region + + + &reftitle.description; + + arraygeoip_region_by_name + stringhostname + + + + The geoip_region_by_name function will return the country + and region corresponding to a hostname or an IP address. + + + This function is currently only available to users who have bought a commercial + GeoIP Region Edition. A warning will be issued if the proper database cannot be + located. + + + The names of the different keys of the returning associative array are as follows: + + + + + + "country_code" -- Two letter country code (see + geoip_country_code_by_name) + + + + + "region" -- The region code (ex: CA for California) + + + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose region is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the associative array on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_region_by_name</function> example + + This will print the array containing the country code and region + of the host example.com. + + + +]]> + + &example.outputs; + + US + [region] => CA +) +]]> + + + + + + + + diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml new file mode 100644 index 0000000..178ee38 --- /dev/null +++ b/reference/geoip/reference.xml @@ -0,0 +1,74 @@ + + + + + + GeoIP Functions + GeoIP + + +
+ &reftitle.intro; + + The GeoIP extension allows you to find the location of an IP address. City, + State, Country, Longitude, Latitude, and other information as all, such as + ISP and connection type can be obtained with the help of GeoIP. + +
+
+ &reftitle.required; + + This extension requires the GeoIP C library version 1.4.0 or higher to be + installed. You can grab the latest version from + http://www.maxmind.com/app/c + and compile it yourself. + + + By default, you will only have access to the Free GeoIP Country or GeoLite + City databases. While this module can work with other types of database, + you must buy a commercial license from + Maxmind. + +
+ +
+ &reftitle.install; + + &pecl.moved; + + + &pecl.info; + &url.pecl.package;geoip. + +
+ +
+ &reftitle.resources; + &no.resource; +
+ + &reference.geoip.constants; + + &reference.geoip.functions; + + + From 76fc3fcee36e5c70b29433c2ea8b2ef4b7e2a95f Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 24 Aug 2006 11:16:59 +0000 Subject: [PATCH 02/63] Fix return type git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@218789 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-id-by-name.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml index 9ed801f..02aaf50 100644 --- a/reference/geoip/functions/geoip-id-by-name.xml +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -1,5 +1,5 @@ - + geoip_id_by_name @@ -8,7 +8,7 @@ &reftitle.description; - integergeoip_id_by_name + intgeoip_id_by_name stringhostname From e9af163138f65eb447a8d36c9c0ee87f0b7a4a2f Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Fri, 8 Sep 2006 12:30:07 +0000 Subject: [PATCH 03/63] move maxmind.* urls to entities. add mising refpurposes tags git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@219628 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/reference.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml index 178ee38..ed0c806 100644 --- a/reference/geoip/reference.xml +++ b/reference/geoip/reference.xml @@ -1,7 +1,7 @@ - - - + + + GeoIP Functions GeoIP @@ -20,14 +20,14 @@ This extension requires the GeoIP C library version 1.4.0 or higher to be installed. You can grab the latest version from - http://www.maxmind.com/app/c + &url.maxmind.geoip; and compile it yourself. By default, you will only have access to the Free GeoIP Country or GeoLite City databases. While this module can work with other types of database, you must buy a commercial license from - Maxmind. + Maxmind. From 4299efcecd8494fd5df78d072ffdb3887284c829 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Wed, 20 Jun 2007 22:25:43 +0000 Subject: [PATCH 04/63] Upgrade to DocBook5: - All id attributes are now xml:id - Add docbook namespace to all root elements - Replace with - Minor markup fixes here and there git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@238160 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 4 ++-- .../functions/geoip-country-code-by-name.xml | 4 ++-- .../functions/geoip-country-code3-by-name.xml | 4 ++-- .../functions/geoip-country-name-by-name.xml | 4 ++-- .../geoip/functions/geoip-database-info.xml | 4 ++-- reference/geoip/functions/geoip-id-by-name.xml | 4 ++-- .../geoip/functions/geoip-org-by-name.xml | 4 ++-- .../geoip/functions/geoip-record-by-name.xml | 4 ++-- .../geoip/functions/geoip-region-by-name.xml | 4 ++-- reference/geoip/reference.xml | 18 +++++++++--------- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index 42b601b..efcb421 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,6 +1,6 @@ - -
+ +
&reftitle.constants; &extension.constants; diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index f394d21..9edfbdf 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_country_code_by_name Get the two letter country code diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml index 3bb983e..b1f4707 100644 --- a/reference/geoip/functions/geoip-country-code3-by-name.xml +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_country_code3_by_name Get the three letter country code diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml index 6f0893f..474cf6e 100644 --- a/reference/geoip/functions/geoip-country-name-by-name.xml +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_country_name_by_name Get the full country name diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 60c192b..11f4105 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -1,6 +1,6 @@ - - + + geoip_database_info Get GeoIP Database information diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml index 02aaf50..c5ab9bc 100644 --- a/reference/geoip/functions/geoip-id-by-name.xml +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_id_by_name Get the Internet connection speed diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index 4207ec2..b385616 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_org_by_name Get the organization name diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index 3e83801..d95762a 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_record_by_name Returns the detailed City information found in the GeoIP Database diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml index 66b17f7..3d2f288 100644 --- a/reference/geoip/functions/geoip-region-by-name.xml +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -1,6 +1,6 @@ - - + + geoip_region_by_name Get the country code and region diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml index ed0c806..5b2bfa3 100644 --- a/reference/geoip/reference.xml +++ b/reference/geoip/reference.xml @@ -1,13 +1,13 @@ - + - + GeoIP Functions GeoIP -
+
&reftitle.intro; The GeoIP extension allows you to find the location of an IP address. City, @@ -15,34 +15,34 @@ ISP and connection type can be obtained with the help of GeoIP.
-
+
&reftitle.required; This extension requires the GeoIP C library version 1.4.0 or higher to be installed. You can grab the latest version from - &url.maxmind.geoip; + &url.maxmind.geoip; and compile it yourself. By default, you will only have access to the Free GeoIP Country or GeoLite City databases. While this module can work with other types of database, you must buy a commercial license from - Maxmind. + Maxmind.
-
+
&reftitle.install; &pecl.moved; &pecl.info; - &url.pecl.package;geoip. + &url.pecl.package;geoip.
-
+
&reftitle.resources; &no.resource;
From 1dcc5dcfec1833798f4f750a5744aa3e3b4ee805 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Thu, 23 Aug 2007 12:52:06 +0000 Subject: [PATCH 05/63] Documenting new functions found in newer releases git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@241753 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-db-avail.xml | 98 +++++++++++ .../geoip/functions/geoip-db-filename.xml | 99 ++++++++++++ .../geoip/functions/geoip-db-get-all-info.xml | 152 ++++++++++++++++++ 3 files changed, 349 insertions(+) create mode 100644 reference/geoip/functions/geoip-db-avail.xml create mode 100644 reference/geoip/functions/geoip-db-filename.xml create mode 100644 reference/geoip/functions/geoip-db-get-all-info.xml diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml new file mode 100644 index 0000000..1acbce5 --- /dev/null +++ b/reference/geoip/functions/geoip-db-avail.xml @@ -0,0 +1,98 @@ + + + + + geoip_db_avail + Determine if GeoIP Database is available + + + &reftitle.description; + + boolgeoip_db_avail + intdatabase + + + + The geoip_db_avail function returns if the corresponding + GeoIP Database is available and can be opened on disk. + + + + It does not indicate if the file is a proper database, only if it is readable. + + + + + &reftitle.parameters; + + + + database + + + The database type as an integer. You can use the + various constants defined with + this extension (ie: GEOIP_*_EDITION). + + + + + + + + + &reftitle.returnvalues; + + Returns &true; is database exists, &false; if not found, or &null; on error. + + + + + &reftitle.examples; + + + A <function>geoip_db_avail</function> example + + This will output the current database version string. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml new file mode 100644 index 0000000..f51e44b --- /dev/null +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -0,0 +1,99 @@ + + + + + geoip_db_filename + Returns the filename of the corresponding GeoIP Database + + + &reftitle.description; + + stringgeoip_db_filename + intdatabase + + + + The geoip_db_filename function returns the filename of + the corresponding GeoIP Database. + + + + It does not indicate if the file exists or not on disk, only where the library + is looking for the database. + + + + + &reftitle.parameters; + + + + database + + + The database type as an integer. You can use the + various constants defined with + this extension (ie: GEOIP_*_EDITION). + + + + + + + + + &reftitle.returnvalues; + + Returns the filename of the corresponding database, or &null; on error. + + + + + &reftitle.examples; + + + A <function>geoip_db_avail</function> example + + This will output the current database version string. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml new file mode 100644 index 0000000..a27e69f --- /dev/null +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -0,0 +1,152 @@ + + + + + geoip_db_get_all_info + Returns detailed informations about all GeoIP database types + + + &reftitle.description; + + arraygeoip_db_get_all_info + + + + The geoip_db_get_all_info function will return + detailed informations as a multi-dimensional array about all the + GeoIP database types. + + + This function is available even if no databases are installed. It + will simply list them as non-available. + + + The names of the different keys of the returning associative array are as follows: + + + + + + "available" -- Boolean, indicate if DB is available (see + geoip_db_avail) + + + + + "description" -- The database description + + + + + "filename" -- The database filename on disk (see + geoip_db_filename) + + + + + + + + &reftitle.returnvalues; + + Returns the associative array. + + + + + &reftitle.examples; + + + A <function>geoip_db_get_all_info</function> example + + This will print the array containing all the informations. + + + +]]> + + &example.outputs; + + + array(3) { + ["available"]=> + bool(true) + ["description"]=> + string(21) "GeoIP Country Edition" + ["filename"]=> + string(32) "/usr/share/GeoIP/GeoIP.dat" + } + +[ ... ] + + [11]=> + array(3) { + ["available"]=> + bool(false) + ["description"]=> + string(25) "GeoIP Domain Name Edition" + ["filename"]=> + string(38) "/usr/share/GeoIP/GeoIPDomain.dat" + } +} +]]> + + + + + + + A <function>geoip_db_get_all_info</function> example + + You can use the various constants as keys to get only parts of the information. + + + +]]> + + &example.outputs; + + + + + + + + + + From 227772696ecc4b89a0f3a6861ccef22f34ddd818 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Thu, 23 Aug 2007 16:57:41 +0000 Subject: [PATCH 06/63] fix build git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@241757 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-db-get-all-info.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index a27e69f..e1fd620 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -1,5 +1,5 @@ - + geoip_db_get_all_info @@ -9,6 +9,7 @@ &reftitle.description; arraygeoip_db_get_all_info + From 85a0a8ad5b37e1a956dd294d3b9d0d624d436440 Mon Sep 17 00:00:00 2001 From: TAKAGI Masahiro Date: Sat, 25 Aug 2007 08:06:19 +0000 Subject: [PATCH 07/63] correct the title and description of example. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@241814 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-db-filename.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml index f51e44b..48b93fa 100644 --- a/reference/geoip/functions/geoip-db-filename.xml +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -1,5 +1,5 @@ - + geoip_db_filename @@ -52,9 +52,9 @@ &reftitle.examples; - A <function>geoip_db_avail</function> example + A <function>geoip_db_filename</function> example - This will output the current database version string. + This will output the filename of the corresponding database. Date: Thu, 1 Nov 2007 16:40:42 +0000 Subject: [PATCH 08/63] WS - Removal of TABs. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@245390 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-db-get-all-info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index e1fd620..c04c1a7 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -1,5 +1,5 @@ - + geoip_db_get_all_info @@ -107,7 +107,7 @@ array(11) { A <function>geoip_db_get_all_info</function> example - You can use the various constants as keys to get only parts of the information. + You can use the various constants as keys to get only parts of the information. Date: Wed, 21 Nov 2007 13:47:06 +0000 Subject: [PATCH 09/63] New function in 1.0.2 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@246604 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip/functions/geoip-isp-by-name.xml | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 reference/geoip/functions/geoip-isp-by-name.xml diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml new file mode 100644 index 0000000..31b5490 --- /dev/null +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -0,0 +1,98 @@ + + + + + geoip_isp_by_name + Get the Internet Service Provider (ISP) name + + + &reftitle.description; + + stringgeoip_isp_by_name + stringhostname + + + + The geoip_isp_by_name function will return the name of + the Internet Service Provider (ISP) that an IP is assigned to. + + + This function is currently only available to users who have bought a commercial + GeoIP ISP Edition. A warning will be issued if the proper database cannot be + located. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address. + + + + + + + + &reftitle.returnvalues; + + Returns the ISP name on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_isp_by_name</function> example + + This will print the ISP name of host example.com. + + + +]]> + + &example.outputs; + + + + + + + + + + From fba52965bcc14678db2f8c70fe8c3ba0fbf8da2d Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Mon, 10 Dec 2007 17:06:11 +0000 Subject: [PATCH 10/63] MFB: Rename "functions.xml" to entities..xml git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@247901 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/reference.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml index 5b2bfa3..63bd15c 100644 --- a/reference/geoip/reference.xml +++ b/reference/geoip/reference.xml @@ -1,5 +1,5 @@ - + @@ -49,7 +49,7 @@ &reference.geoip.constants; - &reference.geoip.functions; + &reference.geoip.entities.functions; + + + + + GeoIP Functions + GeoIP + + + &reftitle.intro; + + The GeoIP extension allows you to find the location of an IP address. City, + State, Country, Longitude, Latitude, and other information as all, such as + ISP and connection type can be obtained with the help of GeoIP. + + + + &reference.geoip.setup; + &reference.geoip.constants; + &reference.geoip.reference; + + + + diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index efcb421..5c7347b 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,6 +1,6 @@ - -
+ + &reftitle.constants; &extension.constants; @@ -167,7 +167,7 @@ -
+ - - - - GeoIP Functions - GeoIP - - -
- &reftitle.intro; - - The GeoIP extension allows you to find the location of an IP address. City, - State, Country, Longitude, Latitude, and other information as all, such as - ISP and connection type can be obtained with the help of GeoIP. - -
-
- &reftitle.required; - - This extension requires the GeoIP C library version 1.4.0 or higher to be - installed. You can grab the latest version from - &url.maxmind.geoip; - and compile it yourself. - - - By default, you will only have access to the Free GeoIP Country or GeoLite - City databases. While this module can work with other types of database, - you must buy a commercial license from - Maxmind. - -
- -
- &reftitle.install; - - &pecl.moved; - - - &pecl.info; - &url.pecl.package;geoip. - -
+ -
- &reftitle.resources; - &no.resource; -
- - &reference.geoip.constants; - + + GeoIP &Functions; &reference.geoip.entities.functions; @@ -72,3 +26,4 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> + diff --git a/reference/geoip/setup.xml b/reference/geoip/setup.xml new file mode 100644 index 0000000..7fb0e40 --- /dev/null +++ b/reference/geoip/setup.xml @@ -0,0 +1,66 @@ + + + + + &reftitle.setup; + +
+ &reftitle.required; + + This extension requires the GeoIP C library version 1.4.0 or higher to be + installed. You can grab the latest version from + &url.maxmind.geoip; + and compile it yourself. + + + By default, you will only have access to the Free GeoIP Country or GeoLite + City databases. While this module can work with other types of database, + you must buy a commercial license from + Maxmind. + +
+ +
+ &reftitle.install; + + &pecl.moved; + + + &pecl.info; + &url.pecl.package;geoip. + +
+ +
+ &reftitle.runtime; + &no.config; +
+ +
+ &reftitle.resources; + &no.resource; +
+ + + + + From bbe1b9f62c1f877cadbdd9cf66a413a04bc23015 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Tue, 25 Dec 2007 23:41:33 +0000 Subject: [PATCH 12/63] Use the &Functions; entity (patch by Felipe) git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@248985 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 33b6d1e..00589ca 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,10 +1,10 @@ - + - GeoIP Functions + GeoIP &Functions; GeoIP From 3bc77a7c2a412957d3931fd5380170c32d7a7246 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Fri, 30 May 2008 17:25:13 +0000 Subject: [PATCH 13/63] Unified and <titleabbrev> in every extensions book.xml/reference.xml See the following bug report for details: http://bugs.php.net/44736 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@260480 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 00589ca..4566b8d 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- Purpose: basic.other --> <!-- Membership: pecl, external --> <book xml:id="book.geoip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>GeoIP &Functions; + Geo IP Location GeoIP From 0b463f42498dec1854b79d9981822eb265f08a42 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Thu, 30 Oct 2008 08:46:16 +0000 Subject: [PATCH 14/63] Contains version information (when functions became available in PHP) # Originally from the following location (although modified): # phpdoc/phpbook/phpbook-xsl/version.xml git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@268000 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/versions.xml | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 reference/geoip/versions.xml diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml new file mode 100644 index 0000000..d8dac75 --- /dev/null +++ b/reference/geoip/versions.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From 93f6fde0d3567c2672b856c3cca4b67f5d1ad7c6 Mon Sep 17 00:00:00 2001 From: "Daniel P. Brown" Date: Mon, 1 Dec 2008 01:09:07 +0000 Subject: [PATCH 15/63] Fixed example. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@270190 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-org-by-name.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index b385616..3cefad8 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -1,5 +1,5 @@ - + geoip_org_by_name @@ -57,7 +57,7 @@ Date: Wed, 3 Dec 2008 18:44:58 +0000 Subject: [PATCH 16/63] Adding missing version info for new function git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@270476 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/versions.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index d8dac75..1a0bf97 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -1,5 +1,5 @@ - + @@ -12,6 +12,7 @@ + @@ -36,4 +37,4 @@ End: vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 ---> \ No newline at end of file +--> From f85d039dc5e42aaa215a0d9a56f001170b55df9c Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Tue, 16 Dec 2008 01:58:18 +0000 Subject: [PATCH 17/63] Fixed simple spelling errors git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271307 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-db-get-all-info.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index c04c1a7..29ba979 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -1,9 +1,9 @@ - + geoip_db_get_all_info - Returns detailed informations about all GeoIP database types + Returns detailed information about all GeoIP database types &reftitle.description; @@ -14,7 +14,7 @@ The geoip_db_get_all_info function will return - detailed informations as a multi-dimensional array about all the + detailed information as a multi-dimensional array about all the GeoIP database types. @@ -60,7 +60,7 @@ A <function>geoip_db_get_all_info</function> example - This will print the array containing all the informations. + This will print the array containing all the information. Date: Fri, 19 Dec 2008 14:21:04 +0000 Subject: [PATCH 18/63] Adding missing documentation for geoip_continent_code_by_name() git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271606 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip-continent-code-by-name.xml | 102 ++++++++++++++++++ reference/geoip/versions.xml | 3 +- 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 reference/geoip/functions/geoip-continent-code-by-name.xml diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml new file mode 100644 index 0000000..fe43a14 --- /dev/null +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -0,0 +1,102 @@ + + + + + geoip_continent_code_by_name + Get the two letter continent code + + + &reftitle.description; + + stringgeoip_continent_code_by_name + stringhostname + + + + The geoip_continent_code_by_name function will return + the two letter continent code corresponding to a hostname or an IP address. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + + + + + &reftitle.returnvalues; + + Returns the two letter continent code on success, or &false; if the + address cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_continent_code_by_name</function> example + + This will print where the host example.com is located. + + + +]]> + + &example.outputs; + + + + + + + + + &reftitle.seealso; + + + geoip_country_code_by_name + + + + + + + diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index 1a0bf97..d983b2a 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -1,9 +1,10 @@ - + + From 3c4e33e83b95312dd739d4d1751309515bc82328 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Fri, 19 Dec 2008 15:23:04 +0000 Subject: [PATCH 19/63] Documenting new fields available with recent releases git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271610 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip/functions/geoip-record-by-name.xml | 57 ++++++++++++++++++- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index d95762a..6a73308 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -1,5 +1,5 @@ - + geoip_record_by_name @@ -26,12 +26,30 @@ + + + "continent_code" -- Two letter continent code (as of version 1.0.4 with + libgeoip 1.4.3 or newer) + + "country_code" -- Two letter country code (see geoip_country_code_by_name) + + + "country_code3" -- Three letter country code (see + geoip_country_code3_by_name) + + + + + "country_name" -- The country name (see + geoip_country_name_by_name) + + "region" -- The region code (ex: CA for California) @@ -59,7 +77,7 @@ - "dma_code" + "dma_code" -- Designated Market Area code (USA and Canada only) @@ -69,8 +87,8 @@ - + &reftitle.parameters; @@ -94,6 +112,36 @@ + + &reftitle.changelog; + + + + + + &Version; + &Description; + + + + + 1.0.4 + + Adding the continent_code with GeoIP Library 1.4.3 or newer only + + + + 1.0.3 + + Adding country_code3 and country_name + + + + + + + + &reftitle.examples; @@ -117,7 +165,10 @@ if ($record) { NA [country_code] => US + [country_code3] => USA + [country_name] => United States [region] => CA [city] => Marina Del Rey [postal_code] => From cde01fcb9fd676c617c26bcf7f811f7f387b2f09 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Tue, 23 Dec 2008 21:26:50 +0000 Subject: [PATCH 20/63] Documentation for new GeoIP functions git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271778 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../functions/geoip-region-name-by-code.xml | 139 ++++++++++++++++++ .../geoip-time-zone-by-country-and-region.xml | 139 ++++++++++++++++++ reference/geoip/versions.xml | 4 +- 3 files changed, 281 insertions(+), 1 deletion(-) create mode 100644 reference/geoip/functions/geoip-region-name-by-code.xml create mode 100644 reference/geoip/functions/geoip-time-zone-by-country-and-region.xml diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml new file mode 100644 index 0000000..38b54c2 --- /dev/null +++ b/reference/geoip/functions/geoip-region-name-by-code.xml @@ -0,0 +1,139 @@ + + + + + geoip_region_name_by_code + Returns the region name for some country and region code combo + + + &reftitle.description; + + stringgeoip_region_name_by_code + stringcountry_code + stringregion_code + + + + The geoip_region_name_by_code function will return the region + name corresponding to a country and region code combo. + + + In the United States, the region code corresponds to the two-letter abbreviation + of each state. In Canada, the region code corresponds to the two-letter province or + territory code as attributed by Canada Post. + + + For the rest of the world, GeoIP uses FIPS 10-4 codes to represent regions. + You can check &url.maxmind.fips; + for a detailed list of FIPS 10-4 codes. + + + This function is always available if using GeoIP Library version 1.4.1 or newer. The + data is taken directly from the GeoIP Library and not from any database. + + + + &reftitle.parameters; + + + + country_code + + + The two-letter country code (see + geoip_country_code_by_name) + + + + + region_code + + + The two-letter (or digit) region code (see + geoip_region_by_name) + + + + + + + + &reftitle.returnvalues; + + Returns the region name on success, or &false; if the country and region code + combo cannot be found. + + + + + &reftitle.examples; + + + A <function>geoip_region_name_by_code</function> example using region code for US/Canada + + This will print the region name for country CA (Canada), region QC (Quebec). + + + +]]> + + &example.outputs; + + + + + + A <function>geoip_region_name_by_code</function> example using FIPS codes + + This will print the region name for country JP (Japan), region 01. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml new file mode 100644 index 0000000..cd61dcc --- /dev/null +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -0,0 +1,139 @@ + + + + + geoip_time_zone_by_country_and_region + Returns the time zone for some country and region code combo + + + &reftitle.description; + + stringgeoip_time_zone_by_country_and_region + stringcountry_code + stringregion_code + + + + The geoip_time_zone_by_country_and_region function will return the + time zone corresponding to a country and region code combo. + + + In the United States, the region code corresponds to the two-letter abbreviation + of each state. In Canada, the region code corresponds to the two-letter province or + territory code as attributed by Canada Post. + + + For the rest of the world, GeoIP uses FIPS 10-4 codes to represent regions. + You can check &url.maxmind.fips; + for a detailed list of FIPS 10-4 codes. + + + This function is always available if using GeoIP Library version 1.4.1 or newer. The + data is taken directly from the GeoIP Library and not from any database. + + + + &reftitle.parameters; + + + + country_code + + + The two-letter country code (see + geoip_country_code_by_name) + + + + + region_code + + + The two-letter (or digit) region code (see + geoip_region_by_name) + + + + + + + + &reftitle.returnvalues; + + Returns the time zone on success, or &false; if the country and region code + combo cannot be found. + + + + + &reftitle.examples; + + + A <function>geoip_time_zone_by_country_and_region</function> example using region code for US/Canada + + This will print the time zone for country CA (Canada), region QC (Quebec). + + + +]]> + + &example.outputs; + + + + + + A <function>geoip_time_zone_by_country_and_region</function> example using FIPS codes + + This will print the time zone for country JP (Japan), region 01 (Aichi). + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index d983b2a..486f852 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -1,5 +1,5 @@ - + @@ -17,6 +17,8 @@ + + + geoip_database_info @@ -9,7 +9,7 @@ &reftitle.description; stringgeoip_database_info - intdatabase + intdatabaseGEOIP_COUNTRY_EDITION diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index cd61dcc..b45ef02 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -1,5 +1,5 @@ - + geoip_time_zone_by_country_and_region @@ -10,7 +10,7 @@ stringgeoip_time_zone_by_country_and_region stringcountry_code - stringregion_code + stringregion_code From 0c1a5b38c01f7c45d535b0015485ef9fc01e8cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nilg=C3=BCn=20Belma=20Bug=C3=BCner?= Date: Sat, 11 Jul 2009 07:07:53 +0000 Subject: [PATCH 22/63] fixed properties git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@283811 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 2 +- reference/geoip/constants.xml | 2 +- reference/geoip/functions/geoip-continent-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code3-by-name.xml | 2 +- reference/geoip/functions/geoip-country-name-by-name.xml | 2 +- reference/geoip/functions/geoip-database-info.xml | 2 +- reference/geoip/functions/geoip-db-avail.xml | 2 +- reference/geoip/functions/geoip-db-filename.xml | 2 +- reference/geoip/functions/geoip-db-get-all-info.xml | 2 +- reference/geoip/functions/geoip-id-by-name.xml | 2 +- reference/geoip/functions/geoip-isp-by-name.xml | 2 +- reference/geoip/functions/geoip-org-by-name.xml | 2 +- reference/geoip/functions/geoip-record-by-name.xml | 2 +- reference/geoip/functions/geoip-region-by-name.xml | 2 +- reference/geoip/functions/geoip-region-name-by-code.xml | 2 +- .../geoip/functions/geoip-time-zone-by-country-and-region.xml | 2 +- reference/geoip/reference.xml | 2 +- reference/geoip/setup.xml | 2 +- reference/geoip/versions.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 4566b8d..ceeebc7 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,5 +1,5 @@ - + diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index 5c7347b..a60c9dc 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,5 +1,5 @@ - + &reftitle.constants; &extension.constants; diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index fe43a14..0f2c9f4 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -1,5 +1,5 @@ - + geoip_continent_code_by_name diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index 9edfbdf..e7c9daf 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -1,5 +1,5 @@ - + geoip_country_code_by_name diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml index b1f4707..d941297 100644 --- a/reference/geoip/functions/geoip-country-code3-by-name.xml +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -1,5 +1,5 @@ - + geoip_country_code3_by_name diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml index 474cf6e..21a9145 100644 --- a/reference/geoip/functions/geoip-country-name-by-name.xml +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -1,5 +1,5 @@ - + geoip_country_name_by_name diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 0c92f29..8a861ab 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -1,5 +1,5 @@ - + geoip_database_info diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml index 1acbce5..0eeee11 100644 --- a/reference/geoip/functions/geoip-db-avail.xml +++ b/reference/geoip/functions/geoip-db-avail.xml @@ -1,5 +1,5 @@ - + geoip_db_avail diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml index 48b93fa..8ff7950 100644 --- a/reference/geoip/functions/geoip-db-filename.xml +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -1,5 +1,5 @@ - + geoip_db_filename diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index 29ba979..41d72c1 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -1,5 +1,5 @@ - + geoip_db_get_all_info diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml index c5ab9bc..d24c5e5 100644 --- a/reference/geoip/functions/geoip-id-by-name.xml +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -1,5 +1,5 @@ - + geoip_id_by_name diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml index 31b5490..780aef1 100644 --- a/reference/geoip/functions/geoip-isp-by-name.xml +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -1,5 +1,5 @@ - + geoip_isp_by_name diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index 3cefad8..243b592 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -1,5 +1,5 @@ - + geoip_org_by_name diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index 6a73308..9657079 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -1,5 +1,5 @@ - + geoip_record_by_name diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml index 3d2f288..3755659 100644 --- a/reference/geoip/functions/geoip-region-by-name.xml +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -1,5 +1,5 @@ - + geoip_region_by_name diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml index 38b54c2..2a75c14 100644 --- a/reference/geoip/functions/geoip-region-name-by-code.xml +++ b/reference/geoip/functions/geoip-region-name-by-code.xml @@ -1,5 +1,5 @@ - + geoip_region_name_by_code diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index b45ef02..3426018 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -1,5 +1,5 @@ - + geoip_time_zone_by_country_and_region diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml index 1879852..200e92d 100644 --- a/reference/geoip/reference.xml +++ b/reference/geoip/reference.xml @@ -1,5 +1,5 @@ - + GeoIP &Functions; diff --git a/reference/geoip/setup.xml b/reference/geoip/setup.xml index 7fb0e40..a1cc2ba 100644 --- a/reference/geoip/setup.xml +++ b/reference/geoip/setup.xml @@ -1,5 +1,5 @@ - + &reftitle.setup; diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index 486f852..e708e2a 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -1,5 +1,5 @@ - + From ef853c21869761099945f0e2d3150c3788c74cb1 Mon Sep 17 00:00:00 2001 From: Torben Wilson Date: Fri, 25 Sep 2009 07:04:39 +0000 Subject: [PATCH 23/63] Normalized the sgml-default-dtd-file local-variable line for those still using this, after discussion on the phpdoc list. From now on, manual.ced will need to be found at ~/.phpdoc/manual.ced. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@288721 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 2 +- reference/geoip/constants.xml | 2 +- reference/geoip/functions/geoip-continent-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code3-by-name.xml | 2 +- reference/geoip/functions/geoip-country-name-by-name.xml | 2 +- reference/geoip/functions/geoip-database-info.xml | 2 +- reference/geoip/functions/geoip-db-avail.xml | 2 +- reference/geoip/functions/geoip-db-filename.xml | 2 +- reference/geoip/functions/geoip-db-get-all-info.xml | 2 +- reference/geoip/functions/geoip-id-by-name.xml | 2 +- reference/geoip/functions/geoip-isp-by-name.xml | 2 +- reference/geoip/functions/geoip-org-by-name.xml | 2 +- reference/geoip/functions/geoip-record-by-name.xml | 2 +- reference/geoip/functions/geoip-region-by-name.xml | 2 +- reference/geoip/functions/geoip-region-name-by-code.xml | 2 +- .../geoip/functions/geoip-time-zone-by-country-and-region.xml | 2 +- reference/geoip/reference.xml | 2 +- reference/geoip/setup.xml | 2 +- reference/geoip/versions.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index ceeebc7..0079be9 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -32,7 +32,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index a60c9dc..5e5c9b1 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -180,7 +180,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index 0f2c9f4..26c3867 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -91,7 +91,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index e7c9daf..2d6caca 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -92,7 +92,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml index d941297..8c4b03c 100644 --- a/reference/geoip/functions/geoip-country-code3-by-name.xml +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -92,7 +92,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml index 21a9145..cfe4b08 100644 --- a/reference/geoip/functions/geoip-country-name-by-name.xml +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -92,7 +92,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 8a861ab..432008b 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -86,7 +86,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml index 0eeee11..ede4888 100644 --- a/reference/geoip/functions/geoip-db-avail.xml +++ b/reference/geoip/functions/geoip-db-avail.xml @@ -87,7 +87,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml index 8ff7950..f20d814 100644 --- a/reference/geoip/functions/geoip-db-filename.xml +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -88,7 +88,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index 41d72c1..02d0f2d 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -142,7 +142,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml index d24c5e5..0e01ca5 100644 --- a/reference/geoip/functions/geoip-id-by-name.xml +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -122,7 +122,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml index 780aef1..1f19020 100644 --- a/reference/geoip/functions/geoip-isp-by-name.xml +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -87,7 +87,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index 243b592..9b4d649 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -87,7 +87,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index 9657079..179270b 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -196,7 +196,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml index 3755659..86c04ad 100644 --- a/reference/geoip/functions/geoip-region-by-name.xml +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -109,7 +109,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml index 2a75c14..0f99e59 100644 --- a/reference/geoip/functions/geoip-region-name-by-code.xml +++ b/reference/geoip/functions/geoip-region-name-by-code.xml @@ -128,7 +128,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index 3426018..08dcd3d 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -128,7 +128,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml index 200e92d..3063245 100644 --- a/reference/geoip/reference.xml +++ b/reference/geoip/reference.xml @@ -17,7 +17,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/setup.xml b/reference/geoip/setup.xml index a1cc2ba..1463f25 100644 --- a/reference/geoip/setup.xml +++ b/reference/geoip/setup.xml @@ -54,7 +54,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index e708e2a..937fd96 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -32,7 +32,7 @@ sgml-indent-step:1 sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil From 339e73ea79b079052efa20198adc5739609ef0f3 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Wed, 3 Feb 2010 13:30:05 +0000 Subject: [PATCH 24/63] W/S tabs git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@294386 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip/functions/geoip-time-zone-by-country-and-region.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index 08dcd3d..1457cf6 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -60,8 +60,8 @@ &reftitle.returnvalues; - Returns the time zone on success, or &false; if the country and region code - combo cannot be found. + Returns the time zone on success, or &false; if the country and region code + combo cannot be found. From a7035b8209d412f16583e7d0bbd08b18773a303a Mon Sep 17 00:00:00 2001 From: Daniel Egeberg Date: Sun, 28 Mar 2010 22:10:10 +0000 Subject: [PATCH 25/63] Converted to utf-8 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297028 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 2 +- reference/geoip/functions/geoip-continent-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code3-by-name.xml | 2 +- reference/geoip/functions/geoip-country-name-by-name.xml | 2 +- reference/geoip/functions/geoip-database-info.xml | 2 +- reference/geoip/functions/geoip-db-avail.xml | 2 +- reference/geoip/functions/geoip-db-filename.xml | 2 +- reference/geoip/functions/geoip-db-get-all-info.xml | 2 +- reference/geoip/functions/geoip-id-by-name.xml | 2 +- reference/geoip/functions/geoip-isp-by-name.xml | 2 +- reference/geoip/functions/geoip-org-by-name.xml | 2 +- reference/geoip/functions/geoip-record-by-name.xml | 2 +- reference/geoip/functions/geoip-region-by-name.xml | 2 +- reference/geoip/functions/geoip-region-name-by-code.xml | 2 +- .../geoip/functions/geoip-time-zone-by-country-and-region.xml | 2 +- reference/geoip/reference.xml | 2 +- reference/geoip/setup.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 0079be9..aaac3d9 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index 26c3867..7152044 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index 2d6caca..e04265a 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml index 8c4b03c..a7b941d 100644 --- a/reference/geoip/functions/geoip-country-code3-by-name.xml +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml index cfe4b08..f5897f4 100644 --- a/reference/geoip/functions/geoip-country-name-by-name.xml +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 432008b..6b50700 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml index ede4888..f0aa521 100644 --- a/reference/geoip/functions/geoip-db-avail.xml +++ b/reference/geoip/functions/geoip-db-avail.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml index f20d814..ea54e1f 100644 --- a/reference/geoip/functions/geoip-db-filename.xml +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index 02d0f2d..ea7c359 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml index 0e01ca5..da26400 100644 --- a/reference/geoip/functions/geoip-id-by-name.xml +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml index 1f19020..bac78d6 100644 --- a/reference/geoip/functions/geoip-isp-by-name.xml +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index 9b4d649..7a6439b 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index 179270b..4961186 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml index 86c04ad..af7a49d 100644 --- a/reference/geoip/functions/geoip-region-by-name.xml +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml index 0f99e59..6ef12f3 100644 --- a/reference/geoip/functions/geoip-region-name-by-code.xml +++ b/reference/geoip/functions/geoip-region-name-by-code.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index 1457cf6..b811e1d 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml index 3063245..2440b29 100644 --- a/reference/geoip/reference.xml +++ b/reference/geoip/reference.xml @@ -1,4 +1,4 @@ - + diff --git a/reference/geoip/setup.xml b/reference/geoip/setup.xml index 1463f25..1c19d02 100644 --- a/reference/geoip/setup.xml +++ b/reference/geoip/setup.xml @@ -1,4 +1,4 @@ - + From 5ce8a3731b46bd80c78be470ab7f889a23ca9264 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Mon, 29 Mar 2010 09:53:08 +0000 Subject: [PATCH 26/63] Converted to UTF-8 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297058 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index 5e5c9b1..e574ea8 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,4 +1,4 @@ - + &reftitle.constants; From a094f648a06fc5689d64ac6e5313dc0ce8c27642 Mon Sep 17 00:00:00 2001 From: Daniel Egeberg Date: Mon, 29 Mar 2010 16:13:03 +0000 Subject: [PATCH 27/63] Reverted r297058 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297077 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index e574ea8..5e5c9b1 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,4 +1,4 @@ - + &reftitle.constants; From d6694f2d281444a6f7f21f7eb4fb9caa66b4e3a8 Mon Sep 17 00:00:00 2001 From: Daniel Egeberg Date: Mon, 29 Mar 2010 16:25:51 +0000 Subject: [PATCH 28/63] Converted remaining files to utf-8 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297078 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index 5e5c9b1..9d2d75a 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,4 +1,4 @@ - + &reftitle.constants; From eb97d43dfcefd481f2be18e3d0905c865350ac65 Mon Sep 17 00:00:00 2001 From: Yago Ferrer Date: Tue, 3 Aug 2010 09:26:49 +0000 Subject: [PATCH 29/63] To make it less confusing I changed to: Internet connection type. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@301827 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-id-by-name.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/reference/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml index da26400..f74c111 100644 --- a/reference/geoip/functions/geoip-id-by-name.xml +++ b/reference/geoip/functions/geoip-id-by-name.xml @@ -3,7 +3,7 @@ geoip_id_by_name - Get the Internet connection speed + Get the Internet connection type &reftitle.description; @@ -13,8 +13,8 @@ - The geoip_id_by_name function will return the country - and region corresponding to a hostname or an IP address. + The geoip_id_by_name function will return the Internet + connection type corresponding to a hostname or an IP address. The return value is numeric and can be compared to the following constants: @@ -53,7 +53,7 @@ hostname - The hostname or IP address whose net speed is to be looked-up. + The hostname or IP address whose connection type is to be looked-up. @@ -63,7 +63,7 @@ &reftitle.returnvalues; - Returns the net speed. + Returns the connection type. @@ -73,7 +73,7 @@ A <function>geoip_id_by_name</function> example - This will output the net speed of the host example.com. + This will output the connection type of the host example.com. Date: Fri, 22 Oct 2010 02:07:20 +0000 Subject: [PATCH 30/63] Fixed bug #53122 (output doesn't match code) git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@304601 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-isp-by-name.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml index bac78d6..2ed93ca 100644 --- a/reference/geoip/functions/geoip-isp-by-name.xml +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -67,7 +67,7 @@ if ($isp) { &example.outputs; From cf002121871d7d6c3fca40d16b7305da191cb962 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 15 Jul 2011 15:46:15 +0000 Subject: [PATCH 31/63] Extension purpose is not needed anymore git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@313269 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index aaac3d9..6436d93 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,6 +1,5 @@ - From 537be5d90837e18545015083c4dfc1cce6d77954 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Tue, 16 Aug 2011 11:38:58 +0000 Subject: [PATCH 32/63] Standardise on single style of quotes for XML tag. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@315005 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index 9d2d75a..e574ea8 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,4 +1,4 @@ - + &reftitle.constants; From 7fdd6f0920cb4bfd8155f5b6c84153782bda2361 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 28 Feb 2012 13:22:09 +0000 Subject: [PATCH 33/63] Linkable reference constants git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@323624 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index e574ea8..c1a11fa 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -4,7 +4,7 @@ &reftitle.constants; &extension.constants; - + GEOIP_COUNTRY_EDITION (integer) @@ -15,7 +15,7 @@ - + GEOIP_REGION_EDITION_REV0 (integer) @@ -26,7 +26,7 @@ - + GEOIP_CITY_EDITION_REV0 (integer) @@ -37,7 +37,7 @@ - + GEOIP_ORG_EDITION (integer) @@ -48,7 +48,7 @@ - + GEOIP_ISP_EDITION (integer) @@ -59,7 +59,7 @@ - + GEOIP_CITY_EDITION_REV1 (integer) @@ -70,7 +70,7 @@ - + GEOIP_REGION_EDITION_REV1 (integer) @@ -81,7 +81,7 @@ - + GEOIP_PROXY_EDITION (integer) @@ -92,7 +92,7 @@ - + GEOIP_ASNUM_EDITION (integer) @@ -103,7 +103,7 @@ - + GEOIP_NETSPEED_EDITION (integer) @@ -114,7 +114,7 @@ - + GEOIP_DOMAIN_EDITION (integer) @@ -130,7 +130,7 @@ The following constants are for net speed: - + GEOIP_UNKNOWN_SPEED (integer) @@ -139,7 +139,7 @@ - + GEOIP_DIALUP_SPEED (integer) @@ -148,7 +148,7 @@ - + GEOIP_CABLEDSL_SPEED (integer) @@ -157,7 +157,7 @@ - + GEOIP_CORPORATE_SPEED (integer) From b5b769060428e9f0b2cd98f4216a36bd0800dd05 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Thu, 15 Nov 2012 13:40:31 +0000 Subject: [PATCH 34/63] many bugs git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328365 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-country-code-by-name.xml | 9 +++++++++ reference/geoip/functions/geoip-database-info.xml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index e04265a..1209325 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -68,6 +68,15 @@ This host is located in: US + + + &reftitle.notes; + + + Please see http://www.maxmind.com/en/iso3166 for a complete list of possible return values, including special codes. + + + &reftitle.seealso; diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 6b50700..0abe009 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -52,9 +52,9 @@ &reftitle.examples; - A <function>geoip_region_by_name</function> example + A <function>geoip_database_info</function> example - This will output the current database version string. + This will output information regarding the database. Date: Wed, 20 Mar 2013 19:02:53 +0000 Subject: [PATCH 35/63] Fix the link to Maxmind's ISO 3166 page. Fixes doc bug #64464 (Wrong link for country list). git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329842 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-country-code-by-name.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index 1209325..1b23707 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -1,6 +1,6 @@ - + geoip_country_code_by_name Get the two letter country code @@ -73,7 +73,9 @@ This host is located in: US &reftitle.notes; - Please see http://www.maxmind.com/en/iso3166 for a complete list of possible return values, including special codes. + Please see + &url.maxmind.iso3166; for + a complete list of possible return values, including special codes. From bb0110e8ae7b64e217b611f4d5bcaf95fec5ecf8 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 26 Apr 2013 11:43:45 +0000 Subject: [PATCH 36/63] Fix bug #64721: geoip_continent_code_by_name() code list git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330152 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip-continent-code-by-name.xml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index 7152044..4606f21 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -39,6 +39,45 @@ Returns the two letter continent code on success, or &false; if the address cannot be found in the database. + + Continent codes + + + Code + Continent name + + + + + AF + Africa + + + AN + Antarctica + + + AS + Asia + + + EU + Europe + + + NA + North america + + + OC + Oceania + + + SA + South america + + +
From bc89f0d554c0c0717fe84c11fb003d461d7246ed Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 26 Apr 2013 12:13:35 +0000 Subject: [PATCH 37/63] fix docbook, table wants not git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330153 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-continent-code-by-name.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index 4606f21..c8f2634 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -40,7 +40,7 @@ address cannot be found in the database. </para> <table> - <title>Continent codes + Continent codes Code From c010b54221c96fad2e7ef86dcde57aca65855d0f Mon Sep 17 00:00:00 2001 From: Peter Cowburn Date: Sat, 27 Apr 2013 10:57:14 +0000 Subject: [PATCH 38/63] fix markup git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330158 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip-continent-code-by-name.xml | 76 ++++++++++--------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index c8f2634..dc909a9 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -40,43 +40,45 @@ address cannot be found in the database. - - - - Code - Continent name - - - - - AF - Africa - - - AN - Antarctica - - - AS - Asia - - - EU - Europe - - - NA - North america - - - OC - Oceania - - - SA - South america - - + Continent codes + + + + Code + Continent name + + + + + AF + Africa + + + AN + Antarctica + + + AS + Asia + + + EU + Europe + + + NA + North america + + + OC + Oceania + + + SA + South america + + +
Continent codes
From 15fce6852ad9426bdc9053ef301e7472b0105e6b Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 23 May 2013 17:38:21 +0000 Subject: [PATCH 39/63] Delete redundant git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330340 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 6436d93..256b2de 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,6 +1,5 @@ - Geo IP Location From 0c8e42dda956a9a7c3740f3ec0db93f1c26a4a34 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Tue, 29 Apr 2014 19:22:59 +0000 Subject: [PATCH 40/63] Add documentation for GeoIP ini entry git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333448 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/ini.xml | 48 +++++++++++++++++++++++++++++++++++++++ reference/geoip/setup.xml | 5 +--- 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 reference/geoip/ini.xml diff --git a/reference/geoip/ini.xml b/reference/geoip/ini.xml new file mode 100644 index 0000000..6530973 --- /dev/null +++ b/reference/geoip/ini.xml @@ -0,0 +1,48 @@ + + + +
+ &reftitle.runtime; + &extension.runtime; + + + GeoIP &ConfigureOptions; + + + + &Name; + &Default; + &Changeable; + &Changelog; + + + + + geoip.custom_directory + "" + PHP_INI_ALL + + + + +
+ + + &ini.descriptions.title; + + + + + + geoip.custom_directory + string + + + + Empty by default, but can be set to force a different database path than the one compiled in the library. + + + + + +
diff --git a/reference/geoip/setup.xml b/reference/geoip/setup.xml index 1c19d02..05930a6 100644 --- a/reference/geoip/setup.xml +++ b/reference/geoip/setup.xml @@ -31,10 +31,7 @@
-
- &reftitle.runtime; - &no.config; -
+ &reference.geoip.ini;
&reftitle.resources; From 07f294ad1f6781ed4afa00c9766571763b66f8b3 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Wed, 30 Apr 2014 12:55:04 +0000 Subject: [PATCH 41/63] Adding documentation for new GeoIP functions git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333450 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../geoip/functions/geoip-asnum-by-name.xml | 94 +++++++++++++ .../geoip/functions/geoip-domain-by-name.xml | 100 ++++++++++++++ .../functions/geoip-netspeedcell-by-name.xml | 129 ++++++++++++++++++ .../geoip-setup-custom-directory.xml | 94 +++++++++++++ 4 files changed, 417 insertions(+) create mode 100644 reference/geoip/functions/geoip-asnum-by-name.xml create mode 100644 reference/geoip/functions/geoip-domain-by-name.xml create mode 100644 reference/geoip/functions/geoip-netspeedcell-by-name.xml create mode 100644 reference/geoip/functions/geoip-setup-custom-directory.xml diff --git a/reference/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml new file mode 100644 index 0000000..d585c60 --- /dev/null +++ b/reference/geoip/functions/geoip-asnum-by-name.xml @@ -0,0 +1,94 @@ + + + + + geoip_asnum_by_name + Get the Autonomous System Numbers (ASN) + + + &reftitle.description; + + stringgeoip_asnum_by_name + stringhostname + + + + The geoip_asnum_by_name function will return the Autonomous + System Numbers (ASN) associated with an IP address. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address. + + + + + + + + &reftitle.returnvalues; + + Returns the ASN on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_asnum_by_name</function> example + + This will output the ASN of the host www.example.com. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-domain-by-name.xml b/reference/geoip/functions/geoip-domain-by-name.xml new file mode 100644 index 0000000..2ea5f18 --- /dev/null +++ b/reference/geoip/functions/geoip-domain-by-name.xml @@ -0,0 +1,100 @@ + + + + + geoip_domain_by_name + Get the second level domain name + + + &reftitle.description; + + stringgeoip_domain_by_name + stringhostname + + + + The geoip_domain_by_name function will return the second level + domain names associated with a hostname or an IP address. + + + This function is currently only available to users who have bought a commercial + GeoIP Domain Edition. A warning will be issued if the proper database cannot be + located. + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address. + + + + + + + + &reftitle.returnvalues; + + Returns the domain name on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_domain_by_name</function> example + + This will output the domain associated with IP 61.106.139.1. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-netspeedcell-by-name.xml b/reference/geoip/functions/geoip-netspeedcell-by-name.xml new file mode 100644 index 0000000..1588d9c --- /dev/null +++ b/reference/geoip/functions/geoip-netspeedcell-by-name.xml @@ -0,0 +1,129 @@ + + + + + geoip_netspeedcell_by_name + Get the Internet connection speed + + + &reftitle.description; + + stringgeoip_netspeedcell_by_name + stringhostname + + + + The geoip_netspeedcell_by_name function will return the Internet + connection type and speed corresponding to a hostname or an IP address. + + + This function is only available if using GeoIP Library version 1.4.8 or newer. + + + This function is currently only available to users who have bought a commercial + GeoIP NetSpeedCell Edition. A warning will be issued if the proper database cannot be + located. + + + The return value is a string, common values are: + + + + + + Cable/DSL + + + + + Dialup + + + + + Cellular + + + + + Corporate + + + + + + + + &reftitle.parameters; + + + + hostname + + + The hostname or IP address. + + + + + + + + &reftitle.returnvalues; + + Returns the connection speed on success, or &false; if the address + cannot be found in the database. + + + + + &reftitle.examples; + + + A <function>geoip_netspeedcell_by_name</function> example + + This will output the connection speed of the host example.com. + + + +]]> + + &example.outputs; + + + + + + + + + + diff --git a/reference/geoip/functions/geoip-setup-custom-directory.xml b/reference/geoip/functions/geoip-setup-custom-directory.xml new file mode 100644 index 0000000..6b99ccc --- /dev/null +++ b/reference/geoip/functions/geoip-setup-custom-directory.xml @@ -0,0 +1,94 @@ + + + + + geoip_setup_custom_directory + Set a custom directory for the GeoIP database. + + + &reftitle.description; + + voidgeoip_setup_custom_directory + stringpath + + + + The geoip_setup_custom_directory function will change the + default directory of the GeoIP database. This is equivalent to changing + geoip.custom_directory. + + + + + &reftitle.parameters; + + + + path + + + The full path of where the GeoIP database is on disk. + + + + + + + + &reftitle.returnvalues; + + &return.void; + + + + + &reftitle.examples; + + + A <function>geoip_setup_custom_directory</function> example + + This will change the GeoIP default database path. + + + +]]> + + &example.outputs; + + + + + + + + + + From e36569b64b534326a3acdd657d50eee97c18de49 Mon Sep 17 00:00:00 2001 From: Olivier Hill Date: Thu, 1 May 2014 17:53:07 +0000 Subject: [PATCH 42/63] Adding version information for new functions git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333463 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/versions.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index 937fd96..efc423c 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -4,6 +4,7 @@ Do NOT translate this file --> + @@ -12,12 +13,15 @@ + + + From 06aba1b6eb73b8faa386a6819ca6cecd0201fb37 Mon Sep 17 00:00:00 2001 From: Simion Onea Date: Fri, 5 Sep 2014 07:44:07 +0000 Subject: [PATCH 43/63] Making the XML definition consistent across the entire project. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@334762 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 2 +- reference/geoip/versions.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index c1a11fa..b236d16 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,4 +1,4 @@ - + &reftitle.constants; diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index efc423c..b95d4cb 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -1,4 +1,4 @@ - + + geoip_asnum_by_name diff --git a/reference/geoip/functions/geoip-domain-by-name.xml b/reference/geoip/functions/geoip-domain-by-name.xml index 2ea5f18..bde6996 100644 --- a/reference/geoip/functions/geoip-domain-by-name.xml +++ b/reference/geoip/functions/geoip-domain-by-name.xml @@ -1,5 +1,5 @@ - + geoip_domain_by_name diff --git a/reference/geoip/functions/geoip-netspeedcell-by-name.xml b/reference/geoip/functions/geoip-netspeedcell-by-name.xml index 1588d9c..a31a637 100644 --- a/reference/geoip/functions/geoip-netspeedcell-by-name.xml +++ b/reference/geoip/functions/geoip-netspeedcell-by-name.xml @@ -1,5 +1,5 @@ - + geoip_netspeedcell_by_name diff --git a/reference/geoip/functions/geoip-setup-custom-directory.xml b/reference/geoip/functions/geoip-setup-custom-directory.xml index 6b99ccc..f4c0e2a 100644 --- a/reference/geoip/functions/geoip-setup-custom-directory.xml +++ b/reference/geoip/functions/geoip-setup-custom-directory.xml @@ -1,5 +1,5 @@ - + geoip_setup_custom_directory diff --git a/reference/geoip/ini.xml b/reference/geoip/ini.xml index 6530973..d2a84ff 100644 --- a/reference/geoip/ini.xml +++ b/reference/geoip/ini.xml @@ -1,5 +1,5 @@ - +
&reftitle.runtime; From e958fc036f4b2e2af168774252980c9845055fe9 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 22 Feb 2017 10:19:08 +0000 Subject: [PATCH 45/63] Warn about missing GeoIP2 database support. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341950 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/book.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 256b2de..ce81383 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -12,6 +12,12 @@ State, Country, Longitude, Latitude, and other information as all, such as ISP and connection type can be obtained with the help of GeoIP. + + + This extension does not support MaxMind's current "GeoIP2" databases, + only the "GeoIP legacy" database files. + + &reference.geoip.setup; From 0f4d0ffa273a307c7be41a84503b74926b8f93f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luis=20Ferreira=20da=20Silva=20Bacci?= Date: Sat, 2 Sep 2017 18:42:15 +0000 Subject: [PATCH 46/63] Fix svn:eol-style, svn:keywords and svn:mime-type on XML files. No content change, but some revision numbers will upgrade. See https://github.com/phpdocbrbridge/bridge/blob/master/src/revbumper.php for automatic tool for translations. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342988 c90b9560-bf6c-de11-be94-00142212c4b1 From 3d4a8eb5fb60aed1ae3801c4a3edfee4f2e0d990 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 25 Jan 2018 15:34:22 +0000 Subject: [PATCH 47/63] Remove trailing fullstop in git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343888 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-setup-custom-directory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/functions/geoip-setup-custom-directory.xml b/reference/geoip/functions/geoip-setup-custom-directory.xml index f4c0e2a..d8dd17d 100644 --- a/reference/geoip/functions/geoip-setup-custom-directory.xml +++ b/reference/geoip/functions/geoip-setup-custom-directory.xml @@ -3,7 +3,7 @@ geoip_setup_custom_directory - Set a custom directory for the GeoIP database. + Set a custom directory for the GeoIP database &reftitle.description; From 04810d65001e07a6df8348552f2462aa8bd38732 Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Tue, 8 May 2018 11:37:38 +0000 Subject: [PATCH 48/63] Fix example Patch provided by Laurent B. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@344977 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-asnum-by-name.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml index 855b144..f9be2a5 100644 --- a/reference/geoip/functions/geoip-asnum-by-name.xml +++ b/reference/geoip/functions/geoip-asnum-by-name.xml @@ -55,7 +55,7 @@ $asn = geoip_asnum_by_name('www.example.com'); if ($asn) { - echo 'The ASN is: ' $asn; + echo 'The ASN is: ' . $asn; } ?> ]]> From 12bd853f66b48cbeb01360e135a4d6030599592b Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Sun, 25 Oct 2020 15:11:56 +0000 Subject: [PATCH 49/63] Add PECL in front of version numbers in changelogs Patch contributed by Benjamin Morel . git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350988 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-record-by-name.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index 4961186..dc2ba0f 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -125,13 +125,13 @@ - 1.0.4 + PECL geoip 1.0.4 Adding the continent_code with GeoIP Library 1.4.3 or newer only - 1.0.3 + PECL geoip 1.0.3 Adding country_code3 and country_name From bec487f7558ec541ef5672a1d0d950f6968a7116 Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Mon, 2 Nov 2020 15:39:04 +0000 Subject: [PATCH 50/63] Use canonical type names git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@351133 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/constants.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index b236d16..4508a12 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -7,7 +7,7 @@ GEOIP_COUNTRY_EDITION - (integer) + (int) @@ -18,7 +18,7 @@ GEOIP_REGION_EDITION_REV0 - (integer) + (int) @@ -29,7 +29,7 @@ GEOIP_CITY_EDITION_REV0 - (integer) + (int) @@ -40,7 +40,7 @@ GEOIP_ORG_EDITION - (integer) + (int) @@ -51,7 +51,7 @@ GEOIP_ISP_EDITION - (integer) + (int) @@ -62,7 +62,7 @@ GEOIP_CITY_EDITION_REV1 - (integer) + (int) @@ -73,7 +73,7 @@ GEOIP_REGION_EDITION_REV1 - (integer) + (int) @@ -84,7 +84,7 @@ GEOIP_PROXY_EDITION - (integer) + (int) @@ -95,7 +95,7 @@ GEOIP_ASNUM_EDITION - (integer) + (int) @@ -106,7 +106,7 @@ GEOIP_NETSPEED_EDITION - (integer) + (int) @@ -117,7 +117,7 @@ GEOIP_DOMAIN_EDITION - (integer) + (int) @@ -133,7 +133,7 @@ GEOIP_UNKNOWN_SPEED - (integer) + (int) @@ -142,7 +142,7 @@ GEOIP_DIALUP_SPEED - (integer) + (int) @@ -151,7 +151,7 @@ GEOIP_CABLEDSL_SPEED - (integer) + (int) @@ -160,7 +160,7 @@ GEOIP_CORPORATE_SPEED - (integer) + (int) From 6101408754a4c0d21d3e206b60b77771c7848550 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sat, 28 Nov 2020 12:54:59 +0000 Subject: [PATCH 51/63] Document false and null return types git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@351724 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-database-info.xml | 2 +- reference/geoip/functions/geoip-db-filename.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 0abe009..5e6ea3a 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_database_info + stringnullgeoip_database_info intdatabaseGEOIP_COUNTRY_EDITION diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml index ea54e1f..3deac7c 100644 --- a/reference/geoip/functions/geoip-db-filename.xml +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_db_filename + stringnullgeoip_db_filename intdatabase From e9e02c13d3c72512acf442ffda011b0eb87df1d6 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sat, 28 Nov 2020 15:12:46 +0000 Subject: [PATCH 52/63] Document false and null return types git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@351727 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-asnum-by-name.xml | 2 +- reference/geoip/functions/geoip-continent-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code3-by-name.xml | 2 +- reference/geoip/functions/geoip-country-name-by-name.xml | 2 +- reference/geoip/functions/geoip-db-avail.xml | 2 +- reference/geoip/functions/geoip-domain-by-name.xml | 2 +- reference/geoip/functions/geoip-isp-by-name.xml | 2 +- reference/geoip/functions/geoip-netspeedcell-by-name.xml | 2 +- reference/geoip/functions/geoip-org-by-name.xml | 2 +- reference/geoip/functions/geoip-record-by-name.xml | 2 +- reference/geoip/functions/geoip-region-by-name.xml | 2 +- reference/geoip/functions/geoip-region-name-by-code.xml | 2 +- .../geoip/functions/geoip-time-zone-by-country-and-region.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/reference/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml index f9be2a5..586cb53 100644 --- a/reference/geoip/functions/geoip-asnum-by-name.xml +++ b/reference/geoip/functions/geoip-asnum-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_asnum_by_name + stringfalsegeoip_asnum_by_name stringhostname diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index dc909a9..239254d 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_continent_code_by_name + stringfalsegeoip_continent_code_by_name stringhostname diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index 1b23707..01d9eb1 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_country_code_by_name + stringfalsegeoip_country_code_by_name stringhostname diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml index a7b941d..74a6b32 100644 --- a/reference/geoip/functions/geoip-country-code3-by-name.xml +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_country_code3_by_name + stringfalsegeoip_country_code3_by_name stringhostname diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml index f5897f4..be9a9a2 100644 --- a/reference/geoip/functions/geoip-country-name-by-name.xml +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_country_name_by_name + stringfalsegeoip_country_name_by_name stringhostname diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml index f0aa521..ac58aac 100644 --- a/reference/geoip/functions/geoip-db-avail.xml +++ b/reference/geoip/functions/geoip-db-avail.xml @@ -8,7 +8,7 @@ &reftitle.description; - boolgeoip_db_avail + boolnullgeoip_db_avail intdatabase diff --git a/reference/geoip/functions/geoip-domain-by-name.xml b/reference/geoip/functions/geoip-domain-by-name.xml index bde6996..5b244ea 100644 --- a/reference/geoip/functions/geoip-domain-by-name.xml +++ b/reference/geoip/functions/geoip-domain-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_domain_by_name + stringfalsegeoip_domain_by_name stringhostname diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml index 2ed93ca..515722b 100644 --- a/reference/geoip/functions/geoip-isp-by-name.xml +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_isp_by_name + stringfalsegeoip_isp_by_name stringhostname diff --git a/reference/geoip/functions/geoip-netspeedcell-by-name.xml b/reference/geoip/functions/geoip-netspeedcell-by-name.xml index a31a637..a06c991 100644 --- a/reference/geoip/functions/geoip-netspeedcell-by-name.xml +++ b/reference/geoip/functions/geoip-netspeedcell-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_netspeedcell_by_name + stringfalsegeoip_netspeedcell_by_name stringhostname diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index 7a6439b..f57a0f4 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_org_by_name + stringfalsegeoip_org_by_name stringhostname diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index dc2ba0f..6b0ef81 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - arraygeoip_record_by_name + arrayfalsegeoip_record_by_name stringhostname diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml index af7a49d..3c1a61e 100644 --- a/reference/geoip/functions/geoip-region-by-name.xml +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - arraygeoip_region_by_name + arrayfalsegeoip_region_by_name stringhostname diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml index 6ef12f3..d17e5da 100644 --- a/reference/geoip/functions/geoip-region-name-by-code.xml +++ b/reference/geoip/functions/geoip-region-name-by-code.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_region_name_by_code + stringfalsegeoip_region_name_by_code stringcountry_code stringregion_code diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index b811e1d..85955f5 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringgeoip_time_zone_by_country_and_region + stringfalsegeoip_time_zone_by_country_and_region stringcountry_code stringregion_code From 198aa4816c502da913ce175b247b222d2cc00301 Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Sat, 28 Nov 2020 17:58:32 +0000 Subject: [PATCH 53/63] Revert revision 351727 from phpdoc/en/trunk: Document false and null return types Cf. . git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@351729 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-asnum-by-name.xml | 2 +- reference/geoip/functions/geoip-continent-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code-by-name.xml | 2 +- reference/geoip/functions/geoip-country-code3-by-name.xml | 2 +- reference/geoip/functions/geoip-country-name-by-name.xml | 2 +- reference/geoip/functions/geoip-db-avail.xml | 2 +- reference/geoip/functions/geoip-domain-by-name.xml | 2 +- reference/geoip/functions/geoip-isp-by-name.xml | 2 +- reference/geoip/functions/geoip-netspeedcell-by-name.xml | 2 +- reference/geoip/functions/geoip-org-by-name.xml | 2 +- reference/geoip/functions/geoip-record-by-name.xml | 2 +- reference/geoip/functions/geoip-region-by-name.xml | 2 +- reference/geoip/functions/geoip-region-name-by-code.xml | 2 +- .../geoip/functions/geoip-time-zone-by-country-and-region.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/reference/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml index 586cb53..f9be2a5 100644 --- a/reference/geoip/functions/geoip-asnum-by-name.xml +++ b/reference/geoip/functions/geoip-asnum-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_asnum_by_name + stringgeoip_asnum_by_name stringhostname diff --git a/reference/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml index 239254d..dc909a9 100644 --- a/reference/geoip/functions/geoip-continent-code-by-name.xml +++ b/reference/geoip/functions/geoip-continent-code-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_continent_code_by_name + stringgeoip_continent_code_by_name stringhostname diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index 01d9eb1..1b23707 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_country_code_by_name + stringgeoip_country_code_by_name stringhostname diff --git a/reference/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml index 74a6b32..a7b941d 100644 --- a/reference/geoip/functions/geoip-country-code3-by-name.xml +++ b/reference/geoip/functions/geoip-country-code3-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_country_code3_by_name + stringgeoip_country_code3_by_name stringhostname diff --git a/reference/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml index be9a9a2..f5897f4 100644 --- a/reference/geoip/functions/geoip-country-name-by-name.xml +++ b/reference/geoip/functions/geoip-country-name-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_country_name_by_name + stringgeoip_country_name_by_name stringhostname diff --git a/reference/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml index ac58aac..f0aa521 100644 --- a/reference/geoip/functions/geoip-db-avail.xml +++ b/reference/geoip/functions/geoip-db-avail.xml @@ -8,7 +8,7 @@ &reftitle.description; - boolnullgeoip_db_avail + boolgeoip_db_avail intdatabase diff --git a/reference/geoip/functions/geoip-domain-by-name.xml b/reference/geoip/functions/geoip-domain-by-name.xml index 5b244ea..bde6996 100644 --- a/reference/geoip/functions/geoip-domain-by-name.xml +++ b/reference/geoip/functions/geoip-domain-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_domain_by_name + stringgeoip_domain_by_name stringhostname diff --git a/reference/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml index 515722b..2ed93ca 100644 --- a/reference/geoip/functions/geoip-isp-by-name.xml +++ b/reference/geoip/functions/geoip-isp-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_isp_by_name + stringgeoip_isp_by_name stringhostname diff --git a/reference/geoip/functions/geoip-netspeedcell-by-name.xml b/reference/geoip/functions/geoip-netspeedcell-by-name.xml index a06c991..a31a637 100644 --- a/reference/geoip/functions/geoip-netspeedcell-by-name.xml +++ b/reference/geoip/functions/geoip-netspeedcell-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_netspeedcell_by_name + stringgeoip_netspeedcell_by_name stringhostname diff --git a/reference/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml index f57a0f4..7a6439b 100644 --- a/reference/geoip/functions/geoip-org-by-name.xml +++ b/reference/geoip/functions/geoip-org-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_org_by_name + stringgeoip_org_by_name stringhostname diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index 6b0ef81..dc2ba0f 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - arrayfalsegeoip_record_by_name + arraygeoip_record_by_name stringhostname diff --git a/reference/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml index 3c1a61e..af7a49d 100644 --- a/reference/geoip/functions/geoip-region-by-name.xml +++ b/reference/geoip/functions/geoip-region-by-name.xml @@ -8,7 +8,7 @@ &reftitle.description; - arrayfalsegeoip_region_by_name + arraygeoip_region_by_name stringhostname diff --git a/reference/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml index d17e5da..6ef12f3 100644 --- a/reference/geoip/functions/geoip-region-name-by-code.xml +++ b/reference/geoip/functions/geoip-region-name-by-code.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_region_name_by_code + stringgeoip_region_name_by_code stringcountry_code stringregion_code diff --git a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml index 85955f5..b811e1d 100644 --- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml +++ b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringfalsegeoip_time_zone_by_country_and_region + stringgeoip_time_zone_by_country_and_region stringcountry_code stringregion_code From 216976eb703c8f2191d1b52362a81a9b45deb537 Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Sat, 28 Nov 2020 18:05:44 +0000 Subject: [PATCH 54/63] Revert revision(s) 351724 from phpdoc/en/trunk: Document false and null return types Cf. . git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@351730 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/geoip/functions/geoip-database-info.xml | 2 +- reference/geoip/functions/geoip-db-filename.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 5e6ea3a..0abe009 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringnullgeoip_database_info + stringgeoip_database_info intdatabaseGEOIP_COUNTRY_EDITION diff --git a/reference/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml index 3deac7c..ea54e1f 100644 --- a/reference/geoip/functions/geoip-db-filename.xml +++ b/reference/geoip/functions/geoip-db-filename.xml @@ -8,7 +8,7 @@ &reftitle.description; - stringnullgeoip_db_filename + stringgeoip_db_filename intdatabase From 8bbdf9947904e61a27010e3cc8b0813aade6f4ba Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 24 Feb 2021 17:58:20 +0100 Subject: [PATCH 55/63] xi:include INI settings documented elsewhere in ini.list We do not xi:include core INI settings, since we want to keep alphabetic sort order (well, roughly at least). We do add xi:fallback elements to all xi:includes, just in case. --- reference/geoip/ini.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/ini.xml b/reference/geoip/ini.xml index d2a84ff..fcada0e 100644 --- a/reference/geoip/ini.xml +++ b/reference/geoip/ini.xml @@ -16,7 +16,7 @@ &Changelog; - + geoip.custom_directory "" From 6b80563df81355adf559879064a76dbe7b986ca3 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Sun, 6 Jun 2021 17:49:54 +0100 Subject: [PATCH 56/63] Fix lone section order issues in various extensions Part of #658 --- reference/geoip/functions/geoip-db-get-all-info.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml index ea7c359..4144e61 100644 --- a/reference/geoip/functions/geoip-db-get-all-info.xml +++ b/reference/geoip/functions/geoip-db-get-all-info.xml @@ -47,6 +47,12 @@ + + + &reftitle.parameters; + &no.function.parameters; + + &reftitle.returnvalues; From aa530cbe53eecec2b9c82e3fdea4815f90021148 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 20 May 2021 18:45:21 +0100 Subject: [PATCH 57/63] Fix extension doc membership --- reference/geoip/book.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index ce81383..9cd3a2e 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,7 +1,6 @@ - - + Geo IP Location GeoIP @@ -45,4 +44,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - From 0e255f2a4a35887e4c43dceaffbf0cdc05010dff Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Tue, 27 Sep 2022 12:38:35 +0100 Subject: [PATCH 58/63] Remove references to "double" and use float instead (#1848) --- reference/geoip/functions/geoip-record-by-name.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml index dc2ba0f..b7c5d2c 100644 --- a/reference/geoip/functions/geoip-record-by-name.xml +++ b/reference/geoip/functions/geoip-record-by-name.xml @@ -67,12 +67,12 @@ - "latitude" -- The Latitude as signed double. + "latitude" -- The Latitude as signed float. - "longitude" -- The Longitude as signed double. + "longitude" -- The Longitude as signed float. From 733e92d77d6963b14130244db019347e5c8edd45 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Fri, 26 Jan 2024 13:50:32 +0000 Subject: [PATCH 59/63] Replace PHP_INI_* with INI_* constants Performed via a bash script which can be found on PR GH-3140 Closes GH-3140 Co-authored-by: haszi --- reference/geoip/ini.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/geoip/ini.xml b/reference/geoip/ini.xml index fcada0e..59d92d0 100644 --- a/reference/geoip/ini.xml +++ b/reference/geoip/ini.xml @@ -20,7 +20,7 @@ geoip.custom_directory "" - PHP_INI_ALL + INI_ALL From 3656c4c7a8bc163705d206b848cef454a70093cc Mon Sep 17 00:00:00 2001 From: haszi Date: Fri, 26 Jul 2024 03:17:29 +0200 Subject: [PATCH 60/63] Remove empty resources pages (#3545) Co-authored-by: haszi --- reference/geoip/setup.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/reference/geoip/setup.xml b/reference/geoip/setup.xml index 05930a6..824d8b1 100644 --- a/reference/geoip/setup.xml +++ b/reference/geoip/setup.xml @@ -9,11 +9,11 @@ This extension requires the GeoIP C library version 1.4.0 or higher to be installed. You can grab the latest version from - &url.maxmind.geoip; + &url.maxmind.geoip; and compile it yourself. - By default, you will only have access to the Free GeoIP Country or GeoLite + By default, you will only have access to the Free GeoIP Country or GeoLite City databases. While this module can work with other types of database, you must buy a commercial license from Maxmind. @@ -33,11 +33,6 @@ &reference.geoip.ini; -
- &reftitle.resources; - &no.resource; -
- - + From 0272a25fecead3fc3045d2bdaaff2a2daa98d2ca Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Fri, 16 Jan 2026 06:24:12 +0000 Subject: [PATCH 61/63] geoip: fix XML to get remove of useless wrapping para tags (#5119) --- .../geoip/functions/geoip-asnum-by-name.xml | 51 ++-- .../geoip-continent-code-by-name.xml | 57 ++--- .../functions/geoip-country-code-by-name.xml | 63 +++-- .../functions/geoip-country-code3-by-name.xml | 61 +++-- .../functions/geoip-country-name-by-name.xml | 61 +++-- .../geoip/functions/geoip-database-info.xml | 57 ++--- reference/geoip/functions/geoip-db-avail.xml | 55 ++--- .../geoip/functions/geoip-db-filename.xml | 55 ++--- .../geoip/functions/geoip-db-get-all-info.xml | 97 ++++---- .../geoip/functions/geoip-domain-by-name.xml | 53 ++-- .../geoip/functions/geoip-id-by-name.xml | 99 ++++---- .../geoip/functions/geoip-isp-by-name.xml | 53 ++-- .../functions/geoip-netspeedcell-by-name.xml | 101 ++++---- .../geoip/functions/geoip-org-by-name.xml | 53 ++-- .../geoip/functions/geoip-record-by-name.xml | 227 +++++++++--------- .../geoip/functions/geoip-region-by-name.xml | 81 +++---- .../functions/geoip-region-name-by-code.xml | 45 ++-- .../geoip-setup-custom-directory.xml | 51 ++-- .../geoip-time-zone-by-country-and-region.xml | 45 ++-- reference/geoip/ini.xml | 75 +++--- 20 files changed, 662 insertions(+), 778 deletions(-) diff --git a/reference/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml index f9be2a5..cb275b6 100644 --- a/reference/geoip/functions/geoip-asnum-by-name.xml +++ b/reference/geoip/functions/geoip-asnum-by-name.xml @@ -1,6 +1,6 @@ - + geoip_asnum_by_name Get the Autonomous System Numbers (ASN) @@ -16,22 +16,20 @@ The geoip_asnum_by_name function will return the Autonomous System Numbers (ASN) associated with an IP address. - + &reftitle.parameters; - - - - hostname - - - The hostname or IP address. - - - - - + + + hostname + + + The hostname or IP address. + + + + &reftitle.returnvalues; @@ -43,13 +41,12 @@ &reftitle.examples; - - - A <function>geoip_asnum_by_name</function> example - - This will output the ASN of the host www.example.com. - - + + A <function>geoip_asnum_by_name</function> example + + This will output the ASN of the host www.example.com. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_continent_code_by_name Get the two letter continent code @@ -20,18 +20,16 @@ &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose location is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + &reftitle.returnvalues; @@ -84,13 +82,12 @@ &reftitle.examples; - - - A <function>geoip_continent_code_by_name</function> example - - This will print where the host example.com is located. - - + + A <function>geoip_continent_code_by_name</function> example + + This will print where the host example.com is located. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + &reftitle.seealso; - - - geoip_country_code_by_name - - + + geoip_country_code_by_name + - - + geoip_country_code_by_name Get the two letter country code @@ -20,36 +20,33 @@ &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose location is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + &reftitle.returnvalues; - Returns the two letter ISO country code on success, or &false; + Returns the two letter ISO country code on success, or &false; if the address cannot be found in the database. &reftitle.examples; - - - A <function>geoip_country_code_by_name</function> example - - This will print where the host example.com is located. - - + + A <function>geoip_country_code_by_name</function> example + + This will print where the host example.com is located. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - + &reftitle.notes; @@ -82,16 +78,13 @@ This host is located in: US &reftitle.seealso; - - - geoip_country_code3_by_name - geoip_country_name_by_name - - + + geoip_country_code3_by_name + geoip_country_name_by_name + - - + geoip_country_code3_by_name Get the three letter country code @@ -20,36 +20,33 @@ &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose location is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + &reftitle.returnvalues; - Returns the three letter country code on success, or &false; + Returns the three letter country code on success, or &false; if the address cannot be found in the database. &reftitle.examples; - - - A <function>geoip_country_code3_by_name</function> example - - This will print where the host example.com is located. - - + + A <function>geoip_country_code3_by_name</function> example + + This will print where the host example.com is located. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + &reftitle.seealso; - - - geoip_country_code_by_name - geoip_country_name_by_name - - + + geoip_country_code_by_name + geoip_country_name_by_name + - - + geoip_country_name_by_name Get the full country name @@ -20,36 +20,33 @@ &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose location is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose location is to be looked-up. + + + + &reftitle.returnvalues; - Returns the country name on success, or &false; if the address cannot + Returns the country name on success, or &false; if the address cannot be found in the database. &reftitle.examples; - - - A <function>geoip_country_name_by_name</function> example - - This will print where the host example.com is located. - - + + A <function>geoip_country_name_by_name</function> example + + This will print where the host example.com is located. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + &reftitle.seealso; - - - geoip_country_code_by_name - geoip_country_code3_by_name - - + + geoip_country_code_by_name + geoip_country_code3_by_name + - - + geoip_database_info Get GeoIP Database information @@ -16,7 +16,7 @@ The geoip_database_info function returns the corresponding GeoIP Database version as it is defined inside the binary file. - + If this function is called without arguments, it returns the version of the GeoIP Free Country Edition. @@ -25,21 +25,19 @@ &reftitle.parameters; - - - - database - - - The database type as an integer. You can use the - various constants defined with - this extension (ie: GEOIP_*_EDITION). - + + + database + + + The database type as an integer. You can use the + various constants defined with + this extension (ie: GEOIP_*_EDITION). + - - - - + + + &reftitle.returnvalues; @@ -50,31 +48,28 @@ &reftitle.examples; - - - A <function>geoip_database_info</function> example - - This will output information regarding the database. - - + + A <function>geoip_database_info</function> example + + This will output information regarding the database. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + - + geoip_db_avail Determine if GeoIP Database is available @@ -24,21 +24,19 @@ &reftitle.parameters; - - - - database - - - The database type as an integer. You can use the - various constants defined with - this extension (ie: GEOIP_*_EDITION). - + + + database + + + The database type as an integer. You can use the + various constants defined with + this extension (ie: GEOIP_*_EDITION). + - - - - + + + &reftitle.returnvalues; @@ -49,13 +47,12 @@ &reftitle.examples; - - - A <function>geoip_db_avail</function> example - - This will output the current database version string. - - + + A <function>geoip_db_avail</function> example + + This will output the current database version string. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + - + geoip_db_filename Returns the filename of the corresponding GeoIP Database @@ -25,21 +25,19 @@ &reftitle.parameters; - - - - database - - - The database type as an integer. You can use the - various constants defined with - this extension (ie: GEOIP_*_EDITION). - + + + database + + + The database type as an integer. You can use the + various constants defined with + this extension (ie: GEOIP_*_EDITION). + - - - - + + + &reftitle.returnvalues; @@ -50,13 +48,12 @@ &reftitle.examples; - - - A <function>geoip_db_filename</function> example - - This will output the filename of the corresponding database. - - + + A <function>geoip_db_filename</function> example + + This will output the filename of the corresponding database. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + - + geoip_db_get_all_info Returns detailed information about all GeoIP database types @@ -9,12 +9,12 @@ &reftitle.description; arraygeoip_db_get_all_info - + - The geoip_db_get_all_info function will return - detailed information as a multi-dimensional array about all the + The geoip_db_get_all_info function will return + detailed information as a multi-dimensional array about all the GeoIP database types. @@ -24,27 +24,25 @@ The names of the different keys of the returning associative array are as follows: - - - - - "available" -- Boolean, indicate if DB is available (see - geoip_db_avail) - - - - - "description" -- The database description - - - - - "filename" -- The database filename on disk (see - geoip_db_filename) - - - - + + + + "available" -- Boolean, indicate if DB is available (see + geoip_db_avail) + + + + + "description" -- The database description + + + + + "filename" -- The database filename on disk (see + geoip_db_filename) + + + @@ -62,13 +60,12 @@ &reftitle.examples; - - - A <function>geoip_db_get_all_info</function> example - - This will print the array containing all the information. - - + + A <function>geoip_db_get_all_info</function> example + + This will print the array containing all the information. + + ]]> - - &example.outputs; - + + &example.outputs; + @@ -105,17 +102,15 @@ array(11) { } } ]]> - - - + + - - - A <function>geoip_db_get_all_info</function> example - - You can use the various constants as keys to get only parts of the information. - - + + A <function>geoip_db_get_all_info</function> example + + You can use the various constants as keys to get only parts of the information. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_domain_by_name Get the second level domain name @@ -18,25 +18,23 @@ This function is currently only available to users who have bought a commercial - GeoIP Domain Edition. A warning will be issued if the proper database cannot be + GeoIP Domain Edition. A warning will be issued if the proper database cannot be located. - + &reftitle.parameters; - - - - hostname - - - The hostname or IP address. - - - - - + + + hostname + + + The hostname or IP address. + + + + &reftitle.returnvalues; @@ -48,13 +46,12 @@ &reftitle.examples; - - - A <function>geoip_domain_by_name</function> example - - This will output the domain associated with IP 61.106.139.1. - - + + A <function>geoip_domain_by_name</function> example + + This will output the domain associated with IP 61.106.139.1. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_id_by_name Get the Internet connection type @@ -13,52 +13,48 @@ - The geoip_id_by_name function will return the Internet + The geoip_id_by_name function will return the Internet connection type corresponding to a hostname or an IP address. The return value is numeric and can be compared to the following constants: - - - - - GEOIP_UNKNOWN_SPEED - - - - - GEOIP_DIALUP_SPEED - - - - - GEOIP_CABLEDSL_SPEED - - - - - GEOIP_CORPORATE_SPEED - - - - - + + + + GEOIP_UNKNOWN_SPEED + + + + + GEOIP_DIALUP_SPEED + + + + + GEOIP_CABLEDSL_SPEED + + + + + GEOIP_CORPORATE_SPEED + + + + &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose connection type is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose connection type is to be looked-up. + + + + &reftitle.returnvalues; @@ -69,13 +65,12 @@ &reftitle.examples; - - - A <function>geoip_id_by_name</function> example - - This will output the connection type of the host example.com. - - + + A <function>geoip_id_by_name</function> example + + This will output the connection type of the host example.com. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_isp_by_name Get the Internet Service Provider (ISP) name @@ -18,25 +18,23 @@ This function is currently only available to users who have bought a commercial - GeoIP ISP Edition. A warning will be issued if the proper database cannot be + GeoIP ISP Edition. A warning will be issued if the proper database cannot be located. - + &reftitle.parameters; - - - - hostname - - - The hostname or IP address. - - - - - + + + hostname + + + The hostname or IP address. + + + + &reftitle.returnvalues; @@ -48,13 +46,12 @@ &reftitle.examples; - - - A <function>geoip_isp_by_name</function> example - - This will print the ISP name of host example.com. - - + + A <function>geoip_isp_by_name</function> example + + This will print the ISP name of host example.com. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_netspeedcell_by_name Get the Internet connection speed @@ -13,7 +13,7 @@ - The geoip_netspeedcell_by_name function will return the Internet + The geoip_netspeedcell_by_name function will return the Internet connection type and speed corresponding to a hostname or an IP address. @@ -21,52 +21,48 @@ This function is currently only available to users who have bought a commercial - GeoIP NetSpeedCell Edition. A warning will be issued if the proper database cannot be + GeoIP NetSpeedCell Edition. A warning will be issued if the proper database cannot be located. The return value is a string, common values are: - - - - - Cable/DSL - - - - - Dialup - - - - - Cellular - - - - - Corporate - - - - - + + + + Cable/DSL + + + + + Dialup + + + + + Cellular + + + + + Corporate + + + + &reftitle.parameters; - - - - hostname - - - The hostname or IP address. - - - - - + + + hostname + + + The hostname or IP address. + + + + &reftitle.returnvalues; @@ -78,13 +74,12 @@ &reftitle.examples; - - - A <function>geoip_netspeedcell_by_name</function> example - - This will output the connection speed of the host example.com. - - + + A <function>geoip_netspeedcell_by_name</function> example + + This will output the connection speed of the host example.com. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_org_by_name Get the organization name @@ -18,25 +18,23 @@ This function is currently only available to users who have bought a commercial - GeoIP Organization, ISP or AS Edition. A warning will be issued if the proper + GeoIP Organization, ISP or AS Edition. A warning will be issued if the proper database cannot be located. - + &reftitle.parameters; - - - - hostname - - - The hostname or IP address. - - - - - + + + hostname + + + The hostname or IP address. + + + + &reftitle.returnvalues; @@ -48,13 +46,12 @@ &reftitle.examples; - - - A <function>geoip_org_by_name</function> example - - This will print to whom the host example.com IP is allocated. - - + + A <function>geoip_org_by_name</function> example + + This will print to whom the host example.com IP is allocated. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_record_by_name Returns the detailed City information found in the GeoIP Database @@ -24,133 +24,126 @@ The names of the different keys of the returning associative array are as follows: - - - - - "continent_code" -- Two letter continent code (as of version 1.0.4 with - libgeoip 1.4.3 or newer) - - - - - "country_code" -- Two letter country code (see - geoip_country_code_by_name) - - - - - "country_code3" -- Three letter country code (see - geoip_country_code3_by_name) - - - - - "country_name" -- The country name (see - geoip_country_name_by_name) - - - - - "region" -- The region code (ex: CA for California) - - - - - "city" -- The city. - - - - - "postal_code" -- The Postal Code, FSA or Zip Code. - - - - - "latitude" -- The Latitude as signed float. - - - - - "longitude" -- The Longitude as signed float. - - - - - "dma_code" -- Designated Market Area code (USA and Canada only) - - - - - "area_code" -- The PSTN area code (ex: 212) - - - - + + + + "continent_code" -- Two letter continent code (as of version 1.0.4 with + libgeoip 1.4.3 or newer) + + + + + "country_code" -- Two letter country code (see + geoip_country_code_by_name) + + + + + "country_code3" -- Three letter country code (see + geoip_country_code3_by_name) + + + + + "country_name" -- The country name (see + geoip_country_name_by_name) + + + + + "region" -- The region code (ex: CA for California) + + + + + "city" -- The city. + + + + + "postal_code" -- The Postal Code, FSA or Zip Code. + + + + + "latitude" -- The Latitude as signed float. + + + + + "longitude" -- The Longitude as signed float. + + + + + "dma_code" -- Designated Market Area code (USA and Canada only) + + + + + "area_code" -- The PSTN area code (ex: 212) + + + &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose record is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose record is to be looked-up. + + + + &reftitle.returnvalues; - Returns the associative array on success, or &false; if the address + Returns the associative array on success, or &false; if the address cannot be found in the database. &reftitle.changelog; - - - - - - &Version; - &Description; - - - - - PECL geoip 1.0.4 - - Adding the continent_code with GeoIP Library 1.4.3 or newer only - - - - PECL geoip 1.0.3 - - Adding country_code3 and country_name - - - - - - + + + + + &Version; + &Description; + + + + + PECL geoip 1.0.4 + + Adding the continent_code with GeoIP Library 1.4.3 or newer only + + + + PECL geoip 1.0.3 + + Adding country_code3 and country_name + + + + + &reftitle.examples; - - - A <function>geoip_record_by_name</function> example - - This will print the array containing the record of host example.com. - - + + A <function>geoip_record_by_name</function> example + + This will print the array containing the record of host example.com. + + ]]> - - &example.outputs; - + + &example.outputs; + United States [region] => CA [city] => Marina Del Rey - [postal_code] => + [postal_code] => [latitude] => 33.9776992798 [longitude] => -118.435096741 [dma_code] => 803 [area_code] => 310 ) ]]> - - - + + - - + geoip_region_by_name Get the country code and region @@ -24,55 +24,50 @@ The names of the different keys of the returning associative array are as follows: - - - - - "country_code" -- Two letter country code (see - geoip_country_code_by_name) - - - - - "region" -- The region code (ex: CA for California) - - - - + + + + "country_code" -- Two letter country code (see + geoip_country_code_by_name) + + + + + "region" -- The region code (ex: CA for California) + + + &reftitle.parameters; - - - - hostname - - - The hostname or IP address whose region is to be looked-up. - - - - - + + + hostname + + + The hostname or IP address whose region is to be looked-up. + + + + &reftitle.returnvalues; - Returns the associative array on success, or &false; if the address + Returns the associative array on success, or &false; if the address cannot be found in the database. &reftitle.examples; - - - A <function>geoip_region_by_name</function> example - - This will print the array containing the country code and region - of the host example.com. - - + + A <function>geoip_region_by_name</function> example + + This will print the array containing the country code and region + of the host example.com. + + ]]> - - &example.outputs; - + + &example.outputs; + CA ) ]]> - - - + + - - + geoip_region_name_by_code Returns the region name for some country and region code combo @@ -34,28 +34,26 @@ &reftitle.parameters; - - - - country_code - - - The two-letter country code (see - geoip_country_code_by_name) - - - - - region_code - - - The two-letter (or digit) region code (see - geoip_region_by_name) - - - - - + + + country_code + + + The two-letter country code (see + geoip_country_code_by_name) + + + + + region_code + + + The two-letter (or digit) region code (see + geoip_region_by_name) + + + + &reftitle.returnvalues; @@ -116,7 +114,6 @@ Region name for JP/01 is: Aichi - - + geoip_setup_custom_directory Set a custom directory for the GeoIP database @@ -17,22 +17,20 @@ default directory of the GeoIP database. This is equivalent to changing geoip.custom_directory. - + &reftitle.parameters; - - - - path - - - The full path of where the GeoIP database is on disk. - - - - - + + + path + + + The full path of where the GeoIP database is on disk. + + + + &reftitle.returnvalues; @@ -43,13 +41,12 @@ &reftitle.examples; - - - A <function>geoip_setup_custom_directory</function> example - - This will change the GeoIP default database path. - - + + A <function>geoip_setup_custom_directory</function> example + + This will change the GeoIP default database path. + + ]]> - - &example.outputs; - + + &example.outputs; + - - - + + - - + geoip_time_zone_by_country_and_region Returns the time zone for some country and region code combo @@ -34,28 +34,26 @@ &reftitle.parameters; - - - - country_code - - - The two-letter country code (see - geoip_country_code_by_name) - - - - - region_code - - - The two-letter (or digit) region code (see - geoip_region_by_name) - - - - - + + + country_code + + + The two-letter country code (see + geoip_country_code_by_name) + + + + + region_code + + + The two-letter (or digit) region code (see + geoip_region_by_name) + + + + &reftitle.returnvalues; @@ -116,7 +114,6 @@ Time zone for JP/01 is: Asia/Tokyo - - -
+
&reftitle.runtime; &extension.runtime; - - - GeoIP &ConfigureOptions; - - - - &Name; - &Default; - &Changeable; - &Changelog; - - - - - geoip.custom_directory - "" - INI_ALL - - - - -
- + + GeoIP &ConfigureOptions; + + + + &Name; + &Default; + &Changeable; + &Changelog; + + + + + geoip.custom_directory + "" + INI_ALL + + + + +
&ini.descriptions.title; - - - - - geoip.custom_directory - string - - - - Empty by default, but can be set to force a different database path than the one compiled in the library. - - - - - + + + + geoip.custom_directory + string + + + + Empty by default, but can be set to force a different database path than the one compiled in the library. + + + +
From 31e7a05c9f9d1dffdf1764109dbb72cb0e7d1885 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sun, 18 Jan 2026 20:04:45 +0000 Subject: [PATCH 62/63] geoip: fix XML by converting para to simpara tags via script (#5131) --- reference/geoip/book.xml | 12 +++---- reference/geoip/constants.xml | 15 ++++---- .../geoip/functions/geoip-asnum-by-name.xml | 16 ++++----- .../geoip-continent-code-by-name.xml | 16 ++++----- .../functions/geoip-country-code-by-name.xml | 20 +++++------ .../functions/geoip-country-code3-by-name.xml | 16 ++++----- .../functions/geoip-country-name-by-name.xml | 16 ++++----- .../geoip/functions/geoip-database-info.xml | 20 +++++------ reference/geoip/functions/geoip-db-avail.xml | 20 +++++------ .../geoip/functions/geoip-db-filename.xml | 20 +++++------ .../geoip/functions/geoip-db-get-all-info.xml | 24 ++++++------- .../geoip/functions/geoip-domain-by-name.xml | 20 +++++------ .../geoip/functions/geoip-id-by-name.xml | 20 +++++------ .../geoip/functions/geoip-isp-by-name.xml | 20 +++++------ .../functions/geoip-netspeedcell-by-name.xml | 28 +++++++-------- .../geoip/functions/geoip-org-by-name.xml | 20 +++++------ .../geoip/functions/geoip-record-by-name.xml | 24 ++++++------- .../geoip/functions/geoip-region-by-name.xml | 24 ++++++------- .../functions/geoip-region-name-by-code.xml | 36 +++++++++---------- .../geoip-setup-custom-directory.xml | 16 ++++----- .../geoip-time-zone-by-country-and-region.xml | 36 +++++++++---------- reference/geoip/ini.xml | 4 +-- reference/geoip/setup.xml | 21 +++++------ 23 files changed, 230 insertions(+), 234 deletions(-) diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml index 9cd3a2e..b0d335e 100644 --- a/reference/geoip/book.xml +++ b/reference/geoip/book.xml @@ -1,21 +1,21 @@ - + Geo IP Location GeoIP &reftitle.intro; - + The GeoIP extension allows you to find the location of an IP address. City, - State, Country, Longitude, Latitude, and other information as all, such as + State, Country, Longitude, Latitude, and other information as all, such as ISP and connection type can be obtained with the help of GeoIP. - + - + This extension does not support MaxMind's current "GeoIP2" databases, only the "GeoIP legacy" database files. - + diff --git a/reference/geoip/constants.xml b/reference/geoip/constants.xml index 4508a12..b653bba 100644 --- a/reference/geoip/constants.xml +++ b/reference/geoip/constants.xml @@ -1,6 +1,6 @@ - + &reftitle.constants; &extension.constants; @@ -126,9 +126,9 @@ - + The following constants are for net speed: - + @@ -136,7 +136,7 @@ (int) - + @@ -145,7 +145,7 @@ (int) - + @@ -154,7 +154,7 @@ (int) - + @@ -163,12 +163,11 @@ (int) - + - - - + &reftitle.setup;
&reftitle.required; - + This extension requires the GeoIP C library version 1.4.0 or higher to be installed. You can grab the latest version from &url.maxmind.geoip; and compile it yourself. - - + + By default, you will only have access to the Free GeoIP Country or GeoLite City databases. While this module can work with other types of database, you must buy a commercial license from Maxmind. - +
&reftitle.install; - + &pecl.moved; - - + + &pecl.info; &url.pecl.package;geoip. - +
&reference.geoip.ini; - - From 558507a703996b41ec89f403542e35494a3343ac Mon Sep 17 00:00:00 2001 From: alfsb Date: Wed, 15 Jul 2026 11:12:17 -0300 Subject: [PATCH 63/63] Mark version.xml files as do-not-translate (#5662) --- reference/geoip/versions.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/reference/geoip/versions.xml b/reference/geoip/versions.xml index b95d4cb..2fd8c50 100644 --- a/reference/geoip/versions.xml +++ b/reference/geoip/versions.xml @@ -1,9 +1,7 @@ - - - + + +