From b5c7f7a1aa051dfbd9dfdc67d2a6747824f9df19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 7 Aug 2011 17:40:41 +0000 Subject: [PATCH] Introduced ext-geoip (unfinished) --- .gitattributes | 3 + DOCS/geoip_LICENSE.txt | 39 +++++++++++ inc/extensions/ext-geoip.php | 100 ++++++++++++++++++++++++++++ templates/de/html/ext/ext_geoip.tpl | 7 ++ 4 files changed, 149 insertions(+) create mode 100644 DOCS/geoip_LICENSE.txt create mode 100644 inc/extensions/ext-geoip.php create mode 100644 templates/de/html/ext/ext_geoip.tpl diff --git a/.gitattributes b/.gitattributes index d9eb29067c..6f67363f55 100644 --- a/.gitattributes +++ b/.gitattributes @@ -61,6 +61,7 @@ DOCS/en/rewrite/.htaccess svneol=native#text/plain DOCS/en/rewrite/README.txt svneol=native#text/plain DOCS/en/task/README.txt svneol=native#text/plain DOCS/en/themes/README.txt svneol=native#text/plain +DOCS/geoip_LICENSE.txt svneol=native#text/plain DOCS/tpl-validator.php svneol=native#text/plain /admin.php svneol=native#text/plain /agb.php svneol=native#text/plain @@ -148,6 +149,7 @@ inc/extensions/ext-earning.php svneol=native#text/plain inc/extensions/ext-events.php svneol=native#text/plain inc/extensions/ext-forced.php svneol=native#text/plain inc/extensions/ext-funcoins.php svneol=native#text/plain +inc/extensions/ext-geoip.php svneol=native#text/plain inc/extensions/ext-grade.php svneol=native#text/plain inc/extensions/ext-holiday.php svneol=native#text/plain inc/extensions/ext-html_mail.php svneol=native#text/plain @@ -1528,6 +1530,7 @@ templates/de/html/ext/ext_earning.tpl svneol=native#text/plain templates/de/html/ext/ext_events.tpl svneol=native#text/plain templates/de/html/ext/ext_forced.tpl svneol=native#text/plain templates/de/html/ext/ext_funcoins.tpl svneol=native#text/plain +templates/de/html/ext/ext_geoip.tpl svneol=native#text/plain templates/de/html/ext/ext_grade.tpl svneol=native#text/plain templates/de/html/ext/ext_holiday.tpl svneol=native#text/plain templates/de/html/ext/ext_html_mail.tpl svneol=native#text/plain diff --git a/DOCS/geoip_LICENSE.txt b/DOCS/geoip_LICENSE.txt new file mode 100644 index 0000000000..01c2910fe1 --- /dev/null +++ b/DOCS/geoip_LICENSE.txt @@ -0,0 +1,39 @@ +There are two licenses, one for the C library software, and one for +the database. + +SOFTWARE LICENSE (C library) + +The GeoIP C Library is licensed under the LGPL. For details see +the COPYING file. + +OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) + +Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. + +All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgment: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" + +Redistribution and use with or without modification, are permitted provided +that the following conditions are met: +1. Redistributions must retain the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or other +materials provided with the distribution. +2. All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgement: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" +3. "MaxMind" may not be used to endorse or promote products derived from this +database without specific prior written permission. + +THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/inc/extensions/ext-geoip.php b/inc/extensions/ext-geoip.php new file mode 100644 index 0000000000..320c0c4410 --- /dev/null +++ b/inc/extensions/ext-geoip.php @@ -0,0 +1,100 @@ + diff --git a/templates/de/html/ext/ext_geoip.tpl b/templates/de/html/ext/ext_geoip.tpl new file mode 100644 index 0000000000..66af200c1f --- /dev/null +++ b/templates/de/html/ext/ext_geoip.tpl @@ -0,0 +1,7 @@ +
+ Verwendet die GeoLiteCountry von MaxMind.com, um + Anmeldungen von ausschliessbaren Ländern unterbinden (da leider nicht + jeder Sponsor an jedes Land vergütet). Bitte lesen Sie dazu auch die + Nutzungsbedingungen der dat-Datei unter DOCS/geoip_LICENSE.txt. +
-- 2.30.2