From d24075b1c5caf438cd60aecb361fe8fd8d0c285d Mon Sep 17 00:00:00 2001
From: tenma <brvnocasteleiro@gmail.com>
Date: Sun, 15 Mar 2020 21:37:37 +0000
Subject: [PATCH] [INSTALL] Allow the setup of sslproxy during install time

install.php:
installer.php:
- add option field and handle logic

display.css:
- hardcode ssl's label margin-top value so all options are correctly displayed
---
 lib/util/installer.php            | 1 +
 public/install.php                | 3 ++-
 public/theme/base/css/display.css | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/util/installer.php b/lib/util/installer.php
index 9115ebdec4..01afa46d2b 100644
--- a/lib/util/installer.php
+++ b/lib/util/installer.php
@@ -454,6 +454,7 @@ abstract class Installer
             "\$config['site']['server'] = {$vals['server']};\n" .
             "\$config['site']['path'] = {$vals['path']}; \n\n" .
             "\$config['site']['ssl'] = {$vals['ssl']}; \n\n" .
+            ($this->ssl === 'proxy' ? "\$config['site']['sslproxy'] = true;\n\n" : '') .
 
             // checks if fancy URLs are enabled
             ($this->fancy ? "\$config['site']['fancy'] = true;\n\n" : '') .
diff --git a/public/install.php b/public/install.php
index 60e0e7362d..dd764420cd 100644
--- a/public/install.php
+++ b/public/install.php
@@ -206,6 +206,7 @@ class WebInstaller extends Installer
                         <label for="ssl">Server SSL</label>
                         <input type="radio" name="ssl" id="ssl-always" value="always" {$ssl['always']}> enable<br>
                         <input type="radio" name="ssl" id="ssl-never" value="never" {$ssl['never']}> disable<br>
+                        <input type="radio" name="ssl" id="ssl-proxy" value="proxy"> proxied<br>
                         <p class="form_guide" id="ssl-form_guide">Enabling SSL (https://) requires extra webserver configuration and certificate generation not offered by this installation.</p>
                     </li>
                 </ul>
@@ -357,7 +358,7 @@ STR;
             $fail = true;
         }
 
-        if (!in_array($this->ssl, ['never', 'always'])) {
+        if (!in_array($this->ssl, ['never', 'always', 'proxy'])) {
             $this->updateStatus("Bad value for server SSL enabling.");
             $fail = true;
         }
diff --git a/public/theme/base/css/display.css b/public/theme/base/css/display.css
index cd909274da..393286faeb 100644
--- a/public/theme/base/css/display.css
+++ b/public/theme/base/css/display.css
@@ -1405,6 +1405,10 @@ form label.submit {
     margin-left:0;
 }
 
+.form_settings label[for=ssl] {
+    margin-top:23px;
+}
+
 .form_settings label {
     margin-top:2px;
     width: 25%;