Do not change SSL certs if enabling Let's Encrypt

kmark · kmark · commit 443614a00f5f · 2017-01-19T07:48:51.000-05:00
Fixes issue noted in outroll/vesta#1008
diff --git a/web/edit/web/index.php b/web/edit/web/index.php
@@ -279,7 +279,7 @@
     }
 
     // Change SSL certificate
-    if (( $v_letsencrypt == 'no' ) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
+    if (( $v_letsencrypt == 'no' ) && (empty($_POST['v_letsencrypt'])) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
         if (( $v_ssl_crt != str_replace("\r\n", "\n",  $_POST['v_ssl_crt'])) || ( $v_ssl_key != str_replace("\r\n", "\n",  $_POST['v_ssl_key'])) || ( $v_ssl_ca != str_replace("\r\n", "\n",  $_POST['v_ssl_ca']))) {
             exec ('mktemp -d', $mktemp_output, $return_var);
             $tmpdir = $mktemp_output[0];

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`// Change SSL certificate`
`282`		`- if (( $v_letsencrypt == 'no' ) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {`
	`282`	`+ if (( $v_letsencrypt == 'no' ) && (empty($_POST['v_letsencrypt'])) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {`
`283`	`283`	`if (( $v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) \|\| ( $v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key'])) \|\| ( $v_ssl_ca != str_replace("\r\n", "\n", $_POST['v_ssl_ca']))) {`
`284`	`284`	`exec ('mktemp -d', $mktemp_output, $return_var);`
`285`	`285`	`$tmpdir = $mktemp_output[0];`