From 598ecc2011b09b2c8ae4ee32ed5c31dde3939c94 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 9 Dec 2008 17:42:11 +0000
Subject: [PATCH] New extension added, minor fixes, new author added - Wolfgang
 "profi-concept" Stelzhammer has contributed an extension for ISO 3166  
 conform country codes and their humanreadable descriptions - Parser error
 fixed in admin area (what-list_bonus.php) - THANK_YOU.txt slightly rewritten
 - New code contributor added to AUTHORS.txt file

---
 .gitattributes                        |   1 +
 DOCS/de/AUTHORS.txt                   |  36 +--
 DOCS/de/THANK_YOU.txt                 |   2 +-
 inc/databases.php                     |   2 +-
 inc/extensions/ext-iso3166.php        | 335 ++++++++++++++++++++++++++
 inc/modules/admin/what-list_bonus.php |   2 +-
 inc/modules/guest/what-login.php      |   2 +-
 7 files changed, 361 insertions(+), 19 deletions(-)
 create mode 100644 inc/extensions/ext-iso3166.php

diff --git a/.gitattributes b/.gitattributes
index f0d603f5a7..23ff93abc8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -114,6 +114,7 @@ inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-iso3166.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
diff --git a/DOCS/de/AUTHORS.txt b/DOCS/de/AUTHORS.txt
index 699dcfb49f..b00a16c373 100644
--- a/DOCS/de/AUTHORS.txt
+++ b/DOCS/de/AUTHORS.txt
@@ -1,12 +1,17 @@
-[----------------------------------]
-[-- Alle Autoren dieses Scriptes --]
-[----------------------------------]
+[------------------------------------]
+[-- Aktive Autoren dieses Scriptes --]
+[------------------------------------]
 
-- Roland "Quix0r" Haeder <webmaster [AT] mxchange [DOT] org>
+- Roland "Quix0r" Haeder <webmaster[AT]mxchange[DOT]org>
 
   (Projektleiter, Hauptprogrammierer, Webmaster)
 
-- Mr. X <vielleicht.ihre [AT] adresse.de>
+- Wolfang "profi-concept" Stelzhammer <php_listen[AT]inode[DOT]at>
+
+  (Contributed the extension "iso3166" which depends on country extension
+   and gives you a ISO 3166 confirm list of country codes)
+
+- Mr. X <vielleicht.ihre[AT]adresse.de>
 
   (Will gerne aufgenommen werden... ;-) )
 
@@ -14,17 +19,17 @@
 [-- Alpha- und Beta-Tester --]
 [----------------------------]
 
-- Peter "Piter01" Llorens y Rilk <peter.llorens [AT] piter02 [DOT] de>
+- Peter "Piter01" Llorens y Rilk <peter.llorens[AT]piter02[DOT]de>
   (Beta-Tester, hat bei der 0.2.1-Bugsuche mitgemacht und sonst immer jede
   neue Version getestet. Vielen Dank! :)
 
-- Michael "The Shadowmaster" Wollweber <the_shadowmaster [AT] hotmail [DOT] de>
+- Michael "The Shadowmaster" Wollweber <the_shadowmaster[AT]hotmail[DOT]de>
 
   (Beta-Tester, hat mir bei der Fehlersuche wegen unterschiedlichen IP-Nummern
    in $_SERVER['SERVER_ADDR'] und getaddrbyname($_SERVER['SERVER_NAME']) seinen
    FTP-Zugang ausgeliehen)
 
-- Dominik "monakoianar/Nike" Schmauder <dominikschmauder [AT] gmx DOT de>
+- Dominik "monakoianar/Nike" Schmauder <dominikschmauder[AT]gmx[DOT]de>
 
   (Beta-Tester, hat mir bei der Fehlersuche auf Win32-PCs (apachefriends.org,
   kein Bindestrich!!!) und bei der allgemeinen Bugsuche geholfen)
@@ -39,20 +44,21 @@
 [-- Inaktive Entwickler / Mitwirkende  --]
 [----------------------------------------]
 
-- Robert Niedziela <mail [AT] mc-p.org>
+- Robert Niedziela <mail[AT]mc-p[DOT]org>
 
   (Sekundaerer Programmierer, einige Bugfixes und viele Verbesserungen:
-    "Andere Einstellungen" im Admin-Menue, EMails loeschen, Medidaten,
-    EMail-Archiv und -Details Menuepunkte)
+  "Andere Einstellungen" im Admin-Menue, EMails loeschen, Medidaten,
+  EMail-Archiv und -Details Menuepunkte)
 
