Setze SSL-Option beim erstellen einer Webapp richtig
Bernd Wurst commited on 2014-10-10 06:09:04
Zeige 2 geänderte Dateien mit 6 Einfügungen und 3 Löschungen.
- modules/vhosts/include/vhosts.php 64bc698..4cc6a0b
- modules/webapps/install.php 21b2af1..d94dc99
| ... | ... |
@@ -361,9 +361,14 @@ function save_vhost($vhost) |
| 361 | 361 |
$autoipv6 = $vhost['autoipv6']; |
| 362 | 362 |
} |
| 363 | 363 |
|
| 364 |
+ if (!($vhost['ssl'] = 'forward' || $vhost['ssl'] == 'http' || |
|
| 365 |
+ $vhost['ssl'] = 'https')) {
|
|
| 366 |
+ $vhost['ssl'] = NULL; |
|
| 367 |
+ } |
|
| 368 |
+ |
|
| 364 | 369 |
$args = array(":hostname" => ($hostname ? $hostname : NULL),
|
| 365 | 370 |
":domain" => $domain, |
| 366 |
- ":docroot" => $vhost['docroot'], |
|
| 371 |
+ ":docroot" => ($vhost['docroot'] ? $vhost['docroot'] : NULL), |
|
| 367 | 372 |
":php" => $vhost['php'], |
| 368 | 373 |
":cgi" => ($vhost['cgi'] == 1 ? 1 : 0), |
| 369 | 374 |
":ssl" => $vhost['ssl'], |
| ... | ... |
@@ -52,8 +52,6 @@ $form .= " |
| 52 | 52 |
<div style=\"margin-left: 2em;\"> |
| 53 | 53 |
<select name=\"ssl\" id=\"ssl\"> |
| 54 | 54 |
<option value=\"none\" selected=\"selected\">SSL optional anbieten</option> |
| 55 |
- <option value=\"http\">kein SSL</option> |
|
| 56 |
- <option value=\"https\">nur SSL</option> |
|
| 57 | 55 |
<option value=\"forward\">Immer auf SSL umleiten</option> |
| 58 | 56 |
</select> |
| 59 | 57 |
</div> |
| 60 | 58 |