diff --git a/server/ControlScripts/Common.php b/server/ControlScripts/Common.php index 5182999..d48f64c 100644 --- a/server/ControlScripts/Common.php +++ b/server/ControlScripts/Common.php @@ -50,7 +50,7 @@ ]); } - public function btn_on_online(String $alias, Array $muted = []) { + public function btn_on_online(String $alias, Array $muted = []): void { $this -> add_event_handler("button@{$alias}.online", function(Device $btns_block, Array $data) use ($muted) { $btns_block_api = $btns_block -> device_api(); if($btns_block_api instanceof \SHServ\Tools\DeviceAPI\Button) { @@ -63,9 +63,10 @@ }); } - protected function set_btns_click_handlers($alias): void { + public function set_btns_click_handlers($alias): void { $self = $this; $buttons = $this -> helper() -> prepare_sync_map_by_alias($this -> sync_map(), $alias); + foreach($buttons as $btn_channel => $entry) { if($entry[0]["type"] != "relay") { continue; @@ -73,7 +74,7 @@ $relay_alias = $entry[0]["alias"]; $relay_channel = $entry[0]["channel"]; - + $this -> add_event_handler("button@{$alias}({$btn_channel}).press", function(Device $btns_block, Array $data) use ($self, $btn_channel, $relay_alias, $relay_channel) { $btns_block_api = $btns_block -> device_api(); $relay_api = $this -> devices() -> by_alias($relay_alias) -> device_api(); @@ -85,4 +86,4 @@ }); } } -} \ No newline at end of file +} diff --git a/server/SHServ/Controllers/EventsController.php b/server/SHServ/Controllers/EventsController.php index 7a717e2..9a6167b 100644 --- a/server/SHServ/Controllers/EventsController.php +++ b/server/SHServ/Controllers/EventsController.php @@ -50,4 +50,4 @@ $events_model -> global_device_event_call($device, $event_name, $data); $events_model -> global_any_device_event_call($device, $event_name, $data); } -} \ No newline at end of file +} diff --git a/server/SHServ/Helpers/DeviceScriptsHelper.php b/server/SHServ/Helpers/DeviceScriptsHelper.php index e0e3cc8..34eb54f 100644 --- a/server/SHServ/Helpers/DeviceScriptsHelper.php +++ b/server/SHServ/Helpers/DeviceScriptsHelper.php @@ -170,4 +170,4 @@ return $result; } -} \ No newline at end of file +}