Merge pull request #630 from sergejey/alpha

Alpha
sergejey · Sep 24, 2019 · 08b4b6d · 08b4b6d
2 parents 607230c + 886c37a
commit 08b4b6d
Show file tree

Hide file tree

Showing 40 changed files with 957 additions and 679 deletions.
diff --git a/3rdparty/googleblockly/blocks/majordomo_states.js.php b/3rdparty/googleblockly/blocks/majordomo_states.js.php
@@ -36,29 +36,33 @@
 include_once("./config.php");
 include_once("./lib/loader.php");
 
-$session=new session("prj");
+$session = new session("prj");
 
 include_once("./load_settings.php");
 include_once(DIR_MODULES . "control_modules/control_modules.class.php");
 
-    $objects = getObjectsByClass('OperationalModes');
+$objects = getObjectsByClass('OperationalModes');
 
-    foreach($objects as $object) {
-        $object = SQLSelectOne("SELECT * FROM objects WHERE ID=".$object['ID']);
-        ?>
+
+foreach($objects as $object) {
+$object = SQLSelectOne("SELECT * FROM objects WHERE ID=" . $object['ID']);
+if (!$object['DESCRIPTION']) {
+    $object['DESCRIPTION']=$object['TITLE'];
+}
+?>
 
 Blockly.Blocks['majordomo_<?php echo $object['TITLE']?>'] = {
-    init: function() {
+    init: function () {
         var thisBlock = this;
         this.setColour(220);
         this.appendDummyInput()
-            .appendField('<?php echo addcslashes($object['DESCRIPTION'],"'")?>');
+            .appendField('<?php echo addcslashes($object['DESCRIPTION'], "'")?>');
         this.setOutput(true);
         this.setTooltip('');
     }
 };
 
 <?php
-    }
+}
 
 $session->save();
diff --git a/admin.php b/admin.php
@@ -63,6 +63,8 @@
 
 $result = str_replace("nf.php", "admin.php", $result);
 
+require(ROOT.'lib/utils/postprocess_general.inc.php');
+require(ROOT.'lib/utils/postprocess_subscriptions.inc.php');
 //require(ROOT.'lib/utils/postprocess_result.inc.php');
 
 

diff --git a/css/menu_custom.css b/css/menu_custom.css
@@ -8,4 +8,8 @@
 }
 .ui-listview>li>a.ui-btn {
     padding: 0.3em 1em;
-}
+}
+select {
+	background-color: Gray;
+}
+
diff --git a/index.php b/index.php
@@ -80,6 +80,8 @@
    $result = $cached_result;
 }
 
+require(ROOT.'lib/utils/postprocess_general.inc.php');
+require(ROOT.'lib/utils/postprocess_subscriptions.inc.php');
 require(ROOT.'lib/utils/postprocess_result.inc.php');
 
 /**

diff --git a/languages/default.php b/languages/default.php
@@ -1390,6 +1390,8 @@
     'PREVIOUS' => 'Prev',
     'NEXT' => 'Next',
     'LOCATED_IN_ROOM' => 'located in',
+    'BLOCK_SENSOR' => 'Block sensor',
+    'UNBLOCK_SENSOR' => 'Un-block sensor',
 
     'TEST' => 'test'
 

diff --git a/languages/ru.php b/languages/ru.php
@@ -1388,6 +1388,9 @@
 
     'LOCATED_IN_ROOM' => 'расположеный в комнате',
 
+    'BLOCK_SENSOR' => 'Блокировать датчик',
+    'UNBLOCK_SENSOR' => 'Разблокировать датчик',
+
     /* end module names */
 
 

