diff --git a/.gitattributes b/.gitattributes index ce78e33..faf049e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,7 @@ * text=auto !eol -changed_full/EE/EE420-EE456/out/admin/de/d3_geoip_lang.php -text -changed_full/EE/EE420-EE456/out/admin/tpl/d3_cfg_geoipset_main.tpl -text -changed_full/EE/EE420-EE456/out/admin/tpl/d3_country_geoip.tpl -text -changed_full/PE/PE420-PE456/out/admin/de/d3_geoip_lang.php -text -changed_full/PE/PE420-PE456/out/admin/tpl/d3_cfg_geoipset_main.tpl -text -changed_full/PE/PE420-PE456/out/admin/tpl/d3_country_geoip.tpl -text +changed_full/420-461/out/admin/de/d3_geoip_lang.php -text +changed_full/420-461/out/admin/tpl/d3_cfg_geoipset_main.tpl -text +changed_full/420-461/out/admin/tpl/d3_country_geoip.tpl -text copy_this/admin/d3_cfg_geoipset.php -text copy_this/admin/d3_cfg_geoipset_licence.php -text copy_this/admin/d3_cfg_geoipset_list.php -text diff --git a/changed_full/EE/EE420-EE456/out/admin/de/d3_geoip_lang.php b/changed_full/420-461/out/admin/de/d3_geoip_lang.php similarity index 93% rename from changed_full/EE/EE420-EE456/out/admin/de/d3_geoip_lang.php rename to changed_full/420-461/out/admin/de/d3_geoip_lang.php index 1c224bf..f85ed2b 100644 --- a/changed_full/EE/EE420-EE456/out/admin/de/d3_geoip_lang.php +++ b/changed_full/420-461/out/admin/de/d3_geoip_lang.php @@ -54,6 +54,9 @@ $aLang = array( 'D3_GEOIP_SELURL' => 'zu wechselnde URL', 'D3_GEOIP_SELURL_DESC' => 'Sobald im URL-Feld eine Eingabe vorhanden ist, wird bei passenden Kunden versucht, zur hinterlegten URL zu wechseln. Möchten Sie den Mandanten, die Währung und / oder die Sprache einstellen, entfernen Sie die URL.

Aktivieren / deaktivieren Sie den URL-Wechsel zusätzlich in den Modul-Grundeinstellungen.', +'D3_GEOIP_METADATA_TITLE' => 'D³ GeoIP Vorauswahl', +'D3_GEOIP_METADATA_DESC' => 'Begrüßen Sie Ihre Kunden in seiner Landessprache.', + ); /* diff --git a/changed_full/EE/EE420-EE456/out/admin/tpl/d3_cfg_geoipset_main.tpl b/changed_full/420-461/out/admin/tpl/d3_cfg_geoipset_main.tpl similarity index 100% rename from changed_full/EE/EE420-EE456/out/admin/tpl/d3_cfg_geoipset_main.tpl rename to changed_full/420-461/out/admin/tpl/d3_cfg_geoipset_main.tpl diff --git a/changed_full/EE/EE420-EE456/out/admin/tpl/d3_country_geoip.tpl b/changed_full/420-461/out/admin/tpl/d3_country_geoip.tpl similarity index 100% rename from changed_full/EE/EE420-EE456/out/admin/tpl/d3_country_geoip.tpl rename to changed_full/420-461/out/admin/tpl/d3_country_geoip.tpl diff --git a/changed_full/PE/PE420-PE456/out/admin/de/d3_geoip_lang.php b/changed_full/PE/PE420-PE456/out/admin/de/d3_geoip_lang.php deleted file mode 100644 index 1c224bf..0000000 --- a/changed_full/PE/PE420-PE456/out/admin/de/d3_geoip_lang.php +++ /dev/null @@ -1,61 +0,0 @@ - 'ISO-8859-15', -'d3mxd3modules' => 'D³ Module', -'d3mxgeoip' => 'GeoIP', -'d3mxgeoip_settings' => 'Einstellungen', -'d3tbclgeoip_settings_main' => 'Grundeinstellungen', -'tbclcountry_geoip' => 'GeoIP-Kundenumleitungen', - -'D3_GEOIP_TRANSL' => 'GeoIP-Kundenumleitungen', - -'D3_GEOIP_SET_DEBUG_DESC' => 'Mit aktiviertem Debug-Modus wird im Frontend die aktuelle IP-Adresse des Shopbesuchers gezeigt. Beachten Sie, dass Umleitungen, die auf Weiterleitungen basieren, dann nicht ausgeführt werden können.', -'D3_GEOIP_SET_OPTIONS' => 'Optionen', -'D3_GEOIP_SET_OPTIONS_CHANGESHOP' => 'Mandant wechseln, wenn eingestellt (nur EE)', -'D3_GEOIP_SET_OPTIONS_CHANGECURR' => 'Währung wechseln, wenn eingestellt', -'D3_GEOIP_SET_OPTIONS_CHANGELANG' => 'Sprache wechseln, wenn eingestellt', -'D3_GEOIP_SET_OPTIONS_CHANGEURL' => 'URL wechseln, wenn eingestellt', -'D3_GEOIP_SET_OPTIONS_NOCOUNTRY' => 'Shop verwendet die Einstellung dieses Landes, wenn IP nicht zuzuordnen ist', -'D3_GEOIP_SET_IP' => 'IP-Einstellungen', -'D3_GEOIP_SET_IP_TESTIP' => 'statt Kunden-IP immer diese IP-Adresse verwenden', -'D3_GEOIP_SET_IP_CHECKIP' => 'diese IP-Adresse prüfen', -'D3_GEOIP_SET_IP_CHECKIP_NOTSET' => 'IP nicht zugewiesen oder Land nicht aktiv', -'D3_GENERAL_GEOIP_SAVE' => 'Speichern', - -'D3_GEOIP_SELSHOP' => 'zuständiger Shop', -'D3_GEOIP_SELLANG' => 'vorgewählte Sprache', -'D3_GEOIP_SELCUR' => 'vorgewählte Währung', -'D3_GEOIP_CUSTSELSHOP' => ' - vom Kunden gewählter Shop - ', -'D3_GEOIP_CUSTSELLANG' => ' - vom Kunden gewählte Sprache - ', -'D3_GEOIP_CUSTSELCUR' => ' - vom Kunden gewählte Währung - ', -'D3_GEOIP_OR' => 'oder', -'D3_GEOIP_DISABLED' => '(deaktiviert)', -'D3_GEOIP_SELURL' => 'zu wechselnde URL', -'D3_GEOIP_SELURL_DESC' => 'Sobald im URL-Feld eine Eingabe vorhanden ist, wird bei passenden Kunden versucht, zur hinterlegten URL zu wechseln. Möchten Sie den Mandanten, die Währung und / oder die Sprache einstellen, entfernen Sie die URL.

Aktivieren / deaktivieren Sie den URL-Wechsel zusätzlich in den Modul-Grundeinstellungen.', - -); - -/* -[{ oxmultilang ident='ACTIONS_MAIN_YOUWANTTODELETE' }] -*/ \ No newline at end of file diff --git a/changed_full/PE/PE420-PE456/out/admin/tpl/d3_cfg_geoipset_main.tpl b/changed_full/PE/PE420-PE456/out/admin/tpl/d3_cfg_geoipset_main.tpl deleted file mode 100644 index 9ad6e15..0000000 --- a/changed_full/PE/PE420-PE456/out/admin/tpl/d3_cfg_geoipset_main.tpl +++ /dev/null @@ -1,327 +0,0 @@ -[{include file="headitem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}] - - - - - - - -[{ if $readonly}] - [{assign var="readonly" value="readonly disabled"}] -[{else}] - [{assign var="readonly" value=""}] -[{/if}] - -
- [{ $oViewConf->getHiddenSid() }] - - - - -
- -
- [{ $oViewConf->getHiddenSid() }] - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - -
- [{oxmultilang ident="D3_CFG_MOD_GENERAL_MODULEACTIVE"}] - - - d3_cfg_mod__oxactive->value == 1}]checked[{/if}]> - [{oxinputhelp ident="D3_CFG_MOD_GENERAL_MODULEACTIVE_DESC"}] -
- -
- [{if $edit->getValue('blDebugmodeGlobal') == 1}][{/if}][{oxmultilang ident="D3_CFG_MOD_GENERAL_DEBUGACTIVE"}][{if $edit->getValue('blDebugmodeGlobal') == 1}][{/if}]  - - - getValue('blDebugmodeGlobal') == 1}]checked[{/if}]> - [{oxinputhelp ident="D3_GEOIP_SET_DEBUG_DESC"}] -
- 		- [{assign var="blD3HasLog" value=$oView->checkD3Log() }] - - - - - - - - - -
- [{if $blD3HasLog}] - [{oxmultilang ident="D3_CFG_MOD_GENERAL_MODULELOGGING"}] - [{/if}] - - [{if $blD3HasLog}] - - [{/if}] -
-   - -   -
-
- -
-
- - - [{oxmultilang ident="D3_GEOIP_SET_OPTIONS"}] - - -
-
- [{oxmultilang ident="D3_GEOIP_SET_OPTIONS_CHANGESHOP"}] -
-
- - getValue('blChangeShop') == 1}]checked[{/if}]> - [{ oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGESHOP_DESC" }] -
-
-
-
-
- [{oxmultilang ident="D3_GEOIP_SET_OPTIONS_CHANGECURR"}] -
-
- - getValue('blChangeCurr') == 1}]checked[{/if}]> - [{ oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGECURR_DESC" }] -
-
-
-
-
- [{oxmultilang ident="D3_GEOIP_SET_OPTIONS_CHANGELANG"}] -
-
- - getValue('blChangeLang') == 1}]checked[{/if}]> - [{ oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGELANG_DESC" }] -
-
-
-
-
- [{oxmultilang ident="D3_GEOIP_SET_OPTIONS_CHANGEURL"}] -
-
- - getValue('blChangeURL') == 1}]checked[{/if}]> - [{ oxinputhelp ident="D3_GEOIP_SET_OPTIONS_CHANGEURL_DESC" }] -
-
-
-
-
- [{oxmultilang ident="D3_GEOIP_SET_OPTIONS_NOCOUNTRY"}] - - getValue('blUseFallback') == 1}]checked[{/if}]> -
-
- - [{ oxinputhelp ident="D3_GEOIP_SET_OPTIONS_NOCOUNTRY_DESC" }] -
-
-
-
-
- -
-
- - - [{oxmultilang ident="D3_GEOIP_SET_IP"}] - - -
-
- [{oxmultilang ident="D3_GEOIP_SET_IP_TESTIP"}] - - getValue('blUseTestIp') == 1}]checked[{/if}]> -
-
- - [{ oxinputhelp ident="D3_GEOIP_SET_IP_TESTIP_DESC" }] -
-
-
-
-
- [{oxmultilang ident="D3_GEOIP_SET_IP_CHECKIP"}] -
-
- - [{ oxinputhelp ident="D3_GEOIP_SET_IP_CHECKIP_DESC" }] - - [{if $edit->getValue('sCheckIp')}] - [{$oView->getIpCountry($edit->getValue('sCheckIp'))}] - [{/if}] -
-
-
-
-
- - - - - - -
- - -
- -
-
-
- - -[{include file="bottomitem.tpl"}] diff --git a/changed_full/PE/PE420-PE456/out/admin/tpl/d3_country_geoip.tpl b/changed_full/PE/PE420-PE456/out/admin/tpl/d3_country_geoip.tpl deleted file mode 100644 index c032b26..0000000 --- a/changed_full/PE/PE420-PE456/out/admin/tpl/d3_country_geoip.tpl +++ /dev/null @@ -1,120 +0,0 @@ -[{include file="headitem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}] - - - -[{ if $readonly }] - [{assign var="readonly" value="readonly disabled"}] -[{else}] - [{assign var="readonly" value=""}] -[{/if}] - -
- [{ $oViewConf->getHiddenSid() }] - - - - -
- -
- [{ $oViewConf->getHiddenSid() }] - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- [{oxmultilang ident="D3_GEOIP_SELSHOP"}]: - - [{if !$oView->getModCfgValue('blChangeShop')}] [{oxmultilang ident="D3_GEOIP_DISABLED"}][{/if}] -
- [{oxmultilang ident="D3_GEOIP_SELLANG"}]: - - [{if !$oView->getModCfgValue('blChangeLang')}] [{oxmultilang ident="D3_GEOIP_DISABLED"}][{/if}] -
- [{oxmultilang ident="D3_GEOIP_SELCUR"}]: - - [{if !$oView->getModCfgValue('blChangeCurr')}] [{oxmultilang ident="D3_GEOIP_DISABLED"}][{/if}] -


-

- oxcountry__oxtitle->value && !$oxparentid }]disabled[{/if}]>
-
- 		- [{oxmultilang ident="D3_GEOIP_OR"}] - - - - - - - -
- [{oxmultilang ident="D3_GEOIP_SELURL"}]: - - getModCfgValue('blChangeURL')}]disabled[{/if}]> [{if !$oView->getModCfgValue('blChangeURL')}] [{oxmultilang ident="D3_GEOIP_DISABLED"}][{/if}] - [{oxinputhelp ident="D3_GEOIP_SELURL_DESC"}] -
-
- -
- -[{include file="bottomnaviitem.tpl"}] - -[{include file="bottomitem.tpl"}] diff --git a/copy_this/modules/d3_geoip/metadata.php b/copy_this/modules/d3_geoip/metadata.php index 5182d8a..6d7958f 100644 --- a/copy_this/modules/d3_geoip/metadata.php +++ b/copy_this/modules/d3_geoip/metadata.php @@ -3,13 +3,14 @@ * Module information */ $aModule = array( - 'id' => 'd3ordermanager', - 'title' => 'D³ Auftragsmanager Pro / Order Manager Pro', - 'description' => 'Führt ausgeführte Aufträge nach definierten Regeln weiter.
Aktiviere Sie die Moduleinträge bitte immer und steuern Sie die Modulaktivität ausschließlich im Adminbereich des Moduls.', + 'id' => 'd3_geoip', + 'title' => oxLang::getInstance()->translateString('D3_GEOIP_METADATA_TITLE'), + 'description' => oxLang::getInstance()->translateString('D3_GEOIP_METADATA_DESC'), 'thumbnail' => 'picture.png', - 'version' => '1.0.0', - 'author' => 'D³ Data Development', + 'version' => '2.1.1', + 'author' => oxLang::getInstance()->translateString('D3_MOD_LIB_METADATA_AUTHOR'), 'extend' => array( - 'oxemail' => 'd3ordermanager/core/d3_oxemail_ordermanager' + 'oxcmp_cur' => 'd3_geoip/views/d3_oxcmp_cur_geoip', + 'oxcmp_lang' => 'd3_geoip/views/d3_oxcmp_lang_geoip', ) ); \ No newline at end of file diff --git a/setup+doku/EE/install.sql b/setup+doku/EE/install.sql index 665afd9..ea20f90 100644 --- a/setup+doku/EE/install.sql +++ b/setup+doku/EE/install.sql @@ -1,11 +1,13 @@ -INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -(MD5(RAND()), 1, 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.1', 'EE4', 0, '', '', '', '', 24, 24); -INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -(MD5(RAND()), 2, 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.1', 'EE4', 0, '', '', '', '', 24, 24); -INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -(MD5(RAND()), 3, 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.1', 'EE4', 0, '', '', '', '', 24, 24); +INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXNEWREVISION`) VALUES +(MD5(RAND()), 1, 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.2', 'EE4', 0, '', '', '', '', 26); +INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXNEWREVISION`) VALUES +(MD5(RAND()), 2, 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.2', 'EE4', 0, '', '', '', '', 26); +INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXNEWREVISION`) VALUES +(MD5(RAND()), 3, 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.2', 'EE4', 0, '', '', '', '', 26); ALTER TABLE `oxcountry` ADD `D3GEOIPSHOP` VARCHAR( 10 ) NOT NULL DEFAULT '-1', ADD `D3GEOIPLANG` TINYINT( 2 ) NOT NULL DEFAULT '-1', ADD `D3GEOIPCUR` TINYINT( 2 ) NOT NULL DEFAULT '-1', -ADD `D3GEOIPURL` VARCHAR( 255 ) NOT NULL; \ No newline at end of file +ADD `D3GEOIPURL` VARCHAR( 255 ) NOT NULL; + +UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_geoip'; \ No newline at end of file diff --git a/setup+doku/EE/update.sql b/setup+doku/EE/update.sql index 05e5bb4..5423844 100644 --- a/setup+doku/EE/update.sql +++ b/setup+doku/EE/update.sql @@ -15,4 +15,8 @@ ALTER TABLE `oxcountry` ADD `D3GEOIPURL` VARCHAR( 255 ) NOT NULL; UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.0', `OXREVISION` = '18', `OXNEWREVISION` = '18' WHERE OXMODID = 'd3_geoip'; # ==== 2.1.0 PE4 => 2.1.1 PE4 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.1', `OXREVISION` = '24', `OXNEWREVISION` = '24' WHERE OXMODID = 'd3_geoip'; \ No newline at end of file +UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.1', `OXREVISION` = '24', `OXNEWREVISION` = '24' WHERE OXMODID = 'd3_geoip'; + +# ==== 2.1.1 PE4 => 2.1.2 PE4 ==== +UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.2', `OXNEWREVISION` = '26' WHERE OXMODID = 'd3_geoip'; +UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_geoip'; \ No newline at end of file diff --git a/setup+doku/Installation.pdf b/setup+doku/Installation.pdf index ee6b078..59e498f 100644 Binary files a/setup+doku/Installation.pdf and b/setup+doku/Installation.pdf differ diff --git a/setup+doku/PE/install.sql b/setup+doku/PE/install.sql index 1bb1257..4cebc27 100644 --- a/setup+doku/PE/install.sql +++ b/setup+doku/PE/install.sql @@ -1,7 +1,9 @@ -INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -(MD5(RAND()), 'oxbaseshop', 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.1', 'PE4', 0, '', '', '', '', 24, 24); +INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXNEWREVISION`) VALUES +(MD5(RAND()), 'oxbaseshop', 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.2', 'PE4', 0, '', '', '', '', 26); ALTER TABLE `oxcountry` ADD `D3GEOIPSHOP` VARCHAR( 10 ) NOT NULL DEFAULT 'oxbaseshop', ADD `D3GEOIPLANG` TINYINT( 2 ) NOT NULL DEFAULT '-1', ADD `D3GEOIPCUR` TINYINT( 2 ) NOT NULL DEFAULT '-1', -ADD `D3GEOIPURL` VARCHAR( 255 ) NOT NULL; \ No newline at end of file +ADD `D3GEOIPURL` VARCHAR( 255 ) NOT NULL; + +UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_geoip'; \ No newline at end of file diff --git a/setup+doku/PE/update.sql b/setup+doku/PE/update.sql index 3f49b58..db92233 100644 --- a/setup+doku/PE/update.sql +++ b/setup+doku/PE/update.sql @@ -17,4 +17,8 @@ UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE OXMODID = 'd3_geoip UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.1', `OXNEWREVISION` = '24' WHERE OXMODID = 'd3_geoip'; ALTER TABLE `oxcountry` CHANGE `D3GEOIPSHOP` `D3GEOIPSHOP` VARCHAR( 10 ) NOT NULL DEFAULT 'oxbaseshop'; UPDATE `oxcountry` SET `D3GEOIPSHOP` = 'oxbaseshop' WHERE `D3GEOIPSHOP` = '-1'; -UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE OXMODID = 'd3_geoip'; \ No newline at end of file +UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE OXMODID = 'd3_geoip'; + +# ==== 2.1.1 PE4 => 2.1.2 PE4 ==== +UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.2', `OXNEWREVISION` = '26' WHERE OXMODID = 'd3_geoip'; +UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_geoip'; \ No newline at end of file diff --git a/sources/GeoIP-Installation.docx b/sources/GeoIP-Installation.docx index 98be340..34bbbb0 100644 Binary files a/sources/GeoIP-Installation.docx and b/sources/GeoIP-Installation.docx differ