D3Public/UserOnline
8
0
Fork 0
Code Pull Requests Releases Activity

merge rel_2.x to trunk

Browse Source
This commit is contained in:
Daniel Seifert 2015-07-06 14:18:09 +00:00
commit e777703589
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
copy_this/modules/d3/d3usersonline/metadata.php
View File

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

16
copy_this/modules/d3/d3usersonline/setup/d3usersonline_update.php
View File

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

14
setup+doku/Precheck/d3precheck.php
View File

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

3
setup+doku/changelog.txt
View File

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