Skip to content

Commit 24ba9c0

Browse files
author
Kristan Kenney
committed
Add PLUGIN_APP_INSTALLER
1 parent 1e5f30e commit 24ba9c0

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

bin/v-list-sys-config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ json_list() {
7676
"API": "'$API'",
7777
"API_ALLOWED_IP": "'$API_ALLOWED_IP'",
7878
"UPDATE_AVAILABLE": "'$UPDATE_AVAILABLE'",
79+
"PLUGIN_APP_INSTALLER": "'$PLUGIN_APP_INSTALLER'",
80+
"PLUGIN_FILE_MANAGER": "'$PLUGIN_FILE_MANAGER'",
7981
"POLICY_SYSTEM_ENABLE_BACON": "'$POLICY_SYSTEM_ENABLE_BACON'",
8082
"POLICY_SYSTEM_PROTECTED_ADMIN": "'$POLICY_SYSTEM_PROTECTED_ADMIN'",
8183
"POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",

web/edit/server/index.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,16 @@
288288
}
289289
}
290290

291+
// Enable/Disable Quick App Installer
292+
if (empty($_SESSION['error_msg'])) {
293+
if ($_POST['v_plugin_app_installer'] != $_SESSION['PLUGIN_APP_INSTALLER']) {
294+
if ($_POST['v_plugin_app_installer'] == 'true') { $_POST['v_plugin_app_installer'] = 'true'; } else { $_POST['v_plugin_app_installer'] = 'false'; }
295+
exec (HESTIA_CMD."v-change-sys-config-value PLUGIN_APP_INSTALLER ".escapeshellarg($_POST['v_plugin_app_installer']), $output, $return_var);
296+
check_return_code($return_var,$output);
297+
unset($output);
298+
}
299+
}
300+
291301
// Update experimental features status
292302
if (empty($_SESSION['error_msg'])) {
293303
if ($_POST['v_experimental_features'] != $_SESSION['POLICY_SYSTEM_ENABLE_BACON']) {
@@ -315,7 +325,7 @@
315325
}
316326
}
317327
}
318-
// Set File Manager support
328+
// Set phpMyAdmin SSO key
319329
if (empty($_SESSION['error_msg'])) {
320330
if (!empty($_POST['v_phpmyadmin_key'])) {
321331
if ($_POST['v_phpmyadmin_key'] == 'yes' && $_SESSION['PHPMYADMIN_KEY'] == '') {

web/templates/pages/edit_server.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,20 @@
12281228
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="hestia">
12291229
<tr>
12301230
<td class="vst-text step-top">
1231+
<?php print _('Quick App Installer');?>
1232+
</td>
1233+
</tr>
1234+
<tr>
1235+
<td>
1236+
<select class="vst-list" name="v_plugin_app_installer">
1237+
<option value='false'><?php print _('no'); ?></option>
1238+
<option value='true' <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?> ><?php print _('yes'); ?></option>
1239+
</select>
1240+
<br><br>
1241+
</td>
1242+
</tr>
1243+
<tr>
1244+
<td class="vst-text input-label">
12311245
<?php print _('Filemanager');?>
12321246
</td>
12331247
</tr>

web/templates/pages/edit_web.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<a href="/delete/web/cache/?domain=<?=$_GET['domain'];?>&token=<?=$_SESSION['token'];?>" class="ui-button cancel <?php if ( $v_nginx_cache == 'yes' || ($v_proxy_template == 'caching' && $_SESSION['PROXY_SYSTEM'] == 'nginx')) { echo "block"; } else{ echo "hidden"; }?>" id="v-clear-cache">
88
<i class="fas fa-trash status-icon red"></i><?=_('Purge Nginx Cache');?>
99
</a>
10-
11-
<a href="/add/webapp/?domain=<?=$v_domain?>" class="ui-button cancel" dir="ltr">
12-
<i class="fas fa-magic status-icon blue"></i> <?=_('Quick Install App')?>
13-
</a>
10+
<? if ($_SESSION['PLUGIN_APP_INSTALLER'] !== 'false') {?>
11+
<a href="/add/webapp/?domain=<?=$v_domain?>" class="ui-button cancel" dir="ltr">
12+
<i class="fas fa-magic status-icon blue"></i> <?=_('Quick Install App')?>
13+
</a>
14+
<? } ?>
1415
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save')?></a>
1516
</div>
1617
</div>

0 commit comments

Comments
 (0)