summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/bin/beep.sh4
-rw-r--r--usr/local/www/system_advanced_admin.php7
2 files changed, 5 insertions, 6 deletions
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;
OpenPOWER on IntegriCloud