improved commenting and code-cleanup
This commit is contained in:
parent
4e6c7212d7
commit
1f6c569d44
5 changed files with 22 additions and 9 deletions
|
@ -71,9 +71,18 @@ switch (DISTRIBUTION) {
|
||||||
define("CONFIGFILENAME", "ircddbgateway");
|
define("CONFIGFILENAME", "ircddbgateway");
|
||||||
define("GATEWAYCONFIGPATH", CONFIGPATH . "/" . CONFIGFILENAME);
|
define("GATEWAYCONFIGPATH", CONFIGPATH . "/" . CONFIGFILENAME);
|
||||||
|
|
||||||
|
// set time to refresh page
|
||||||
define("REFRESHAFTER", "60");
|
define("REFRESHAFTER", "60");
|
||||||
|
|
||||||
|
// enables CPU-temperature alert
|
||||||
define("TEMPERATUREALERT", true);
|
define("TEMPERATUREALERT", true);
|
||||||
|
|
||||||
|
// defines temperature of warning
|
||||||
define("TEMPERATUREHIGHLEVEL", 60);
|
define("TEMPERATUREHIGHLEVEL", 60);
|
||||||
|
|
||||||
|
// enables progress-bars
|
||||||
define("SHOWPROGRESSBARS", true);
|
define("SHOWPROGRESSBARS", true);
|
||||||
|
|
||||||
|
// defines number of lines in last heard list
|
||||||
define("LHLINES", 20);
|
define("LHLINES", 20);
|
||||||
?>
|
?>
|
|
@ -1,6 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
function getMMDVMHostVersion() {
|
function getMMDVMHostVersion() {
|
||||||
|
// returns creation-time of MMDVMHost as version-number
|
||||||
$filename = MMDVMHOSTPATH . "MMDVMHost";
|
$filename = MMDVMHOSTPATH . "MMDVMHost";
|
||||||
if (file_exists($filename)) {
|
if (file_exists($filename)) {
|
||||||
return date("Y-m-d", filectime($filename));
|
return date("Y-m-d", filectime($filename));
|
||||||
|
@ -8,6 +9,7 @@ function getMMDVMHostVersion() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getMMDVMConfig() {
|
function getMMDVMConfig() {
|
||||||
|
// loads MMDVM.ini into array for further use
|
||||||
$mmdvmconfigs = array();
|
$mmdvmconfigs = array();
|
||||||
if ($configs = fopen(MMDVMINIPATH."MMDVM.ini", 'r')) {
|
if ($configs = fopen(MMDVMINIPATH."MMDVM.ini", 'r')) {
|
||||||
while ($config = fgets($configs)) {
|
while ($config = fgets($configs)) {
|
||||||
|
@ -19,10 +21,12 @@ function getMMDVMConfig() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCallsign($mmdvmconfigs) {
|
function getCallsign($mmdvmconfigs) {
|
||||||
|
// returns Callsign from MMDVM-config
|
||||||
return getConfigItem("General", "Callsign", $mmdvmconfigs);
|
return getConfigItem("General", "Callsign", $mmdvmconfigs);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getConfigItem($section, $key, $configs) {
|
function getConfigItem($section, $key, $configs) {
|
||||||
|
// retrieves the corresponding config-entry within a [section]
|
||||||
$sectionpos = array_search("[" . $section . "]", $configs) + 1;
|
$sectionpos = array_search("[" . $section . "]", $configs) + 1;
|
||||||
$len = count($configs);
|
$len = count($configs);
|
||||||
while(startsWith($configs[$sectionpos],$key."=") === false && $sectionpos <= ($len) ) {
|
while(startsWith($configs[$sectionpos],$key."=") === false && $sectionpos <= ($len) ) {
|
||||||
|
@ -36,11 +40,12 @@ function getConfigItem($section, $key, $configs) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getEnabled ($mode, $mmdvmconfigs) {
|
function getEnabled ($mode, $mmdvmconfigs) {
|
||||||
|
// returns enabled/disabled-State of mode
|
||||||
return getConfigItem($mode, "Enable", $mmdvmconfigs);
|
return getConfigItem($mode, "Enable", $mmdvmconfigs);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function showMode($mode, $mmdvmconfigs) {
|
function showMode($mode, $mmdvmconfigs) {
|
||||||
|
// shows if mode is enabled or not.
|
||||||
?>
|
?>
|
||||||
<td><span class="label <?php
|
<td><span class="label <?php
|
||||||
if (getEnabled($mode, $mmdvmconfigs) == 1) {
|
if (getEnabled($mode, $mmdvmconfigs) == 1) {
|
||||||
|
@ -191,6 +196,7 @@ function getHeardList($logLines) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getLastHeard($logLines) {
|
function getLastHeard($logLines) {
|
||||||
|
//returns last heard list from log
|
||||||
$lastHeard = array();
|
$lastHeard = array();
|
||||||
$heardCalls = array();
|
$heardCalls = array();
|
||||||
$heardList = getHeardList($logLines);
|
$heardList = getHeardList($logLines);
|
||||||
|
@ -206,6 +212,7 @@ function getLastHeard($logLines) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getActualMode($logLines) {
|
function getActualMode($logLines) {
|
||||||
|
// returns mode of repeater actual working in
|
||||||
array_multisort($logLines,SORT_DESC);
|
array_multisort($logLines,SORT_DESC);
|
||||||
foreach ($logLines as $logLine) {
|
foreach ($logLines as $logLine) {
|
||||||
if (strpos($logLine, "Mode set to")) {
|
if (strpos($logLine, "Mode set to")) {
|
||||||
|
@ -216,6 +223,7 @@ function getActualMode($logLines) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getDSTARLinks() {
|
function getDSTARLinks() {
|
||||||
|
// returns link-states of all D-Star-modules
|
||||||
$out = "<table>";
|
$out = "<table>";
|
||||||
if ($linkLog = fopen(LINKLOGPATH,'r')) {
|
if ($linkLog = fopen(LINKLOGPATH,'r')) {
|
||||||
while ($linkLine = fgets($linkLog)) {
|
while ($linkLine = fgets($linkLog)) {
|
||||||
|
@ -266,6 +274,7 @@ function getDSTARLinks() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getActualLink($logLines, $mode) {
|
function getActualLink($logLines, $mode) {
|
||||||
|
// returns actual link state of specific mode
|
||||||
//M: 2016-05-02 07:04:10.504 D-Star link status set to "Verlinkt zu DCS002 S"
|
//M: 2016-05-02 07:04:10.504 D-Star link status set to "Verlinkt zu DCS002 S"
|
||||||
//M: 2016-04-03 16:16:18.638 DMR Slot 2, received network voice header from 4000 to 2625094
|
//M: 2016-04-03 16:16:18.638 DMR Slot 2, received network voice header from 4000 to 2625094
|
||||||
//M: 2016-04-03 19:30:03.099 DMR Slot 2, received network voice header from 4020 to 2625094
|
//M: 2016-04-03 19:30:03.099 DMR Slot 2, received network voice header from 4020 to 2625094
|
||||||
|
|
|
@ -4,10 +4,6 @@ $lastHeard = getLastHeard($logLines);
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<!-- Standard-Panel-Inhalt -->
|
<!-- Standard-Panel-Inhalt -->
|
||||||
<div class="panel-heading">Last Heard List of today's <?php echo LHLINES; ?> callsigns.</div>
|
<div class="panel-heading">Last Heard List of today's <?php echo LHLINES; ?> callsigns.</div>
|
||||||
<!--<div class="panel-body">
|
|
||||||
<p>In the following table you will find a maximum of the last <?php echo LHLINES; ?> callsigns heard on this repeater for the current day</p>
|
|
||||||
</div>-->
|
|
||||||
|
|
||||||
<!-- Tabelle -->
|
<!-- Tabelle -->
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<!-- Standard-Panel-Inhalt -->
|
<!-- Standard-Panel-Inhalt -->
|
||||||
<div class="panel-heading">Repeater Info</div>
|
<div class="panel-heading">Repeater Info</div>
|
||||||
<!--<div class="panel-body">
|
|
||||||
<p>Some info about link states</p>
|
|
||||||
</div>-->
|
|
||||||
|
|
||||||
<!-- Tabelle -->
|
<!-- Tabelle -->
|
||||||
<table class="table">
|
<table class="table">
|
||||||
|
|
|
@ -4,6 +4,7 @@ $time = explode(' ', $time);
|
||||||
$time = $time[1] + $time[0];
|
$time = $time[1] + $time[0];
|
||||||
$start = $time;
|
$start = $time;
|
||||||
|
|
||||||
|
// do not touch this includes!!! Never ever!!!
|
||||||
include "config/config.php";
|
include "config/config.php";
|
||||||
include "include/tools.php";
|
include "include/tools.php";
|
||||||
include "include/functions.php";
|
include "include/functions.php";
|
||||||
|
@ -29,6 +30,7 @@ include "include/functions.php";
|
||||||
<h4>MMDVMHost v<?php echo getMMDVMHostVersion() ?> by G4KLX</h4>
|
<h4>MMDVMHost v<?php echo getMMDVMHostVersion() ?> by G4KLX</h4>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
// Here you can feel free to disable info-sections by commenting out with // before include
|
||||||
include "include/sysinfo.php";
|
include "include/sysinfo.php";
|
||||||
include "include/repeaterinfo.php";
|
include "include/repeaterinfo.php";
|
||||||
include "include/modes.php";
|
include "include/modes.php";
|
||||||
|
|
Loading…
Reference in a new issue