diff options
author | Warren Baker <warren@decoy.co.za> | 2012-02-23 10:35:03 +0200 |
---|---|---|
committer | Warren Baker <warren@decoy.co.za> | 2012-02-23 10:35:03 +0200 |
commit | 4b0e8c916b9dac14ee5131725ae503eb15369084 (patch) | |
tree | 7873b5d74d5195a0df701fa23fb9dab0decbb46c | |
parent | a2263f0cd8b655922ea8a66b3b93a6062539ea99 (diff) | |
download | pfsense-4b0e8c916b9dac14ee5131725ae503eb15369084.zip pfsense-4b0e8c916b9dac14ee5131725ae503eb15369084.tar.gz |
No need for extra function and touching of file, just set the value and use grep from XML to determine to beep or not
-rw-r--r-- | etc/inc/pfsense-utils.inc | 23 | ||||
-rwxr-xr-x | usr/local/bin/beep.sh | 4 | ||||
-rw-r--r-- | usr/local/www/system_advanced_admin.php | 7 |
3 files changed, 5 insertions, 29 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index da39c39..b0a93a2 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -927,29 +927,6 @@ function auto_login() { conf_mount_ro(); } -function setup_beep() { - global $config; - - if(isset($config['system']['disablebeep'])) - $status = false; - else - $status = true; - - $beep_file = "/etc/disable_beep"; - - conf_mount_rw(); - - if($status == false) { - touch($beep_file); - } else { - if (file_exists($beep_file)) { - unlink($beep_file); - } - } - - conf_mount_ro(); -} - function setup_serial_port($when="save", $path="") { global $g, $config; conf_mount_rw(); diff --git a/usr/local/bin/beep.sh b/usr/local/bin/beep.sh index eeefc55..0158244 100755 --- a/usr/local/bin/beep.sh +++ b/usr/local/bin/beep.sh @@ -1,6 +1,8 @@ #!/bin/sh -if [ -f /etc/disable_beep ]; then + +BEEP=`/usr/bin/grep -c disablebeep /conf/config.xml` +if [ $BEEP -gt 0 ]; then exit; fi diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 88f022a..c726979 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -142,13 +142,10 @@ if ($_POST) { auto_login(); } - if($_POST['disablebeep'] == "yes") { + if($_POST['disablebeep'] == "yes") $config['system']['disablebeep'] = true; - setup_beep(); - } else { + else unset($config['system']['disablebeep']); - setup_beep(); - } if ($_POST['noantilockout'] == "yes") $config['system']['webgui']['noantilockout'] = true; |