diff --git a/.gitattributes b/.gitattributes index 9416b9c..60f4d3a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,8 +18,8 @@ copy_this/modules/d3/d3geoip/views/admin/de/d3_geoip_lang.php -text copy_this/modules/d3/d3geoip/views/admin/tpl/d3_cfg_geoipset_main.tpl -text copy_this/modules/d3/d3geoip/views/admin/tpl/d3_country_geoip.tpl -text setup+doku/Installation.pdf -text +setup+doku/Precheck/d3precheck.php -text setup+doku/changelog.txt -text -setup+doku/d3precheck.php -text setup+doku/geoip-Data_IPv4_2013-04-18.sql -text setup+doku/geoip-Data_IPv6_2013-04-18.sql -text setup+doku/geoip-Struktur.sql -text diff --git a/copy_this/modules/d3/d3geoip/metadata.php b/copy_this/modules/d3/d3geoip/metadata.php index a4fb781..e8faecf 100644 --- a/copy_this/modules/d3/d3geoip/metadata.php +++ b/copy_this/modules/d3/d3geoip/metadata.php @@ -15,7 +15,7 @@ $aModule = array( 'en' => '', ), 'thumbnail' => 'picture.png', - 'version' => '3.0.0.0', + 'version' => '3.0.0.2', 'author' => 'D³ Data Development (Inh.: Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', diff --git a/copy_this/modules/d3/d3geoip/models/d3geoip_update.php b/copy_this/modules/d3/d3geoip/models/d3geoip_update.php index e9a4b0f..7249015 100644 --- a/copy_this/modules/d3/d3geoip/models/d3geoip_update.php +++ b/copy_this/modules/d3/d3geoip/models/d3geoip_update.php @@ -18,14 +18,14 @@ class d3geoip_update extends d3install_updatebase { public $sModKey = 'd3_geoip'; public $sModName = 'GeoIP'; - public $sModVersion = '3.0.0.1'; - public $sModRevision = '48'; - public $sBaseConf = '4C7a1dCMWRRcFB1TUdmeitQYmxZcmpZem5IRERUVjdlWmo5R1J3T3E0dTRJZy9NUFFpUkhWVTdZTk95Y -2d4ZStmTXpud2tteld3NlFWUEVTUDY4MDhBYVhWUlpRUnZ4RmtwS3FNM2VDeG9IL3JnMkJRWDFmVEM4U -mdCZUd1aGp4WkFPVk1NRjJyR0lLNUF1ZmEwb0J3YTUwdDhjTjRraG9DQit4NjBNRWd2KzdzZjZEQldhc -1dsSUtGK240enBoTzJWb2VpSlg1Yzh5VlhNenc4S1JHSDVoOWJRbEZvYkVCeDhvcnU2NHpZUVdodnNXc -TNjT2tVQ01nVkRxMnZoQXVTL1hrU3ZIRFBWWUdoWWlLMzRFbHhtd0lFbWN5ejA0RHZQRnhwbU5MbHhWM -E09'; + public $sModVersion = '3.0.0.2'; + public $sModRevision = '52'; + public $sBaseConf = 'DSdWUJnZzd3RTd4aStQNjFBVnBkK3NFUmwzY2tiNHllWmFjSUZZOS9USTAzbHpHb241YWZTNThRWnpCV +XBnQ2J0STVReGNTQmVJQ0h3aXVYWVBKcWFuVzM2WVNwdld0cXZ3bEYzTWJRMnJTN2ZYMGFNMkFxT2VQe +CsxNzVVaytabkRBbCtJWnE1Y3lKZWdmaC9XNDhkZzhhQXhHc2FaZHlyejlSMFE1ZUJjNzA1M1dzSEJPQ +0NBNGZJbEpZNFVuMG1STEtQRkx1WDZZZzRndXF2OW1oUGdGb2tJZW1lQ09waE5FK29PYmpML2pRVkNaS +EdaS3RXUW5NZzJhUUF5ZlNIZ1h3MUo3QVpIeFUwL0lmajRTbWw2cmNsckpJVnFYQjFKWTd3RXUrMlhHK +zQ9'; public $sRequirements = ''; public $sBaseValue = ''; diff --git a/setup+doku/Installation.pdf b/setup+doku/Installation.pdf index 1a421fc..47f3157 100644 Binary files a/setup+doku/Installation.pdf and b/setup+doku/Installation.pdf differ diff --git a/setup+doku/d3precheck.php b/setup+doku/Precheck/d3precheck.php similarity index 99% rename from setup+doku/d3precheck.php rename to setup+doku/Precheck/d3precheck.php index 08508a1..fec45dc 100644 --- a/setup+doku/d3precheck.php +++ b/setup+doku/Precheck/d3precheck.php @@ -113,9 +113,9 @@ class requConfig 'hasMaxShopVersion' => array( 'blExec' => 1, 'aParams' => array( - 'PE' => '4.8.0', - 'CE' => '4.8.0', - 'EE' => '5.1.0' + 'PE' => '4.8.3', + 'CE' => '4.8.3', + 'EE' => '5.1.3' ), ), diff --git a/sources/GeoIP-Installation.docx b/sources/GeoIP-Installation.docx index 078e884..0381719 100644 Binary files a/sources/GeoIP-Installation.docx and b/sources/GeoIP-Installation.docx differ