Updates

* Redis cache fix * getObject method fix * Simple Devices: now user can set additional conditions to some properties on Settings tab.
sergejey · Sep 11, 2022 · 5b6fc7c · 5b6fc7c
1 parent fe0ac29
commit 5b6fc7c
Show file tree

Hide file tree

Showing 16 changed files with 1,382 additions and 1,276 deletions.
diff --git a/lib/caching.class.php b/lib/caching.class.php
@@ -107,7 +107,7 @@ function saveToCache($key, $value)
             $redisConnection = new Redis();
             $redisConnection->pconnect(USE_REDIS);
         }
-        $redisConnection->set($key, $value);
+        $redisConnection->set($key, (string)$value);
         return;
     }
 

diff --git a/lib/common.class.php b/lib/common.class.php
@@ -315,7 +315,7 @@ function runScheduledJobs()
         SQLExec("UPDATE jobs SET PROCESSED=" . $jobs[$i]['PROCESSED'] . ", STARTED='" . $jobs[$i]['STARTED'] . "' WHERE ID=" . $jobs[$i]['ID']);
 
         if ($jobs[$i]['COMMANDS'] != '') {
-            $url = BASE_URL . '/objects/?system_call=1&job=' . $jobs[$i]['ID'];
+            $url = BASE_URL . '/objects/?system_call=1&job=' . $jobs[$i]['ID'] . '&title=' . urlencode($jobs[$i]['TITLE']);
             $result = trim(getURL($url, 0));
             $result = preg_replace('/<!--.+-->/is', '', $result);
             if (!preg_match('/OK$/', $result)) {
@@ -845,6 +845,24 @@ function checkAccess($object_type, $object_id)
     return $result;
 }
 
+function checkAccessDefined($object_type, $object_id)
+{
+    $rec = SQLSelectOne("SELECT ID FROM security_rules WHERE OBJECT_TYPE='" . DBSafe($object_type) . "' AND OBJECT_ID=" . (int)$object_id);
+    if ($rec['ID']) return true;
+    return false;
+}
+
+function checkAccessCopy($object_type, $src_id, $dst_id)
+{
+    $rec = SQLSelectOne("SELECT * FROM security_rules WHERE OBJECT_TYPE='" . DBSafe($object_type) . "' AND OBJECT_ID=" . (int)$src_id);
+    if ($rec['ID']) {
+        SQLExec("DELETE FROM security_rules WHERE OBJECT_TYPE='".DBSafe($object_type)."' AND OBJECT_ID=".(int)$dst_id);
+        unset($rec['ID']);
+        $rec['OBJECT_ID']=(int)$dst_id;
+        SQLInsert('security_rules',$rec);
+    }
+}
+
 /**
  * Summary of registerError
  * @param mixed $code Code (default 'custom')

diff --git a/modules/devices/darknessmode_activate.php b/modules/devices/darknessmode_activate.php
@@ -6,7 +6,11 @@
 $objects = getObjectsByProperty('groupSunset', '=', 1);
 $total = count($objects);
 for ($i = 0; $i < $total; $i++) {
-    usleep(50000);
+
+    $obj = getObject($objects[$i]);
+    if (is_object($obj) && $obj->device_id && !checkAccess('prop_groupSunset', $obj->device_id)) continue;
+
     callMethodSafe($objects[$i] . '.turnOn', array('source' => 'DarknessMode'));
-    //sleep(1);
+    usleep(50000);
+
 }
diff --git a/modules/devices/darknessmode_deactivate.php b/modules/devices/darknessmode_deactivate.php
@@ -1,14 +1,18 @@
 <?php
 
-if (defined('DISABLE_SIMPLE_DEVICES') && DISABLE_SIMPLE_DEVICES==1) return;
+if (defined('DISABLE_SIMPLE_DEVICES') && DISABLE_SIMPLE_DEVICES == 1) return;
 
 //groupSunrise
 $objects = getObjectsByProperty('groupSunrise', '=', 1);
 $total = count($objects);
 for ($i = 0; $i < $total; $i++) {
-  if (getGlobal($objects[$i] . '.status')) {
-    usleep(50000);
-    callMethodSafe($objects[$i] . '.turnOff', array('source' => 'DarknessMode'));
-    //sleep(1);
-  }
+    if (getGlobal($objects[$i] . '.status')) {
+
+        $obj = getObject($objects[$i]);
+        if (is_object($obj) && $obj->device_id && !checkAccess('prop_groupSunrise', $obj->device_id)) continue;
+
+        callMethodSafe($objects[$i] . '.turnOff', array('source' => 'DarknessMode'));
+        usleep(50000);
+
+    }
 }
diff --git a/modules/devices/devices_edit.inc.php b/modules/devices/devices_edit.inc.php
@@ -168,8 +168,14 @@
                         }
                         setGlobal($rec['LINKED_OBJECT'] . '.' . $k, $value);
                         if (is_array($apply_others)) {
-                            foreach($apply_others as $other_dev) {
+                            foreach ($apply_others as $other_dev) {
                                 setGlobal($other_dev . '.' . $k, $value);
+                                if ($v['_CONFIG_RESTRICTIONS'] && checkAccessDefined('prop_' . $k, $rec['ID'])) {
+                                    $other_obj = getObject($other_dev);
+                                    if (is_object($other_obj) && $other_obj->device_id) {
+                                        checkAccessCopy('prop_' . $k, $rec['ID'], $other_obj->device_id);
+                                    }
+                                }
                             }
                         }
                     }
@@ -204,6 +210,11 @@
                     $styles = $scene_class->getAllTypes();
                     $v['FOLDERS'] = $styles;
                 }
+
+                if ($v['_CONFIG_RESTRICTIONS'] && checkAccessDefined('prop_' . $v['NAME'], $rec['ID'])) {
+                    $v['_CONFIG_RESTRICTIONS_SET'] = 1;
+                }
+
                 $res_properties[] = $v;
             }
         }
@@ -446,7 +457,8 @@
                 $class_2b_changed = 0;
                 break;
             }
-            $tmp_class_id = current(SQLSelectOne("SELECT PARENT_ID FROM classes WHERE ID=" . (int)$tmp_class_id));
+            $tmp = SQLSelectOne("SELECT PARENT_ID FROM classes WHERE ID=" . (int)$tmp_class_id);
+            $tmp_class_id = (int)$tmp['PARENT_ID'];
         }
         if ($class_2b_changed) {
             //move object to new class

diff --git a/modules/devices/devices_schedule.inc.php b/modules/devices/devices_schedule.inc.php
@@ -41,6 +41,11 @@
     if ($point['SET_TIME']) {
 
     }
+
+    if (checkAccessDefined('spoint',$point_id)) {
+        $out['POINT_ACCESS_DEFINED']=1;
+    }
+
 }
 
 
@@ -71,8 +76,7 @@
             }
         }
         $point_item['SET_DAYS']=implode(', ',$point_days_title);
-        $rule=SQLSelectOne("SELECT ID FROM security_rules WHERE OBJECT_TYPE='spoint' AND OBJECT_ID=".$point_item['ID']);
-        if ($rule['ID']) {
+        if (checkAccessDefined('spoint',$point_item['ID'])) {
             $point_item['HAS_RULE']=1;
         }
     }

diff --git a/modules/devices/devices_structure.inc.php b/modules/devices/devices_structure.inc.php
@@ -54,11 +54,11 @@
         'PARENT_CLASS'=>'SDevices',
         'DESCRIPTION'=>'Controllable device',
         'PROPERTIES'=>array(
-            'groupEco'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_ECO,'_CONFIG_TYPE'=>'yesno','_CONFIG_HELP'=>'SdGroupEco'),
-            'groupEcoOn'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_ECO_ON,'_CONFIG_TYPE'=>'yesno','_CONFIG_HELP'=>'SdGroupEcoOn'),
-            'groupSunrise'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_SUNRISE,'_CONFIG_TYPE'=>'yesno','_CONFIG_HELP'=>'SdGroupSunrise'),
-            'groupSunset'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_SUNSET,'_CONFIG_TYPE'=>'yesno','_CONFIG_HELP'=>'SdGroupSunset'),
-            'groupNight'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_NIGHT,'_CONFIG_TYPE'=>'yesno','_CONFIG_HELP'=>'SdGroupNight'),
+            'groupEco'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_ECO,'_CONFIG_TYPE'=>'yesno','_CONFIG_RESTRICTIONS'=>1,'_CONFIG_HELP'=>'SdGroupEco'),
+            'groupEcoOn'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_ECO_ON,'_CONFIG_TYPE'=>'yesno','_CONFIG_RESTRICTIONS'=>1,'_CONFIG_HELP'=>'SdGroupEcoOn'),
+            'groupSunrise'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_SUNRISE,'_CONFIG_TYPE'=>'yesno','_CONFIG_RESTRICTIONS'=>1,'_CONFIG_HELP'=>'SdGroupSunrise'),
+            'groupSunset'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_SUNSET,'_CONFIG_TYPE'=>'yesno','_CONFIG_RESTRICTIONS'=>1,'_CONFIG_HELP'=>'SdGroupSunset'),
+            'groupNight'=>array('DESCRIPTION'=>LANG_DEVICES_GROUP_NIGHT,'_CONFIG_TYPE'=>'yesno','_CONFIG_RESTRICTIONS'=>1,'_CONFIG_HELP'=>'SdGroupNight'),
             'isActivity'=>array('DESCRIPTION'=>LANG_DEVICES_IS_ACTIVITY,'_CONFIG_TYPE'=>'yesno','_CONFIG_HELP'=>'SdIsActivity'),
             'loadType'=>array('DESCRIPTION'=>LANG_DEVICES_LOADTYPE,
                 '_CONFIG_TYPE'=>'select','_CONFIG_HELP'=>'SdLoadType',

diff --git a/modules/devices/econommode_activate.php b/modules/devices/econommode_activate.php
@@ -1,14 +1,17 @@
 <?php
 
-if (defined('DISABLE_SIMPLE_DEVICES') && DISABLE_SIMPLE_DEVICES==1) return;
+if (defined('DISABLE_SIMPLE_DEVICES') && DISABLE_SIMPLE_DEVICES == 1) return;
 
 //groupEco
 $objects = getObjectsByProperty('groupEco', '=', 1);
 $total = count($objects);
 for ($i = 0; $i < $total; $i++) {
-  if (getGlobal($objects[$i] . '.status')) {
-    usleep(50000);
-    callMethodSafe($objects[$i] . '.turnOff', array('source' => 'EconomMode'));
-    //sleep(1);
-  }
+    if (getGlobal($objects[$i] . '.status')) {
+
+        $obj = getObject($objects[$i]);
+        if (is_object($obj) && $obj->device_id && !checkAccess('prop_groupEco', $obj->device_id)) continue;
+
+        callMethodSafe($objects[$i] . '.turnOff', array('source' => 'EconomMode'));
+        usleep(50000);
+    }
 }
diff --git a/modules/devices/econommode_deactivate.php b/modules/devices/econommode_deactivate.php
@@ -6,7 +6,10 @@
 $objects = getObjectsByProperty('groupEcoOn', '=', 1);
 $total = count($objects);
 for ($i = 0; $i < $total; $i++) {
-    usleep(50000);
+
+    $obj = getObject($objects[$i]);
+    if (is_object($obj) && $obj->device_id && !checkAccess('prop_groupEcoOn', $obj->device_id)) continue;
+
     callMethodSafe($objects[$i] . '.turnOn', array('source' => 'EconomMode'));
-    //sleep(1);
+    usleep(50000);
 }
diff --git a/modules/devices/nightmode_activate.php b/modules/devices/nightmode_activate.php
@@ -1,13 +1,18 @@
 <?php
-if (defined('DISABLE_SIMPLE_DEVICES') && DISABLE_SIMPLE_DEVICES==1) return;
+if (defined('DISABLE_SIMPLE_DEVICES') && DISABLE_SIMPLE_DEVICES == 1) return;
 
 //groupNight
 $objects = getObjectsByProperty('groupNight', '=', 1);
 $total = count($objects);
 for ($i = 0; $i < $total; $i++) {
     $currentStatus = gg($objects[$i] . '.status');
     if ($currentStatus) {
-        usleep(50000);
+
+        $obj = getObject($objects[$i]);
+        if (is_object($obj) && $obj->device_id && !checkAccess('prop_groupNight', $obj->device_id)) continue;
+
         callMethodSafe($objects[$i] . '.turnOff', array('source' => 'NightMode'));
+        usleep(50000);
+
     }
 }