From 58c12741c07a817be897bdb881b62e4c73625a5e Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-6AP4J8U>
Date: Wed, 7 Aug 2024 10:03:16 +0200
Subject: [PATCH] redis, uppercase

---
 install.html | 48 ++++++++++++++++++++++++------------------------
 install.php  | 10 +++++++---
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/install.html b/install.html
index 13487fc..1cd2368 100644
--- a/install.html
+++ b/install.html
@@ -151,7 +151,7 @@
 	<div class="row">
 	    <div class="mb-3">
 			<label for="service_dir">Please add directory path of service files: (/etc/user/config/services/)</label>
-			<input type="text" class="form-control" name="service_dir" id="SERVICE_DIR" value="/etc/user/config/services">
+			<input type="text" class="form-control" name="SERVICE_DIR" id="service_dir" value="/etc/user/config/services">
 	    </div>
 	</div>
 	<div class="row">
@@ -204,7 +204,7 @@
 		<div class="row">
 		    <div class="mb-3">
 			<label for="bitwarden_smtp">Please choose an SMTP server: &nbsp; &nbsp;</label>
-			<select class="custom-select d-block w-100" name="bitwarden_smtp" id="bitwarden_smtp">
+			<select class="custom-select d-block w-100" name="BITWARDEN_SMTP" id="bitwarden_smtp">
 			<option value="1" selected>Gmail</option>
 			<option value="2">Microsoft Outlook/Hotmail</option>
 			<option value="3">Other</option>
@@ -215,51 +215,51 @@
 			<div class="row">
 			    <div class="mb-3">
 				<label for="bitwarden_smtp_host">Please add SMTP HOST: &nbsp; &nbsp; &nbsp; &nbsp; </label>
-				<input type="text" class="form-control" name="bitwarden_smtp_host" id="bitwarden_smtp_host" value="">
+				<input type="text" class="form-control" name="BITWARDEN_SMTP_HOST" id="bitwarden_smtp_host" value="">
 			    </div>
 			</div>
 			<div class="row">
 			    <div class="mb-3">
 				<label for="bitwarden_smtp_port">Please add SMTP PORT (587, 465, 25, etc.): </label>
-				<input type="text" class="form-control" name="bitwarden_smtp_port" id="bitwarden_smtp_port" value="">
+				<input type="text" class="form-control" name="BITWARDEN_SMTP_PORT" id="bitwarden_smtp_port" value="">
 			    </div>
 			</div>
 			<div class="row">
 			    <div class="mb-3">
 				<label for="bitwarden_smtp_security">Please add SMTP SECURITY (starttls, force_tls, off, etc.): </label>
-				<input type="text" class="form-control" name="bitwarden_smtp_security" id="bitwarden_smtp_security" value="">
+				<input type="text" class="form-control" name="BITWARDEN_SMTP_SECURITY" id="bitwarden_smtp_security" value="">
 			    </div>
 			</div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 			<label for="bitwarden_smtp_host">Please add SMTP FROM (mail address from): </label>
-			<input type="text" class="form-control" name="bitwarden_smtp_from" id="bitwarden_smtp_from" value="">
+			<input type="text" class="form-control" name="BITWARDEN_SMTP_FROM" id="bitwarden_smtp_from" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 			<label for="bitwarden_smtp_username">Please add SMTP USERNAME: </label>
-			<input type="text" class="form-control" name="bitwarden_smtp_username" id="bitwarden_smtp_username" value="">
+			<input type="text" class="form-control" name="BITWARDEN_SMTP_USERNAME" id="bitwarden_smtp_username" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 			<label for="bitwarden_smtp_password">Please add SMTP PASSWORD: </label>
-			<input type="text" class="form-control" name="bitwarden_smtp_password" id="bitwarden_smtp_password" value="">
+			<input type="text" class="form-control" name="BITWARDEN_SMTP_PASSWORD" id="bitwarden_smtp_password" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 			<label for="bitwarden_domains_whitelist">Please add Domains Whitelist (list of domains): </label>
-			<input type="text" class="form-control" name="bitwarden_domains_whitelist" id="bitwarden_domains_whitelist" value="">
+			<input type="text" class="form-control" name="BITWARDEN_DOMAINS_WHITELIST" id="bitwarden_domains_whitelist" value="">
 		    </div>
 		</div>
 	</fieldset>
 	<div class="row">
 	    <div class="mb-3">
 			<label for="guacamole">Do you want to install Guacamole?</label>
-			<select class="custom-select d-block w-100" name="guacamole" id="guacamole">
+			<select class="custom-select d-block w-100" name="GUACAMOLE" id="guacamole">
 			<option value="yes">Yes</option>
 			<option value="no" selected>No</option>
 			</select>
@@ -270,25 +270,25 @@
 		<div class="row">
 		    <div class="mb-3">
 				<label for="guacamole_domain">Please add Guacamole domain: </label>
