From abd1f8d44bdbcacfa03addc2ecedd2cf416e7f83 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Tue, 21 Nov 2017 11:41:06 +0100
Subject: [PATCH] small improvements

---
 .../controllers/admin/d3_cfg_usersonline_licence.php       | 2 --
 .../controllers/admin/d3_usersonline_statistic.php         | 3 +--
 .../modules/d3/d3usersonline/models/d3usersonline.php      | 7 ++++---
 .../modules/components/d3_oxcmp_utils_usersonline.php      | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_licence.php b/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_licence.php
index aded1eb..5969a1e 100644
--- a/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_licence.php
+++ b/copy_this/modules/d3/d3usersonline/controllers/admin/d3_cfg_usersonline_licence.php
@@ -20,6 +20,4 @@ class d3_cfg_usersonline_licence extends d3_cfg_mod_licence
     protected $_hasNewsletterForm = false;
 
     protected $_sLogType = 2;
-
-    //protected $_sBlogFeed = "http://blog.oxidmodule.com/feeds/categories/46-Angebotsanfrage.rss";
 }
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 3c14f46..5671239 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
@@ -14,7 +14,6 @@
 class d3_usersonline_statistic extends d3_cfg_mod_main
 {
     protected $_blUseOwnOxid = false;
-    protected $_iExpTime = 600; // (in seconds)
     protected $_sThisTemplate = 'd3_usersonline_statistic.tpl';
 
     protected $_sMenuItemTitle = 'd3mxusersonline';
@@ -37,7 +36,7 @@ class d3_usersonline_statistic extends d3_cfg_mod_main
     {
         /** @var d3usersonline $oUsersOnline */
         $oUsersOnline = oxNew('d3usersonline');
-        $oUsersOnline->clearOldItems($this->_iExpTime);
+        $oUsersOnline->clearOldItems();
         return $oUsersOnline->getUserCount($this->blGroupByClass);
     }
 
diff --git a/copy_this/modules/d3/d3usersonline/models/d3usersonline.php b/copy_this/modules/d3/d3usersonline/models/d3usersonline.php
index 531209f..e7a83d2 100644
--- a/copy_this/modules/d3/d3usersonline/models/d3usersonline.php
+++ b/copy_this/modules/d3/d3usersonline/models/d3usersonline.php
@@ -32,7 +32,8 @@ class d3usersonline extends oxbase
     protected $_httpXComingFrom = null;
     protected $_httpComingFrom = null;
 
-    protected $_iDeleteThreshold = 30; // Zeitdifferenz für Löschaufträge
+    protected $_iDeleteThreshold = 30;  // Zeitdifferenz zwischen 2 Löschaufträgen
+    protected $_iExpTime = 600;         // Ablaufzeit für inaktive Benutzer
 
     /**
      * constructor
@@ -46,7 +47,7 @@ class d3usersonline extends oxbase
     /**
      * @param $iExpTime
      */
-    public function clearOldItems($iExpTime)
+    public function clearOldItems()
     {
         startProfile(__METHOD__);
 
@@ -54,7 +55,7 @@ class d3usersonline extends oxbase
         $iLastDeleteTime = oxRegistry::getConfig()->getShopConfVar('iLastDeleteTime', null, 'd3usersonline');
 
         if ($iTime > $iLastDeleteTime + $this->_iDeleteThreshold) {
-            $iExptime = $iTime - $iExpTime;
+            $iExptime = $iTime - $this->_iExpTime;
             oxDb::getDb()->Execute("delete from " . $this->getViewName() . " where timevisit < $iExptime");
 
             oxRegistry::getConfig()->saveShopConfVar('int', 'iLastDeleteTime', $iTime, null, 'd3usersonline');
diff --git a/copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php b/copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php
index e706c4a..4ed9fdb 100644
--- a/copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php
+++ b/copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php
@@ -20,7 +20,6 @@
 class d3_oxcmp_utils_usersonline extends d3_oxcmp_utils_usersonline_parent
 {
     protected $_blIsComponent = true;
-    protected $_iExpTime = 600; // (in seconds)
     protected $_sD3UsersOnlineModId = 'd3usersonline';
 
     /**
@@ -33,7 +32,7 @@ class d3_oxcmp_utils_usersonline extends d3_oxcmp_utils_usersonline_parent
         if (d3_cfg_mod::get($this->_sD3UsersOnlineModId)->isActive()) {
             /** @var d3usersonline $oUsersOnline */
             $oUsersOnline = oxNew('d3usersonline');
-            $oUsersOnline->clearOldItems($this->_iExpTime);
+            $oUsersOnline->clearOldItems();
             $oUsersOnline->setActTimeVisit();
 
             $oUser = $this->getUser();