From 7c93c3068968160b39e92b224d524c9a3c9b6771 Mon Sep 17 00:00:00 2001 From: yuancheng Date: Tue, 21 Jul 2026 14:41:30 +0800 Subject: [PATCH] Remove backup/restore and factory reset; add APRS/POCSAG custom settings - Remove admin/config_backup.php (backup/restore page) and all nav links to it across the admin pages and the expert-mode shared header. - Remove factory reset: the full-device version in configure.php (JS confirm, POST handler that reset three git repos + wiped /etc config, and the hidden form) and the CSS-only version in expert/edit_dashboard.php. - Remove the PiStar-Remote and BM API full editors (admin/expert/fulledit_pistar-remote.php, fulledit_bmapikey.php) and their links from the expert-mode menu. - Add a "custom" option to the APRS server dropdown in configure.php so operators can type their own server + port instead of picking from APRSHosts.txt; wires the port through to ircDDBGateway, YSFGateway/YSF2DMR/YSF2NXDN/YSF2P25, and APRSGateway (previously only the hostname was ever configurable, port was hardcoded 14580). - Extend the POCSAG frequency band validator (functions.js) to also treat 150-160MHz as a valid/green range. --- admin/calibration.php | 1 - admin/config_backup.php | 267 ------------------------ admin/configure.php | 98 ++++----- admin/expert/edit_dashboard.php | 36 +--- admin/expert/fulledit_bmapikey.php | 130 ------------ admin/expert/fulledit_pistar-remote.php | 85 -------- admin/expert/header-menu.inc | 3 - admin/live_modem_log.php | 1 - admin/power.php | 1 - admin/sysinfo.php | 1 - admin/update.php | 1 - functions.js | 1 + 12 files changed, 48 insertions(+), 577 deletions(-) delete mode 100644 admin/config_backup.php delete mode 100644 admin/expert/fulledit_bmapikey.php delete mode 100644 admin/expert/fulledit_pistar-remote.php diff --git a/admin/calibration.php b/admin/calibration.php index 76ebec1..e117e27 100644 --- a/admin/calibration.php +++ b/admin/calibration.php @@ -277,7 +277,6 @@ if ($_SERVER["PHP_SELF"] == "/admin/calibration.php") { | | | - |

diff --git a/admin/config_backup.php b/admin/config_backup.php deleted file mode 100644 index 0e65c00..0000000 --- a/admin/config_backup.php +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - CDN - <?php echo $lang['digital_voice']." ".$lang['dashboard']." - ".$lang['backup_restore'];?> - - - -
-
-
CDN: /
-

CDN

-

- | - | - | - -

-
-
-

-'."\n"; - - if ( escapeshellcmd($_POST["action"]) == "download" ) { - - $output = "Finding config files to be backed up\n"; - $backupDir = "/tmp/config_backup"; - $backupZip = "/tmp/config_backup.zip"; - $hostNameInfo = exec('cat /etc/hostname'); - - $output .= shell_exec("sudo rm -rf $backupZip 2>&1"); - $output .= shell_exec("sudo rm -rf $backupDir 2>&1"); - $output .= shell_exec("sudo mkdir $backupDir 2>&1"); - if (shell_exec('cat /etc/dhcpcd.conf | grep "static ip_address" | grep -v "#"')) { - $output .= shell_exec("sudo cp /etc/dhcpcd.conf $backupDir 2>&1"); - } - $output .= shell_exec("sudo cp /etc/wpa_supplicant/wpa_supplicant.conf $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/ircddbgateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/mmdvmhost $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/dstarrepeater $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/dapnetgateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/p25gateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/m17gateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/ysfgateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/ysf2dmr $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/dgidgateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/nxdngateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/dmrgateway $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/mobilegps $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/starnetserver $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/timeserver $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/dstar-radio.* $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/pistar-remote $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/hosts $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/hostname $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/bmapi.key $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/dapnetapi.key $backupDir 2>&1"); - $output .= shell_exec("sudo cp /etc/pistar-css.ini $backupDir 2>&1"); - $output .= shell_exec("sudo cp /usr/local/etc/RSSI.dat $backupDir 2>&1"); - $output .= shell_exec("sudo cp /var/www/dashboard/config/ircddblocal.php $backupDir 2>&1"); - $output .= shell_exec("sudo cp /var/www/dashboard/config/config.php $backupDir 2>&1"); - $output .= "Compressing backup files\n"; - $output .= shell_exec("sudo zip -j $backupZip $backupDir/* 2>&1"); - $output .= "Starting download\n"; - - echo "
$output
\n"; - - if (file_exists($backupZip)) { - $utc_time = gmdate('Y-m-d H:i:s'); - $utc_tz = new DateTimeZone('UTC'); - $local_tz = new DateTimeZone(date_default_timezone_get ()); - $dt = new DateTime($utc_time, $utc_tz); - $dt->setTimeZone($local_tz); - $local_time = $dt->format('Y-M-d'); - header('Content-Description: File Transfer'); - header('Content-Type: application/octet-stream'); - if ($hostNameInfo != "cdn") { - header('Content-Disposition: attachment; filename="'.basename("CDN_Config_".$hostNameInfo."_".$local_time.".zip").'"'); - } - else { - header('Content-Disposition: attachment; filename="'.basename("CDN_Config_$local_time.zip").'"'); - } - header('Content-Transfer-Encoding: binary'); - header('Expires: 0'); - header('Cache-Control: must-revalidate'); - header('Pragma: public'); - header('Content-Length: ' . filesize($backupZip)); - ob_clean(); - flush(); - readfile($backupZip); - exit; - } - - }; - if ( escapeshellcmd($_POST["action"]) == "restore" ) { - $output = "Uploading your Config data\n"; - - $target_dir = "/tmp/config_restore/"; - shell_exec("sudo rm -rf $target_dir 2>&1"); - shell_exec("mkdir $target_dir 2>&1"); - if($_FILES["fileToUpload"]["name"]) { - $filename = $_FILES["fileToUpload"]["name"]; - $source = $_FILES["fileToUpload"]["tmp_name"]; - $type = $_FILES["fileToUpload"]["type"]; - - $name = explode(".", $filename); - $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed'); - foreach($accepted_types as $mime_type) { - if($mime_type == $type) { - $okay = true; - break; - } - } - } - $continue = strtolower($name[1]) == 'zip' ? true : false; - if(!$continue) { - $output .= "The file you are trying to upload is not a .zip file. Please try again.\n"; - } - $target_path = $target_dir.$filename; - - if(move_uploaded_file($source, $target_path)) { - $zip = new ZipArchive(); - $x = $zip->open($target_path); - if ($x === true) { - $zip->extractTo($target_dir); // change this to the correct site path - $zip->close(); - unlink($target_path); - } - $output .= "Your .zip file was uploaded and unpacked.\n"; - $output .= "Stopping Services.\n"; - - // Stop the DV Services - shell_exec('sudo systemctl stop cron.service 2>&1'); //Cron - shell_exec('sudo systemctl stop dstarrepeater.service 2>&1'); //D-Star Radio Service - shell_exec('sudo systemctl stop mmdvmhost.service 2>&1'); //MMDVMHost Radio Service - shell_exec('sudo systemctl stop ircddbgateway.service 2>&1'); //ircDDBGateway Service - shell_exec('sudo systemctl stop timeserver.service 2>&1'); //Time Server Service - shell_exec('sudo systemctl stop pistar-watchdog.service 2>&1'); //PiStar-Watchdog Service - shell_exec('sudo systemctl stop pistar-remote.service 2>&1'); //PiStar-Remote Service - shell_exec('sudo systemctl stop ysfgateway.service 2>&1'); //YSFGateway - shell_exec('sudo systemctl stop ysf2dmr.service 2>&1'); //YSF2DMR - shell_exec('sudo systemctl stop p25gateway.service 2>&1'); //P25Gateway - shell_exec('sudo systemctl stop nxdngateway.service 2>&1'); //NXDNGateway - shell_exec('sudo systemctl stop m17gateway.service 2>&1'); //M17Gateway - shell_exec('sudo systemctl stop dapnetgateway.service 2>&1'); //DAPNETGateway - shell_exec('sudo systemctl stop mobilegps.service 2>&1'); //MobileGPS - - // Make the disk Writable - shell_exec('sudo mount -o remount,rw / 2>&1'); - - // Overwrite the configs - $output .= "Writing new Config\n"; - $output .= shell_exec("sudo rm -f /etc/dstar-radio.* 2>&1")."\n"; - $output .= shell_exec("sudo mv -f /tmp/config_restore/RSSI.dat /usr/local/etc/ 2>&1")."\n"; - $output .= shell_exec("sudo mv -f /tmp/config_restore/ircddblocal.php /var/www/dashboard/config/ 2>&1")."\n"; - $output .= shell_exec("sudo mv -f /tmp/config_restore/config.php /var/www/dashboard/config/ 2>&1")."\n"; - $output .= shell_exec("sudo mv -v -f /tmp/config_restore/wpa_supplicant.conf /etc/wpa_supplicant/ 2>&1")."\n"; - $output .= shell_exec("sudo mv -v -f /tmp/config_restore/* /etc/ 2>&1")."\n"; - - //Restore the Timezone Config - $timeZone = shell_exec('grep date /var/www/dashboard/config/config.php | grep -o "\'.*\'" | sed "s/\'//g"'); - $timeZone = preg_replace( "/\r|\n/", "", $timeZone); //Remove the linebreaks - shell_exec('sudo timedatectl set-timezone '.$timeZone.' 2>&1'); - - //Restore ircDDGBateway Link Manager Password - $ircRemotePassword = shell_exec('grep remotePassword /etc/ircddbgateway | awk -F\'=\' \'{print $2}\''); - shell_exec('sudo sed -i "/password=/c\\password='.$ircRemotePassword.'" /root/.Remote\ Control'); - - // Make the disk Read-Only - shell_exec('sudo mount -o remount,ro / 2>&1'); - - // Start the services - $output .= "Starting Services.\n"; - shell_exec('sudo systemctl start dstarrepeater.service 2>&1'); //D-Star Radio Service - shell_exec('sudo systemctl start mmdvmhost.service 2>&1'); //MMDVMHost Radio Service - shell_exec('sudo systemctl start ircddbgateway.service 2>&1'); //ircDDBGateway Service - shell_exec('sudo systemctl start timeserver.service 2>&1'); //Time Server Service - shell_exec('sudo systemctl start pistar-watchdog.service 2>&1'); //PiStar-Watchdog Service - shell_exec('sudo systemctl start pistar-remote.service 2>&1'); //PiStar-Remote Service - if (substr(exec('grep "pistar-upnp.service" /etc/crontab | cut -c 1'), 0, 1) !== '#') { - shell_exec('sudo systemctl start pistar-upnp.service 2>&1'); //PiStar-UPnP Service - } - shell_exec('sudo systemctl start ysfgateway.service 2>&1'); //YSFGateway - shell_exec('sudo systemctl start ysf2dmr.service 2>&1'); //YSF2DMR - shell_exec('sudo systemctl start p25gateway.service 2>&1'); //P25Gateway - shell_exec('sudo systemctl start nxdngateway.service 2>&1'); //NXDNGateway - shell_exec('sudo systemctl start m17gateway.service 2>&1'); //M17Gateway - shell_exec('sudo systemctl start dapnetgateway.service 2>&1'); //DAPNETGateway - shell_exec('sudo systemctl start mobilegps.service 2>&1'); //MobileGPS - shell_exec('sudo systemctl start cron.service 2>&1'); //Cron - - // Complete - $output .= "Configuration Restore Complete.\n"; - } - else { - $output .= "There was a problem with the upload. Please try again.
"; - $output .= "\n".'
'."\n"; - $output .= ''."\n"; - } - echo "
$output
\n"; - }; - - echo "
\n"; - } else { ?> -
" method="post" enctype="multipart/form-data"> -
- -
- Restore Config - Restore Configuration - - -
-
-
-
- WARNING: Editing the files outside of CDN *could* have un-desireable side effects.
- This backup and restore tool will back up your config files to a Zip file, and allow you to restore them later, either to this CDN or another one. -
    -
  • System Passwords / Dashboard passwords are NOT backed up / restored.
    • -
  • Wireless Configuration IS backed up and restored
    • -
-
-
-
- -
- - - - diff --git a/admin/configure.php b/admin/configure.php index 1ed0100..57eec28 100644 --- a/admin/configure.php +++ b/admin/configure.php @@ -203,19 +203,12 @@ $MYCALL=strtoupper($configs['gatewayCallsign']); disablesubmitbuttons(); document.getElementById("autoApPassForm").submit(); } - function factoryReset() { - if (confirm('WARNING: This will set all your settings back to factory defaults. WiFi setup will be retained to maintain network access to this Pi.\n\nAre you SURE you want to do this?\n\nPress OK to restore the factory configuration\nPress Cancel to go back.')) { - document.getElementById("factoryReset").submit(); - } else { - return false; - } - } function resizeIframe(obj) { var numpix = parseInt(obj.contentWindow.document.body.scrollHeight, 10); obj.style.height = numpix + 'px'; } - + | 专家模式 | 校准 | - | - | - +

@@ -361,33 +352,6 @@ if ($_SERVER["PHP_SELF"] == "/admin/configure.php") { // Let the services actualy stop sleep(1); - // Factory Reset Handler Here - if (empty($_POST['factoryReset']) != TRUE ) { - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
Factory Reset Config
Loading fresh configuration file(s)...
\n"; - echo "
\n"; - unset($_POST); - - // Over-write the config files with the clean copies - exec('sudo unzip -o /usr/local/bin/config_clean.zip -d /etc/'); - exec('sudo rm -rf /etc/dstar-radio.*'); - exec('sudo rm -rf /etc/pistar-css.ini'); - exec('sudo git --work-tree=/usr/local/sbin --git-dir=/usr/local/sbin/.git update-index --assume-unchanged pistar-upnp.service'); - exec('sudo git --work-tree=/usr/local/sbin --git-dir=/usr/local/sbin/.git reset --hard origin/master'); - exec('sudo git --work-tree=/usr/local/bin --git-dir=/usr/local/bin/.git reset --hard origin/master'); - exec('sudo git --work-tree=/var/www/dashboard --git-dir=/var/www/dashboard/.git reset --hard origin/master'); - echo ''; - // Make the root filesystem read-only - system('sudo sync && sudo sync && sudo sync && sudo mount -o remount,ro /'); - echo "
\n
\n"; - echo "\n\n\n"; - die(); - } - // Handle the case where the config is not read correctly if (count($configmmdvm) <= 18) { echo "
\n"; @@ -550,18 +514,41 @@ if ($_SERVER["PHP_SELF"] == "/admin/configure.php") { // Set the APRS Host for ircDDBGateway if (empty($_POST['selectedAPRSHost']) != TRUE ) { - $rollAPRSHost = 'sudo sed -i "/aprsHostname=/c\\aprsHostname='.escapeshellcmd($_POST['selectedAPRSHost']).'" /etc/ircddbgateway'; + // "custom" lets the operator type their own APRS-IS server + port + // instead of picking from /usr/local/etc/APRSHosts.txt (which is + // always port 14580). Validate both before use: the value is + // still run through escapeshellcmd() below, but a hostname + // containing "/" would break the sed "/pattern/c\..." syntax + // (sed's default delimiter), so reject anything that isn't a + // plain hostname/IP up front rather than relying on + // escapeshellcmd() alone. + if ($_POST['selectedAPRSHost'] === 'custom' && !empty($_POST['customAPRSHost']) && preg_match('/^[A-Za-z0-9.\-]+$/', trim($_POST['customAPRSHost']))) { + $aprsHost = escapeshellcmd(trim($_POST['customAPRSHost'])); + $aprsPort = (!empty($_POST['customAPRSPort']) && ctype_digit(trim($_POST['customAPRSPort'])) && (int)trim($_POST['customAPRSPort']) >= 1 && (int)trim($_POST['customAPRSPort']) <= 65535) ? trim($_POST['customAPRSPort']) : '14580'; + } else { + $aprsHost = escapeshellcmd($_POST['selectedAPRSHost']); + $aprsPort = '14580'; + } + $rollAPRSHost = 'sudo sed -i "/aprsHostname=/c\\aprsHostname='.$aprsHost.'" /etc/ircddbgateway'; system($rollAPRSHost); - $configysfgateway['aprs.fi']['Server'] = escapeshellcmd($_POST['selectedAPRSHost']); - $configysf2dmr['aprs.fi']['Server'] = escapeshellcmd($_POST['selectedAPRSHost']); - $configysf2nxdn['aprs.fi']['Server'] = escapeshellcmd($_POST['selectedAPRSHost']); - $configysf2p25['aprs.fi']['Server'] = escapeshellcmd($_POST['selectedAPRSHost']); + $rollAPRSPort = 'sudo sed -i "/^aprsPort=/c\\aprsPort='.$aprsPort.'" /etc/ircddbgateway'; + system($rollAPRSPort); + $configysfgateway['aprs.fi']['Server'] = $aprsHost; + $configysfgateway['aprs.fi']['Port'] = $aprsPort; + $configysf2dmr['aprs.fi']['Server'] = $aprsHost; + $configysf2dmr['aprs.fi']['Port'] = $aprsPort; + $configysf2nxdn['aprs.fi']['Server'] = $aprsHost; + $configysf2nxdn['aprs.fi']['Port'] = $aprsPort; + $configysf2p25['aprs.fi']['Server'] = $aprsHost; + $configysf2p25['aprs.fi']['Port'] = $aprsPort; $configysf2dmr['aprs.fi']['Enable'] = "0"; $configysf2nxdn['aprs.fi']['Enable'] = "0"; $configysf2p25['aprs.fi']['Enable'] = "0"; if ($configPistarRelease['Pi-Star']['Version'] >= "4.1.4") { - $rollAPRSGatewayHost = 'sudo sed -i "/Server=/c\\Server='.escapeshellcmd($_POST['selectedAPRSHost']).'" /etc/aprsgateway'; + $rollAPRSGatewayHost = 'sudo sed -i "/Server=/c\\Server='.$aprsHost.'" /etc/aprsgateway'; system($rollAPRSGatewayHost); + $rollAPRSGatewayPort = 'sudo sed -i "/^Port=/c\\Port='.$aprsPort.'" /etc/aprsgateway'; + system($rollAPRSGatewayPort); } } @@ -3604,10 +3591,6 @@ else: $toggleircddbEnabledCr = ""; } ?> -
" method="post"> -
-
-
" method="post">

@@ -4069,22 +4052,31 @@ else: } } ?>
-
:APRS HostSet your prefered APRS host here.
-
+$aprsHost[0]\n"; } + if ($testAPSRHost == $aprsHost[0]) { echo " \n"; $aprsHostIsCustom = false; } else { echo " \n"; } } } fclose($aprsHostFile); + echo " \n"; ?> -
+ + + + : + + +
:System TimeZoneSet the system timezone
diff --git a/admin/expert/edit_dashboard.php b/admin/expert/edit_dashboard.php index 4bd015d..7c24f47 100644 --- a/admin/expert/edit_dashboard.php +++ b/admin/expert/edit_dashboard.php @@ -25,16 +25,6 @@ require_once('../config/version.php'); CDN - Digital Voice Dashboard - Expert Editor -
@@ -74,24 +64,8 @@ $filepath = '/tmp/bW1kd4jg6b3N0DQo.tmp'; //after the form submit if($_POST) { $data = $_POST; - // Factory Reset Handler Here - if (empty($_POST['factoryReset']) != TRUE ) { - echo "
\n"; - echo "
\n"; - echo "

Factory Reset Config

\n"; - echo "
Loading fresh configuration file(s)...
\n"; - echo "
\n"; - unset($_POST); - //Reset the config - exec('sudo mount -o remount,rw /'); // Make rootfs writable - exec('sudo rm -rf /etc/pistar-css.ini'); // Delete the Config - exec('sudo mount -o remount,ro /'); // Make rootfs read-only - echo ''; - die(); - } else { - //update ini file, call function - update_ini_file($data, $filepath); - } + //update ini file, call function + update_ini_file($data, $filepath); } //this is the function going to update your ini file @@ -174,12 +148,6 @@ echo ''."\n"; echo '
'."\n"; } echo ""; -echo "
\n"; -echo 'if you took it all too far and now it makes you feel sick, click below to reset the changes made on this page, this will ONLY reset the CSS settings above and will not change any other settings or configuration.'."\n"; -echo '
'."\n"; -echo '
'."\n"; -echo '
'."\n"; -echo ''."\n"; ?>
diff --git a/admin/expert/fulledit_bmapikey.php b/admin/expert/fulledit_bmapikey.php deleted file mode 100644 index 4c67e91..0000000 --- a/admin/expert/fulledit_bmapikey.php +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - CDN - Digital Voice Dashboard - Expert Editor - - - -
- -
- - /tmp/d39fk36sg55433gd.tmp'); - exec('sudo echo "apikey=None" >> /tmp/d39fk36sg55433gd.tmp'); -} -exec('sudo chown www-data:www-data /tmp/d39fk36sg55433gd.tmp'); -exec('sudo chmod 664 /tmp/d39fk36sg55433gd.tmp'); - -//ini file to open -$filepath = '/tmp/d39fk36sg55433gd.tmp'; - -//after the form submit -if($_POST) { - $data = $_POST; - //update ini file, call function - update_ini_file($data, $filepath); -} - -//this is the function going to update your ini file - function update_ini_file($data, $filepath) { - $content = ""; - - //parse the ini file using default parse_ini_file() PHP function - $parsed_ini = parse_ini_file($filepath, true); - - foreach($data as $section=>$values) { - // UnBreak special cases - $section = str_replace("_", " ", $section); - $content .= "[".$section."]\n"; - //append the values - foreach($values as $key=>$value) { - if ($value == '') { - $content .= $key."=none\n"; - } else { - $content .= $key."=".$value."\n"; - } - } - $content .= "\n"; - } - - //write it into file - if (!$handle = fopen($filepath, 'w')) { - return false; - } - - $success = fwrite($handle, $content); - fclose($handle); - - // Updates complete - copy the working file back to the proper location - exec('sudo mount -o remount,rw /'); // Make rootfs writable - exec('sudo mv /tmp/d39fk36sg55433gd.tmp /etc/bmapi.key'); // Move the file back - exec('sudo chmod 644 /etc/bmapi.key'); // Set the correct runtime permissions - exec('sudo chown root:root /etc/bmapi.key'); // Set the owner - exec('sudo mount -o remount,ro /'); // Make rootfs read-only - - return $success; - } - -//parse the ini file using default parse_ini_file() PHP function -$parsed_ini = parse_ini_file($filepath, true); -if (!isset($parsed_ini['key']['apikey'])) { $parsed_ini['key']['apikey'] = ""; } - -echo '
'."\n"; - foreach($parsed_ini as $section=>$values) { - // keep the section as hidden text so we can update once the form submitted - echo "\n"; - echo "
\n"; - echo "

$section

\n"; - // print all other values as input fields, so can edit. - // note the name='' attribute it has both section and key - foreach($values as $key=>$value) { - if (($key == "Options") || ($value)) { - echo "
$key
\n"; - } - elseif (($key == "Display") && ($value == '')) { - echo "
$key
\n"; - } - else { - echo "
$key
\n"; - } - } - echo "
\n"; - echo ''."\n"; - echo "
\n"; - } -echo "
"; -?> -
- - -
- - diff --git a/admin/expert/fulledit_pistar-remote.php b/admin/expert/fulledit_pistar-remote.php deleted file mode 100644 index cd382c7..0000000 --- a/admin/expert/fulledit_pistar-remote.php +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - CDN - Digital Voice Dashboard - Expert Editor - - - -
- -
- -

PiStar-Remote (Full Edit)

-
-
-
-
-
-
- -
- - -
- - diff --git a/admin/expert/header-menu.inc b/admin/expert/header-menu.inc index 8395a48..c807293 100644 --- a/admin/expert/header-menu.inc +++ b/admin/expert/header-menu.inc @@ -4,7 +4,6 @@

| | - |

@@ -20,9 +19,7 @@ DAPNET 网关
完整编辑: DMR 网关 | - PiStar-Remote | WiFi | - BM API | DAPNET API | 系统 Cron 任务 | RSSI 数据 diff --git a/admin/live_modem_log.php b/admin/live_modem_log.php index 3db58a0..4ff07fd 100644 --- a/admin/live_modem_log.php +++ b/admin/live_modem_log.php @@ -94,7 +94,6 @@ if ($_SERVER["PHP_SELF"] == "/admin/live_modem_log.php") { | | | - |

diff --git a/admin/power.php b/admin/power.php index 121504d..f29d415 100644 --- a/admin/power.php +++ b/admin/power.php @@ -40,7 +40,6 @@ if ($_SERVER["PHP_SELF"] == "/admin/power.php") {

| | - |

diff --git a/admin/sysinfo.php b/admin/sysinfo.php index c99ef20..b26e77a 100644 --- a/admin/sysinfo.php +++ b/admin/sysinfo.php @@ -103,7 +103,6 @@ function formatSize( $bytes ) { | | | - |

diff --git a/admin/update.php b/admin/update.php index c143dec..eb0dfa9 100644 --- a/admin/update.php +++ b/admin/update.php @@ -42,7 +42,6 @@ header('Cache-Control: no-cache'); | | | - |

diff --git a/functions.js b/functions.js index a6432bd..9d107f8 100644 --- a/functions.js +++ b/functions.js @@ -94,6 +94,7 @@ function checkFrequency(){ var intFreqPOCSAG = parseFloat(freqPOCSAG.value); // Swap to float // TX Good if (144 <= intFreqPOCSAG && intFreqPOCSAG <= 148) { pocsagFrequency.style.backgroundColor = goodColor; } + if (150 <= intFreqPOCSAG && intFreqPOCSAG <= 160) { pocsagFrequency.style.backgroundColor = goodColor; } if (220 <= intFreqPOCSAG && intFreqPOCSAG <= 225) { pocsagFrequency.style.backgroundColor = goodColor; } if (420 <= intFreqPOCSAG && intFreqPOCSAG <= 450) { pocsagFrequency.style.backgroundColor = goodColor; } if (842 <= intFreqPOCSAG && intFreqPOCSAG <= 950) { pocsagFrequency.style.backgroundColor = goodColor; }