Skip to content

Commit 1fa3c4b

Browse files
committed
Move content of .js.html files to .html
1 parent 61e556a commit 1fa3c4b

Some content is hidden

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

43 files changed

+550
-507
lines changed

web/inc/main.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ function check_return_code($return_var,$output) {
9595
}
9696
}
9797

98+
function insert_scripts() {
99+
@include_once(dirname(__DIR__) . '/templates/scripts.html');
100+
}
101+
98102
function render_page($user, $TAB, $page) {
99103
$__template_dir = dirname(__DIR__) . '/templates/';
100104

@@ -115,18 +119,14 @@ function render_page($user, $TAB, $page) {
115119

116120
// Body
117121
if (($_SESSION['user'] !== 'admin') && (@include($__template_dir . "user/$page.html"))) {
118-
// User page exists
119-
// Use user page
120-
$__template_base = $__template_dir . "user/$page";
122+
// User page loaded
121123
} else {
122124
// Not admin or user page doesn't exist
123-
// Use admin page
124-
$__template_base = $__template_dir . "admin/$page";
125-
include($__template_base . '.html');
125+
// Load admin page
126+
@include($__template_dir . "admin/$page.html");
126127
}
127128

128129
// Footer
129-
$JS_FILE = $__template_base . '.js.html';
130130
include($__template_dir . 'footer.html');
131131
}
132132

web/templates/admin/add_db.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,26 @@
186186
</table>
187187
</form>
188188
</div>
189+
190+
<?php insert_scripts(); ?>
191+
<script>
192+
function elementHideShow(elementToHideOrShow){
193+
var el = document.getElementById(elementToHideOrShow);
194+
el.style.display = el.style.display === 'none' ? 'block' : 'none';
195+
}
196+
197+
function randomString() {
198+
var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
199+
var string_length = 10;
200+
var randomstring = '';
201+
for (var i = 0; i < string_length; i++) {
202+
var rnum = Math.floor(Math.random() * chars.length);
203+
randomstring += chars.substr(rnum, 1);
204+
}
205+
document.v_add_db.v_password.value = randomstring;
206+
}
207+
208+
GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
209+
GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
210+
</script>
211+
<script src="/js/pages/add.db.js"></script>

web/templates/admin/add_db.js.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

web/templates/admin/add_dns.html

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,40 @@
178178
</table>
179179
</form>
180180
</div>
181+
182+
<?php insert_scripts(); ?>
183+
<script>
184+
function elementHideShow(elementToHideOrShow){
185+
var el = document.getElementById(elementToHideOrShow);
186+
el.style.display = el.style.display === 'none' ? 'block' : 'none';
187+
}
188+
189+
$(document).ready(function(){
190+
$('.add-ns-button').click(function(){
191+
var n = $('input[name^=v_ns]').length;
192+
if(n < 8){
193+
var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
194+
t.find('input').attr({value:'', name:'v_ns'+(n+1)});
195+
t.find('span').show();
196+
$('tr.add-ns').before(t);
197+
}
198+
if( n == 7 ) {
199+
$('.add-ns').hide();
200+
}
201+
});
202+
203+
$('.remove-ns').click(function(){
204+
$(this).parents('tr')[0].remove();
205+
$('input[name^=v_ns]').each(function(i, ns){
206+
$(ns).attr({name: 'v_ns'+(i+1)});
207+
i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
208+
})
209+
$('.add-ns').show()
210+
});
211+
212+
$('input[name^=v_ns]').each(function(i, ns){
213+
i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
214+
});
215+
216+
});
217+
</script>

web/templates/admin/add_dns.js.html

Lines changed: 0 additions & 35 deletions
This file was deleted.

web/templates/admin/add_dns_rec.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,9 @@
119119
</table>
120120
</form>
121121
</div>
122+
123+
<?php insert_scripts(); ?>
124+
<script>
125+
GLOBAL.DNS_REC_PREFIX = <?=json_encode($_GET['domain'])?>;
126+
</script>
127+
<script src="/js/pages/add.dns.record.js"></script>

web/templates/admin/add_dns_rec.js.html

Lines changed: 0 additions & 4 deletions
This file was deleted.

web/templates/admin/add_firewall.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,11 @@
117117
</from>
118118

119119
</div>
120+
121+
<?php insert_scripts(); ?>
122+
<script>
123+
function elementHideShow(elementToHideOrShow) {
124+
var el = document.getElementById(elementToHideOrShow);
125+
el.style.display = el.style.display === 'none' ? 'block' : 'none';
126+
}
127+
</script>

web/templates/admin/add_firewall.js.html

Lines changed: 0 additions & 6 deletions
This file was deleted.

web/templates/admin/add_firewall_banlist.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,11 @@
8484
</table>
8585
</from>
8686
</div>
87+
88+
<?php insert_scripts(); ?>
89+
<script>
90+
function elementHideShow(elementToHideOrShow) {
91+
var el = document.getElementById(elementToHideOrShow);
92+
el.style.display = el.style.display === 'none' ? 'block' : 'none';
93+
}
94+
</script>

0 commit comments

Comments
 (0)