Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/global.php	Sat Jul 14 17:21:25 2018 +0200
+++ b/www-thermferm/global.php	Sat Jul 14 21:15:20 2018 +0200
@@ -1,6 +1,6 @@
 <?php
 /*****************************************************************************
- * Copyright (C) 2014-2017
+ * Copyright (C) 2014-2018
  *   
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -52,7 +52,11 @@
 	if (isset($_POST['LCDcols']))
 	    $cmd[] = "LCD_COLS,".$_POST['LCDcols'];
 	if (isset($_POST['LCDrows']))
-	    $cmd[] = "LCD_ROWS,".$_POST['LCDrows'];
+		$cmd[] = "LCD_ROWS,".$_POST['LCDrows'];
+	$cmd[] = "MQTT_HOST,".$_POST['MQTThost'];
+	$cmd[] = "MQTT_POST,".$_POST['MQTTport'];
+	$cmd[] = "MQTT_USER,".$_POST['MQTTuser'];
+	$cmd[] = "MQTT_PASS,".$_POST['MQTTpass'];
 	$cmd[] = ".";
 	send_array($cmd);
     }
@@ -64,6 +68,10 @@
     unset($_POST['TempHumIdx']);
     unset($_POST['LCDcols']);
     unset($_POST['LCDrows']);
+    unset($_POST['MQTThost']);
+    unset($_POST['MQTTport']);
+    unset($_POST['MQTTuser']);
+    unset($_POST['MQTTpass']);
     unset($_POST['key']);
     load('maintenance.php');
 }
@@ -74,7 +82,9 @@
 
     if (isset($_POST['Name']) && isset($_POST['Port']) &&
 	isset($_POST['TempAddress']) && isset($_POST['HumAddress']) &&
-	isset($_POST['TempHumIdx']) && isset($_POST['key'])) {
+	isset($_POST['TempHumIdx']) && isset($_POST['key']) &&
+	isset($_POST['MQTThost']) && isset($_POST['MQTTport']) &&
+	isset($_POST['MQTTuser']) && isset($_POST['MQTTpass'])) {
 
 	if ($_POST['key'] == 'Cancel')
 	    return 99;
@@ -207,7 +217,7 @@
 	    }
 	    if ($f[0] == "TEMP_HUM_IDX") {
 		$outstr .= '       <tr class="editor">'.PHP_EOL;
-		$outstr .= '        <td class="editname">Temp/Humidity domoticz index</td>'.PHP_EOL;
+		$outstr .= '        <td class="editname">Domoticz TH index</td>'.PHP_EOL;
 		$outstr .= '        <td class="editfield"><input type="text" name="TempHumIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
@@ -223,6 +233,36 @@
 		$outstr .= '        <td class="editfield"><input type="text" name="LCDrows" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
+	    if ($f[0] == "MQTT_HOST") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">MQTT host</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="MQTThost" size="50" value="'.$f[1].'"></td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
+	    if ($f[0] == "MQTT_PORT") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">MQTT port</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="MQTTport" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
+	    if ($f[0] == "MQTT_USER") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">MQTT username</td>'.PHP_EOL;
+		if (strcmp($f[1], "(null)") == 0) {
+		    $f[1] = "";
+		}
+		$outstr .= '        <td class="editfield"><input type="text" name="MQTTuser" size="50" value="'.$f[1].'"></td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
+	    if ($f[0] == "MQTT_PASS") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">MQTT password</td>'.PHP_EOL;
+		if (strcmp($f[1], "(null)") == 0) {
+		    $f[1] = "";
+		}
+		$outstr .= '        <td class="editfield"><input type="text" name="MQTTpass" size="50" value="'.$f[1].'"></td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
 	    $i++;
 	}
     }