Skip to content

Commit 121e5a6

Browse files
serghey-rodinserghey-rodin
committed
Merge branch 'Flatta-move-js'
2 parents 656d34e + 1fa3c4b commit 121e5a6

File tree

106 files changed

+1030
-1670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1030
-1670
lines changed

‎web/add/cron/index.php‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'CRON';
75

6+
// Main include
87
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
98

109
// Check POST request
@@ -62,18 +61,9 @@
6261
}
6362
}
6463

65-
// Header
66-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
67-
68-
// Panel
69-
top_panel($user,$TAB);
70-
71-
// Display body
72-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_cron.html');
64+
// Render
65+
render_page($user, $TAB, 'add_cron');
7366

7467
// Flush session messages
7568
unset($_SESSION['error_msg']);
7669
unset($_SESSION['ok_msg']);
77-
78-
// Footer
79-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/db/index.php‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'DB';
5+
6+
// Main include
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check POST request
@@ -107,17 +107,11 @@
107107
}
108108
}
109109

110-
// Header
111-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
112-
113-
// Panel
114-
top_panel($user,$TAB);
115-
116110
// Get user email
117111
$v_db_email = $panel[$user]['CONTACT'];
118112

119113
// List avaiable database types
120-
$db_types = split(",",$_SESSION['DB_SYSTEM']);
114+
$db_types = split(',', $_SESSION['DB_SYSTEM']);
121115

122116
// List available database servers
123117
$db_hosts = array();
@@ -127,13 +121,8 @@
127121
unset($db_hosts_tmp);
128122
unset($output);
129123

130-
// Display body
131-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_db.html');
124+
render_page($user, $TAB, 'add_db');
132125

133126
// Flush session messages
134127
unset($_SESSION['error_msg']);
135128
unset($_SESSION['ok_msg']);
136-
137-
// Footer
138-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
139-
?>

‎web/add/dns/index.php‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'DNS';
75

6+
// Main include
87
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
98

109
// Check POST request for dns domain
@@ -138,12 +137,6 @@
138137
}
139138

140139

141-
// Header
142-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
143-
144-
// Panel
145-
top_panel($user,$TAB);
146-
147140
$v_ns1 = str_replace("'", "", $v_ns1);
148141
$v_ns2 = str_replace("'", "", $v_ns2);
149142
$v_ns3 = str_replace("'", "", $v_ns3);
@@ -154,8 +147,9 @@
154147
$v_ns8 = str_replace("'", "", $v_ns8);
155148

156149

157-
// Display body for dns domain
158150
if (empty($_GET['domain'])) {
151+
// Display body for dns domain
152+
159153
if (empty($v_ttl)) $v_ttl = 14400;
160154
if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
161155
if (empty($v_ns1)) {
@@ -171,18 +165,16 @@
171165
$v_ns8 = str_replace("'", "", $nameservers[7]);
172166
unset($output);
173167
}
174-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
175-
}
176168

177-
// Display body for dns record
178-
if (!empty($_GET['domain'])) {
169+
render_page($user, $TAB, 'add_dns');
170+
} else {
171+
// Display body for dns record
172+
179173
$v_domain = $_GET['domain'];
180-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns_rec.html');
174+
render_page($user, $TAB, 'add_dns_rec');
181175
}
182176

177+
183178
// Flush session messages
184179
unset($_SESSION['error_msg']);
185180
unset($_SESSION['ok_msg']);
186-
187-
// Footer
188-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/firewall/banlist/index.php‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'FIREWALL';
75

86
// Main include
@@ -49,18 +47,9 @@
4947
}
5048
}
5149

52-
// Header
53-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
54-
55-
// Panel
56-
top_panel($user,$TAB);
57-
58-
// Display body
59-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_firewall_banlist.html');
50+
// Render
51+
render_page($user, $TAB, 'add_firewall_banlist');
6052

6153
// Flush session messages
6254
unset($_SESSION['error_msg']);
6355
unset($_SESSION['ok_msg']);
64-
65-
// Footer
66-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/firewall/index.php‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'FIREWALL';
75

86
// Main include
@@ -65,18 +63,9 @@
6563
}
6664
}
6765

