merge rel_2.x to trunk

copy_this/modules/d3/d3usersonline/metadata.php

@@ -36,7 +36,7 @@ $aModule = array(
         'en' => '',
     ),
     'thumbnail'   => 'picture.png',
-    'version'     => '2.0.1.0',
+    'version'     => '2.0.1.1',
     'author'      => 'D³ Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'http://www.oxidmodule.com/',

copy_this/modules/d3/d3usersonline/setup/d3usersonline_update.php

@@ -22,14 +22,14 @@ class d3usersonline_update extends d3install_updatebase
 {
     public $sModKey = 'd3usersonline';
     public $sModName = 'Users Online';
-    public $sModVersion = '2.0.1.0';
-    public $sModRevision = '39';
-    public $sBaseConf = 'esySjhjTE5Va2RmRXhYWHlFVTluQkhzUGMzZEhWWUtLS2ZyYm5Fb1BCQWlONjBiRmtnMmZjaVpqbWF3M
-DRzRDRKRTlRbktRTmkwMmNiTjd5bTRHd2pjZkI3MGx5bGdGZjJyNU1mbFM2NzQ4bW5FWGEraUg1QWlMd
-kZqSHFkNkdPZ05XbzdNa0tlWGNmUWNIOVFaMEdvZzROU05TZEp3UFdPRDZRdHdPbFZYdFZrcmR5UHRDV
-GdVVTV3Y1RCd1JRMGJuZ1JHVWpxYWM4Q0o1czkvakk4SE8zdngwaWI4aFRPQ0ZPa2JKVHRGWTlpTnJBM
-WwzTnVBSUtDdVA2cTgzRzJhODRXTFZDeUJLaUpSNzQ5OThmVFF6eldYbEI2bUVRSlBNRGtXdWg2T0VwS
-Ws9';
+    public $sModVersion = '2.0.1.1';
+    public $sModRevision = '43';
+    public $sBaseConf = 'Nv6RXZkcTl5NmIybDdzQldqUWo5dURBTXB4Tld3aHN3N2pmNmZacUljL0R4WUg2a1o4QUxLeVUrdjBSZ
+WFud2VjRFJDa2ZvTHVaS2tpczAyZ0NGOGxwV3ZISHB3c0xRLzQ4Ny9kcTdDSjVQZDBYZ3VUMHFNaVg1R
+3ZudGMzOGhsb01Sd1dTRG4xd0xscCtORC93VXJsWngrV200YktMSk93UENWNzJuT2NaT0U0UkJaQWdqa
+nVKT0RwVFFzclYrT2JnckNGZjNieVRDSzcyV2Z2QktDR3RqNWJsemd6WURVMm1tbWl5cEJNMDFvR3JiS
+2F5OHIvb0VoMUw1Nm9XdWdTc2FwVWpCVWFkZEllT1lGTzdiY2I0YUdNMmV3K3kyakZQMVRuUVJyUjhKO
+DQ9';
     public $sRequirements = '';
     public $sBaseValue = '';
 

setup+doku/Precheck/d3precheck.php

@@ -41,9 +41,9 @@ class requConfig
 {
     public $sModName = 'D³ Users Online';
 
-    public $sModId   = 'd3modid';
+    public $sModId   = 'd3usersonline';
 
-    public $sModVersion = '2.0.1.X';
+    public $sModVersion = '2.0.1.1';
 
     /********************** check configuration section ************************/
 
@@ -60,7 +60,7 @@ class requConfig
         'hasMaxPhpVersion'       => array(
             'blExec'  => 0,
             'aParams' => array(
-                'version' => '5.4.200'
+                'version' => '5.6.200'
             )
         ),
 
@@ -69,7 +69,7 @@ class requConfig
             'blExec'  => 1,
             'aParams' => array(
                 'from' => '5.2.0',
-                'to'   => '5.4.200',
+                'to'   => '5.6.200',
             )
         ),
 
@@ -1241,7 +1241,7 @@ class requTranslations
                     'Shopedition.</div>'.
                     '<div>Bei Fragen wenden Sie sich bitte an <a href="mailto:support@shopmodule.com">'.
                     'support@shopmodule.com</a>.</div>',
-                'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) oder Zend Guard Loader (PHP 5.3, 5.4) '.
+                'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) oder Zend Guard Loader (PHP 5.3, 5.4, 5.5, 5.6) '.
                     'installiert',
                 'hasZendLoaderOptimizer_DESC' => '<div>Das Modul erfordert (je nach PHP-Version) den Zend Optimizer '.
                     'bzw. den Zend Guard Loader.</div>'.
@@ -1382,7 +1382,7 @@ class requTranslations
                     'fulfilled. The module can\'t installed or executed.</div>'.
                     '<div>The [+] button show details for all tested directories. If you have any questions, please '.
                     'contact us at support@shopmodule.com.</div>',
-                'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) or Zend Guard Loader (PHP 5.3, 5.4) installed',
+                'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) or Zend Guard Loader (PHP 5.3, 5.4, 5.5, 5.6) installed',
                 'hasZendLoaderOptimizer_DESC' => '<div>requirement check result</div>'.
                     '<div><div class="squ_bullet" style="background-color: green;"></div> This requirement is '.
                     'fulfilled.</div>'.
@@ -1989,7 +1989,7 @@ class requTests
                 function_exists('zend_optimizer_version')
             ) || (
                 version_compare(phpversion(), '5.3.0', '>=') &&
-                version_compare(phpversion(), '5.4.900', '<') &&
+                version_compare(phpversion(), '5.6.900', '<') &&
                 function_exists('zend_loader_version')
             )
         ) {

setup+doku/changelog.txt

@@ -1,3 +1,6 @@
+=> 2.0.1.1
+- Precheck für PHP 5.5 und 5.6 angepasst
+
 => 2.0.1.0
 - Statistik steht auch im Adminbereich zur Verfügung
 - automatische Installation aktualisiert