From 970ca1b7831950086e79aa63e54ae6eaf51dbdca Mon Sep 17 00:00:00 2001
From: Yehuda Katz <yehuda@ymkatz.net>
Date: Tue, 28 Feb 2012 17:33:32 -0500
Subject: Moved beep option to notifications page

---
 usr/local/www/system_advanced_admin.php         | 15 ---------------
 usr/local/www/system_advanced_notifications.php | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index a83ddee..84070fc 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -55,7 +55,6 @@ $pconfig['max_procs'] = ($config['system']['webgui']['max_procs']) ? $config['sy
 $pconfig['ssl-certref'] = $config['system']['webgui']['ssl-certref'];
 $pconfig['disablehttpredirect'] = isset($config['system']['webgui']['disablehttpredirect']);
 $pconfig['disableconsolemenu'] = isset($config['system']['disableconsolemenu']);
-$pconfig['disablebeep'] = isset($config['system']['disablebeep']);
 $pconfig['noantilockout'] = isset($config['system']['webgui']['noantilockout']);
 $pconfig['nodnsrebindcheck'] = isset($config['system']['webgui']['nodnsrebindcheck']);
 $pconfig['nohttpreferercheck'] = isset($config['system']['webgui']['nohttpreferercheck']);
@@ -142,11 +141,6 @@ if ($_POST) {
 			auto_login();
 		}
 
-		if($_POST['disablebeep'] == "yes")
-			$config['system']['disablebeep'] = true;
-		else
-			unset($config['system']['disablebeep']);
-		
 		if ($_POST['noantilockout'] == "yes")
 			$config['system']['webgui']['noantilockout'] = true;
 		else
@@ -401,15 +395,6 @@ function prot_change() {
 								</td>
 							</tr>
 							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("Startup/Shutdown Sound"); ?></td>
-								<td width="78%" class="vtable">
-									<input name="disablebeep" type="checkbox" id="disablebeep" value="yes" <?php if ($pconfig['disablebeep']) echo "checked"; ?>  />
-									<strong><?=gettext("Disable the startup/shutdown beep"); ?></strong>
-									<br/>
-									<span class="vexpl"><?=gettext("When this is checked, startup and shutdown sounds will no longer play."); ?></span>
-								</td>
-							</tr>
-							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Anti-lockout"); ?></td>
 								<td width="78%" class="vtable">
 									<?php
diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php
index d314f11..d170a90 100644
--- a/usr/local/www/system_advanced_notifications.php
+++ b/usr/local/www/system_advanced_notifications.php
@@ -73,6 +73,9 @@ if($config['notifications']['smtp']['password'])
 if($config['notifications']['smtp']['fromaddress']) 
 	$pconfig['smtpfromaddress'] = $config['notifications']['smtp']['fromaddress'];
 
+// System Sounds
+$pconfig['disablebeep'] = isset($config['notifications']['disablebeep']);
+
 if ($_POST) {
 
 	unset($input_errors);
@@ -108,6 +111,12 @@ if ($_POST) {
 		$config['notifications']['smtp']['password'] = $_POST['smtppassword'];
 		$config['notifications']['smtp']['fromaddress'] = $_POST['smtpfromaddress'];
 
+		// System Sounds
+		if($_POST['disablebeep'] == "yes")
+			$config['notifications']['disablebeep'] = true;
+		else
+			unset($config['notifications']['disablebeep']);
+
 		write_config();
 
 		// Send test message via growl
@@ -245,6 +254,19 @@ include("head.inc");
 								<?=gettext("Enter the e-mail address password for SMTP authentication."); ?>
 							</td>
 						</tr>
+						<!-- System Sounds -->
+						<tr>
+							<td colspan="2" valign="top" class="listtopic"><?=gettext("System Sounds"); ?></td>
+						</tr>
+						<tr>
+							<td width="22%" valign="top" class="vncell"><?=gettext("Startup/Shutdown Sound"); ?></td>
+							<td width="78%" class="vtable">
+								<input name="disablebeep" type="checkbox" id="disablebeep" value="yes" <?php if ($pconfig['disablebeep']) echo "checked"; ?>  />
+								<strong><?=gettext("Disable the startup/shutdown beep"); ?></strong>
+								<br/>
+								<span class="vexpl"><?=gettext("When this is checked, startup and shutdown sounds will no longer play."); ?></span>
+							</td>
+						</tr>
 						<tr>
 							<td valign="top" class="">
 								&nbsp;
-- 
cgit v1.1