From 6c5b7d0cd1bbc43bb8d0aece73ba17031c3488ec Mon Sep 17 00:00:00 2001 From: KristianHempel Date: Mon, 9 Dec 2013 09:59:45 +0000 Subject: [PATCH] modified: added individual changes --- .gitattributes | 8 +++- .../views/admin/d3usersonline.tpl} | 10 +++-- .../views/admin/de/d3usersonline_lang.php | 15 +++++++ .../views/admin/en/d3usersonline_lang.php | 16 ++++++++ .../controllers/admin/useronline.php | 39 +++++++++++++++++++ .../d3useronlineschalter_stub.php | 5 +++ .../modules/d3/d3useronlineschalter/menu.xml | 8 ++++ .../d3/d3useronlineschalter/metadata.php | 27 +++++++++++++ .../models/d3usersonline_update.php | 2 +- 9 files changed, 124 insertions(+), 6 deletions(-) rename changed_full/{EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl => PE470-/modules/d3/d3useronlineschalter/views/admin/d3usersonline.tpl} (83%) create mode 100644 changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/de/d3usersonline_lang.php create mode 100644 changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/en/d3usersonline_lang.php create mode 100644 copy_this/modules/d3/d3useronlineschalter/controllers/admin/useronline.php create mode 100644 copy_this/modules/d3/d3useronlineschalter/d3useronlineschalter_stub.php create mode 100644 copy_this/modules/d3/d3useronlineschalter/menu.xml create mode 100644 copy_this/modules/d3/d3useronlineschalter/metadata.php diff --git a/.gitattributes b/.gitattributes index 07d7a35..e88312a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,13 @@ * text=auto !eol -changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl -text +changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/d3usersonline.tpl -text +changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/de/d3usersonline_lang.php -text +changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/en/d3usersonline_lang.php -text changed_full/PE470-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl -text copy_this/.noencode -text +copy_this/modules/d3/d3useronlineschalter/controllers/admin/useronline.php -text +copy_this/modules/d3/d3useronlineschalter/d3useronlineschalter_stub.php -text +copy_this/modules/d3/d3useronlineschalter/menu.xml -text +copy_this/modules/d3/d3useronlineschalter/metadata.php -text copy_this/modules/d3/d3usersonline/metadata.php -text copy_this/modules/d3/d3usersonline/models/d3usersonline.php -text copy_this/modules/d3/d3usersonline/models/d3usersonline_update.php -text diff --git a/changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl b/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/d3usersonline.tpl similarity index 83% rename from changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl rename to changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/d3usersonline.tpl index 8717382..9920729 100644 --- a/changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl +++ b/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/d3usersonline.tpl @@ -1,5 +1,8 @@ +[{include file="headitem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}] +[{assign var='oxcmp_user' value=$oView->getUser()}] [{d3modcfgcheck modid="d3usersonline"}] [{if $oxcmp_user && $oxcmp_user->getFieldData('oxrights') == 'malladmin'}] + [{assign var='aUsersOnline' value=$oView->getOnlineUsersByController()}]

[{oxmultilang ident="D3_USERSONLINE_USERSONLINE"}]

@@ -9,10 +12,10 @@ [{oxmultilang ident="D3_USERSONLINE_ALL"}] - [{$aUsersOnline.all}]  + [{$oView->getOnlineUsersAll()}]  - [{if $aUsersOnline.all == 1}] + [{if $oView->getOnlineUsersAll() == 1}] [{oxmultilang ident="D3_USERSONLINE_USER"}] [{else}] [{oxmultilang ident="D3_USERSONLINE_USERS"}] @@ -45,5 +48,4 @@
[{/if}] [{/d3modcfgcheck}] - -[{$smarty.block.parent}] \ No newline at end of file +[{include file="bottomitem.tpl"}] \ No newline at end of file diff --git a/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/de/d3usersonline_lang.php b/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/de/d3usersonline_lang.php new file mode 100644 index 0000000..e59e51f --- /dev/null +++ b/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/de/d3usersonline_lang.php @@ -0,0 +1,15 @@ + 'ISO-8859-15', + 'D3_USERSONLINE_USERSONLINE' => 'Benutzer online', + 'D3_USERSONLINE_USER' => 'Benutzer', + 'D3_USERSONLINE_USERS' => 'Benutzer', + 'D3_USERSONLINE_ALL' => 'gesamt', + 'd3useronline' => 'Users online', + 'd3_d3useronlineschalter_controllers_admin_useronline' => 'aktuelle Benutzer', +); diff --git a/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/en/d3usersonline_lang.php b/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/en/d3usersonline_lang.php new file mode 100644 index 0000000..b914dca --- /dev/null +++ b/changed_full/PE470-/modules/d3/d3useronlineschalter/views/admin/en/d3usersonline_lang.php @@ -0,0 +1,16 @@ + 'ISO-8859-15', + 'D3_USERSONLINE_USERSONLINE' => 'Users online', + 'D3_USERSONLINE_USER' => 'user', + 'D3_USERSONLINE_USERS' => 'users', + 'D3_USERSONLINE_ALL' => 'all', + 'd3useronline' => 'Users online', + 'd3_d3useronlineschalter_controllers_admin_useronline' => 'actual users', +); diff --git a/copy_this/modules/d3/d3useronlineschalter/controllers/admin/useronline.php b/copy_this/modules/d3/d3useronlineschalter/controllers/admin/useronline.php new file mode 100644 index 0000000..adeae9a --- /dev/null +++ b/copy_this/modules/d3/d3useronlineschalter/controllers/admin/useronline.php @@ -0,0 +1,39 @@ +getOnlineUsersByController(); + + return (int)$aUserOnline['all']; + } + + /** + * @return array + */ + public function getOnlineUsersByController() + { + /** @var d3usersonline $oUsersOnline */ + $oUsersOnline = oxNew('d3usersonline'); + $oUsersOnline->clearOldItems($this->iExpTime); + $oUsersOnline->setActTimeVisit(); + + return $oUsersOnline->getUserCount(); + } +} diff --git a/copy_this/modules/d3/d3useronlineschalter/d3useronlineschalter_stub.php b/copy_this/modules/d3/d3useronlineschalter/d3useronlineschalter_stub.php new file mode 100644 index 0000000..36091b3 --- /dev/null +++ b/copy_this/modules/d3/d3useronlineschalter/d3useronlineschalter_stub.php @@ -0,0 +1,5 @@ + + + + + + + + \ No newline at end of file diff --git a/copy_this/modules/d3/d3useronlineschalter/metadata.php b/copy_this/modules/d3/d3useronlineschalter/metadata.php new file mode 100644 index 0000000..e52811a --- /dev/null +++ b/copy_this/modules/d3/d3useronlineschalter/metadata.php @@ -0,0 +1,27 @@ + 'd3useronlineschalter', + 'title' => (class_exists('d3utils') ? d3utils::getInstance()->getD3Logo( + ) : 'D³') . ' Users Online Erweiterung Schalterversand', + 'description' => array( + '' + ), + 'version' => '2.0.0.2', + 'author' => 'D³ Data Development (Inh.: Thomas Dartsch)', + 'email' => 'support@shopmodule.com', + 'url' => 'http://www.oxidmodule.com/', + 'extend' => array(), + 'files' => array( + 'd3_d3useronlineschalter_controllers_admin_useronline' => 'd3/d3useronlineschalter/controllers/admin/useronline.php' + ), + 'templates' => array( + 'd3usersonline.tpl' => 'd3/d3useronlineschalter/views/admin/d3usersonline.tpl', + ), +); \ No newline at end of file diff --git a/copy_this/modules/d3/d3usersonline/models/d3usersonline_update.php b/copy_this/modules/d3/d3usersonline/models/d3usersonline_update.php index b8d9981..8c984d2 100644 --- a/copy_this/modules/d3/d3usersonline/models/d3usersonline_update.php +++ b/copy_this/modules/d3/d3usersonline/models/d3usersonline_update.php @@ -74,7 +74,7 @@ k09'; 'OXCLASS' => array( 'sTableName' => 'd3usersonline', 'sFieldName' => 'OXCLASS', - 'sType' => 'VARCHAR(32)', + 'sType' => 'VARCHAR(255)', 'blNull' => FALSE, 'sDefault' => FALSE, 'sComment' => '',