-				<input type="text" class="form-control" name="guacamole_domain" id="guacamole_domain" value="">
+				<input type="text" class="form-control" name="GUACAMOLE_DOMAIN" id="guacamole_domain" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="guacamole_username">Please add Guacamole admin username: </label>
-				<input type="text" class="form-control" name="guacamole_username" id="guacamole_username" value="">
+				<input type="text" class="form-control" name="GUACAMOLE_USERNAME" id="guacamole_username" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="guacamole_password">Please add Guacamole admin password: </label>
-				<input type="text" class="form-control" name="guacamole_password" id="guacamole_password" value="">
+				<input type="text" class="form-control" name="GUACAMOLE_PASSWORD" id="guacamole_password" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 			<label for="guacemole_totp">Do you want TOTP via login? </label>
-			<select class="custom-select d-block w-100" name="guacemole_totp" id="guacemole_totp">
+			<select class="custom-select d-block w-100" name="GUACAMOLE_TOTP" id="guacamole_totp">
 			<option value="yes" selected>Yes</option>
 			<option value="no">No</option>
 			</select>
@@ -298,14 +298,14 @@
 		    <div class="mb-3">
 			<label for="guacamole_ban_duration">Do you want limitation in case invalid login or password? Please add a number how many minutes for deny retry. If you add 0 means it will disabled.";
 			</label>
-			<input type="text" class="form-control" name="guacamole_ban_duration" id="guacamole_ban_duration" value="5">
+			<input type="text" class="form-control" name="GUACAMOLE_BAN_DURATION" id="guacamole_ban_duration" value="5">
 		    </div>
 		</div>
 	</fieldset>
 	<div class="row">
 	    <div class="mb-3">
 			<label for="smtp_server">Do you want to install SMTP server?</label>
-			<select class="custom-select d-block w-100" name="smtp_server" id="smtp_server">
+			<select class="custom-select d-block w-100" name="SMTP_SERVER" id="smtp_server">
 			<option value="yes">Yes</option>
 			<option value="no" selected>No</option>
 			</select>
@@ -314,7 +314,7 @@
 	<div class="row">
 	    <div class="mb-3">
 			<label for="roundcube">Do you want to install roundcube?</label>
-			<select class="custom-select d-block w-100" name="roundcube" id="roundcube">
+			<select class="custom-select d-block w-100" name="ROUNDCUBE" id="roundcube">
 			<option value="yes">Yes</option>
 			<option value="no" selected>No</option>
 			</select>
@@ -325,37 +325,37 @@
 		<div class="row">
 		    <div class="mb-3">
 				<label for="roundcube_imap_host">Please add IMAP HOST: &nbsp; &nbsp; &nbsp; </label>
-				<input type="text" class="form-control" name="roundcube_imap_host" id="roundcube_imap_host" value="">
+				<input type="text" class="form-control" name="ROUNDCUBE_IMAP_HOST" id="roundcube_imap_host" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="roundcube_imap_port">Please add IMAP PORT (default: 143): </label>
-				<input type="text" class="form-control" name="roundcube_imap_port" id="roundcube_imap_port" value="143">
+				<input type="text" class="form-control" name="ROUNDCUBE_IMAP_PORT" id="roundcube_imap_port" value="143">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="roundcube_smtp_host">Please add SMTP HOST: &nbsp; &nbsp; &nbsp; &nbsp; </label>
-				<input type="text" class="form-control" name="roundcube_smtp_host" id="roundcube_smtp_host" value="">
+				<input type="text" class="form-control" name="ROUNDCUBE_SMTP_HOST" id="roundcube_smtp_host" value="">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="roundcube_smtp_port">Please add SMTP PORT (587, 465, 25, etc., default: 25): </label>
-				<input type="text" class="form-control" name="roundcube_smtp_port" id="roundcube_smtp_port" value="25">
+				<input type="text" class="form-control" name="ROUNDCUBE_SMTP_PORT" id="roundcube_smtp_port" value="25">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="roundcube_upload">Please add UPLOAD_MAX_FILESIZE (default: 50M): </label>
-				<input type="text" class="form-control" name="roundcube_upload" id="roundcube_upload" value="50M">
+				<input type="text" class="form-control" name="ROUNDCUBE_UPLOAD" id="roundcube_upload" value="50M">
 		    </div>
 		</div>
 		<div class="row">
 		    <div class="mb-3">
 				<label for="roundcube_domain">Please add Roundcube DOMAIN: </label>
-				<input type="text" class="form-control" name="roundcube_domain" id="roundcube_domain" value="">
+				<input type="text" class="form-control" name="ROUNDCUBE_DOMAIN" id="roundcube_domain" value="">
 		    </div>
 		</div>
 	</div>
@@ -376,7 +376,7 @@
 <script>
 jQuery(document).ready(function(){
 
-	jQuery('select#smarthost').click(function() {
+	jQuery('select#smarthost').change(function() {
 		if (jQuery(this).val()=='yes') jQuery('#div_smarthost').show();
 		else jQuery('#div_smarthost').hide();
 
diff --git a/install.php b/install.php
index f33d374..5bd2045 100644
--- a/install.php
+++ b/install.php
@@ -1,4 +1,5 @@
 <?php
+include "functions.php";
 
 if ($_POST["SMARTHOST_PROXY"]=="Y") {
 	if ($_POST["DOMAIN"]=="") $_POST["DOMAIN"] = "localhost";
@@ -24,10 +25,13 @@ if ($_POST["ADDITIONALS"]=="yes") {
       if ($_POST["SERVICE_DIR"] == "" ) $_POST["SERVICE_DIR"]="/etc/user/config/services";
 }
 
-$json = json_encode($_POST);
-echo $json;
+$json = json_encode($_POST, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+//echo $json;
 
-// TODO redis
+echo $op = "install-".date("YmdHis");
+redis_set($op,$json);
+
+//echo redis_get($op);
 
 /*
 put_install_envs();