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

Merge pull request #108 from pjao/DataBaseFix

Browse source 
Fix database compatibility with DMR-MARC and BrandMeister network
This commit is contained in:
Kim - DG9VH 2017-03-13 21:45:09 +01:00 committed by GitHub
commit bf44397a30
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/functions.php
View file

@ -805,13 +805,13 @@ function getName($callsign) {
$callsign = substr($callsign,0,strpos($callsign,"-")); $callsign = substr($callsign,0,strpos($callsign,"-"));
} }
$delimiter =" "; $delimiter =" ";
exec("egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); exec("sed -e 's/[[:space:]]\+/ /g' ".DMRIDDATPATH ." | grep -m1 '".$callsign.$delimiter."'" , $output);
if (count($output) == 0) { // if (count($output) == 0) {
$delimiter = "\t"; // $delimiter = "\t";
exec("egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); // exec("egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
} // }
if (count($output) !== 0) { if (count($output) !== 0) {
$name = substr($output[0], strpos($output[0],$delimiter)+1); $name = preg_replace('/[\x00-\x1F\x7F-\xA0\xAD]/u', '', substr($output[0], strpos($output[0],$delimiter)+1));
$name = substr($name, strpos($name,$delimiter)+1); $name = substr($name, strpos($name,$delimiter)+1);
$fp = fopen($TMP_CALL_NAME .'.TMP', 'a'); $fp = fopen($TMP_CALL_NAME .'.TMP', 'a');