klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove needles whitespaces

Browse source
This commit is contained in:
phl0 2016-10-26 09:46:15 +02:00
parent 25bf9e30e9
commit 6c80594f56
No known key found for this signature in database
GPG key ID: 48EA1E640798CA9A
22 changed files with 119 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ajax.php
View file

@ -72,7 +72,7 @@ if ($_GET['section'] == "sysinfo") {
$cpufreq = $cpufreq[0] / 1000;
}
showLapTime("cpufreq");
if (defined("TEMPERATUREALERT") && $cputemp > TEMPERATUREHIGHLEVEL && $cputemp !== NULL) {
?>
<script>
@ -85,7 +85,7 @@ if ($_GET['section'] == "sysinfo") {
document.all[id].innerHTML='';
document.all[id].outerHTML='';
}
// OBSOLETE CODE FOR NETSCAPE 4
// OBSOLETE CODE FOR NETSCAPE 4
else if (document.layers && document.layers[id]) {
document.layers[id].visibility='hide';
delete document.layers[id];
@ -134,24 +134,24 @@ if ($_GET['section'] == "sysinfo") {
}
$output = shell_exec('cat /proc/loadavg');
$sysload = substr($output,0,strpos($output," "))*100;
$sysload = substr($output,0,strpos($output," "))*100;
showLapTime("sysload");
$stat1 = file('/proc/stat');
sleep(1);
$stat2 = file('/proc/stat');
$info1 = explode(" ", preg_replace("!cpu +!", "", $stat1[0]));
$info2 = explode(" ", preg_replace("!cpu +!", "", $stat2[0]));
$dif = array();
$dif['user'] = $info2[0] - $info1[0];
$dif['nice'] = $info2[1] - $info1[1];
$dif['sys'] = $info2[2] - $info1[2];
$dif['idle'] = $info2[3] - $info1[3];
$total = array_sum($dif);
$cpu = array();
foreach($dif as $x=>$y) $cpu[$x] = round($y / $total * 100, 1);
$cpuusage = round($cpu['user'] + $cpu['sys'], 2);
$stat1 = file('/proc/stat');
sleep(1);
$stat2 = file('/proc/stat');
$info1 = explode(" ", preg_replace("!cpu +!", "", $stat1[0]));
$info2 = explode(" ", preg_replace("!cpu +!", "", $stat2[0]));
$dif = array();
$dif['user'] = $info2[0] - $info1[0];
$dif['nice'] = $info2[1] - $info1[1];
$dif['sys'] = $info2[2] - $info1[2];
$dif['idle'] = $info2[3] - $info1[3];
$total = array_sum($dif);
$cpu = array();
foreach($dif as $x=>$y) $cpu[$x] = round($y / $total * 100, 1);
$cpuusage = round($cpu['user'] + $cpu['sys'], 2);
showLapTime("cpuusage");
$output = shell_exec('grep -c processor /proc/cpuinfo');
$cpucores = $output;
@ -159,7 +159,7 @@ if ($_GET['section'] == "sysinfo") {
$uptime = format_time(substr($output,0,strpos($output," ")));
$idletime = format_time((substr($output,strpos($output," ")))/$cpucores);
showLapTime("idletime");
if (defined("SHOWPOWERSTATE")) {
$pinStatus = trim(shell_exec("gpio -g read ".POWERONLINEPIN)); // Pin 18
}

8
include/disk.php
View file

@ -2,7 +2,7 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Disk Use</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="diskuse" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -45,7 +45,7 @@ try{
<td><?php echo getSize($used * 1024) ?></td>
<td><?php echo getSize($total * 1024) ?></td>
</tr>
<?php
<?php
$key++;
}
}
@ -53,8 +53,8 @@ try{
return false;
}
?>
?>
</tbody>
</table>
</div>
</div>
</div>

12
include/functions.php
View file

@ -45,7 +45,7 @@ function getDMRMasterState() {
foreach($logLines as $logLine) {
if (strpos($logLine, "successfully") > 0) {
$state = 1;
}
}
if (strpos($logLine, "Closing") > 0) {
$state = 0;
}
@ -60,7 +60,7 @@ function getDMRMasterState() {
$state = $contents;
}
return $state;
}
function getMMDVMConfig() {
@ -545,7 +545,7 @@ function getActualLink($logLines, $mode) {
return -2;
break;
}
}
return "something went wrong!";
}
@ -606,7 +606,7 @@ function getYSFReflectorById($id, $reflectors) {
}
}
}
}
}
/*
function getNames($delimiter) {
@ -639,13 +639,13 @@ function getName($callsign) {
}
return "---";
}
*/
*/
function getName($callsign) {
if (is_numeric($callsign)) {
return "---";
}
if (file_exists(DMRIDDATPATH)) {
$callsign = trim($callsign);
if (strpos($callsign,"-")) {

2
include/init.php
View file

@ -18,7 +18,7 @@ if (defined("ENABLEYSFGATEWAY")) {
$logLinesYSFGateway = getYSFGatewayLog();
showLapTime("getYSFGatewayLog");
$reverseLogLinesYSFGateway = $logLinesYSFGateway;
array_multisort($reverseLogLinesYSFGateway,SORT_DESC);
array_multisort($reverseLogLinesYSFGateway,SORT_DESC);
showLapTime("array_multisort");
$activeYSFReflectors = getActiveYSFReflectors();
showLapTime("getActiveYSFReflectors");

4
include/lh.php
View file

@ -5,7 +5,7 @@ $totalLH = count($lastHeard);
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Last Heard List of today's <?php echo $totalLH; ?> callsigns.</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="lastHeard" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -69,6 +69,6 @@ for ($i = 0; ($i < $totalLH); $i++) {
?>
</tbody>
</table>
</div>
</div>
</div>

10
include/lh_ajax.php
View file

@ -5,7 +5,7 @@ $totalLH = count($lastHeard);
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Last Heard List of today's <?php echo $totalLH; ?> callsigns.</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="lastHeard" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -28,13 +28,13 @@ $totalLH = count($lastHeard);
</tr>
</thead>
</table>
</div>
</div>
</div>
<script>
$(document).ready(function(){
var lastHeardT = $('#lastHeard').dataTable( {
"aaSorting": [[0,'desc']],
<?php $request = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}";
<?php $request = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}";
if (strpos($request,"index.php")> 0) {
$request = substr($request,0,strpos($request,"index.php"));
}
@ -49,8 +49,8 @@ $(document).ready(function(){
setInterval( function () {
lastHeardT.api().ajax.reload( );
}, <?php echo REFRESHAFTER * 1000 ?> );
<?php
<?php
}
?>
?>
});
</script>

6
include/localtx.php
View file

@ -8,7 +8,7 @@ $localTXList = getHeardList($reverseLogLinesMMDVM, FALSE);
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Today's local transmissions</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="localTx" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -30,10 +30,10 @@ $localTXList = getHeardList($reverseLogLinesMMDVM, FALSE);
<th>BER</th>
</tr>
</thead>
<tbody>
<tbody>
<?php
for ($i = 0; $i < count($localTXList); $i++) {
$listElem = $localTXList[$i];
$listElem = $localTXList[$i];
if ($listElem[6] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25")) {
echo"<tr>";
echo"<td nowrap>$listElem[0]</td>";

10
include/localtx_ajax.php
View file

@ -5,7 +5,7 @@ $totalLH = count($lastHeard);
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Today's local transmissions</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="localTx" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -28,14 +28,14 @@ $totalLH = count($lastHeard);
</tr>
</thead>
</table>
</div>
</div>
</div>
<script>
$(document).ready(function(){
var localTxT = $('#localTx').dataTable( {
"aaSorting": [[0,'desc']],
<?php $request = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}";
<?php $request = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}";
if (strpos($request,"index.php")> 0) {
$request = substr($request,0,strpos($request,"index.php"));
}
@ -50,7 +50,7 @@ $(document).ready(function(){
setInterval( function () {
localTxT.api().ajax.reload( );
}, <?php echo REFRESHAFTER * 1000 ?> );
<?php
<?php
}
?>
});

2
include/modes.php
View file

@ -2,7 +2,7 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Enabled Modes</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table class="table">
<tr>
<?php showMode("DMR", $mmdvmconfigs);?>

12
include/repeaterinfo.php
View file

@ -2,7 +2,7 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Repeater Info</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table class="table">
<tr>
<th>Current Mode</th>
@ -44,7 +44,7 @@
<th>TS2</th>
<?php
}
}
}
?>
</tr>
<?php
@ -67,16 +67,16 @@
echo getConfigItem("DMR Network", "Address", $mmdvmconfigs)."</td>";
?>
</span>
<td><span class="label <?php
<td><span class="label <?php
if (getConfigItem("DMR Network", "Slot1", $mmdvmconfigs) == 1) {
echo 'label-success">enabled';
echo 'label-success">enabled';
} else {
echo 'label-default">disabled';
}
?></span></td>
<td><span class="label <?php
<td><span class="label <?php
if (getConfigItem("DMR Network", "Slot2", $mmdvmconfigs) == 1) {
echo 'label-success">enabled';
echo 'label-success">enabled';
} else {
echo 'label-default">disabled';
}

40
include/sysinfo.php
View file

@ -11,7 +11,7 @@
$cpufreq = $cpufreq[0] / 1000;
}
showLapTime("cpufreq");
if (defined("TEMPERATUREALERT") && $cputemp > TEMPERATUREHIGHLEVEL && $cputemp !== NULL) {
?>
<script>
@ -24,7 +24,7 @@
document.all[id].innerHTML='';
document.all[id].outerHTML='';
}
// OBSOLETE CODE FOR NETSCAPE 4
// OBSOLETE CODE FOR NETSCAPE 4
else if (document.layers && document.layers[id]) {
document.layers[id].visibility='hide';
delete document.layers[id];
@ -73,24 +73,24 @@
}
$output = shell_exec('cat /proc/loadavg');
$sysload = substr($output,0,strpos($output," "))*100;
$sysload = substr($output,0,strpos($output," "))*100;
showLapTime("sysload");
$stat1 = file('/proc/stat');
sleep(1);
$stat2 = file('/proc/stat');
$info1 = explode(" ", preg_replace("!cpu +!", "", $stat1[0]));
$info2 = explode(" ", preg_replace("!cpu +!", "", $stat2[0]));
$dif = array();
$dif['user'] = $info2[0] - $info1[0];
$dif['nice'] = $info2[1] - $info1[1];
$dif['sys'] = $info2[2] - $info1[2];
$dif['idle'] = $info2[3] - $info1[3];
$total = array_sum($dif);
$cpu = array();
foreach($dif as $x=>$y) $cpu[$x] = round($y / $total * 100, 1);
$cpuusage = round($cpu['user'] + $cpu['sys'], 2);
$stat1 = file('/proc/stat');
sleep(1);
$stat2 = file('/proc/stat');
$info1 = explode(" ", preg_replace("!cpu +!", "", $stat1[0]));
$info2 = explode(" ", preg_replace("!cpu +!", "", $stat2[0]));
$dif = array();
$dif['user'] = $info2[0] - $info1[0];
$dif['nice'] = $info2[1] - $info1[1];
$dif['sys'] = $info2[2] - $info1[2];
$dif['idle'] = $info2[3] - $info1[3];
$total = array_sum($dif);
$cpu = array();
foreach($dif as $x=>$y) $cpu[$x] = round($y / $total * 100, 1);
$cpuusage = round($cpu['user'] + $cpu['sys'], 2);
showLapTime("cpuusage");
$output = shell_exec('grep -c processor /proc/cpuinfo');
$cpucores = $output;
@ -98,7 +98,7 @@
$uptime = format_time(substr($output,0,strpos($output," ")));
$idletime = format_time((substr($output,strpos($output," ")))/$cpucores);
showLapTime("idletime");
if (defined("SHOWPOWERSTATE")) {
$pinStatus = trim(shell_exec("gpio -g read ".POWERONLINEPIN)); // Pin 18
}
@ -108,7 +108,7 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">System Info</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="sysinfo" class="table table-condensed">
<tbody>
<tr>

2
include/sysinfo_ajax.php
View file

@ -2,7 +2,7 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">System Info</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="sysinfo" class="table table-condensed">
</table>
</div>

10
include/tools.php
View file

@ -44,15 +44,15 @@ function isProcessRunning($processname) {
}
}
function createConfigLines() {
function createConfigLines() {
$out ="";
foreach($_GET as $key=>$val) {
foreach($_GET as $key=>$val) {
if($key != "cmd") {
$out .= "define(\"$key\", \"$val\");"."\n";
}
}
return $out;
}
}
function getSize($filesize, $precision = 2) {
$units = array('', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y');
@ -72,7 +72,7 @@ function checkSetup() {
?>
<div class="alert alert-danger" role="alert">You are using an old config.php. Please configure your Dashboard by calling <a href="setup.php">setup.php</a>!</div>
<?php
} else {
if (file_exists ("setup.php")) {
?>
@ -104,6 +104,6 @@ function getLapTime() {
function showLapTime($func) {
if( defined("DEBUG") ) {
?><script>console.log('<?php echo $func . ": ". getLapTime(); ?> sec.');</script><?php
}
}
}
?>

4
include/txinfo.php
View file

@ -2,7 +2,7 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">Currently TXing</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="currtx" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -25,7 +25,7 @@
<tbody id="txline">
</tbody>
</table>
</div>
</div>
</div>
<script>
function doXMLHTTPRequest(scriptname, elem) {

8
include/ysfgatewayinfo.php
View file

@ -6,9 +6,9 @@
<!-- Tabelle -->
<table class="table">
<tr>
<td><span class="label <?php
<td><span class="label <?php
if (isProcessRunning("YSFGateway")) {
echo "label-success";
echo "label-success";
?>">YSFGateway Process is running</span></td><?php
} else {
echo "label-danger\" title=\"YSFGateway is down!";
@ -22,11 +22,11 @@
<!-- Standard-Panel-Inhalt -->
<div class="panel-heading">YSFReflectors reported active</div>
<!-- Tabelle -->
<div class="table-responsive">
<div class="table-responsive">
<table id="ysfGateways" class="table table-condensed table-striped table-hover">
<?php
if (count($activeYSFReflectors) > 0) {
?>
<thead>

6
index.php
View file

@ -51,7 +51,7 @@ include "version.php";
if (LOGO !== "") {
?>
<div id="Logo" style="position:absolute;top:-43px;right:10px;"><img src="<?php echo LOGO ?>" width="250px" style="width:250px; border-radius:10px;box-shadow:2px 2px 2px #808080; padding:1px;background:#FFFFFF;border:1px solid #808080;" border="0" hspace="10" vspace="10" align="absmiddle"></div>
<?php
<?php
}
?>
</div>
@ -95,7 +95,7 @@ $time = explode(' ', $time);
$time = $time[1] + $time[0];
$finish = $time;
$total_time = round(($finish - $start), 4);*/
echo '<!--Page generated in '.getLapTime().' seconds.-->';
echo '<!--Page generated in '.getLapTime().' seconds.-->';
?> |
<?php
if (!isset($_GET['stoprefresh'])) {
@ -115,4 +115,4 @@ if (!isset($_GET['stoprefresh'])) {
</html>
<?php
showLapTime("End of Page");
?>
?>

8
scripts/halt.php
View file

@ -22,7 +22,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=extend-to-zoom, initial-scale=1.0">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<!-- Das neueste kompilierte und minimierte CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@ -39,7 +39,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") {
echo "Repeater";
} else {
echo "Hotspot";
echo "Hotspot";
}
?>:</small> <?php echo getCallsign($mmdvmconfigs) ?></h1>
<h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
@ -52,7 +52,7 @@ checkSetup();
include "../include/sysinfo.php";
exec(HALTSYS. ' > /dev/null 2>&1 &');
?>
<div class="alert alert-info" role="alert">Executing <b><?php echo HALTSYS ?></b><br>Halt in progress...bye</div>
<div class="alert alert-info" role="alert">Executing <b><?php echo HALTSYS ?></b><br>Halt in progress...bye</div>
<div class="panel panel-info">
@ -68,7 +68,7 @@ $finish = $time;
$total_time = round(($finish - $start), 4);
echo '<!--Page generated in '.$total_time.' seconds.-->';
} else {
header('WWW-Authenticate: Basic realm="Dashboard"');
header('HTTP/1.0 401 Unauthorized');
echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!';

8
scripts/log.php
View file

@ -42,7 +42,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") {
echo "Repeater";
} else {
echo "Hotspot";
echo "Hotspot";
}
?>:</small> <?php echo getCallsign($mmdvmconfigs) ?></h1>
<h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
@ -57,7 +57,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
<div class="panel-heading">
<span class="label label-info">Viewing log <?php echo $fileName ?></span>
</div>
<div class="table-responsive">
<div class="table-responsive">
<table id="log" class="table table-condensed table-striped table-hover">
<thead>
<tr>
@ -104,9 +104,9 @@ $time = explode(' ', $time);
$time = $time[1] + $time[0];
$finish = $time;
$total_time = round(($finish - $start), 4);
echo '<!--Page generated in '.$total_time.' seconds.-->';
echo '<!--Page generated in '.$total_time.' seconds.-->';
} else {
header('WWW-Authenticate: Basic realm="Dashboard"');
header('HTTP/1.0 401 Unauthorized');
echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!';

10
scripts/reboot.php
View file

@ -23,7 +23,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<!-- Das neueste kompilierte und minimierte CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@ -40,7 +40,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") {
echo "Repeater";
} else {
echo "Hotspot";
echo "Hotspot";
}
?>:</small> <?php echo getCallsign($mmdvmconfigs) ?></h1>
<h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
@ -52,7 +52,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
checkSetup();
exec('sleep 5s && '. REBOOTSYS . ' > /dev/null 2>&1 &');
?>
<div class="alert alert-info" role="alert">Executing <b><?php echo 'sleep 5s && '. REBOOTSYS . ' > /dev/null 2>&1 &'?></b><br>Reboot system in progress</div>
<div class="alert alert-info" role="alert">Executing <b><?php echo 'sleep 5s && '. REBOOTSYS . ' > /dev/null 2>&1 &'?></b><br>Reboot system in progress</div>
<div class="panel panel-info">
@ -66,9 +66,9 @@ $time = explode(' ', $time);
$time = $time[1] + $time[0];
$finish = $time;
$total_time = round(($finish - $start), 4);
echo '<!--Page generated in '.$total_time.' seconds.-->';
echo '<!--Page generated in '.$total_time.' seconds.-->';
} else {
header('WWW-Authenticate: Basic realm="Dashboard"');
header('HTTP/1.0 401 Unauthorized');
echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!';

8
scripts/rebootmmdvm.php
View file

@ -23,7 +23,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<!-- Das neueste kompilierte und minimierte CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@ -40,7 +40,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") {
echo "Repeater";
} else {
echo "Hotspot";
echo "Hotspot";
}
?>:</small> <?php echo getCallsign($mmdvmconfigs) ?></h1>
<h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
@ -53,7 +53,7 @@ checkSetup();
include "../include/sysinfo.php";
exec( REBOOTMMDVM );
?>
<div class="alert alert-info" role="alert">Executing <b><?php echo REBOOTMMDVM ?></b><br>Reboot MMDVMHost service in progress</div>
<div class="alert alert-info" role="alert">Executing <b><?php echo REBOOTMMDVM ?></b><br>Reboot MMDVMHost service in progress</div>
<div class="panel panel-info">
@ -69,7 +69,7 @@ $finish = $time;
$total_time = round(($finish - $start), 4);
echo '<!--Page generated in '.$total_time.' seconds.-->';
} else {
header('WWW-Authenticate: Basic realm="Dashboard"');
header('HTTP/1.0 401 Unauthorized');
echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!';

28
setup.php
View file

@ -113,7 +113,7 @@ include "include/tools.php";
<span class="input-group-addon" id="YSFHOSTSFILENAME" style="width: 300px">YSFHosts.txt-filename</span>
<input type="text" value="<?php echo constant("YSFHOSTSFILENAME") ?>" name="YSFHOSTSFILENAME" class="form-control" placeholder="YSFHosts.txt" aria-describedby="YSFHOSTSFILENAME">
</div>
</div>
</div>
<div class="container">
<h2>ircddbgateway-Configuration</h2>
<div class="input-group">
@ -154,47 +154,47 @@ include "include/tools.php";
<div class="input-group">
<span class="input-group-addon" id="VIEWLOGUSER" style="width: 300px">Username for view log:</span>
<input type="text" value="<?php echo constant("VIEWLOGUSER") ?>" name="VIEWLOGUSER" class="form-control" placeholder="username" aria-describedby="VIEWLOGUSER">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="VIEWLOGPW" style="width: 300px">Password for view log:</span>
<input type="text" value="<?php echo constant("VIEWLOGPW") ?>" name="VIEWLOGPW" class="form-control" placeholder="password" aria-describedby="VIEWLOGPW">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="HALTUSER" style="width: 300px">Username for halt:</span>
<input type="text" value="<?php echo constant("HALTUSER") ?>" name="HALTUSER" class="form-control" placeholder="username" aria-describedby="HALTUSER">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="HALTPW" style="width: 300px">Password for halt:</span>
<input type="text" value="<?php echo constant("HALTPW") ?>" name="HALTPW" class="form-control" placeholder="password" aria-describedby="HALTPW">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="REBOOTUSER" style="width: 300px">Username for reboot:</span>
<input type="text" value="<?php echo constant("REBOOTUSER") ?>" name="REBOOTUSER" class="form-control" placeholder="username" aria-describedby="REBOOTUSER">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="REBOOTPW" style="width: 300px">Password for reboot:</span>
<input type="text" value="<?php echo constant("REBOOTPW") ?>" name="REBOOTPW" class="form-control" placeholder="password" aria-describedby="REBOOTPW">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="RESTARTUSER" style="width: 300px">Username for restart:</span>
<input type="text" value="<?php echo constant("RESTARTUSER") ?>" name="RESTARTUSER" class="form-control" placeholder="username" aria-describedby="RESTARTUSER">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="RESTARTPW" style="width: 300px">Password for restart:</span>
<input type="text" value="<?php echo constant("RESTARTPW") ?>" name="RESTARTPW" class="form-control" placeholder="password" aria-describedby="RESTARTPW">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="REBOOTMMDVM" style="width: 300px">Reboot MMDVMHost command:</span>
<input type="text" value="<?php echo constant("REBOOTMMDVM") ?>" name="REBOOTMMDVM" class="form-control" placeholder="sudo systemctl restart mmdvmhost.service" aria-describedby="REBOOTMMDVM">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="REBOOTSYS" style="width: 300px">Reboot system command:</span>
<input type="text" value="<?php echo constant("REBOOTSYS") ?>" name="REBOOTSYS" class="form-control" placeholder="sudo reboot" aria-describedby="REBOOTSYS">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="HALTSYS" style="width: 300px">Halt system command:</span>
<input type="text" value="<?php echo constant("HALTSYS") ?>" name="HALTSYS" class="form-control" placeholder="sudo halt" aria-describedby="HALTSYS">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="SHOWPOWERSTATE" style="width: 300px">Show Powerstate (online or battery, wiringpi needed)</span>
<div class="panel-body"><input type="checkbox" name="SHOWPOWERSTATE" <?php if (defined("SHOWPOWERSTATE")) echo "checked" ?>></div>
@ -206,7 +206,7 @@ include "include/tools.php";
<div class="input-group">
<span class="input-group-addon" id="POWERONLINESTATE" style="width: 300px">State that signalizes online-state:</span>
<input type="text" value="<?php echo constant("POWERONLINESTATE") ?>" name="POWERONLINESTATE" class="form-control" placeholder="1" aria-describedby="POWERONLINESTATE">
</div>
</div>
<div class="input-group">
<span class="input-group-addon" id="SHOWQRZ" style="width: 300px">Show link to QRZ.com on Callsigns</span>
<div class="panel-body"><input type="checkbox" name="SHOWQRZ" <?php if (defined("SHOWQRZ")) echo "checked" ?>></div>
@ -214,7 +214,7 @@ include "include/tools.php";
<div class="input-group">
<span class="input-group-btn">
<button class="btn btn-default" type="submit" form="config">Save configuration</button>
</span>
</span>
</div>
</div>
</form>

2
txinfo.php
View file

@ -31,7 +31,7 @@ foreach ($lastHeard as $listElem) {
}
}*/
echo"<td nowrap>$listElem[2]</td>";
if (defined("ENABLEXTDLOOKUP")) {
//echo "<td nowrap>".getName($listElem[2])."</td>";
echo"<td nowrap>$listElem[3]</td>";