diff --git a/Sources/UsersOnline-Installation.docx b/Sources/UsersOnline-Installation.docx index 9763618..13914c7 100644 Binary files a/Sources/UsersOnline-Installation.docx and b/Sources/UsersOnline-Installation.docx differ diff --git a/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_main.php b/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_main.php index 3f64ebf..8f94d21 100644 --- a/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_main.php +++ b/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_main.php @@ -25,5 +25,9 @@ class d3_cfg_usersonline_Main extends d3_cfg_mod_main protected $_blHasTestModeSwitch = false; + protected $_sMenuItemTitle = 'd3mxusersonline'; + + protected $_sMenuSubItemTitle = 'd3mxusersonline_settings'; + //protected $_sDebugHelpTextIdent = 'D3_INQUIRY_MAIN_DEBUGACTIVE_DESC'; } diff --git a/copy_this/modules/d3/d3usersonline/controllers/admin/d3_usersonline_statistic.php b/copy_this/modules/d3/d3usersonline/controllers/admin/d3_usersonline_statistic.php index 234a961..13c2b0b 100644 --- a/copy_this/modules/d3/d3usersonline/controllers/admin/d3_usersonline_statistic.php +++ b/copy_this/modules/d3/d3usersonline/controllers/admin/d3_usersonline_statistic.php @@ -17,6 +17,10 @@ class d3_usersonline_statistic extends d3_cfg_mod_main protected $_iExpTime = 600; // (in seconds) protected $_sThisTemplate = 'd3_usersonline_statistic.tpl'; + protected $_sMenuItemTitle = 'd3mxusersonline'; + + protected $_sMenuSubItemTitle = 'd3mxusersonline_analysis'; + /** * @return array */ diff --git a/copy_this/modules/d3/d3usersonline/setup/d3usersonline_update.php b/copy_this/modules/d3/d3usersonline/setup/d3usersonline_update.php index 47327b9..083f6a9 100644 --- a/copy_this/modules/d3/d3usersonline/setup/d3usersonline_update.php +++ b/copy_this/modules/d3/d3usersonline/setup/d3usersonline_update.php @@ -33,9 +33,13 @@ DQ9'; public $sRequirements = ''; public $sBaseValue = ''; + public $sMinModCfgVersion = '4.3.7.0'; + protected $_aUpdateMethods = array( array('check' => 'checkUsersOnlineTableExist', 'do' => 'updateUsersOnlineTableExist'), + array('check' => 'checkUsersOnlineTableEngine', + 'do' => 'updateUsersOnlineTableEngine'), array('check' => 'checkRenameFields', 'do' => 'fixRenameFields'), array('check' => 'checkDeleteFields', @@ -162,12 +166,39 @@ DQ9'; $blRet = true; if ($this->checkUsersOnlineTableExist()) { - $blRet = $this->_addTable2('d3usersonline', $this->aFields, $this->aIndizes, 'users online', 'MyISAM'); + $blRet = $this->_addTable2('d3usersonline', $this->aFields, $this->aIndizes, 'users online', 'InnoDB'); } return $blRet; } + /** + * @return bool true, if table has wrong engine + */ + public function checkUsersOnlineTableEngine() + { + /** @var d3installdbtable $oDbTable */ + $oDbTable = oxNew('d3installdbtable', $this); + $aData = $oDbTable->getTableData('d3usersonline'); + + if (isset($aData) && count($aData) && isset($aData['ENGINE']) && $aData['ENGINE'] == 'InnoDB') { + return false; + } + + return true; + } + + /** + * @return bool + */ + public function updateUsersOnlineTableEngine() + { + /** @var d3installdbtable $oDbTable */ + $oDbTable = oxNew('d3installdbtable', $this); + $blRet = $oDbTable->changeTableEngine('d3usersonline', 'InnoDB'); + return $blRet; + } + /** * @return bool */ diff --git a/copy_this/modules/d3/d3usersonline/views/admin/de/d3usersonline_lang.php b/copy_this/modules/d3/d3usersonline/views/admin/de/d3usersonline_lang.php index f67ea15..a6818d9 100644 --- a/copy_this/modules/d3/d3usersonline/views/admin/de/d3usersonline_lang.php +++ b/copy_this/modules/d3/d3usersonline/views/admin/de/d3usersonline_lang.php @@ -25,7 +25,7 @@ $iLangNr = 0; $aLang = array( 'charset' => 'ISO-8859-15', - 'd3mxusersonline' => 'Benutzer online', + 'd3mxusersonline' => ' Benutzer online', 'd3mxusersonline_settings' => 'Einstellungen', 'd3tbclussersonline_settings_main' => 'Grundeinstellungen', 'd3mxusersonline_analysis' => 'Auswertungen', @@ -35,4 +35,5 @@ $aLang = array( 'D3_USERSONLINE_USER' => 'Benutzer', 'D3_USERSONLINE_USERS' => 'Benutzer', 'D3_USERSONLINE_ALL' => 'gesamt', + 'D3_USERSONLINE_SAVE' => 'Speichern', ); diff --git a/copy_this/modules/d3/d3usersonline/views/admin/en/d3usersonline_lang.php b/copy_this/modules/d3/d3usersonline/views/admin/en/d3usersonline_lang.php index a5a3c60..64d6f52 100644 --- a/copy_this/modules/d3/d3usersonline/views/admin/en/d3usersonline_lang.php +++ b/copy_this/modules/d3/d3usersonline/views/admin/en/d3usersonline_lang.php @@ -25,7 +25,7 @@ $iLangNr = 0; $aLang = array( 'charset' => 'ISO-8859-15', - 'd3mxusersonline' => 'Users Online', + 'd3mxusersonline' => ' Users online', 'd3mxusersonline_settings' => 'Settings', 'd3tbclussersonline_settings_main' => 'Main Settings', 'd3mxusersonline_analysis' => 'Analysis', @@ -35,4 +35,5 @@ $aLang = array( 'D3_USERSONLINE_USER' => 'user', 'D3_USERSONLINE_USERS' => 'users', 'D3_USERSONLINE_ALL' => 'all', + 'D3_USERSONLINE_SAVE' => 'save', ); diff --git a/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_cfg_usersonline_main.tpl b/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_cfg_usersonline_main.tpl index 3574879..2c23747 100644 --- a/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_cfg_usersonline_main.tpl +++ b/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_cfg_usersonline_main.tpl @@ -128,7 +128,7 @@
- +

@@ -142,13 +142,3 @@ [{include file="d3_cfg_mod_inc.tpl"}] - - \ No newline at end of file diff --git a/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_usersonline_statistic.tpl b/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_usersonline_statistic.tpl index ac39bfa..921b1eb 100644 --- a/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_usersonline_statistic.tpl +++ b/copy_this/modules/d3/d3usersonline/views/admin/tpl/d3_usersonline_statistic.tpl @@ -149,13 +149,3 @@ [{/if}] [{include file="d3_cfg_mod_inc.tpl"}] - - \ No newline at end of file diff --git a/setup+doku/Precheck/d3precheck.php b/setup+doku/Precheck/d3precheck.php index e8a4b09..8e75852 100644 --- a/setup+doku/Precheck/d3precheck.php +++ b/setup+doku/Precheck/d3precheck.php @@ -143,7 +143,7 @@ class requConfig 'aParams' => array( 'id' => 'd3modcfg_lib', 'name' => 'Modul-Connector', - 'version' => '4.3.1.0', + 'version' => '4.3.7.0', ), ), ),