correction of command.php arguments + code_on & code_off

valentinp72 · May 1, 2017 · 2320483 · 2320483
1 parent 9cfbf26
commit 2320483
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/supervisor/checker.php b/supervisor/checker.php
@@ -5,7 +5,7 @@
 		=> Check if we need to turn on or turn off a device
 	*/
 
-	require '../config/include.php';
+	require __DIR__ . '/../config/include.php';
 
 	// Returns all devices that match the $time_columnName, $prog_state and $active
 	// ==> All devices that should be activated of disactivated according to the DB

diff --git a/supervisor/command.php b/supervisor/command.php
@@ -5,7 +5,7 @@
 		=> Turn on or off a device
 	*/
 
-	require '../config/include.php';
+	require __DIR__ . '/../config/include.php';
 	$args_requiredNB = 3;
 
 	// Returns all device info that match $id id
@@ -46,11 +46,13 @@ function getCode($device, $origin, $command){
 		$values = array();
 
 		foreach($arguments as $arg){
-   			list($x, $y) = explode('=', $arg);
-   			$values["$x"] = $y;
+   			$elems = explode('=', $arg);
+			if(count($elems) == 2){
+   				$values["$elems[0]"] = $elems[1];
+			}
 		}
 
-		$nb = count($values) - 1;
+		$nb = count($values);
 	}
 
 	$command   = $values['command'];               // ON or OFF

diff --git a/web/device_edit.php b/web/device_edit.php
@@ -47,9 +47,19 @@
 						<li>
 							<div class="item-content">
 								<div class="item-inner">
-									<div class="item-title label">Code</div>
+									<div class="item-title label">Code d'allumage</div>
+									<div class="item-input">
+										<input class="right" type="text" value="<?php echo $data['code_on']; ?>" name="code_on">
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item-content">
+								<div class="item-inner">
+									<div class="item-title label">Code d'éxtinction</div>
 									<div class="item-input">
-										<input class="right" type="text" value="<?php echo $data['code']; ?>" name="code">
+										<input class="right" type="text" value="<?php echo $data['code_off']; ?>" name="code_off">
 									</div>
 								</div>
 							</div>

diff --git a/web/post_device_edit.php b/web/post_device_edit.php
@@ -14,7 +14,8 @@
 
 		$id             = $_POST['id'];
 		$name           = $_POST['name'];
-		$code           = $_POST['code'];
+		$code_on        = $_POST['code_on'];
+		$code_off       = $_POST['code_off'];
 
 		$prog_on_state      = 0; // Initialization to 0 because if the checkbox is not checked, it won't exist
 		$prog_on_time       = $_POST['prog_on_time'];
@@ -43,7 +44,8 @@
 		// Update
 		$query = "UPDATE devices SET
 			name = '". $name ."',
-			code = '". $code ."',
+			code_on = '". $code_on ."',
+			code_off = '". $code_off ."',
 
 			prog_on_state = ". $prog_on_state .",
 			prog_on_time = '". $prog_on_time ."',