Small improvements

This commit is contained in:
Henjo Hoeksma 2014-05-23 12:10:28 +02:00
parent 9c5b1c260e
commit 75614ef673

157
index.php
View file

@ -19,27 +19,33 @@ if (!is_logged_in() and isset($_POST['formname']) && $_POST['formname'] == "logi
?> ?>
<html> <html>
<head> <head>
<link href="jquery-ui/themes/base/jquery.ui.all.css" rel="stylesheet" type="text/css" /> <link href="jquery-ui/themes/base/jquery.ui.all.css" rel="stylesheet" type="text/css"/>
<link href="jtable/themes/metro/lightgray/jtable.css" rel="stylesheet" type="text/css" /> <link href="jtable/lib/themes/lightcolor/gray/jtable.min.css" rel="stylesheet" type="text/css"/>
<link href="css/base.css" rel="stylesheet" type="text/css" /> <link href="css/base.css" rel="stylesheet" type="text/css"/>
<script src="jquery-ui/jquery-1.10.2.js" type="text/javascript"></script> <script src="jquery-ui/jquery-1.10.2.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.core.js" type="text/javascript"></script> <script src="jquery-ui/ui/jquery.ui.core.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.widget.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.mouse.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.draggable.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.position.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.button.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.resizable.js" type="text/javascript"></script>
<script src="jquery-ui/ui/jquery.ui.dialog.js" type="text/javascript"></script> <script src="jquery-ui/ui/jquery.ui.dialog.js" type="text/javascript"></script>
<script src="jtable/jquery.jtable.min.js" type="text/javascript"></script> <script src="jtable/lib/jquery.jtable.min.js" type="text/javascript"></script>
</head> </head>
<? <?
if (!is_logged_in()) { if (!is_logged_in()) {
?> ?>
<body onload="document.getElementById('username').focus()"> <body onload="document.getElementById('username').focus()">
<div class="loginblock"> <div class="loginblock">
<div class="logo"> <div class="logo">
<img src="https://www.tuxis.nl/uploads/images/nsedit.png" alt="Logo" /> <img src="https://www.tuxis.nl/uploads/images/nsedit.png" alt="Logo"/>
</div> </div>
<div class="login"> <div class="login">
<? if (isset($errormsg)) { <? if (isset($errormsg)) {
echo '<span style="color: red">'.$errormsg.'</span><br />'; echo '<span style="color: red">' . $errormsg . '</span><br />';
} }
?> ?>
<form action="index.php" method="post"> <form action="index.php" method="post">
@ -60,17 +66,17 @@ if (!is_logged_in()) {
<input type="hidden" name="formname" value="loginform"/> <input type="hidden" name="formname" value="loginform"/>
</form> </form>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
<? <?
exit(0); exit(0);
} }
if (is_adminuser()) { if (is_adminuser()) {
foreach (get_all_users() as $user) { foreach (get_all_users() as $user) {
$userlist[] = "'".$user['emailaddress']."':'".$user['emailaddress']."'"; $userlist[] = "'" . $user['emailaddress'] . "':'" . $user['emailaddress'] . "'";
} }
$ulist = ','; $ulist = ',';
@ -79,18 +85,20 @@ if (is_adminuser()) {
foreach ($templates as $template) { foreach ($templates as $template) {
if (is_adminuser() or (isset($template['owner']) && $template['owner'] == get_sess_user()) or ($template['owner'] == 'public')) { if (is_adminuser() or (isset($template['owner']) && $template['owner'] == get_sess_user()) or ($template['owner'] == 'public')) {
$templatelist[] = "'".$template['name']."':'".$template['name']."'"; $templatelist[] = "'" . $template['name'] . "':'" . $template['name'] . "'";
} }
} }
if (isset($templatelist)) { if (isset($templatelist)) {
$tmpllist = ','; $tmpllist = ',';
$tmpllist .= join(',', $templatelist); $tmpllist .= join(',', $templatelist);
} else {
$tmpllist = '';
} }
?> ?>
<body> <body>
<div id="wrap"> <div id="wrap">
<div id="menu" class="jtable-main-container"> <div id="menu" class="jtable-main-container">
<div class="jtable-title"> <div class="jtable-title">
<div class="jtable-title-text"> <div class="jtable-title-text">
@ -114,9 +122,9 @@ if (isset($templatelist)) {
<div class="tables" id="Users"></div> <div class="tables" id="Users"></div>
</div> </div>
<? } ?> <? } ?>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
<? if (is_adminuser()) { ?> <? if (is_adminuser()) { ?>
$('#Users').hide(); $('#Users').hide();
$('#useradmin').click(function () { $('#useradmin').click(function () {
@ -141,7 +149,7 @@ if (isset($templatelist)) {
updateAction: 'users.php?action=update' updateAction: 'users.php?action=update'
}, },
messages: { messages: {
addNewRecord: 'Add new user', addNewRecord: 'Add new user'
}, },
fields: { fields: {
id: { id: {
@ -149,17 +157,17 @@ if (isset($templatelist)) {
type: 'hidden' type: 'hidden'
}, },
emailaddress: { emailaddress: {
title: 'User', title: 'User'
}, },
password: { password: {
title: 'Password', title: 'Password',
type: 'password', type: 'password',
list: false, list: false
}, },
isadmin: { isadmin: {
title: 'Admin', title: 'Admin',
type: 'checkbox', type: 'checkbox',
values: { '0' : 'No', '1' : 'Yes' } values: {'0': 'No', '1': 'Yes'}
} }
} }
}); });
@ -172,7 +180,7 @@ if (isset($templatelist)) {
sorting: false, sorting: false,
messages: { messages: {
addNewRecord: 'Add new slave zone', addNewRecord: 'Add new slave zone',
noDataAvailable: 'No slave zones configured', noDataAvailable: 'No slave zones configured'
}, },
openChildAsAccordion: true, openChildAsAccordion: true,
actions: { actions: {
@ -186,13 +194,13 @@ if (isset($templatelist)) {
type: 'hidden' type: 'hidden'
}, },
name: { name: {
title: 'Domain', title: 'Domain'
}, },
<? if (is_adminuser()) { ?> <? if (is_adminuser()) { ?>
owner: { owner: {
title: 'Owner', title: 'Owner',
options: {'admin':'admin'<? echo $ulist; ?>}, options: {'admin': 'admin'<? echo $ulist; ?>},
defaultValue: 'admin', defaultValue: 'admin'
}, },
<? } ?> <? } ?>
kind: { kind: {
@ -203,7 +211,7 @@ if (isset($templatelist)) {
}, },
serial: { serial: {
title: 'Serial', title: 'Serial',
create: false, create: false
}, },
records: { records: {
width: '5%', width: '5%',
@ -212,19 +220,19 @@ if (isset($templatelist)) {
pageSize: 20, pageSize: 20,
edit: false, edit: false,
create: false, create: false,
display: function(zone) { display: function (zone) {
var $img = $('<img class="list" src="jtable/themes/metro/list.png" title="Records" />'); var $img = $('<img class="list" src="jtable/themes/metro/list.png" title="Records" />');
$img.click(function() { $img.click(function () {
$('#MasterZones').jtable('openChildTable', $('#MasterZones').jtable('openChildTable',
$img.closest('tr'), { $img.closest('tr'), {
title: 'Records in '+zone.record.name, title: 'Records in ' + zone.record.name,
openChildAsAccordion: true, openChildAsAccordion: true,
actions: { actions: {
listAction: 'zones.php?action=listrecords&zoneurl='+zone.record.url, listAction: 'zones.php?action=listrecords&zoneurl=' + zone.record.url
}, },
fields: { fields: {
name: { name: {
title: 'Label', title: 'Label'
}, },
type: { type: {
title: 'Type' title: 'Type'
@ -233,11 +241,11 @@ if (isset($templatelist)) {
title: 'Prio' title: 'Prio'
}, },
content: { content: {
title: 'Content', title: 'Content'
}, },
ttl: { ttl: {
title: 'TTL', title: 'TTL'
}, }
} }
}, function (data) { }, function (data) {
data.childTable.jtable('load'); data.childTable.jtable('load');
@ -245,7 +253,7 @@ if (isset($templatelist)) {
}); });
return $img; return $img;
} }
}, }
} }
}); });
$('#SlaveZones').jtable('load'); $('#SlaveZones').jtable('load');
@ -255,7 +263,7 @@ if (isset($templatelist)) {
pageSize: 20, pageSize: 20,
messages: { messages: {
addNewRecord: 'Add new zone', addNewRecord: 'Add new zone',
noDataAvailable: 'No zones configured', noDataAvailable: 'No zones configured'
}, },
sorting: false, sorting: false,
openChildAsAccordion: true, openChildAsAccordion: true,
@ -273,110 +281,119 @@ if (isset($templatelist)) {
type: 'hidden' type: 'hidden'
}, },
name: { name: {
title: 'Domain', title: 'Domain'
}, },
<? if (is_adminuser()) { ?> <? if (is_adminuser()) { ?>
owner: { owner: {
title: 'Owner', title: 'Owner',
options: {'admin':'admin'<? echo $ulist; ?>}, options: {'admin': 'admin'<? echo $ulist; ?>},
defaultValue: 'admin', defaultValue: 'admin'
}, },
<? } ?> <? } ?>
kind: { kind: {
title: 'Type', title: 'Type',
options: { 'Native':'Native', 'Master':'Master'}, options: {'Native': 'Native', 'Master': 'Master'},
defaultValue: '<? echo $defaults['defaulttype']; ?>', defaultValue: '<? echo $defaults['defaulttype']; ?>',
edit: false, edit: false
}, },
template: { template: {
title: 'Template', title: 'Template',
options: {'None':'None'<? echo $tmpllist; ?>}, options: {'None': 'None'<? echo $tmpllist; ?>},
list: false, list: false,
create: true, create: true,
edit: false, edit: false
}, },
nameserver1: { nameserver1: {
title: 'Pri. Nameserver', title: 'Pri. Nameserver',
create: true, create: true,
list: false, list: false,
edit: false, edit: false,
defaultValue: '<? echo $defaults['primaryns']; ?>', defaultValue: '<? echo $defaults['primaryns']; ?>'
}, },
nameserver2: { nameserver2: {
title: 'Sec. Nameserver', title: 'Sec. Nameserver',
create: true, create: true,
list: false, list: false,
edit: false, edit: false,
defaultValue: '<? echo $defaults['secondaryns']; ?>', defaultValue: '<? echo $defaults['secondaryns']; ?>'
}, },
serial: { serial: {
title: 'Serial', title: 'Serial',
create: false, create: false,
edit: false, edit: false
}, },
records: { records: {
width: '5%', width: '5%',
title: 'Records', title: 'Records',
edit: false, edit: false,
create: false, create: false,
display: function(zone) { display: function (zone) {
var $img = $('<img class="list" src="jtable/themes/metro/list.png" title="Records" />'); var $img = $('<img class="list" src="jtable/themes/metro/list.png" title="Records" />');
$img.click(function() { $img.click(function () {
$('#MasterZones').jtable('openChildTable', $('#MasterZones').jtable('openChildTable',
$img.closest('tr'), { $img.closest('tr'), {
title: 'Records in '+zone.record.name, title: 'Records in ' + zone.record.name,
messages: { messages: {
addNewRecord: 'Add to '+zone.record.name, addNewRecord: 'Add to ' + zone.record.name,
noDataAvailable: 'No records for '+zone.record.name, noDataAvailable: 'No records for ' + zone.record.name
}, },
paging: true, paging: true,
pageSize: 20, pageSize: 20,
openChildAsAccordion: true, openChildAsAccordion: true,
actions: { actions: {
listAction: 'zones.php?action=listrecords&zoneurl='+zone.record.url, listAction: 'zones.php?action=listrecords&zoneurl=' + zone.record.url,
createAction: 'zones.php?action=createrecord&zoneurl='+zone.record.url, createAction: 'zones.php?action=createrecord&zoneurl=' + zone.record.url,
deleteAction: 'zones.php?action=deleterecord&zoneurl='+zone.record.url, deleteAction: 'zones.php?action=deleterecord&zoneurl=' + zone.record.url,
updateAction: 'zones.php?action=editrecord&zoneurl='+zone.record.url, updateAction: 'zones.php?action=editrecord&zoneurl=' + zone.record.url
}, },
fields: { fields: {
domid: { domid: {
create: true, create: true,
type: 'hidden', type: 'hidden',
defaultValue: zone.record.id, defaultValue: zone.record.id
}, },
id: { id: {
key: true, key: true,
create: false, create: false,
edit: false, edit: false,
list: false, list: false
}, },
domain: { domain: {
create: true, create: true,
type: 'hidden', type: 'hidden',
defaultValue: zone.record.name, defaultValue: zone.record.name
}, },
name: { name: {
title: 'Label', title: 'Label',
create: true, create: true
}, },
type: { type: {
options: {'AAAA':'AAAA','A':'A','CNAME':'CNAME','MX':'MX','SRV':'SRV','TXT':'TXT','NS':'NS','SOA':'SOA'}, options: {
create: true, 'AAAA': 'AAAA',
'A': 'A',
'CNAME': 'CNAME',
'MX': 'MX',
'SRV': 'SRV',
'TXT': 'TXT',
'NS': 'NS',
'SOA': 'SOA'
},
create: true
}, },
priority: { priority: {
title: 'Prio', title: 'Prio',
create: true, create: true,
defaultValue: '<? echo $defaults['priority']; ?>', defaultValue: '<? echo $defaults['priority']; ?>'
}, },
content: { content: {
title: 'Content', title: 'Content',
create: true, create: true
}, },
ttl: { ttl: {
title: 'TTL', title: 'TTL',
create: true, create: true,
defaultValue: '<? echo $defaults['ttl']; ?>', defaultValue: '<? echo $defaults['ttl']; ?>'
}, }
} }
}, function (data) { }, function (data) {
data.childTable.jtable('load'); data.childTable.jtable('load');
@ -384,12 +401,12 @@ if (isset($templatelist)) {
}); });
return $img; return $img;
} }
}, }
} }
}); });
$('#MasterZones').jtable('load'); $('#MasterZones').jtable('load');
}); });
</script> </script>
</body> </body>
</html> </html>