Skip to content

Commit f7236d0

Browse files
serghey-rodinserghey-rodin
committed
Fix for Nginx-less setup
1 parent a2f012c commit f7236d0

File tree

10 files changed

+58
-44
lines changed

10 files changed

+58
-44
lines changed

‎web/add/package/index.php‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
// Check empty fields
2020
if (empty($_POST['v_package'])) $errors[] = __('package');
2121
if (empty($_POST['v_web_template'])) $errors[] = __('web template');
22-
if (empty($_POST['v_proxy_template'])) $errors[] = __('proxy template');
22+
if (!empty($_SESSION['PROXY_SYSTEM'])) {
23+
if (empty($_POST['v_proxy_template'])) $errors[] = __('proxy template');
24+
}
2325
if (empty($_POST['v_dns_template'])) $errors[] = __('dns template');
2426
if (empty($_POST['v_shell'])) $errrors[] = __('shell');
2527
if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains');
@@ -140,9 +142,11 @@
140142
unset($output);
141143

142144
// List web templates for proxy
143-
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
144-
$proxy_templates = json_decode(implode('', $output), true);
145-
unset($output);
145+
if (!empty($_SESSION['PROXY_SYSTEM'])) {
146+
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
147+
$proxy_templates = json_decode(implode('', $output), true);
148+
unset($output);
149+
}
146150

147151
// List DNS templates
148152
exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
@@ -159,17 +163,17 @@
159163
if (empty($v_proxy_template)) $v_proxy_template = 'default';
160164
if (empty($v_dns_template)) $v_dns_template = 'default';
161165
if (empty($v_shell)) $v_shell = 'nologin';
162-
if (empty($v_web_domains)) $v_web_domains = "'0'";
163-
if (empty($v_web_aliases)) $v_web_aliases = "'0'";
164-
if (empty($v_dns_domains)) $v_dns_domains = "'0'";
165-
if (empty($v_dns_records)) $v_dns_records = "'0'";
166-
if (empty($v_mail_domains)) $v_mail_domains = "'0'";
167-
if (empty($v_mail_accounts)) $v_mail_accounts = "'0'";
168-
if (empty($v_databases)) $v_databases = "'0'";
169-
if (empty($v_cron_jobs)) $v_cron_jobs = "'0'";
170-
if (empty($v_backups)) $v_backups = "'0'";
171-
if (empty($v_disk_quota)) $v_disk_quota = "'0'";
172-
if (empty($v_bandwidth)) $v_bandwidth = "'0'";
166+
if (empty($v_web_domains)) $v_web_domains = "'1'";
167+
if (empty($v_web_aliases)) $v_web_aliases = "'1'";
168+
if (empty($v_dns_domains)) $v_dns_domains = "'1'";
169+
if (empty($v_dns_records)) $v_dns_records = "'1'";
170+
if (empty($v_mail_domains)) $v_mail_domains = "'1'";
171+
if (empty($v_mail_accounts)) $v_mail_accounts = "'1'";
172+
if (empty($v_databases)) $v_databases = "'1'";
173+
if (empty($v_cron_jobs)) $v_cron_jobs = "'1'";
174+
if (empty($v_backups)) $v_backups = "'1'";
175+
if (empty($v_disk_quota)) $v_disk_quota = "'1000'";
176+
if (empty($v_bandwidth)) $v_bandwidth = "'1000'";
173177
if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd';
174178
if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd';
175179

‎web/add/web/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
}
142142

