diff --git a/copy_this/.noencode b/copy_this/.noencode index 48d822f..3d94b66 100644 --- a/copy_this/.noencode +++ b/copy_this/.noencode @@ -1 +1 @@ -copyAsIsFiles = modules/d3/d3geoip/components, modules/d3/d3geoip/controllers, modules/d3/d3geoip/models/d3geoip_update.php, modules/d3/d3geoip/modules/controllers, modules/d3/d3geoip/views, modules/d3/d3geoip/IntelliSenseHelper.php, modules/d3/d3geoip/metadata.php \ No newline at end of file +copyAsIsFiles = modules/d3/d3geoip/components, modules/d3/d3geoip/controllers, modules/d3/d3geoip/setup, modules/d3/d3geoip/modules/controllers, modules/d3/d3geoip/views, modules/d3/d3geoip/IntelliSenseHelper.php, modules/d3/d3geoip/metadata.php \ No newline at end of file diff --git a/copy_this/modules/d3/d3geoip/metadata.php b/copy_this/modules/d3/d3geoip/metadata.php index 0e9489d..b411786 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.1.0', + 'version' => '3.0.2.0', 'author' => 'D³ Data Development (Inh.: Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', diff --git a/copy_this/modules/d3/d3geoip/setup/d3geoip_update.php b/copy_this/modules/d3/d3geoip/setup/d3geoip_update.php index 6fc3efc..b91a774 100644 --- a/copy_this/modules/d3/d3geoip/setup/d3geoip_update.php +++ b/copy_this/modules/d3/d3geoip/setup/d3geoip_update.php @@ -18,14 +18,14 @@ class d3geoip_update extends d3install_updatebase { public $sModKey = 'd3_geoip'; public $sModName = 'GeoIP'; - public $sModVersion = '3.0.1.0'; - public $sModRevision = '67'; - public $sBaseConf = '5FibjlIQlRvbWMzY29mVi85RXFxbkc5bFI3R24rNkd5Y0lEcXJFOGhtaGExRVcyaEF6a281cVhRUXFMU -0d6dnNDbCtLRVdObFh3bnVEdUNRTFJrVlE5VGtsRkF3Tyt4TU1Pd290WDliOTQ2SUE5Skk0eTcxTGdlT -XZna0dhS2ZOekJUSC94ZUd5YmxXZzRXcG5QSWcvZnFJa1l0N1MrdWRZaFU1VG5nUGFwNEF1WTh6azNja -Gs3SmtzQ05SVjROSGdSZ2N0S3Q1TTV1RGlCSU5RZnh1dGVNNVd6bTBzMU1FdHFiNytJQldBRjRTNmx3U -VVlRkhrRzYxYUtpaWNBOUUrLzZ2YjN5SDM1cllVMTIrYUFPRnRYcFpibHVBQytEQVFnNFV0RWpFZXAwd -FE9'; + public $sModVersion = '3.0.2.0'; + public $sModRevision = '72'; + public $sBaseConf = 'roRU1VvSDZ4NitxaUoyakRyeVU3ZVMzc1pLOW1MVTJDckhqR3JlTHhsS1NGZU5MeTdGRUJpQ1NDeEl5N +C91ZC9DRjNOWlZlTllwajZ3UGF3T1d6SElheW00Z2U0eGlQNzN1cENnS1dDOWl0ck9VNnp1UEtlYlZnN +mFpQ2p5MkYrYVNsSG01TkIxcERZYU56RE9SMGtCSFd5Z2Vpd0NsZHFzRkVJR0pvNk9vTXhNVzZDTHRoZ +3d5Z0szV3ljaXZGSDh4Z1RmUllDOFFGOTJYL21meVI4NEl6ZnRselo3Z0xDbEJMcFo4VjAzMUJvdHRwV +k1TVHVNQmVWRU5TeGN1VVRNcnlWcHZja1FSdXVvZWp6NVhlRHFjR1hmaWRGYlFadkI3ek5aeHVTQzU1M +VU9'; public $sRequirements = ''; public $sBaseValue = ''; diff --git a/setup+doku/Installation.pdf b/setup+doku/Installation.pdf index ce74526..014640b 100644 Binary files a/setup+doku/Installation.pdf and b/setup+doku/Installation.pdf differ diff --git a/setup+doku/Precheck/d3precheck.php b/setup+doku/Precheck/d3precheck.php index 5e1bcbc..6bab44a 100644 --- a/setup+doku/Precheck/d3precheck.php +++ b/setup+doku/Precheck/d3precheck.php @@ -43,7 +43,7 @@ class requConfig public $sModId = 'd3_geoip'; - public $sModVersion = '3.0.1.0'; + public $sModVersion = '3.0.2.0'; /********************** check configuration section ************************/ @@ -68,7 +68,7 @@ class requConfig 'hasFromToPhpVersion' => array( 'blExec' => 1, 'aParams' => array( - 'from' => '5.2.0', + 'from' => '5.3.0', 'to' => '5.6.200', ) ), @@ -103,9 +103,9 @@ class requConfig 'hasMinShopVersion' => array( 'blExec' => 1, 'aParams' => array( - 'PE' => '4.7.0', - 'CE' => '4.7.0', - 'EE' => '5.0.0' + 'PE' => '4.8.0', + 'CE' => '4.8.0', + 'EE' => '5.1.0' ), ), @@ -182,7 +182,7 @@ date_default_timezone_set('Europe/Berlin'); */ class requCheck { - public $sVersion = '4.6.2'; + public $sVersion = '4.6.3'; protected $_db = false; diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index 0ddea11..17c67ed 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -1,3 +1,6 @@ +=> 3.0.2.0 +- Komponente wird dynamisch eingebunden, um bei deaktiviertem Modul keine Exception auszulösen + => 3.0.1.0 - Kompatibilität mit OXID Dynamic Content Cache hergestellt - prüft IP-Syntax bei Eingabe im Adminbereich diff --git a/sources/GeoIP-Installation.docx b/sources/GeoIP-Installation.docx index 9278cbf..d1ccf4e 100644 Binary files a/sources/GeoIP-Installation.docx and b/sources/GeoIP-Installation.docx differ