PHP <= 5.5 entfernt und Vorbereitung für PHP 7.1 getroffen
Bernd Wurst commited on 2016-09-10 06:53:37
Zeige 4 geänderte Dateien mit 14 Einfügungen und 16 Löschungen.
- modules/vhosts/edit.php 7d010a8..fc193af
- modules/vhosts/save.php ce48ac3..eec695b
- modules/vhosts/vhosts.php 11ac61d..52d26f9
- modules/webapps/save.php 83b7afe..d435fe4
| ... | ... |
@@ -121,7 +121,7 @@ $phpoptions = "<h5>PHP</h5> |
| 121 | 121 |
*/ |
| 122 | 122 |
//if ($vhost['php'] == 'php54') |
| 123 | 123 |
//{
|
| 124 |
- $options = array("none" => 'ausgeschaltet', "php55" => "PHP 5.5 (veraltet)", "php56" => "PHP 5.6", "fpm70" => "PHP 7.0"); # FIXME: FPM soll bald default sein
|
|
| 124 |
+ $options = array("none" => 'ausgeschaltet', "php56" => "PHP 5.6", "fpm70" => "PHP 7.0");
|
|
| 125 | 125 |
$phpoptions = " |
| 126 | 126 |
<h5>PHP</h5> |
| 127 | 127 |
<div style=\"margin-left: 2em;\"> |
| ... | ... |
@@ -87,18 +87,17 @@ if ($_GET['action'] == 'edit') |
| 87 | 87 |
if ($_POST['vhost_type'] == 'regular' && isset($_POST['php'])) |
| 88 | 88 |
{
|
| 89 | 89 |
switch ($_POST['php']) {
|
| 90 |
- case 'php54': |
|
| 91 |
- $php = 'php54'; |
|
| 92 |
- break; |
|
| 93 |
- case 'php55': |
|
| 94 |
- $php = 'php55'; |
|
| 95 |
- break; |
|
| 96 | 90 |
case 'php56': |
| 97 | 91 |
$php = 'php56'; |
| 98 | 92 |
break; |
| 99 |
- case 'fpm70': # FIXME: FPM soll bald der default sein, momentan nur einzelne Versionen |
|
| 93 |
+ case 'php70': |
|
| 94 |
+ case 'fpm70': |
|
| 100 | 95 |
$php = 'fpm70'; |
| 101 | 96 |
break; |
| 97 |
+ case 'php71': |
|
| 98 |
+ case 'fpm71': |
|
| 99 |
+ $php = 'fpm71'; |
|
| 100 |
+ break; |
|
| 102 | 101 |
/* Wenn etwas anderes kommt, ist das "kein PHP". So einfach ist das. */ |
| 103 | 102 |
} |
| 104 | 103 |
} |
| ... | ... |
@@ -159,18 +159,17 @@ if (count($vhosts) > 0) |
| 159 | 159 |
case NULL: |
| 160 | 160 |
$php = icon_disabled('PHP ausgeschaltet');
|
| 161 | 161 |
break; |
| 162 |
- case 'php54': |
|
| 163 |
- $php = icon_enabled_warning('PHP in veralteter Version aktiviert');
|
|
| 164 |
- break; |
|
| 165 |
- case 'php55': |
|
| 166 |
- $php = icon_enabled_phpxx('PHP in Version 5.5 eingeschaltet', 5, 5);
|
|
| 167 |
- break; |
|
| 168 | 162 |
case 'php56': |
| 169 | 163 |
$php = icon_enabled_phpxx('PHP in Version 5.6 eingeschaltet', 5, 6);
|
| 170 | 164 |
break; |
| 171 |
- case 'fpm70': # FIXME: FPM soll bald default sein |
|
| 165 |
+ case 'php70': |
|
| 166 |
+ case 'fpm70': |
|
| 172 | 167 |
$php = icon_enabled_phpxx('PHP in Version 7.0 eingeschaltet', 7, 0);
|
| 173 | 168 |
break; |
| 169 |
+ case 'php71': |
|
| 170 |
+ case 'fpm71': |
|
| 171 |
+ $php = icon_enabled_phpxx('PHP in Version 7.1 eingeschaltet', 7, 1);
|
|
| 172 |
+ break; |
|
| 174 | 173 |
} |
| 175 | 174 |
output("<td>{$php}</td>");
|
| 176 | 175 |
if ($vhost['docroot_is_default'] == 1) |
| ... | ... |
@@ -97,7 +97,7 @@ if ($_POST['target'] == 'new') |
| 97 | 97 |
$vhost['domain_id'] = $domainid; |
| 98 | 98 |
$vhost['domain'] = $domainname; |
| 99 | 99 |
$vhost['docroot'] = ''; |
| 100 |
- $vhost['php'] = 'php55'; |
|
| 100 |
+ $vhost['php'] = 'php56'; |
|
| 101 | 101 |
$vhost['ssl'] = $ssl; |
| 102 | 102 |
$vhost['logtype'] = $logtype; |
| 103 | 103 |
$vhost['errorlog'] = $errorlog; |
| 104 | 104 |