diff --git a/lib/common.class.php b/lib/common.class.php
@@ -707,6 +707,7 @@ function getURLBackground($url, $cache = 0, $username = '', $password = '')
 {
     //DebMes("URL: ".$url,'debug1');
     getURL($url, $cache, $username, $password, true);
+    return true;
 }
 
 /**

diff --git a/lib/context.inc.php b/lib/context.inc.php
@@ -6,14 +6,17 @@
  */
 function context_getuser()
 {
+   global $context_user_id;
+   if ($context_user_id) {
+      return $context_user_id;
+   }
+
    global $session;
-   if ($session->data['SITE_USER_ID'])
-   {
-      return $session->data['SITE_USER_ID'];
+   if ($session->data['SITE_USER_ID']) {
+      return (int)$session->data['SITE_USER_ID'];
    }
 
    $user = SQLSelectOne("SELECT ID FROM users WHERE IS_DEFAULT=1");
-
    $session->data['SITE_USER_ID'] = $user['ID'];
 
    return (int)$user['ID'];
@@ -23,19 +26,17 @@ function context_getuser()
  * Summary of context_getcurrent
  * @return int|string
  */
-function context_getcurrent()
+function context_getcurrent($from_user_id = 0)
 {
-   $user_id = context_getuser();
-
+   if (!$from_user_id) {
+      $from_user_id = context_getuser();
+   }
    $sqlQuery = "SELECT ID, ACTIVE_CONTEXT_ID, ACTIVE_CONTEXT_EXTERNAL
                   FROM users
-                 WHERE ID = '" . (int)$user_id . "'";
-
+                 WHERE ID = '" . (int)$from_user_id . "'";
    $user = SQLSelectOne($sqlQuery);
-
    if (!$user['ID'])
       return 0;
-
    if ($user['ACTIVE_CONTEXT_EXTERNAL'])
    {
       return 'ext' . (int)$user['ACTIVE_CONTEXT_ID'];
@@ -50,10 +51,11 @@ function context_getcurrent()
  * Summary of context_get_history
  * @return mixed
  */
-function context_get_history()
+function context_get_history($user_id = 0)
 {
-   $user_id = context_getuser();
-
+   if (!$user_id) {
+      $user_id = context_getuser();
+   }
    $sqlQuery = "SELECT ID, ACTIVE_CONTEXT_ID, ACTIVE_CONTEXT_EXTERNAL, ACTIVE_CONTEXT_HISTORY
                   FROM users
                  WHERE ID = '" . (int)$user_id . "'";
@@ -70,10 +72,13 @@ function context_get_history()
  * Summary of context_clear
  * @return void
  */
-function context_clear()
+function context_clear($user_id=0)
 {
-   $user_id = context_getuser();
-
+
+   if (!$user_id) {
+      $user_id = context_getuser();
+   }
+
    $user = SQLSelectOne("SELECT * FROM users WHERE ID = '" . (int)$user_id . "'");
 
    $user['ACTIVE_CONTEXT_ID']       = 0;
@@ -91,9 +96,11 @@ function context_clear()
  * @param mixed $history   History (default '')
  * @return void
  */
-function context_activate($id, $no_action = 0, $history = '')
+function context_activate($id, $no_action = 0, $history = '', $user_id = 0)
 {
-   $user_id = context_getuser();
+   if (!$user_id) {
+      $user_id = context_getuser();
+   }
    $user    = SQLSelectOne("SELECT * FROM users WHERE ID = '" . (int)$user_id . "'");
 
    $user['ACTIVE_CONTEXT_ID']       = $id;
@@ -127,7 +134,7 @@ function context_activate($id, $no_action = 0, $history = '')
    }
    else
    {
-      context_clear();
+      context_clear($user_id);
       clearTimeOut('user_' . $user_id . '_contexttimeout');
    }
 }
@@ -140,9 +147,12 @@ function context_activate($id, $no_action = 0, $history = '')
  * @param mixed $timeout_context_id Timeout context id (default 0)
  * @return void
  */
-function context_activate_ext($id, $timeout = 0, $timeout_code = '', $timeout_context_id = 0)
+function context_activate_ext($id, $timeout = 0, $timeout_code = '', $timeout_context_id = 0, $user_id = 0)
 {
-   $user_id = context_getuser();
+
+   if (!$user_id) {
+      $user_id = context_getuser();
+   }
    $user    = SQLSelectOne("SELECT * FROM users WHERE ID = '" . (int)$user_id . "'");
 
    $user['ACTIVE_CONTEXT_ID']       = $id;
@@ -176,7 +186,7 @@ function context_activate_ext($id, $timeout = 0, $timeout_code = '', $timeout_co
    }
    else
    {
-      context_clear();
+      context_clear($user_id);
       clearTimeOut('user_' . $user_id . '_contexttimeout');
    }
 }
@@ -187,18 +197,22 @@ function context_activate_ext($id, $timeout = 0, $timeout_code = '', $timeout_co
  * @param mixed $user_id User ID
  * @return void
  */
-function context_timeout($id, $user_id)
+function context_timeout($id, $user_id = 0)
 {
-   global $session;
 
-   $user = SQLSelectOne("SELECT * FROM users WHERE ID = '" . (int)$user_id . "'");
-
-   $session->data['SITE_USER_ID'] = $user['ID'];
+   if (!$user_id) {
+      $user_id = context_getuser();
+   } else {
+      global $context_user_id;
+      $context_user_id = $user_id;
+   }
+   //global $session;
+   //$user = SQLSelectOne("SELECT * FROM users WHERE ID = '" . (int)$user_id . "'");
+   //$session->data['SITE_USER_ID'] = $user['ID'];
 
    $context = SQLSelectOne("SELECT * FROM patterns WHERE ID = '" . (int)$id . "'");
 
-   if (!$context['TIMEOUT_CONTEXT_ID'])
-      context_activate(0);
+   if (!$context['TIMEOUT_CONTEXT_ID']) context_activate(0,0,'',$user_id);
 
    if ($context['TIMEOUT_SCRIPT'])
    {
@@ -221,7 +235,7 @@ function context_timeout($id, $user_id)
    }
 
    if ($context['TIMEOUT_CONTEXT_ID'])
-      context_activate((int)$context['TIMEOUT_CONTEXT_ID']);
+      context_activate((int)$context['TIMEOUT_CONTEXT_ID'],0,'',$user_id);
 }
 
 /**

diff --git a/lib/hooks.inc.php b/lib/hooks.inc.php
@@ -95,40 +95,39 @@ function processSubscriptionsSafe($event_name, $details = '')
  * @param mixed $details Details (default '')
  * @return int|void
  */
-function processSubscriptions($event_name, $details = '')
+function processSubscriptions($event_name, $details = '', $return_output = false)
 {
     //DebMes("New event: ".$event_name,'process_subscription');
-    postToWebSocketQueue($event_name, $details, 'PostEvent');
+    if (!$return_output) {
+        postToWebSocketQueue($event_name, $details, 'PostEvent');
+    }
     //DebMes("Post websocket event done: ".$event_name,'process_subscription');
 
     if (!defined('SETTINGS_HOOK_EVENT_' . strtoupper($event_name))) {
-        DebMes("Processing not defined for " . 'SETTINGS_HOOK_EVENT_' . strtoupper($event_name), 'process_subscription');
+        //DebMes("Processing not defined for " . 'SETTINGS_HOOK_EVENT_' . strtoupper($event_name), 'process_subscription');
         return 0;
     }
 
     $data = json_decode(constant('SETTINGS_HOOK_EVENT_' . strtoupper($event_name)), true);
     //DebMes("Subscription data for ".'SETTINGS_HOOK_EVENT_' . strtoupper($event_name).": ".serialize($data),'process_subscription');
 
     if (!is_array($data)) {
-        DebMes("Incorrect data for " . 'SETTINGS_HOOK_EVENT_' . strtoupper($event_name) . ':' . constant('SETTINGS_HOOK_EVENT_' . strtoupper($event_name)), 'process_subscription');
+        //DebMes("Incorrect data for " . 'SETTINGS_HOOK_EVENT_' . strtoupper($event_name) . ':' . constant('SETTINGS_HOOK_EVENT_' . strtoupper($event_name)), 'process_subscription');
     } else {
         $data2 = array();
         foreach ($data as $k => $v) {
             $data2[] = array('module' => $k, 'filter' => $v['filter'], 'priority' => (int)$v['priority']);
         }
-
         usort($data2, function ($a, $b) {
             if ($a['priority'] == $b['priority']) return 0;
             return ($a['priority'] > $b['priority']) ? -1 : 1;
         });
-
+        $output = '';
         $total = count($data2);
         for ($i = 0; $i < $total; $i++) {
             $module_name = $data2[$i]['module'];
             $filter_details = $data2[$i]['filter'];
-
             //DebMes("Post event ".$event_name." to module ".$module_name. " (details: ".json_encode($details).")",'process_subscription');
-
             $modulePath = DIR_MODULES . $module_name . '/' . $module_name . '.class.php';
 
             if (file_exists($modulePath)) {
@@ -138,30 +137,34 @@ function processSubscriptions($event_name, $details = '')
                     //DebMes("$module_name.processSubscription ($event_name)",'process_subscription');
                     verbose_log("Processing subscription to [" . $event_name . "] by [" . $module_name . "] (" . (is_array($details) ? json_encode($details) : '') . ")");
                     try {
-                        $module_object->processSubscription($event_name, $details);
+                        $output .= $module_object->processSubscription($event_name, $details);
                     } catch (Exception $e) {
-                        DebMes('Error in processing "%s": ' . $e->getMessage(), 'process_subscription');
+                        //DebMes('Error in processing "%s": ' . $e->getMessage(), 'process_subscription');
                     }
                     //DebMes("$module_name.processSubscription ($event_name) DONE",'process_subscription');
                 } else {
-                    DebMes("$module_name.processSubscription error (method not found)", 'process_subscription');
+                    //DebMes("$module_name.processSubscription error (method not found)", 'process_subscription');
                 }
                 if (!isset($details['BREAK'])) {
                     $details['BREAK'] = false;
                 }
                 if ($details['BREAK']) break;
             } else {
-                DebMes("$module_name.processSubscription error (module class not found)", 'process_subscription');
+                //DebMes("$module_name.processSubscription error (module class not found)", 'process_subscription');
             }
         }
 
         if (!isset($details['PROCESSED'])) {
             $details['PROCESSED'] = false;
         }
-        /*
-        if (!$details['PROCESSED'] && $event_name == 'COMMAND') { sayReplySafe(LANG_DEVICES_UNKNOWN_COMMAND,2);}
-        */
-        return (int)$details['PROCESSED'];
+
+        //if (!$details['PROCESSED'] && $event_name == 'COMMAND') { sayReplySafe(LANG_DEVICES_UNKNOWN_COMMAND,2);}
+
+        if ($return_output) {
+            return $output;
+        } else {
+            return (int)$details['PROCESSED'];
+        }
     }
     return 0;
 

diff --git a/lib/utils/postprocess_general.inc.php b/lib/utils/postprocess_general.inc.php
@@ -0,0 +1,4 @@
+<?php
+
+$result = preg_replace('/<!--\s+(\w)/','<!--$1',$result);
+$result = preg_replace('/([\w\]])\s+-->/','$1-->',$result);
diff --git a/lib/utils/postprocess_result.inc.php b/lib/utils/postprocess_result.inc.php
@@ -2,13 +2,13 @@
 
 
 // BEGIN: begincut endcut placecut
-if (preg_match_all('/<!-- placecut (\w+?) -->/is', $result, $matches))
+if (preg_match_all('/<!--placecut (\w+?)-->/is', $result, $matches))
 {
    $matchesCount = count($matches[1]);
    for ($i = 0; $i < $matchesCount; $i++)
    {
       $block = $matches[1][$i];
-      if (preg_match('/<!-- begincut ' . $block . ' -->(.*?)<!-- endcut ' . $block . ' -->/is', $result, $matches2))
+      if (preg_match('/<!--begincut ' . $block . ' -->(.*?)<!--endcut ' . $block . '-->/is', $result, $matches2))
       {
          $result = str_replace($matches[0][$i], $matches2[1], $result);
          $result = str_replace($matches2[0], '', $result);
@@ -20,7 +20,7 @@
 // BEGIN: filter output
 if (isset($filterblock) && $filterblock != '')
 {
-   $matchPattern = '/<!-- begin_data \[' . $filterblock . '\] -->(.*?)<!-- end_data \[' . $filterblock . '\] -->/is';
+   $matchPattern = '/<!--begin_data \[' . $filterblock . '\]-->(.*?)<!--end_data \[' . $filterblock . '\]-->/is';
    preg_match($matchPattern, $result, $match);
    $result = $match[1];
 }
@@ -115,7 +115,6 @@
   }
 
 }
-
 // END GLOBALS
 
 // BEGIN: language constants