143143
// Add proxy support
144-
if (($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
144+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
145145
$ext = str_replace(' ', '', $v_proxy_ext);
146146
$ext = escapeshellarg($ext);
147147
exec (VESTA_CMD."v-add-web-domain-proxy ".$user." ".$v_domain." '' ".$ext." 'no'", $output, $return_var);
@@ -217,7 +217,7 @@
217217
}
218218

219219
// Restart proxy server
220-
if (($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
220+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
221221
exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
222222
check_return_code($return_var,$output);
223223
unset($output);

‎web/edit/package/index.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@
6060
unset($output);
6161

6262
// List proxy templates
63-
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
64-
$proxy_templates = json_decode(implode('', $output), true);
65-
unset($output);
63+
if (!empty($_SESSION['PROXY_SYSTEM'])) {
64+
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
65+
$proxy_templates = json_decode(implode('', $output), true);
66+
unset($output);
67+
}
6668

6769
// List dns templates
6870
exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);

‎web/edit/web/index.php‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@
7676
unset($output);
7777

7878
// List proxy templates
79-
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
80-
$proxy_templates = json_decode(implode('', $output), true);
81-
unset($output);
79+
if (!empty($_SESSION['PROXY_SYSTEM'])) {
80+
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
81+
$proxy_templates = json_decode(implode('', $output), true);
82+
unset($output);
83+
}
8284

8385
// List web stat engines
8486
exec (VESTA_CMD."v-list-web-stats json", $output, $return_var);
@@ -189,7 +191,7 @@
189191
}
190192

191193
// Delete proxy support
192-
if ((!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
194+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
193195
exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var);
194196
check_return_code($return_var,$output);
195197
unset($output);
@@ -198,13 +200,13 @@
198200
}
199201

200202
// Change proxy template / Update extention list
201-
if ((!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
203+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
202204
$ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);
203205
$ext = preg_replace("/,/", " ", $ext);
204206
$ext = preg_replace('/\s+/', ' ',$ext);
205207
$ext = trim($ext);
206208
$ext = str_replace(' ', ", ", $ext);
207-
if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) {
209+
if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) {
208210
$ext = str_replace(', ', ",", $ext);
209211
if (!empty($_POST['v_proxy_template'])) $v_proxy_template = $_POST['v_proxy_template'];
210212
exec (VESTA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var);
@@ -216,7 +218,7 @@
216218
}
217219

218220
// Add proxy support
219-
if ((empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
221+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
220222
$v_proxy_template = $_POST['v_proxy_template'];
221223
if (!empty($_POST['v_proxy_ext'])) {
222224
$ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);
@@ -280,7 +282,7 @@
280282
$v_ssl_crt = $_POST['v_ssl_crt'];
281283
$v_ssl_key = $_POST['v_ssl_key'];
282284
$v_ssl_ca = $_POST['v_ssl_ca'];
283-
285+
284286
// Cleanup certificate tempfiles
285287
if (!empty($_POST['v_ssl_crt'])) {
286288
unlink($tmpdir."/".$_POST['v_domain'].".crt");
@@ -347,7 +349,7 @@
347349
$v_ssl_key = $_POST['v_ssl_key'];
348350
$v_ssl_ca = $_POST['v_ssl_ca'];
349351
$v_ssl_home = $_POST['v_ssl_home'];
350-
352+
351353
// Cleanup certificate tempfiles
352354
if (!empty($_POST['v_ssl_crt'])) {
353355
unlink($tmpdir."/".$_POST['v_domain'].".crt");
@@ -584,7 +586,7 @@
584586
}
585587

586588
// Restart proxy server
587-
if (!empty($restart_proxy) && (empty($_SESSION['error_msg']))) {
589+
if ((!empty($_SESSION['PROXY_SYSTEM'])) && !empty($restart_proxy) && (empty($_SESSION['error_msg']))) {
588590
exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
589591
check_return_code($return_var,$output);
590592
unset($output);

‎web/templates/admin/add_package.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
</select>
6868
</td>
6969
</tr>
70+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
7071
<tr>
7172
<td class="vst-text input-label">
7273
<?php print __('Proxy Template');?>
@@ -90,6 +91,7 @@
9091
</select>
9192
</td>
9293
</tr>
94+
<?php echo ""; }?>
9395
<tr>
9496
<td class="vst-text input-label">
9597
<?php print __('DNS Template');?>
@@ -232,7 +234,6 @@
232234
<tr>
233235
<td>
234236
<input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
235-
<img id="unlim-backups" class="unlim-trigger" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAQAAACMnYaxAAAAAmJLR0QA/4ePzL8AAACaSURBVBgZxcExasJQAADQBwkIujhGXHSxB3ArDg4u0lkE8TRCZwvFC2Rzq2fQOCpY0EO4qoNgftEM9gTte/y9CJG6spOnRNVZoOlbEOyN3I0dBMFOgy9LLW0frj7NXE21vcgsOBoodFycvSoMnWI3kUIiRqIQuzG30dWTyk28y6V6urbm1GWCXKbv7s1aEKzUPFSU/FZS8U9+AP5iKrZ4my0HAAAAAElFTkSuQmCC" />
236237
</td>
237238
</tr>
238239
<tr>

‎web/templates/admin/add_web.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases; ?></textarea>
134134
</td>
135135
</tr>
136+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
136137
<tr>
137138
<td class="vst-text step-top" >
138139
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
@@ -154,6 +155,7 @@
154155
</table>
155156
</td>
156157
</tr>
158+
<?php echo ""; }?>
157159
<tr>
158160
<td class="step-top vst-text">
159161
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /

‎web/templates/admin/edit_package.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
</select>
7474
</td>
7575
</tr>
76+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
7677
<tr>
7778
<td class="vst-text input-label">
7879
<?php print __('Proxy Template');?>
@@ -96,6 +97,7 @@
9697
</select>
9798
</td>
9899
</tr>
100+
<?php echo ""; }?>
99101
<tr>
100102
<td class="vst-text input-label">
101103
<?php print __('DNS Template');?>
@@ -206,7 +208,6 @@
206208
<td>
207209
<input type="text" size="20" class="vst-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
208210
<img id="unlim-mail-accounts" class="unlim-trigger" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAQAAACMnYaxAAAAAmJLR0QA/4ePzL8AAACaSURBVBgZxcExasJQAADQBwkIujhGXHSxB3ArDg4u0lkE8TRCZwvFC2Rzq2fQOCpY0EO4qoNgftEM9gTte/y9CJG6spOnRNVZoOlbEOyN3I0dBMFOgy9LLW0frj7NXE21vcgsOBoodFycvSoMnWI3kUIiRqIQuzG30dWTyk28y6V6urbm1GWCXKbv7s1aEKzUPFSU/FZS8U9+AP5iKrZ4my0HAAAAAElFTkSuQmCC" />
209-
210211
<td>
211212
</tr>
212213
<tr>
@@ -239,7 +240,6 @@
239240
<tr>
240241
<td>
241242
<input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
242-
<img id="unlim-backups" class="unlim-trigger" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAQAAACMnYaxAAAAAmJLR0QA/4ePzL8AAACaSURBVBgZxcExasJQAADQBwkIujhGXHSxB3ArDg4u0lkE8TRCZwvFC2Rzq2fQOCpY0EO4qoNgftEM9gTte/y9CJG6spOnRNVZoOlbEOyN3I0dBMFOgy9LLW0frj7NXE21vcgsOBoodFycvSoMnWI3kUIiRqIQuzG30dWTyk28y6V6urbm1GWCXKbv7s1aEKzUPFSU/FZS8U9+AP5iKrZ4my0HAAAAAElFTkSuQmCC" />
243243
</td>
244244
</tr>
245245
<tr>

‎web/templates/admin/edit_web.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
</select>
141141
</td>
142142
</tr>
143+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
143144
<tr>
144145
<td class="vst-text step-top">
145146
<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');?></label>
@@ -185,9 +186,10 @@
185186
</table>
186187
</td>
187188
</tr>
189+
<?php echo ""; }?>
188190
<tr>
189191
<td class="vst-text step-top">
190-
<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> /
192+
<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> /
191193
<a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a>
192194
</td>
193195
</tr>

‎web/templates/admin/list_packages.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@
7171
<td class="counter-name"><?php print __('Web Template');?>:</td>
7272
<td class="counter-value"><?php print __($data[$key]['WEB_TEMPLATE'])?></td>
7373
</tr>
74+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
7475
<tr>
7576
<td class="counter-name"><?php print __('Proxy Template');?>:</td>
7677
<td class="counter-value"><?php print __($data[$key]['PROXY_TEMPLATE']);?></td>
7778
</tr>
79+
<?php echo ""; }?>
7880
<tr>
7981
<td class="counter-name"><?php print __('DNS Template');?>:</td>
8082
<td class="counter-value"><?php print __($data[$key]['DNS_TEMPLATE']);?></td>

‎web/templates/admin/list_web.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
</td>
175175
<td style="vertical-align:top;" width="238px">
176176
<table>
177+
<tr><td>&nbsp;</td><td></td></tr>
177178
<tr>
178179
<td class="counter-name"><?php print __('Web Template');?>:</td>
179180
<td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
@@ -182,33 +183,31 @@
182183
<td class="counter-name"><?php print __('SSL Support');?>:</td>
183184
<td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
184185
</tr>
185-
186186
<tr>
187187
<td class="counter-name"><?php print __('Web Statistics');?>: </td>
188188
<td class="counter-value"> <?php print __($web_stats) ?></td>
189189
</tr>
190190

191-
<tr>
192-
<td class="counter-name"><?php print __('Proxy Support');?>:</td>
193-
<td class="counter-value"><?php print __($proxy_support);?></td>
194-
</tr>
195-
196191
</table>
197192
</td>
198193
<td rowspan=4 style="vertical-align:top;">
199194
<table>
195+
<tr><td>&nbsp;</td><td></td></tr>
196+
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
200197
<tr>
201-
<td class="counter-name"><?php print __('Proxy Template');?>:</td>
202-
<td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
198+
<td class="counter-name"><?php print __('Proxy Support');?>:</td>
199+
<td class="counter-value"><?php print __($proxy_support);?></td>
203200
</tr>
204201
<tr>
205-
<td class="counter-name"><?php print __('Proxy Extensions');?>:</td>
206-
<td class="counter-value"><?php echo $proxy_ext;?></td>
202+
<td class="counter-name"><?php print __('Proxy Template');?>:</td>
203+
<td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
207204
</tr>
205+
<?php echo ""; }?>
208206
<tr>
209207
<td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
210208
<td class="counter-value"> <?php print __($ftp_user) ?></td>
211209
</tr>
210+
212211
</table>
213212
</td>
214213
</tr>

0 commit comments

Comments
 (0)