Skip to content
Permalink
Browse files

Merge pull request #540 from Alexandr-logrus/alpha

fix
  • Loading branch information...
sergejey committed May 4, 2019
2 parents 26bfc9d + c560436 commit a52a65fca9bc692af725a634de821a0d8e518bbe
@@ -18,7 +18,6 @@
} else {
$activity_timeout=10*60;
}
clearTimeOut($ot."_activity_timeout");
setTimeOut($ot."_activity_timeout","callMethod('".$ot.".onIdle');",$activity_timeout);
if (getGlobal('NobodyHomeMode.active')) {
@@ -8,7 +8,9 @@
$this->setProperty('updated', $tm);
$this->callMethod('setUpdatedText');
}
$this->setProperty('alive', 1);
if ($this->getProperty('alive') == 0) {
$this->setProperty('alive', 1);
}
$alive_timeout = (int)$this->getProperty('aliveTimeout') * 60 * 60;
@@ -4,7 +4,7 @@
$tm=time();
$this->setProperty('updated', $tm);
$this->setProperty('alive', 1);
//$this->setProperty('alive', 1);
$group_name=$this->getProperty('groupName');
$objects = getObjectsByProperty('group'.$group_name,1);
foreach($objects as $object_title) {
@@ -5,7 +5,9 @@
$tm=time();
$this->setProperty('updated', $tm);
$this->setProperty('updatedText', date('H:i', $tm));
$this->setProperty('alive', 1);
if ($this->getProperty('alive') == 0) {
$this->setProperty('alive', 1);
}
$alive_timeout=(int)$this->getProperty('aliveTimeout')*60*60;
if (!$alive_timeout) {
@@ -6,7 +6,9 @@
$tm = time();
$this->setProperty('updated', $tm);
$this->callMethodSafe('setUpdatedText');
$this->setProperty('alive', 1);
if ($this->getProperty('alive') == 0) {
$this->setProperty('alive', 1);
}
$alive_timeout = (int)$this->getProperty('aliveTimeout') * 60 * 60;
if (!$alive_timeout) {
@@ -5,7 +5,9 @@
$tm=time();
$this->setProperty('updated', $tm);
$this->setProperty('updatedText', date('H:i', $tm));
$this->setProperty('alive', 1);
if ($this->getProperty('alive') == 0) {
$this->setProperty('alive', 1);
}
$alive_timeout=(int)$this->getProperty('aliveTimeout')*60*60;
if (!$alive_timeout) {
@@ -5,8 +5,10 @@
$tm=time();
$this->setProperty('updated', $tm);
$this->callMethod('setUpdatedText');
$this->setProperty('alive', 1);
if ($this->getProperty('alive') == 0) {
$this->setProperty('alive', 1);
}
$alive_timeout=(int)$this->getProperty('aliveTimeout')*60*60;
@@ -32,4 +34,5 @@
}
}
$this->callMethod('valueUpdated');
$this->callMethod('valueUpdated');
$this->callMethod('setUpdatedText');
@@ -1,6 +1,8 @@
<?php
$this->setProperty('alive', 1);
if ($this->getProperty('alive') == 0) {
$this->setProperty('alive', 1);
}
$alive_timeout=(int)$this->getProperty('aliveTimeout')*60*60;
if (!$alive_timeout) {
$alive_timeout=2*24*60*60; // 2 days alive timeout by default

0 comments on commit a52a65f

Please sign in to comment.
You can’t perform that action at this time.