Merge pull request #1070 from whitevast/patch-4

sergejey · web-flow · commit aafec3ef9c27 · 2023-03-03T08:28:08.000+03:00
Update SMotions_motionDetected.php
diff --git a/modules/devices/SMotions_motionDetected.php b/modules/devices/SMotions_motionDetected.php
@@ -14,15 +14,18 @@
 }
 
 $motion_timeout = $this->getProperty('timeout'); // seconds timeout
-if (!$motion_timeout) {
+if (!$motion_timeout== "") {
     $motion_timeout = 20; // timeout by default
 }
+if ($motion_timeout) {
+    setTimeout($ot . '_motion_timer', 'setGlobal("' . $ot . '.status", 0);', $motion_timeout);
+}
+
 $nobodysHome = getGlobal('NobodyHomeMode.active');
 
 if (!isset($params['statusUpdated'])) {
     $this->setProperty('status', 1);
 }
-setTimeout($ot . '_motion_timer', 'setGlobal("' . $ot . '.status", 0);', $motion_timeout);
 
 if ($nobodysHome && $this->getProperty('ignoreNobodysHome')) {
     return;

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,18 @@`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`$motion_timeout = $this->getProperty('timeout'); // seconds timeout`
`17`		`-if (!$motion_timeout) {`
	`17`	`+if (!$motion_timeout== "") {`
`18`	`18`	`$motion_timeout = 20; // timeout by default`
`19`	`19`	`}`
	`20`	`+if ($motion_timeout) {`
	`21`	`+ setTimeout($ot . '_motion_timer', 'setGlobal("' . $ot . '.status", 0);', $motion_timeout);`
	`22`	`+}`
	`23`	`+`
`20`	`24`	`$nobodysHome = getGlobal('NobodyHomeMode.active');`
`21`	`25`
`22`	`26`	`if (!isset($params['statusUpdated'])) {`
`23`	`27`	`$this->setProperty('status', 1);`
`24`	`28`	`}`
`25`		`-setTimeout($ot . '_motion_timer', 'setGlobal("' . $ot . '.status", 0);', $motion_timeout);`
`26`	`29`
`27`	`30`	`if ($nobodysHome && $this->getProperty('ignoreNobodysHome')) {`
`28`	`31`	`return;`