Fix bug described in #2322 (#2323)

Edit PHP SSO Feature and remove out of final testing phase

web/edit/server/index.php

@@ -398,6 +398,13 @@ if (!empty($_POST['save'])) {
             check_return_code($return_var, $output);
             unset($output);
             $v_debug_mode_adv = 'yes';
+            
+        }
+        if (($_POST['v_experimental_features'] != $_SESSION['POLICY_SYSTEM_ENABLE_BACON']) && $_POST['v_experimental_features'] == "false" ) {
+            //disable preview mode
+            exec(HESTIA_CMD."v-change-sys-config-value POLICY_USER_VIEW_SUSPENDED ".escapeshellarg($_POST['v_policy_user_view_suspended']), $output, $return_var);
+            check_return_code($return_var, $output);
+            unset($output);
         }
     }
 

web/templates/pages/edit_server.html

@@ -503,24 +503,21 @@
 													<br><br>
 												</td>
 											</tr>
-											<?php if ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] === 'true') {
-											?>
-												<tr>
-													<td class="vst-text">
-														<?=_('phpMyAdmin Single Sign On');?> <span class="hint">(Preview)</span>
-													</td>
-												</tr>
-												<tr>
-													<td>
-														<select class="vst-list" name="v_phpmyadmin_key">
-															<option value='no'><?=_('Disabled'); ?></option>
-															<option value='yes' <?php if($_POST['v_phpmyadmin_key'] == "yes" || $_SESSION['PHPMYADMIN_KEY'] != ''){ echo 'selected="selected"'; }; ?>><?=_('Enabled'); ?></option>
-														</select>
-														<br />
-														<br />
-													</td>
-												</tr>
-											<?php } ?>
+											<tr>
+												<td class="vst-text">
+													<?=_('phpMyAdmin Single Sign On');?>
+												</td>
+											</tr>
+											<tr>
+												<td>
+													<select class="vst-list" name="v_phpmyadmin_key">
+														<option value='no'><?=_('Disabled'); ?></option>
+														<option value='yes' <?php if($_POST['v_phpmyadmin_key'] == "yes" || $_SESSION['PHPMYADMIN_KEY'] != ''){ echo 'selected="selected"'; }; ?>><?=_('Enabled'); ?></option>
+													</select>
+													<br />
+													<br />
+												</td>
+											</tr>
 										<?php } ?>
 										<?php if ($v_mysql == 'yes') {
 											$i = 0;

web/templates/pages/list_server_preview.html

@@ -24,18 +24,6 @@
 		</div>
 	</div>
 	<!-- Start of item element-->
-	<div class="l-unit header animated fadeIn">
-		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left super-compact text-center">
-				<i class="fas fa-database status-icon blue"></i>
-			</div>
-			<div class="clearfix l-unit__stat-col--left"><b><?=_('Databases');?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-6"><b><?=_('phpMyAdmin Single Sign On'); ?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-2">In final development stages.</div>
-		</div>
-	</div>
-	<!-- End of item element-->
-	<!-- Start of item element-->
 	<div class="l-unit header animated fadeIn">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact text-center">