Mercurial > mbsePi-apps / changeset

--- a/www-thermferm/global.php	Wed Aug 20 12:46:31 2014 +0200
+++ b/www-thermferm/global.php	Wed Aug 20 13:02:12 2014 +0200
@@ -43,37 +43,17 @@
 function global_update() {
 
     if ($_POST['key'] == 'Save') {
-	$sock = open_socket();
-	if ($sock != false) {
-	    /*
-	     * Send command and absorb the result.
-	     */
-	    socket_write($sock, "GLOBAL PUT", 4096);
-	    usleep(20000);
-	    socket_write($sock, "NAME,".$_POST['Name'], 4096);
-	    usleep(20000);
-	    socket_write($sock, "PORT,".$_POST['Port'], 4096);
-	    usleep(20000);
-	    socket_write($sock, "TEMP_ADDRESS,".$_POST['TempAddress'], 4096);
-	    usleep(20000);
-	    socket_write($sock, "HUM_ADDRESS,".$_POST['HumAddress'], 4096);
-	    usleep(20000);
-	    if (isset($_POST['LCDcols'])) {
-		socket_write($sock, "LCD_COLS,".$_POST['LCDcols'], 4096);
-		usleep(20000);
-	    }
-	    if (isset($_POST['LCDrows'])) {
-		socket_write($sock, "LCD_ROWS,".$_POST['LCDrows'], 4096);
-		usleep(20000);
-	    }
-	    socket_write($sock, ".", 4096);
-	    while (1) {
-		$line = socket_read($sock, 4096);
-		if ($line === '')
-		    break;
-	    }
-	    socket_close($sock);
-	}
+	$cmd = array("GLOBAL PUT");
+	$cmd[] = "NAME,".$_POST['Name'];
+	$cmd[] = "PORT,".$_POST['Port'];
+	$cmd[] = "TEMP_ADDRESS,".$_POST['TempAddress'];
+	$cmd[] = "HUM_ADDRESS,".$_POST['HumAddress'];
+	if (isset($_POST['LCDcols']))
+	    $cmd[] = "LCD_COLS,".$_POST['LCDcols'];
+	if (isset($_POST['LCDrows']))
+	    $cmd[] = "LCD_ROWS,".$_POST['LCDrows'];
+	$cmd[] = ".";
+	send_array($cmd);
     }
 
     unset($_POST['Name']);

--- a/www-thermferm/profiles.php	Wed Aug 20 12:46:31 2014 +0200
+++ b/www-thermferm/profiles.php	Wed Aug 20 13:02:12 2014 +0200
@@ -185,27 +185,12 @@
 	send_cmd("PROFILE DEL ".$_POST['UUID']);
     }
 
-
     if ($_POST['key'] == 'Save') {
-	$sock = open_socket();
-	if ($sock != false) {
-	    /*
-	     * Send command and absorb the result.
-	     */
-	    socket_write($sock, "PROFILE PUT ".$_POST['UUID'], 4096);
-	    usleep(20000);
-	    socket_write($sock, "NAME,".$_POST['Name'], 4096);
-	    usleep(20000);
-	    socket_write($sock, "INITTEMP,".$_POST['Inittemp'], 4096);
-	    usleep(20000);
-	    socket_write($sock, ".", 4096);
-	    while (1) {
-		$line = socket_read($sock, 4096);
-		if ($line === '')
-		    break;
-	    }
-	    socket_close($sock);
-	}
+	$cmd = array("PROFILE PUT ".$_POST['UUID']);
+	$cmd[] = "NAME,".$_POST['Name'];
+	$cmd[] = "INITTEMP,".$_POST['Inittemp'];
+	$cmd[] = ".";
+	send_array($cmd);
     }
 
     unset($_POST['UUID']);
@@ -237,8 +222,6 @@
 
     global $arr;
 
-//    print_r($_POST);
-
     for ($i = 1; $i <= 8; $i++) {
 	if ((! isset($_POST['steptime'.$i])) || (! isset($_POST['resttime'.$i])) || (! isset($_POST['target'.$i])))
 		return 1;