Denote preview features in settings

Author: Kristan Kenney

bin/v-list-sys-config

@@ -76,7 +76,7 @@ json_list() {
         "API": "'$API'",
         "API_ALLOWED_IP": "'$API_ALLOWED_IP'",
         "UPDATE_AVAILABLE": "'$UPDATE_AVAILABLE'",
-        "POLICY_SYSTEM_ENABLE_JETSKIS": "'$POLICY_SYSTEM_ENABLE_JETSKIS'",
+        "POLICY_SYSTEM_ENABLE_BACON": "'$POLICY_SYSTEM_ENABLE_BACON'",
         "POLICY_SYSTEM_PROTECTED_ADMIN": "'$POLICY_SYSTEM_PROTECTED_ADMIN'",
         "POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",
         "POLICY_SYSTEM_HIDE_SERVICES": "'$POLICY_SYSTEM_HIDE_SERVICES'",

web/edit/server/index.php

@@ -290,9 +290,9 @@
 
     // Update experimental features status
     if (empty($_SESSION['error_msg'])) {
-        if ($_POST['v_experimental_features'] != $_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS']) {
+        if ($_POST['v_experimental_features'] != $_SESSION['POLICY_SYSTEM_ENABLE_BACON']) {
             if ($_POST['v_experimental_features'] == 'on') { $_POST['v_experimental_features'] = 'true'; } else { $_POST['v_experimental_features'] = 'false'; }
-            exec (HESTIA_CMD."v-change-sys-config-value POLICY_SYSTEM_ENABLE_JETSKIS ".escapeshellarg($_POST['v_experimental_features']), $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-config-value POLICY_SYSTEM_ENABLE_BACON ".escapeshellarg($_POST['v_experimental_features']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_debug_mode_adv = 'yes';

web/templates/pages/edit_server.html

@@ -154,18 +154,6 @@
 
                                             </td>
                                         </tr>
-                                        <tr>
-                                            <td>
-                                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'] == "true")) echo "checked=yes" ?>><?php print _('Enable preview features');?></label>
-                                            </td>
-                                        </tr>
-                                        <?php if ($_SESSION['RELEASE_BRANCH'] != "release") { ?>
-                                            <tr>
-                                                <td>
-                                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_debug_mode" <?php if ((isset($_SESSION['DEBUG_MODE'])) && (!empty($_SESSION['DEBUG_MODE'])) && ($_SESSION['DEBUG_MODE'] == "true")) echo "checked=yes" ?>><?php print _('Enable debug mode');?></label>
-                                                </td>
-                                            </tr>
-                                        <?php } ?>
                                         <tr>
                                             <td>
                                                 <br><br>
@@ -200,6 +188,18 @@
                                                 <?php print _('Options'); ?>
                                             </td>
                                         </tr>
+                                        <?php if ($_SESSION['RELEASE_BRANCH'] != "release") { ?>
+                                            <tr>
+                                                <td>
+                                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_debug_mode" <?php if ((isset($_SESSION['DEBUG_MODE'])) && (!empty($_SESSION['DEBUG_MODE'])) && ($_SESSION['DEBUG_MODE'] == "true")) echo "checked=yes" ?>><?php print _('Enable debug mode');?></label>
+                                                </td>
+                                            </tr>
+                                        <?php } ?>
+                                        <tr>
+                                            <td>
+                                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] == "true")) echo "checked=yes" ?>><?php print _('Enable preview features');?></label>
+                                            </td>
+                                        </tr>
                                         <tr>
                                             <td>
                                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_upgrade_send_notification_email" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL'])) && ($_SESSION['UPGRADE_SEND_EMAIL'] == "true")) echo "checked=yes" ?>><?php print _('SYSTEM_UPGRADE_SEND_NOTIFICATION_EMAIL');?></label>
@@ -481,10 +481,10 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <? if ($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'] === 'true') {?>
+                                        <? if ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] === 'true') {?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print _('phpMyAdmin Single Sign On') ?>
+                                                <?php print _('phpMyAdmin Single Sign On') ?> <span class="hint">(Preview)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -1099,10 +1099,10 @@
                                                         </td>
 
                                             </tr>
-                                            <? if ($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'] === 'true') { ?>
+                                            <? if ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] === 'true') { ?>
                                               <tr>
                                             <td class="vst-text input-label">
-                                                <?php print _('Allow suspended users to log in with read-only access');?>
+                                                <?php print _('Allow suspended users to log in with read-only access');?> <span class="hint">(Preview)</span>
                                             </td>
                                         </tr>
                                         <tr>