modified: added individual changes

Cette révision appartient à :
KristianHempel 2013-12-09 09:59:45 +00:00
Parent fee47e0d26
révision 6c5b7d0cd1
9 fichiers modifiés avec 124 ajouts et 6 suppressions

8
.gitattributes externe
Voir le fichier

@ -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

Voir le fichier

@ -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()}]
<div class="box">
<h3>[{oxmultilang ident="D3_USERSONLINE_USERSONLINE"}]</h3>
<div class="content">
@ -9,10 +12,10 @@
[{oxmultilang ident="D3_USERSONLINE_ALL"}]
</td>
<td style="border-bottom: 1px solid silver; text-align: right; font-weight: bold;">
[{$aUsersOnline.all}]&nbsp;
[{$oView->getOnlineUsersAll()}]&nbsp;
</td>
<td style="border-bottom: 1px solid silver; text-align: left;">
[{if $aUsersOnline.all == 1}]
[{if $oView->getOnlineUsersAll() == 1}]
[{oxmultilang ident="D3_USERSONLINE_USER"}]
[{else}]
[{oxmultilang ident="D3_USERSONLINE_USERS"}]
@ -45,5 +48,4 @@
</div>
[{/if}]
[{/d3modcfgcheck}]
[{$smarty.block.parent}]
[{include file="bottomitem.tpl"}]

Voir le fichier

@ -0,0 +1,15 @@
<?php
$sLangName = 'Deutsch';
$iLangNr = 0;
// -------------------------------
// RESOURCE IDENTITFIER = STRING
// -------------------------------
$aLang = array(
'charset' => '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',
);

Voir le fichier

@ -0,0 +1,16 @@
<?php
$sLangName = 'Deutsch';
$iLangNr = 0;
// -------------------------------
// RESOURCE IDENTITFIER = STRING
// -------------------------------
$aLang = array(
'charset' => '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',
);

Voir le fichier

@ -0,0 +1,39 @@
<?php
/**
* Class d3_d3useronlineschalter_controllers_admin_useronline
*/
class d3_d3useronlineschalter_controllers_admin_useronline extends d3_cfg_mod_main
{
/**
* @var int
*/
protected $iExpTime = 600; // (in seconds)
/**
* @var string
*/
protected $_sThisTemplate = 'd3usersonline.tpl';
/**
* @return int
*/
public function getOnlineUsersAll()
{
$aUserOnline = $this->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();
}
}

Voir le fichier

@ -0,0 +1,5 @@
<?php
/**
* User: kristianhempel
* Date: 06.12.13
*/

Voir le fichier

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-15"?>
<OX>
<OXMENU id="d3mxd3modules">
<MAINMENU id="d3useronline">
<SUBMENU id="d3_d3useronlineschalter_controllers_admin_useronline" cl="d3_d3useronlineschalter_controllers_admin_useronline"/>
</MAINMENU>
</OXMENU>
</OX>

Voir le fichier

@ -0,0 +1,27 @@
<?php
/**
* User: kristianhempel
* Date: 06.12.13
*/
$sMetaVersion = '1.1';
$aModule = array(
'id' => 'd3useronlineschalter',
'title' => (class_exists('d3utils') ? d3utils::getInstance()->getD3Logo(
) : 'D&sup3;') . ' Users Online Erweiterung Schalterversand',
'description' => array(
''
),
'version' => '2.0.0.2',
'author' => 'D&sup3; 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',
),
);

Voir le fichier

@ -74,7 +74,7 @@ k09';
'OXCLASS' => array(
'sTableName' => 'd3usersonline',
'sFieldName' => 'OXCLASS',
'sType' => 'VARCHAR(32)',
'sType' => 'VARCHAR(255)',
'blNull' => FALSE,
'sDefault' => FALSE,
'sComment' => '',