Merge pull request #21 from harkx/master

[FIX] short_open_tag can be off now, replaced <? with <?php
This commit is contained in:
Tuxis Internet Engineering V.O.F. 2015-01-26 11:00:35 +01:00
commit 149dc3c983

View file

@ -38,7 +38,7 @@ if (!is_logged_in() and isset($_POST['formname']) and $_POST['formname'] === "lo
<script src="js/addclear/addclear.js" type="text/javascript"></script> <script src="js/addclear/addclear.js" type="text/javascript"></script>
</head> </head>
<? <?php
if (!is_logged_in()) { if (!is_logged_in()) {
?> ?>
<body onload="document.getElementById('username').focus()"> <body onload="document.getElementById('username').focus()">
@ -47,7 +47,7 @@ if (!is_logged_in()) {
<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)) { <?php if (isset($errormsg)) {
echo '<span style="color: red">' . $errormsg . '</span><br />'; echo '<span style="color: red">' . $errormsg . '</span><br />';
} }
?> ?>
@ -83,7 +83,7 @@ if (!is_logged_in()) {
</body> </body>
</html> </html>
<? <?php
exit(0); exit(0);
} }
@ -107,16 +107,16 @@ if ($blocklogin === TRUE) {
</div> </div>
<ul> <ul>
<li><a href="#" id="zoneadmin">Zones</a></li> <li><a href="#" id="zoneadmin">Zones</a></li>
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
<li><a href="#" id="useradmin">Users</a></li> <li><a href="#" id="useradmin">Users</a></li>
<? } ?> <?php } ?>
<li><a href="index.php?logout=1">Logout</a></li> <li><a href="index.php?logout=1">Logout</a></li>
</ul> </ul>
</div> </div>
<div id="zones"> <div id="zones">
<? if (is_adminuser() or $allowzoneadd === TRUE) { ?> <?php if (is_adminuser() or $allowzoneadd === TRUE) { ?>
<div style="visibility: hidden;" id="ImportZone"></div> <div style="visibility: hidden;" id="ImportZone"></div>
<? } ?> <?php } ?>
<div class="tables" id="MasterZones"> <div class="tables" id="MasterZones">
<div class="searchbar" id="searchbar"> <div class="searchbar" id="searchbar">
<input type="text" id="domsearch" name="domsearch" placeholder="Search...."/> <input type="text" id="domsearch" name="domsearch" placeholder="Search...."/>
@ -124,11 +124,11 @@ if ($blocklogin === TRUE) {
</div> </div>
<div class="tables" id="SlaveZones"></div> <div class="tables" id="SlaveZones"></div>
</div> </div>
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
<div id="users"> <div id="users">
<div class="tables" id="Users"></div> <div class="tables" id="Users"></div>
</div> </div>
<? } ?> <?php } ?>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
window.csrf_token = '<?php echo CSRF_TOKEN ?>'; window.csrf_token = '<?php echo CSRF_TOKEN ?>';
@ -219,10 +219,10 @@ $(document).ready(function () {
actions: { actions: {
listAction: 'zones.php?action=listslaves', listAction: 'zones.php?action=listslaves',
updateAction: 'zones.php?action=update', updateAction: 'zones.php?action=update',
<? if (is_adminuser() or $allowzoneadd === TRUE) { ?> <?php if (is_adminuser() or $allowzoneadd === TRUE) { ?>
createAction: 'zones.php?action=create', createAction: 'zones.php?action=create',
deleteAction: 'zones.php?action=delete', deleteAction: 'zones.php?action=delete',
<? } ?> <?php } ?>
}, },
fields: { fields: {
id: { id: {
@ -245,7 +245,7 @@ $(document).ready(function () {
display: displayDnssecIcon, display: displayDnssecIcon,
listClass: 'dnssec' listClass: 'dnssec'
}, },
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
owner: { owner: {
title: 'Owner', title: 'Owner',
width: '8%', width: '8%',
@ -257,7 +257,7 @@ $(document).ready(function () {
inputClass: 'owner', inputClass: 'owner',
listClass: 'owner' listClass: 'owner'
}, },
<? } ?> <?php } ?>
kind: { kind: {
create: true, create: true,
type: 'hidden', type: 'hidden',
@ -368,26 +368,26 @@ $(document).ready(function () {
hoverAnimationDuration: 60, hoverAnimationDuration: 60,
hoverAnimationEasing: undefined, hoverAnimationEasing: undefined,
items: [{ items: [{
<? if (is_adminuser() or $allowzoneadd === TRUE) { ?> <?php if (is_adminuser() or $allowzoneadd === TRUE) { ?>
icon: 'jtable/lib/themes/metro/add.png', icon: 'jtable/lib/themes/metro/add.png',
text: 'Import a new zone', text: 'Import a new zone',
click: function() { click: function() {
$('#ImportZone').jtable('showCreateForm'); $('#ImportZone').jtable('showCreateForm');
} }
<? } ?> <?php } ?>
}], }],
}, },
sorting: false, sorting: false,
openChildAsAccordion: true, openChildAsAccordion: true,
actions: { actions: {
listAction: 'zones.php?action=list', listAction: 'zones.php?action=list',
<? if (is_adminuser() or $allowzoneadd === TRUE) { ?> <?php if (is_adminuser() or $allowzoneadd === TRUE) { ?>
createAction: 'zones.php?action=create', createAction: 'zones.php?action=create',
deleteAction: 'zones.php?action=delete', deleteAction: 'zones.php?action=delete',
<? } ?> <?php } ?>
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
updateAction: 'zones.php?action=update' updateAction: 'zones.php?action=update'
<? } ?> <?php } ?>
}, },
fields: { fields: {
id: { id: {
@ -410,7 +410,7 @@ $(document).ready(function () {
display: displayDnssecIcon, display: displayDnssecIcon,
listClass: 'dnssec' listClass: 'dnssec'
}, },
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
owner: { owner: {
title: 'Owner', title: 'Owner',
width: '8%', width: '8%',
@ -422,20 +422,20 @@ $(document).ready(function () {
inputClass: 'owner', inputClass: 'owner',
listClass: 'owner' listClass: 'owner'
}, },
<? } ?> <?php } ?>
kind: { kind: {
title: 'Type', title: 'Type',
width: '20%', width: '20%',
display: displayContent('kind'), display: displayContent('kind'),
options: {'Native': 'Native', 'Master': 'Master'}, options: {'Native': 'Native', 'Master': 'Master'},
defaultValue: '<? echo $defaults['defaulttype']; ?>', defaultValue: '<?php echo $defaults['defaulttype']; ?>',
edit: false, edit: false,
inputClass: 'kind', inputClass: 'kind',
listClass: 'kind' listClass: 'kind'
}, },
template: { template: {
title: 'Template', title: 'Template',
options: <? echo json_encode(user_template_names()); ?>, options: <?php echo json_encode(user_template_names()); ?>,
list: false, list: false,
create: true, create: true,
edit: false, edit: false,
@ -446,7 +446,7 @@ $(document).ready(function () {
create: true, create: true,
list: false, list: false,
edit: false, edit: false,
defaultValue: '<? echo $defaults['primaryns']; ?>', defaultValue: '<?php echo $defaults['primaryns']; ?>',
inputClass: 'nameserver nameserver1' inputClass: 'nameserver nameserver1'
}, },
nameserver2: { nameserver2: {
@ -454,7 +454,7 @@ $(document).ready(function () {
create: true, create: true,
list: false, list: false,
edit: false, edit: false,
defaultValue: '<? echo $defaults['secondaryns']; ?>', defaultValue: '<?php echo $defaults['secondaryns']; ?>',
inputClass: 'nameserver nameserver2' inputClass: 'nameserver nameserver2'
}, },
serial: { serial: {
@ -557,7 +557,7 @@ $(document).ready(function () {
width: '1%', width: '1%',
create: true, create: true,
display: displayContent('priority'), display: displayContent('priority'),
defaultValue: '<? echo $defaults['priority']; ?>', defaultValue: '<?php echo $defaults['priority']; ?>',
inputClass: 'priority', inputClass: 'priority',
listClass: 'priority' listClass: 'priority'
}, },
@ -574,7 +574,7 @@ $(document).ready(function () {
width: '2%', width: '2%',
create: true, create: true,
display: displayContent('ttl'), display: displayContent('ttl'),
defaultValue: '<? echo $defaults['ttl']; ?>', defaultValue: '<?php echo $defaults['ttl']; ?>',
inputClass: 'ttl', inputClass: 'ttl',
listClass: 'ttl' listClass: 'ttl'
} }
@ -610,7 +610,7 @@ $(document).ready(function () {
title: 'Domain', title: 'Domain',
inputClass: 'domain' inputClass: 'domain'
}, },
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
owner: { owner: {
title: 'Owner', title: 'Owner',
options: function(data) { options: function(data) {
@ -619,11 +619,11 @@ $(document).ready(function () {
defaultValue: 'admin', defaultValue: 'admin',
inputClass: 'owner' inputClass: 'owner'
}, },
<? } ?> <?php } ?>
kind: { kind: {
title: 'Type', title: 'Type',
options: {'Native': 'Native', 'Master': 'Master'}, options: {'Native': 'Native', 'Master': 'Master'},
defaultValue: '<? echo $defaults['defaulttype']; ?>', defaultValue: '<?php echo $defaults['defaulttype']; ?>',
edit: false, edit: false,
inputClass: 'type' inputClass: 'type'
}, },
@ -644,7 +644,7 @@ $(document).ready(function () {
create: true, create: true,
list: false, list: false,
edit: false, edit: false,
defaultValue: '<? echo $defaults['primaryns']; ?>', defaultValue: '<?php echo $defaults['primaryns']; ?>',
inputClass: 'nameserver nameserver1' inputClass: 'nameserver nameserver1'
}, },
nameserver2: { nameserver2: {
@ -652,7 +652,7 @@ $(document).ready(function () {
create: true, create: true,
list: false, list: false,
edit: false, edit: false,
defaultValue: '<? echo $defaults['secondaryns']; ?>', defaultValue: '<?php echo $defaults['secondaryns']; ?>',
inputClass: 'nameserver nameserver2' inputClass: 'nameserver nameserver2'
}, },
}, },
@ -683,7 +683,7 @@ $(document).ready(function () {
stimer = setTimeout(searchDoms, 400); stimer = setTimeout(searchDoms, 400);
}); });
<? if (is_adminuser()) { ?> <?php if (is_adminuser()) { ?>
$('#Users').hide(); $('#Users').hide();
$('#useradmin').click(function () { $('#useradmin').click(function () {
$('#Users').show(); $('#Users').show();
@ -741,7 +741,7 @@ $(document).ready(function () {
} }
}); });
$('#Users').jtable('load'); $('#Users').jtable('load');
<? } ?> <?php } ?>
$('#MasterZones').jtable('load'); $('#MasterZones').jtable('load');
$('#SlaveZones').jtable('load'); $('#SlaveZones').jtable('load');
}); });