Browse code

Merge branch 'master' of zucker.schokokeks.org:webinterface

Bernd Wurst authored on23/10/2017 10:17:58
Showing7 changed files
1 1
Binary files a/images/ok-php56.png and b/images/ok-php56.png differ
2 2
Binary files a/images/ok-php70.png and b/images/ok-php70.png differ
3 3
Binary files a/images/ok-php71.png and b/images/ok-php71.png differ
4 4
new file mode 100644
5 5
Binary files /dev/null and b/images/ok-php72.png differ
... ...
@@ -136,7 +136,7 @@ $phpoptions = "<h5>PHP</h5>
136 136
  */
137 137
 //if ($vhost['php'] == 'php54')
138 138
 //{
139
-  $options = array("none" => 'ausgeschaltet', "php56" => "PHP 5.6", "fpm70" => "PHP 7.0", "fpm71" => "PHP 7.1");
139
+  $options = array("none" => 'ausgeschaltet', "php56" => "PHP 5.6 (veraltet)", "fpm70" => "PHP 7.0", "fpm71" => "PHP 7.1", "fpm72" => "PHP 7.2 (beta)");
140 140
   $phpoptions = "
141 141
   <h5>PHP</h5>
142 142
   <div style=\"margin-left: 2em;\">
... ...
@@ -96,14 +96,15 @@ if ($_GET['action'] == 'edit')
96 96
       case 'php56':
97 97
         $php = 'php56';
98 98
         break;
99
-      case 'php70':
100 99
       case 'fpm70':
101 100
         $php = 'fpm70';
102 101
         break;
103
-      case 'php71':
104 102
       case 'fpm71':
105 103
         $php = 'fpm71';
106 104
         break;
105
+      case 'fpm72':
106
+        $php = 'fpm72';
107
+        break;
107 108
       /* Wenn etwas anderes kommt, ist das "kein PHP". So einfach ist das. */
108 109
     }
109 110
   }
... ...
@@ -156,20 +156,24 @@ if (count($vhosts) > 0)
156 156
       $php = $vhost['php'];
157 157
       switch ($php)
158 158
       {
159
+        /* To create new PHP icon:
160
+           convert ok.png -gravity center -draw "text 0,0 '7.2'" ok-php72.png
161
+        */
159 162
         case NULL:
160 163
           $php = icon_disabled('PHP ausgeschaltet');
161 164
           break;
162 165
         case 'php56':
163 166
           $php = icon_enabled_phpxx('PHP in Version 5.6 eingeschaltet', 5, 6);
164 167
           break;
165
-        case 'php70':
166 168
         case 'fpm70':
167 169
           $php = icon_enabled_phpxx('PHP in Version 7.0 eingeschaltet', 7, 0);
168 170
           break;
169
-        case 'php71':
170 171
         case 'fpm71':
171 172
           $php = icon_enabled_phpxx('PHP in Version 7.1 eingeschaltet', 7, 1);
172 173
           break;
174
+        case 'fpm72':
175
+          $php = icon_enabled_phpxx('PHP in Version 7.2 eingeschaltet', 7, 2);
176
+          break;
173 177
       }
174 178
       output("<td>{$php}</td>");
175 179
       if ($vhost['docroot_is_default'] == 1)