68-
// Header
69-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
70-
71-
// Panel
72-
top_panel($user,$TAB);
73-
74-
// Display body
75-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_firewall.html');
66+
// Render
67+
render_page($user, $TAB, 'add_firewall');
7668

7769
// Flush session messages
7870
unset($_SESSION['error_msg']);
7971
unset($_SESSION['ok_msg']);
80-
81-
// Footer
82-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/ip/index.php‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'IP';
75

6+
// Main include
87
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
98

109
// Check user
@@ -75,12 +74,6 @@
7574
}
7675
}
7776

78-
// Header
79-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
80-
81-
// Panel
82-
top_panel($user,$TAB);
83-
8477
// List network interfaces
8578
exec (VESTA_CMD."v-list-sys-interfaces 'json'", $output, $return_var);
8679
$interfaces = json_decode(implode('', $output), true);
@@ -91,12 +84,9 @@
9184
$users = json_decode(implode('', $output), true);
9285
unset($output);
9386

94-
// Display body
95-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_ip.html');
87+
// Render
88+
render_page($user, $TAB, 'add_ip');
9689

9790
// Flush session messages
9891
unset($_SESSION['error_msg']);
9992
unset($_SESSION['ok_msg']);
100-
101-
// Footer
102-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/mail/index.php‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'MAIL';
75

6+
// Main include
87
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
98

109

@@ -179,26 +178,18 @@
179178
}
180179
}
181180

182-
// Header
183-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
181+
// Render page
182+
if (empty($_GET['domain'])) {
183+
// Display body for mail domain
184184

185-
// Panel
186-
top_panel($user,$TAB);
185+
render_page($user, $TAB, 'add_mail');
186+
} else {
187+
// Display body for mail account
187188

188-
// Display body for mail domain
189-
if (empty($_GET['domain'])) {
190-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_mail.html');
191-
}
192-
193-
// Display body for mail account
194-
if (!empty($_GET['domain'])) {
195189
$v_domain = $_GET['domain'];
196-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_mail_acc.html');
190+
render_page($user, $TAB, 'add_mail_acc');
197191
}
198192

199193
// Flush session messages
200194
unset($_SESSION['error_msg']);
201195
unset($_SESSION['ok_msg']);
202-
203-
// Footer
204-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/package/index.php‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'PACKAGE';
75

6+
// Main include
87
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
98

109
// Check user
@@ -140,7 +139,7 @@
140139
unset($output);
141140
}
142141

143-
// Remove tmpdir
142+
// Remove tmpdir
144143
exec ('rm -rf '.$tmpdir, $output, $return_var);
145144
unset($output);
146145

@@ -153,12 +152,6 @@
153152
}
154153

155154

156-
// Header
157-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
158-
159-
// Panel
160-
top_panel($user,$TAB);
161-
162155
// List web temmplates
163156
exec (VESTA_CMD."v-list-web-templates json", $output, $return_var);
164157
$web_templates = json_decode(implode('', $output), true);
@@ -208,12 +201,9 @@
208201
if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd';
209202
if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd';
210203

211-
// Display body
212-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_package.html');
204+
// Render page
205+
render_page($user, $TAB, 'add_package');
213206

214207
// Flush session messages
215208
unset($_SESSION['error_msg']);
216209
unset($_SESSION['ok_msg']);
217-
218-
// Footer
219-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/add/user/index.php‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
// Init
32
error_reporting(NULL);
43
ob_start();
5-
session_start();
64
$TAB = 'USER';
75

6+
// Main include
87
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
98

109
// Check user
@@ -111,12 +110,6 @@
111110
}
112111

113112

114-
// Header
115-
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
116-
117-
// Panel
118-
top_panel($user,$TAB);
119-
120113
// List hosting packages
121114
exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
122115
check_error($return_var);
@@ -128,12 +121,9 @@
128121
$languages = json_decode(implode('', $output), true);
129122
unset($output);
130123

131-
// Display body
132-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_user.html');
124+
// Render page
125+
render_page($user, $TAB, 'add_user');
133126

134127
// Flush session messages
135128
unset($_SESSION['error_msg']);
136129
unset($_SESSION['ok_msg']);
137-
138-
// Footer
139-
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

0 commit comments

Comments
 (0)