revision adjusted

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/',

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 $sModVersion = '3.0.2.1';
-    public $sModRevision = '72';
+    public $sModRevision = '75';
-    public $sBaseConf = 'roRU1VvSDZ4NitxaUoyakRyeVU3ZVMzc1pLOW1MVTJDckhqR3JlTHhsS1NGZU5MeTdGRUJpQ1NDeEl5N
+    public $sBaseConf = 'sw2M1p3STcxMXh0eDhyR1A3YUJDMDVDakZUM2FnakVDOWdwRm9SQzFiMzhqUEtNTTFXK2ZmSlhqd1k2a
-C91ZC9DRjNOWlZlTllwajZ3UGF3T1d6SElheW00Z2U0eGlQNzN1cENnS1dDOWl0ck9VNnp1UEtlYlZnN
+DJiSi9QSjRTQUhwOXgrMzVOOVRKRWM1c1FUci9OMUtJR2xxQ0JUTzd3V3FaSEFneGRRL3FOOU1sS09ib
-mFpQ2p5MkYrYVNsSG01TkIxcERZYU56RE9SMGtCSFd5Z2Vpd0NsZHFzRkVJR0pvNk9vTXhNVzZDTHRoZ
+FpDSjBrTUJDQTh6R2pScnZpOXphaUtlZUovQ1UzNlN5di9LeXBIYmlTQzRTRlA0czRBRmVibzZOY1R1V
-3d5Z0szV3ljaXZGSDh4Z1RmUllDOFFGOTJYL21meVI4NEl6ZnRselo3Z0xDbEJMcFo4VjAzMUJvdHRwV
+lNZVUE1R3hTa2drOGx0a09HN3JhMkx1OVJvcnN5OHUvbVhqWUVURVhGanBva29GOUY3amNTcXhsTVdRM
-k1TVHVNQmVWRU5TeGN1VVRNcnlWcHZja1FSdXVvZWp6NVhlRHFjR1hmaWRGYlFadkI3ek5aeHVTQzU1M
+W8vRWJtYW9IY0NqdDBlSEtwOFRJMGQ1OElxeG13bDVySGFub1ovYkkrWEtvSm1HY3RMVXlPd0pJU2dmW
-VU9';
+Vk9';
     public $sRequirements = '';
     public $sBaseValue = '';
 

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',
+                'PE' => '4.9.7',
-                'CE' => '4.9.6',
+                'CE' => '4.9.7',
-                'EE' => '5.2.6'
+                '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,8 +287,11 @@ class requCheck
         $aIgnoreDirItems = array('.', '..');
         $aCheckScripts = array();
 
+        try {
             /** @var SplFileInfo $oFileInfo */
-        foreach (new RecursiveDirectoryIterator($sFolder) as $oFileInfo) {
+            $oIterator = new RecursiveDirectoryIterator($sFolder);
+        
+            foreach ($oIterator as $oFileInfo) {
                 if (in_array($oFileInfo->getFileName(), $aIgnoreDirItems)) {
                     continue;
                 }
@@ -300,10 +303,26 @@ class requCheck
                     }
                 }
             }
+        } 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
      * @param $sMethodName
@@ -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_CONNECTTIMEOUT, $iTimeOut);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+        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
                     <title>
                         $sTranslRequCheck "$sModName" $sModVersion
                     </title>
+                    <meta http-equiv="Content-Type" content="text/html;charset=ISO8859-15">
                     <style type="text/css">
                         <!--
                         body {
@@ -840,6 +862,16 @@ class requLayout
                             color: gray;
                             font-size: 10px;
                         }
+                        .messages {
+                            display: block; 
+                            margin: 13px 0; 
+                            text-align: center; 
+                            background-color: orange; 
+                            border: 1px solid black; 
+                            color: black; 
+                            font-weight: normal; 
+                            padding: 1px;
+                        }
                         -->
                     </style>
                 </head>
@@ -868,6 +900,14 @@ EOT;
         $sTranslShopPhpInfo = $this->translate('showPhpInfo');
         $sTranslDependent   = $this->translate('dependentoffurther');
         
+        if (count($this->oBase->getMessages())) {
+            echo '<span class="messages"><ul>';
+            foreach ($this->oBase->getMessages() as $sMessage) {
+                echo '<li>'.$sMessage.'</li>';
+            }
+            echo '</ul></span>';
+        }
+
         if ($this->oBase->blGlobalResult) {
             echo '<p class="box_ok"><b>' . $this->translate('globalSuccess') . '</b>' .
                 $this->translate('deleteFile1') . $sScriptName . $this->translate('deleteFile2') . '</p>';
@@ -1445,6 +1485,8 @@ class requTranslations
                 'unableDeleteFile'       => 'Datei konnte nicht gel&ouml;scht werden. Bitte l&ouml;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)',
             ),
         );
     }

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