Browse Source

Add system policy key

Kristan Kenney 5 years ago
parent
commit
be9a3a9971
3 changed files with 21 additions and 0 deletions
  1. 1 0
      bin/v-list-sys-config
  2. 11 0
      web/edit/server/index.php
  3. 9 0
      web/templates/pages/edit_server.html

+ 1 - 0
bin/v-list-sys-config

@@ -76,6 +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_PROTECTED_ADMIN": "'$POLICY_SYSTEM_PROTECTED_ADMIN'",
         "POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",
         "POLICY_SYSTEM_HIDE_SERVICES": "'$POLICY_SYSTEM_HIDE_SERVICES'",

+ 11 - 0
web/edit/server/index.php

@@ -288,6 +288,17 @@ if (!empty($_POST['save'])) {
         }
     }
 
+    // Update experimental features status
+    if (empty($_SESSION['error_msg'])) {
+        if ($_POST['v_experimental_features'] != $_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS']) {
+            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);
+            check_return_code($return_var,$output);
+            unset($output);
+            $v_debug_mode_adv = 'yes';
+        }
+    }
+
    // Set File Manager support
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_filemanager'])) && ($_SESSION['FILE_MANAGER'] != $_POST['v_filemanager'])) {

+ 9 - 0
web/templates/pages/edit_server.html

@@ -154,6 +154,11 @@
                                                 
                                             </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>
@@ -476,6 +481,7 @@
                                                 <br><br>
                                             </td>
                                         </tr>
+                                        <? if ($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'] === 'true') {?>
                                         <tr>
                                             <td class="vst-text">
                                                 <?php print _('phpMyAdmin Single Sign On') ?>
@@ -491,6 +497,7 @@
                                                 <br />
                                             </td>
                                         </tr>
+                                        <? } ?>
                                         <?php } ?>
                                         <?php if ($v_mysql == 'yes') {
                                                   $i = 0;
@@ -1092,6 +1099,7 @@
                                                         </td>
                                                         
                                             </tr>
+                                            <? if ($_SESSION['POLICY_SYSTEM_ENABLE_JETSKIS'] === 'true') { ?>
                                               <tr>
                                             <td class="vst-text input-label">
                                                 <?php print _('Allow suspended users to log in with read-only access');?>
@@ -1106,6 +1114,7 @@
                                                 <br><br>
                                             </td>
                                         </tr>
+                                        <? } ?>
                                         <tr>
                                             <td class="vst-text input-label">
                                                 <?php print _('Allow users to edit their account details');?>