Skip to content

Commit 20fbf49

Browse files
committed
*Fix Proxy setting becomes unset by user*
1 parent f5ef047 commit 20fbf49

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

web/edit/web/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@
230230
$restart_proxy = 'yes';
231231
}
232232

233-
// Change proxy template / Update extension list
234-
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
233+
// Change proxy template / Update extension list (admin only)
234+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg'])) && ($_SESSION['user'] == 'admin')) {
235235
$ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);
236236
$ext = preg_replace("/,/", " ", $ext);
237237
$ext = preg_replace('/\s+/', ' ',$ext);

web/templates/user/edit_web.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,29 @@
8585
<textarea size="20" class="vst-textinput" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
8686
</td>
8787
</tr>
88+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
89+
<tr>
90+
<td class="vst-text step-top">
91+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support') . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?></label>
92+
</td>
93+
</tr>
94+
<tr>
95+
<td class="step-left">
96+
<table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
97+
<tr>
98+
<td class="vst-text input-label">
99+
<?php print __('Proxy Extensions');?>
100+
</td>
101+
</tr>
102+
<tr>
103+
<td>
104+
<textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo htmlentities(trim($v_proxy_ext, "'"));} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; } ?></textarea>
105+
</td>
106+
</tr>
107+
</table>
108+
</td>
109+
</tr>
110+
<?php echo ""; }?>
88111
<tr>
89112
<td class="vst-text step-top">
90113
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label>

0 commit comments

Comments
 (0)