From 2e0b3639415dae00f3fe08d3973c126a41e2b3fa Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Fri, 26 Feb 2016 08:34:04 +0000 Subject: [PATCH] revision adjusted --- copy_this/modules/d3/d3geoip/metadata.php | 2 +- .../d3/d3geoip/setup/d3geoip_update.php | 16 ++-- setup+doku/Precheck/d3precheck.php | 77 +++++++++++++++---- setup+doku/changelog.txt | 3 + 4 files changed, 72 insertions(+), 26 deletions(-) diff --git a/copy_this/modules/d3/d3geoip/metadata.php b/copy_this/modules/d3/d3geoip/metadata.php index b411786..b904507 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.2.0', + 'version' => '3.0.2.1', '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 b91a774..8daea5e 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.2.0'; - public $sModRevision = '72'; - public $sBaseConf = 'roRU1VvSDZ4NitxaUoyakRyeVU3ZVMzc1pLOW1MVTJDckhqR3JlTHhsS1NGZU5MeTdGRUJpQ1NDeEl5N -C91ZC9DRjNOWlZlTllwajZ3UGF3T1d6SElheW00Z2U0eGlQNzN1cENnS1dDOWl0ck9VNnp1UEtlYlZnN -mFpQ2p5MkYrYVNsSG01TkIxcERZYU56RE9SMGtCSFd5Z2Vpd0NsZHFzRkVJR0pvNk9vTXhNVzZDTHRoZ -3d5Z0szV3ljaXZGSDh4Z1RmUllDOFFGOTJYL21meVI4NEl6ZnRselo3Z0xDbEJMcFo4VjAzMUJvdHRwV -k1TVHVNQmVWRU5TeGN1VVRNcnlWcHZja1FSdXVvZWp6NVhlRHFjR1hmaWRGYlFadkI3ek5aeHVTQzU1M -VU9'; + public $sModVersion = '3.0.2.1'; + public $sModRevision = '75'; + public $sBaseConf = 'sw2M1p3STcxMXh0eDhyR1A3YUJDMDVDakZUM2FnakVDOWdwRm9SQzFiMzhqUEtNTTFXK2ZmSlhqd1k2a +DJiSi9QSjRTQUhwOXgrMzVOOVRKRWM1c1FUci9OMUtJR2xxQ0JUTzd3V3FaSEFneGRRL3FOOU1sS09ib +FpDSjBrTUJDQTh6R2pScnZpOXphaUtlZUovQ1UzNlN5di9LeXBIYmlTQzRTRlA0czRBRmVibzZOY1R1V +lNZVUE1R3hTa2drOGx0a09HN3JhMkx1OVJvcnN5OHUvbVhqWUVURVhGanBva29GOUY3amNTcXhsTVdRM +W8vRWJtYW9IY0NqdDBlSEtwOFRJMGQ1OElxeG13bDVySGFub1ovYkkrWEtvSm1HY3RMVXlPd0pJU2dmW +Vk9'; public $sRequirements = ''; public $sBaseValue = ''; diff --git a/setup+doku/Precheck/d3precheck.php b/setup+doku/Precheck/d3precheck.php index 6bab44a..f8b5bae 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.2.0'; + public $sModVersion = '3.0.2.1'; /********************** check configuration section ************************/ @@ -113,9 +113,9 @@ class requConfig 'hasMaxShopVersion' => array( 'blExec' => 1, 'aParams' => array( - 'PE' => '4.9.6', - 'CE' => '4.9.6', - 'EE' => '5.2.6' + 'PE' => '4.9.7', + 'CE' => '4.9.7', + 'EE' => '5.2.7' ), ), @@ -182,7 +182,7 @@ date_default_timezone_set('Europe/Berlin'); */ class requCheck { - public $sVersion = '4.6.3'; + public $sVersion = '4.7.1'; protected $_db = false; @@ -287,22 +287,41 @@ class requCheck $aIgnoreDirItems = array('.', '..'); $aCheckScripts = array(); - /** @var SplFileInfo $oFileInfo */ - foreach (new RecursiveDirectoryIterator($sFolder) as $oFileInfo) { - if (in_array($oFileInfo->getFileName(), $aIgnoreDirItems)) { - continue; - } - if ($oFileInfo->isDir()) { - $aCheckScripts = array_merge($aCheckScripts, $this->_walkThroughDirs($oFileInfo->getRealPath())); - } elseif ($oFileInfo->isFile()) { - if (strtolower($oFileInfo->getFilename()) == $this->_sInFolderFileName) { - $aCheckScripts[] = str_replace('\\', '/', $oFileInfo->getRealPath()); + try { + /** @var SplFileInfo $oFileInfo */ + $oIterator = new RecursiveDirectoryIterator($sFolder); + + foreach ($oIterator as $oFileInfo) { + if (in_array($oFileInfo->getFileName(), $aIgnoreDirItems)) { + continue; + } + if ($oFileInfo->isDir()) { + $aCheckScripts = array_merge($aCheckScripts, $this->_walkThroughDirs($oFileInfo->getRealPath())); + } elseif ($oFileInfo->isFile()) { + if (strtolower($oFileInfo->getFilename()) == $this->_sInFolderFileName) { + $aCheckScripts[] = str_replace('\\', '/', $oFileInfo->getRealPath()); + } } } + } catch (UnexpectedValueException $oEx) { + sprintf($this->oLayout->translate('unableExecuteDirectoryIterator'), $oEx->getMessage()); + $this->addMessage( + sprintf($this->oLayout->translate('unableExecuteDirectoryIterator'), $oEx->getMessage()) + ); } return $aCheckScripts; } + + public function addMessage($sMessage) + { + $this->aMessages[md5($sMessage)] = $sMessage; + } + + public function getMessages() + { + return $this->aMessages; + } /** * @param $aScriptList @@ -378,15 +397,17 @@ class requCheck */ protected function _getContentByCurl($sUrl) { + $iTimeOut = 5; $ch = curl_init(); $sCurl_URL = preg_replace('@^((http|https)://)@', '', $sUrl); + curl_setopt($ch, CURLOPT_URL, $sCurl_URL); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); - curl_setopt($ch, CURLOPT_TIMEOUT, 5); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $iTimeOut); + curl_setopt($ch, CURLOPT_TIMEOUT, $iTimeOut); curl_setopt($ch, CURLOPT_POST, 0); $sContent = curl_exec($ch); curl_close($ch); @@ -722,6 +743,7 @@ class requLayout $sTranslRequCheck "$sModName" $sModVersion + @@ -867,6 +899,14 @@ EOT; $sScriptName = $_SERVER['SCRIPT_NAME']; $sTranslShopPhpInfo = $this->translate('showPhpInfo'); $sTranslDependent = $this->translate('dependentoffurther'); + + if (count($this->oBase->getMessages())) { + echo ''; + } if ($this->oBase->blGlobalResult) { echo '

' . $this->translate('globalSuccess') . '' . @@ -1445,6 +1485,8 @@ class requTranslations 'unableDeleteFile' => 'Datei konnte nicht gelöscht werden. Bitte löschen Sie diese '. 'manuell.', 'goodBye' => 'Auf Wiedersehen.', + 'unableExecuteDirectoryIterator' => 'Es können nicht alle Unterverzeichnisse auf weitere Prüfungen '. + 'kontrolliert werden. (%1$s)', ), 'en' => array( 'RequCheck' => 'Requirement check', @@ -1610,6 +1652,7 @@ class requTranslations 'toggleswitch' => 'click for details', 'unableDeleteFile' => 'Unable to delete file. Please delete it manually.', 'goodBye' => 'Good Bye.', + 'unableExecuteDirectoryIterator' => 'Unable to check subdirectories for further checks. (%1$s)', ), ); } diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index 17c67ed..d9f51d3 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -1,3 +1,6 @@ +=> 3.0.2.1 +- Sprachumschalter wird sofort bei erstem Shopaufruf umgesetzt + => 3.0.2.0 - Komponente wird dynamisch eingebunden, um bei deaktiviertem Modul keine Exception auszulösen