From b4168c20e1c32679431b2da1a488ae1e67833a63 Mon Sep 17 00:00:00 2001 From: The009 Date: Sun, 14 Oct 2018 21:43:33 -0400 Subject: [PATCH] Ajax Conversion Remove Time Stamp Requirment Change Web GUI To All Ajax Calls --- index.php | 63 ++++++++++++++++++++++++++++++++----------------------- send.php | 37 ++------------------------------ 2 files changed, 39 insertions(+), 61 deletions(-) diff --git a/index.php b/index.php index 524f94a..e75c8a6 100644 --- a/index.php +++ b/index.php @@ -34,37 +34,48 @@ - + - - - + + function SingleSend( givenIp, givenPort, reqAction, devTyp){ + var ip = givenIp; + var port = givenPort; + var action = reqAction; + var deviceType = devTyp; + return $.ajax({ + url: 'send.php', + type: 'get', + data: { ip: ip, port: port, action: action, deviceType: deviceType }, + }); + }; + + function GroupSend( groupName, reqAction){ + var group = groupName; + var action = reqAction; + return $.ajax({ + url: 'send.php', + type: 'get', + data: { group: group, action: action}, + }); + }; + + @@ -95,8 +106,8 @@ function displayDeviceList($csv){

- On - Off + On + Off
@@ -107,7 +118,7 @@ function displayDeviceList($csv){ foreach ($unique as $key2 => $uniqueGroupIDs){ if($uniqueGroupIDs != ""){ echo << +
@@ -123,18 +134,18 @@ function displayDeviceList($csv){

- On - - Off + On + Off
EOD; - } +} } foreach($csv as $i => $item) { echo << +
@@ -142,8 +153,8 @@ function displayDeviceList($csv){

- On - - Off + On - + Off EOD; if($item['deviceType'] == "HS220"){ echo <<

Copyright © The009 www.the009.net 2018

-

Version 1.1.0.4
+

Version 1.1.1.4
This work is licensed under The GNU General Public License v3.0.

diff --git a/send.php b/send.php index 178767b..2c3dfdb 100644 --- a/send.php +++ b/send.php @@ -23,18 +23,10 @@ //Enable Debug Ouput (Works better in CLI mode)) define('debug', false); -//The Max Amout Of Time in MILLISECONDS A Command Can Be Accepted For (Helps with browsers who open the last url you had open so you don't randomly change switch modes) -define('maxCMDAcceptTime', 500); - - //No Further Options - -define('currentTime', (time()) * 1000); - $csv = array(); $devicesDisplayed = false; $group = ""; -$timeStamp = 0; if(getenv('SERVER_ADDR') == null){ if($argv[1] == "group"){ @@ -43,6 +35,7 @@ $ip = ""; $port = ""; $deviceType = ""; + $dimmerValue = ""; } else{ $ip = $argv[1]; @@ -54,6 +47,7 @@ $rawCommand = ""; }else if(count($argv) == 6){ $rawCommand = $argv[5]; + $dimmerValue = ""; }else{ $rawCommand = ""; $dimmerValue = ""; @@ -66,7 +60,6 @@ $action = isset($_GET['action']) ? $_GET['action'] : ''; $deviceType = isset($_GET['deviceType']) ? $_GET['deviceType'] : ''; $group = isset($_GET['group']) ? $_GET['group'] : ''; - $timeStamp = isset($_GET['timeStamp']) ? $_GET['timeStamp'] : ''; $rawCommand = isset($_GET['rawCommand']) ? $_GET['rawCommand'] : ''; $dimmerValue = isset($_GET['dimmerValue']) ? $_GET['dimmerValue'] : ''; } @@ -76,35 +69,9 @@ echo("Port: " . $port . "\n"); echo("Action: " . $action . "\n"); echo("DevTyp: " . $deviceType . "\n" ); - if($timeStamp)echo("Time Stamp: " . $timeStamp . "\n" ); if($dimmerValue)echo("Dimmer Value: " . $dimmerValue . "\n"); } -if(getenv('SERVER_ADDR') == null){ - if(!$timeStamp){ - $timeStamp = (currentTime + maxCMDAcceptTime) + 55; - } - - if(!is_numeric($timeStamp)){ die("Invalid Timestamp Format Detected");} - - if(currentTime <= ($timeStamp + maxCMDAcceptTime)){ - if(debug){ - echo("Current Time Stamp " . currentTime . "\n"); - echo("Given Time Stamp " . $timeStamp . "\n"); - echo("Time Stamp Diff " . ($timeStamp - currentTime)) . "\n"; - } - } - else{ - $ip = ""; - $port = ""; - $action = ""; - $deviceType = ""; - $group = ""; - $timeStamp = ""; - header("location: ?"); - } -} - if($group != "" && $action != ""){ if(debug)echo("Sending Group: " . $group . "\n Action: " . $action . "\n"); if($group)if(preg_match("/^[a-zA-Z0-9 \s]+$/", $group) == 1){} else { die("$group is not a valid Group"); }