-- Lars Moehlenbruch <info [AT] surfo.net>
+- Lars Moehlenbruch <info[AT]surfo[DOT]net>
 
-  (Verbesserter HTML-Template Support, Referals eines Mitgliedes auflisten)
+  (Verbesserter HTML-Template Support, Referals eines Mitgliedes auflisten,
+  veraltete Version, die nur die erste Ebene anzeigt)
 
-- Erol Ilkan <erol [AT] gmxpro.de>
+- Erol Ilkan <erol[AT]gmxpro[DOT]de>
 
   (Neuer Entwickler, einige Bugfixes, SQL-Fehler beseitigt)
 
-- Lothar Mengens <money [AT] gmx.net>
+- Lothar Mengens <money[AT]gmx[DOT]net>
 
   (Hat mir eine SQL-Datei mit Laendercodes zur Verfuegung gestellt)
diff --git a/DOCS/de/THANK_YOU.txt b/DOCS/de/THANK_YOU.txt
index 698264f355..5e17dc516e 100644
--- a/DOCS/de/THANK_YOU.txt
+++ b/DOCS/de/THANK_YOU.txt
@@ -31,6 +31,7 @@ Personen:
   (http://www.onlinewerbebombe.de)
 - Der User profi-concept aus meinem Forum hat mir sehr viele gute Patches zur
   Verfuegung gestellt (http://www.stelzi.net)
+- Irgentjemand, den ich noch vergessen habe...
 
 Websites / Programmierer / etc.:
 - SF.net: Hosten meine Projektdateien (nur Archive)
@@ -45,7 +46,6 @@ Websites / Programmierer / etc.:
   (http://www.server4you.de)
 - Allen Webmastern, die dieses Script installiert haben und auf neue Releases
   warten.
-- Irgentjemand, den ich noch vergessen habe...
 
 Danke euch allen fuer die Unterstuetzung!
 
diff --git a/inc/databases.php b/inc/databases.php
index 3982575640..17f9b711ee 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "610");
+define('CURR_SVN_REVISION', "611");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php
new file mode 100644
index 0000000000..93beba2e54
--- /dev/null
+++ b/inc/extensions/ext-iso3166.php
@@ -0,0 +1,335 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 12/08/2008 *
+ * ================                             Last change: 12/08/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : ext-iso3166.php                                  *
+ * -------------------------------------------------------------------- *
+ * Short description : Country code list ISO3166                        *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Laendercode-Liste ISO3166                        *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2008 by Wolfgang Stelzhammer                           *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	require($INC);
+}
+
+// Version number
+$EXT_VERSION = "0.0.1";
+
+// Version history array (add more with , "0.1" and so on)
+$EXT_VER_HISTORY = array("0.0", "0.0.1");
+
+switch ($EXT_LOAD_MODE)
+{
+case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
+	// SQL commands to run
+	$SQLs[] = "";
+	break;
+
+case "remove": // Do stuff when removing extension
+	// SQL commands to run
+	$SQLs[] = "DELETE FROM `"._MYSQL_PREFIX."_countries` WHERE provider = 'ext-iso3166';";
+	$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_countries` DROP `provider`;";
+	break;
+
+case "activate": // Do stuff when admin activates this extension
+	// SQL commands to run
+	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_countries` SET is_active = 'Y' WHERE provider = 'ext-iso3166';";
+	break;
+
+case "deactivate": // Do stuff when admin deactivates this extension
+	// SQL commands to run
+	$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_countries` SET is_active = 'N' WHERE provider = 'ext-iso3166';";
+	break;
+
+case "update": // Update an extension
+	switch ($EXT_VER)
+	{
+	case "0.0.1": // SQL queries for v0.0.2
+		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_countries` ADD `provider` ENUM( 'user', 'ext-iso3166' ) NOT NULL DEFAULT 'user';";
+		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_countries` (`code` , `descr`, `provider`)
+VALUES ('AD', 'Andorra', 'ext-iso3166'),
+('AE', 'Vereinigte Arabische Emirate', 'ext-iso3166'),
+('AF', 'Afghanistan', 'ext-iso3166'),
+('AG', 'Antigua und Barbuda', 'ext-iso3166'),
+('AI', 'Anguilla', 'ext-iso3166'),
+('AL', 'Albanien', 'ext-iso3166'),
+('AM', 'Armenien', 'ext-iso3166'),
+('AN', 'Niederl&auml;ndische Antillen', 'ext-iso3166'),
+('AO', 'Angola', 'ext-iso3166'),
+('AQ', 'Antarktis', 'ext-iso3166'),
+('AR', 'Argentinien', 'ext-iso3166'),
+('AS', 'Samoa', 'ext-iso3166'),
+('AT', '&Ouml;sterreich', 'ext-iso3166'),
+('AU', 'Australien', 'ext-iso3166'),
+('AW', 'Aruba', 'ext-iso3166'),
+('AZ', 'Aserbaidschan', 'ext-iso3166'),
+('BA', 'Bosnien-Herzegowina', 'ext-iso3166'),
+('BB', 'Barbados', 'ext-iso3166'),
+('BD', 'Bangladesh', 'ext-iso3166'),
+('BE', 'Belgien', 'ext-iso3166'),
+('BF', 'Burkina Faso', 'ext-iso3166'),
+('BG', 'Bulgarien', 'ext-iso3166'),
+('BH', 'Bahrain', 'ext-iso3166'),
+('BI', 'Burundi', 'ext-iso3166'),
+('BJ', 'Benin', 'ext-iso3166'),
+('BM', 'Bermudas', 'ext-iso3166'),
+('BN', 'Brunei', 'ext-iso3166'),
+('BO', 'Bolivien', 'ext-iso3166'),
+('BR', 'Brasilien', 'ext-iso3166'),
+('BS', 'Bahamas', 'ext-iso3166'),
+('BT', 'Bhutan', 'ext-iso3166'),
+('BV', 'Bouvet-Inseln', 'ext-iso3166'),
+('BW', 'Botswana', 'ext-iso3166'),
+('BY', 'Wei&szlig;russland', 'ext-iso3166'),
+('BZ', 'Belize', 'ext-iso3166'),
+('CA', 'Kanada', 'ext-iso3166'),
+('CC', 'Kokosinseln', 'ext-iso3166'),
+('CD', 'Demokratische Republik Kongo (ehemals ZR: Zaire)', 'ext-iso3166'),
+('CF', 'Zentralafrikanische Republik', 'ext-iso3166'),
+('CG', 'Kongo', 'ext-iso3166'),
+('CH', 'Schweiz', 'ext-iso3166'),
+('CI', 'Elfenbeink&uuml;ste', 'ext-iso3166'),
+('CK', 'Cook-Inseln', 'ext-iso3166'),
+('CL', 'Chile', 'ext-iso3166'),
+('CM', 'Kamerun', 'ext-iso3166'),
+('CN', 'China', 'ext-iso3166'),
+('CO', 'Kolumbien', 'ext-iso3166'),
+('CR', 'Costa Rica', 'ext-iso3166'),
+('CS', 'Serbien und Montenegro (fr&uuml;her Tschechoslowakei)', 'ext-iso3166'),
+('CU', 'Kuba', 'ext-iso3166'),
+('CV', 'Kap Verde', 'ext-iso3166'),
+('CX', 'Christmas Island', 'ext-iso3166'),
+('CY', 'Zypern', 'ext-iso3166'),
+('CZ', 'Tschechische Republik', 'ext-iso3166'),
+('DJ', 'Djibuti', 'ext-iso3166'),
+('DE', 'Deutschland', 'ext-iso3166'),
+('DK', 'D&auml;nemark', 'ext-iso3166'),
+('DM', 'Dominika', 'ext-iso3166'),
+('DO', 'Dominikanische Republik', 'ext-iso3166'),
+('DZ', 'Algerien', 'ext-iso3166'),
+('EC', 'Ecuador', 'ext-iso3166'),
+('EE', 'Estland', 'ext-iso3166'),
+('EG', '&Auml;gypten', 'ext-iso3166'),
+('EH', 'Westsahara', 'ext-iso3166'),
+('ER', 'Eritrea', 'ext-iso3166'),
+('ES', 'Spanien', 'ext-iso3166'),
+('ET', '&Auml;thiopien', 'ext-iso3166'),
+('FI', 'Finnland', 'ext-iso3166'),
+('FJ', 'Fidschi-Inseln', 'ext-iso3166'),
+('FK', 'Falkland-Inseln', 'ext-iso3166'),
+('FM', 'Mikronesien', 'ext-iso3166'),
+('FO', 'F&auml;r&ouml;er Inseln', 'ext-iso3166'),
+('FR', 'Frankreich', 'ext-iso3166'),
+('FX', 'Frankreich (nur Europa)', 'ext-iso3166'),
+('GA', 'Gabun', 'ext-iso3166'),
+('GB', 'Gro&szlig;britannien (UK)', 'ext-iso3166'),
+('GD', 'Grenada', 'ext-iso3166'),
+('GE', 'Georgien', 'ext-iso3166'),
+('GF', 'franz&ouml;sisch Guyana', 'ext-iso3166'),
+('GH', 'Ghana', 'ext-iso3166'),
+('GI', 'Gibraltar', 'ext-iso3166'),
+('GL', 'Gr&ouml;nland', 'ext-iso3166'),
+('GM', 'Gambia', 'ext-iso3166'),
+('GN', 'Guinea', 'ext-iso3166'),
+('GP', 'Guadeloupe', 'ext-iso3166'),
+('GQ', '&Auml;quatorial Guinea', 'ext-iso3166'),
+('GR', 'Griechenland', 'ext-iso3166'),
+('GS', 'South Georgia und South Sandwich Islands', 'ext-iso3166'),
+('GT', 'Guatemala', 'ext-iso3166'),
+('GU', 'Guam', 'ext-iso3166'),
+('GW', 'Guinea Bissau', 'ext-iso3166'),
+('GY', 'Guyana', 'ext-iso3166'),
+('HK', 'Hong Kong', 'ext-iso3166'),
+('HM', 'Heard und McDonald Islands', 'ext-iso3166'),
+('HN', 'Honduras', 'ext-iso3166'),
+('HR', 'Kroatien', 'ext-iso3166'),
+('HT', 'Haiti', 'ext-iso3166'),
+('HU', 'Ungarn', 'ext-iso3166'),
+('ID', 'Indonesien', 'ext-iso3166'),
+('IE', 'Irland', 'ext-iso3166'),
+('IL', 'Israel', 'ext-iso3166'),
+('IN', 'Indien', 'ext-iso3166'),
+('IO', 'Britisch-Indischer Ozean', 'ext-iso3166'),
+('IQ', 'Irak', 'ext-iso3166'),
+('IR', 'Iran', 'ext-iso3166'),
+('IS', 'Island', 'ext-iso3166'),
+('IT', 'Italien', 'ext-iso3166'),
+('JM', 'Jamaika', 'ext-iso3166'),
+('JO', 'Jordanien', 'ext-iso3166'),
+('JP', 'Japan', 'ext-iso3166'),
+('KE', 'Kenia', 'ext-iso3166'),
+('KG', 'Kirgisistan', 'ext-iso3166'),
+('KH', 'Kambodscha', 'ext-iso3166'),
+('KI', 'Kiribati', 'ext-iso3166'),
+('KM', 'Komoren', 'ext-iso3166'),
+('KN', 'St. Kitts Nevis Anguilla', 'ext-iso3166'),
+('KP', 'Nordkorea', 'ext-iso3166'),
+('KR', 'S&uuml;dkorea', 'ext-iso3166'),
+('KW', 'Kuwait', 'ext-iso3166'),
+('KY', 'Kaiman-Inseln', 'ext-iso3166'),
+('KZ', 'Kasachstan', 'ext-iso3166'),
+('LA', 'Laos', 'ext-iso3166'),
+('LB', 'Libanon', 'ext-iso3166'),
+('LC', 'Saint Lucia', 'ext-iso3166'),
+('LI', 'Liechtenstein', 'ext-iso3166'),
+('LK', 'Sri Lanka', 'ext-iso3166'),
+('LR', 'Liberia', 'ext-iso3166'),
+('LS', 'Lesotho', 'ext-iso3166'),
+('LT', 'Litauen', 'ext-iso3166'),
+('LU', 'Luxemburg', 'ext-iso3166'),
+('LV', 'Lettland', 'ext-iso3166'),
+('LY', 'Libyen', 'ext-iso3166'),
+('MA', 'Marokko', 'ext-iso3166'),
+('MC', 'Monaco', 'ext-iso3166'),
+('MD', 'Moldavien', 'ext-iso3166'),
+('MG', 'Madagaskar', 'ext-iso3166'),
+('MH', 'Marshall-Inseln', 'ext-iso3166'),
+('MK', 'Mazedonien', 'ext-iso3166'),
+('ML', 'Mali', 'ext-iso3166'),
+('MM', 'Myanmar', 'ext-iso3166'),
+('MN', 'Mongolei', 'ext-iso3166'),
+('MO', 'Macao', 'ext-iso3166'),
+('MP', 'Marianen', 'ext-iso3166'),
+('MQ', 'Martinique', 'ext-iso3166'),
+('MR', 'Mauretanien', 'ext-iso3166'),
+('MS', 'Montserrat', 'ext-iso3166'),
+('MT', 'Malta', 'ext-iso3166'),
+('MU', 'Mauritius', 'ext-iso3166'),
+('MV', 'Malediven', 'ext-iso3166'),
+('MW', 'Malawi', 'ext-iso3166'),
+('MX', 'Mexiko', 'ext-iso3166'),
+('MY', 'Malaysia', 'ext-iso3166'),
+('MZ', 'Mocambique', 'ext-iso3166'),
+('NA', 'Namibia', 'ext-iso3166'),
+('NC', 'Neukaledonien', 'ext-iso3166'),
+('NE', 'Niger', 'ext-iso3166'),
+('NF', 'Norfolk-Inseln', 'ext-iso3166'),
+('NG', 'Nigeria', 'ext-iso3166'),
+('NI', 'Nicaragua', 'ext-iso3166'),
+('NL', 'Niederlande', 'ext-iso3166'),
+('NO', 'Norwegen', 'ext-iso3166'),
+('NP', 'Nepal', 'ext-iso3166'),
+('NR', 'Nauru', 'ext-iso3166'),
+('NU', 'Niue', 'ext-iso3166'),
+('NZ', 'Neuseeland', 'ext-iso3166'),
+('OM', 'Oman', 'ext-iso3166'),
+('PA', 'Panama', 'ext-iso3166'),
+('PE', 'Peru', 'ext-iso3166'),
+('PF', 'Franz&ouml;sisch-Polynesien', 'ext-iso3166'),
+('PG', 'Papua Neuguinea', 'ext-iso3166'),
+('PH', 'Philippinen', 'ext-iso3166'),
+('PK', 'Pakistan', 'ext-iso3166'),
+('PL', 'Polen', 'ext-iso3166'),
+('PM', 'St. Pierre und Miquelon', 'ext-iso3166'),
+('PN', 'Pitcairn', 'ext-iso3166'),
+('PR', 'Puerto Rico', 'ext-iso3166'),
+('PS', 'Pal&auml;stinensische Selbstverwaltungsgebiete', 'ext-iso3166'),
+('PT', 'Portugal', 'ext-iso3166'),
+('PW', 'Palau', 'ext-iso3166'),
+('PY', 'Paraguay', 'ext-iso3166'),
+('QA', 'Qatar', 'ext-iso3166'),
+('RE', 'Reunion', 'ext-iso3166'),
+('RO', 'Rum&auml;nien', 'ext-iso3166'),
+('RU', 'Russland', 'ext-iso3166'),
+('RW', 'Ruanda', 'ext-iso3166'),
+('SA', 'Saudi-Arabien', 'ext-iso3166'),
+('SB', 'Solomon-Inseln', 'ext-iso3166'),
+('SC', 'Seychellen', 'ext-iso3166'),
+('SD', 'Sudan', 'ext-iso3166'),
+('SE', 'Schweden', 'ext-iso3166'),
+('SG', 'Singapur', 'ext-iso3166'),
+('SH', 'St. Helena', 'ext-iso3166'),
+('SI', 'Slowenien', 'ext-iso3166'),
+('SJ', 'Svalbard und Jan Mayen Islands', 'ext-iso3166'),
+('SK', 'Slowakei (Slowakische Republik)', 'ext-iso3166'),
+('SL', 'Sierra Leone', 'ext-iso3166'),
+('SM', 'San Marino', 'ext-iso3166'),
+('SN', 'Senegal', 'ext-iso3166'),
+('SO', 'Somalia', 'ext-iso3166'),
+('SR', 'Surinam', 'ext-iso3166'),
+('ST', 'Sao Tome', 'ext-iso3166'),
+('SU', 'Sowjetunion (obsolet)', 'ext-iso3166'),
+('SV', 'El Salvador', 'ext-iso3166'),
+('SY', 'Syrien', 'ext-iso3166'),
+('SZ', 'Swasiland', 'ext-iso3166'),
+('TC', 'Turks- und Kaikos-Inseln', 'ext-iso3166'),
+('TD', 'Tschad', 'ext-iso3166'),
+('TF', 'Franz&ouml;sisches S&uuml;d-Territorium', 'ext-iso3166'),
+('TG', 'Togo', 'ext-iso3166'),
+('TH', 'Thailand', 'ext-iso3166'),
+('TJ', 'Tadschikistan', 'ext-iso3166'),
+('TK', 'Tokelau', 'ext-iso3166'),
+('TL', 'Ost-Timor', 'ext-iso3166'),
+('TM', 'Turkmenistan', 'ext-iso3166'),
+('TN', 'Tunesien', 'ext-iso3166'),
+('TO', 'Tonga', 'ext-iso3166'),
+('TR', 'T&uuml;rkei', 'ext-iso3166'),
+('TT', 'Trinidad Tobago', 'ext-iso3166'),
+('TV', 'Tuvalu', 'ext-iso3166'),
+('TW', 'Taiwan', 'ext-iso3166'),
+('TZ', 'Tansania', 'ext-iso3166'),
+('UA', 'Ukraine', 'ext-iso3166'),
+('UG', 'Uganda', 'ext-iso3166'),
+('UK', 'Gro&szlig;britannien', 'ext-iso3166'),
+('UM', 'US- kleinere Inseln au&szlig;erhalb', 'ext-iso3166'),
+('US', 'Vereinigte Staaten von Amerika', 'ext-iso3166'),
+('UY', 'Uruguay', 'ext-iso3166'),
+('UZ', 'Usbekistan', 'ext-iso3166'),
+('VA', 'Vatikan', 'ext-iso3166'),
+('VC', 'St. Vincent', 'ext-iso3166'),
+('VE', 'Venezuela', 'ext-iso3166'),
+('VG', 'Virgin Island (Brit.)', 'ext-iso3166'),
+('VI', 'Virgin Island (USA)', 'ext-iso3166'),
+('VN', 'Vietnam', 'ext-iso3166'),
+('VU', 'Vanuatu', 'ext-iso3166'),
+('WF', 'Wallis et Futuna', 'ext-iso3166'),
+('WS', 'Samoa', 'ext-iso3166'),
+('YE', 'Jemen', 'ext-iso3166'),
+('YT', 'Mayotte', 'ext-iso3166'),
+('YU', 'Jugoslawien (obsolet)', 'ext-iso3166'),
+('ZA', 'S&uuml;dafrika', 'ext-iso3166'),
+('ZM', 'Sambia', 'ext-iso3166'),
+('ZW', 'Zimbabwe', 'ext-iso3166');";
+
+		// This extension depends on the country extension
+		$EXT_UPDATE_DEPENDS = "country";
+
+		// Update notes (these will be set as task text!)
+		$UPDATE_NOTES = "Erste Liste von 243 L&auml;ndercodes nach ISO 3166. (Quelle: Selfhtml)<br>Alle L&auml;nder sind zuerst deaktiviert. Achtung DE k&ouml;nnte doppelt vorkommen.<br>Ein Aktivieren/Deaktivieren l&auml;sst alle L&auml;nder beim Registrieren anzeigen oder nicht Anzeigen.";
+		break;
+
+	}
+	break;
+
+default: // Do stuff when extension is loaded
+	break;
+}
+
+// [EOF]
+?>
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index c6b44cf930..d95b4de3f2 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -103,7 +103,7 @@ ORDER BY points DESC, last_online DESC, userid",
 			$content['sw']     = $SW;
 			$content['win1']   = $WIN1;
 			$content['win2']   = $WIN2;
-			$content['cnt'     = $cnt;
+			$content['cnt']    = $cnt;
 
 			// Load template and add it
 			$OUT .= LOAD_TEMPLATE("admin_list_bonus_rows", true, $content);
diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 3a6128d566..94a981ce74 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -262,7 +262,7 @@ if (IS_MEMBER()) {
 			// Ooppps, this was missing! ;-) We should update the database...
 			$NEW_PASS = GEN_PASS();
 			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s LIMIT 1",
-			 array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
+				array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
 
 			// Prepare data and message for email
 			$msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid);
-- 
2.39.5