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

Merge branch 'master' of https://github.com/dg9vh/MMDVMHost-Dashboard

Browse source 
Conflicts:
	include/functions.php
	index.php
This commit is contained in:
dg9vh 2016-05-15 18:53:24 +00:00
commit e4389db7ad
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/functions.php
View file

@ -3,9 +3,18 @@
function getMMDVMHostVersion() { function getMMDVMHostVersion() {
// returns creation-time of MMDVMHost as version-number // returns creation-time of MMDVMHost as version-number
$filename = MMDVMHOSTPATH . "MMDVMHost"; $filename = MMDVMHOSTPATH . "MMDVMHost";
<<<<<<< HEAD
exec($filename . " 2>&1", $output); exec($filename . " 2>&1", $output);
$version = substr($output[1], 10, 4)."-".substr($output[1], 14, 2)."-".substr($output[1], 16, 2)." (compiled ".getMMDVMHostFileVersion().")"; $version = substr($output[1], 10, 4)."-".substr($output[1], 14, 2)."-".substr($output[1], 16, 2)." (compiled ".getMMDVMHostFileVersion().")";
return $version; return $version;
=======
exec($filename." -v 2>&1", $output);
if (substr($output[0],18,8) == ".ini fil") {
return getMMDVMHostFileVersion();
} else {
return substr($output[0],18,8)." (compiled ".getMMDVMHostFileVersion().")";
}
>>>>>>> d49dbc67902a058b9de8b74c08002ee49f6366c7
} }
function getMMDVMHostFileVersion() { function getMMDVMHostFileVersion() {

4
index.php
View file

@ -33,7 +33,11 @@ include "include/functions.php";
echo "Hotspot"; echo "Hotspot";
} }
?>:</small> <?php echo getCallsign($mmdvmconfigs) ?></h1> ?>:</small> <?php echo getCallsign($mmdvmconfigs) ?></h1>
<<<<<<< HEAD
<h4>MMDVMHost by G4KLX - Version: <?php echo getMMDVMHostVersion() ?></h4> <h4>MMDVMHost by G4KLX - Version: <?php echo getMMDVMHostVersion() ?></h4>
=======
<h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
>>>>>>> d49dbc67902a058b9de8b74c08002ee49f6366c7
</div> </div>
<?php <?php
// Here you can feel free to disable info-sections by commenting out with // before include // Here you can feel free to disable info-sections by commenting out with // before include