diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-03 13:27:48 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-03 13:27:48 -0400 |
commit | 4392e82299d6fbd28e468d431ed3578c6fcface9 (patch) | |
tree | 0f0e8010bc842d726f28d9690cfb24b105afcde9 /src/usr/local/www/system_advanced_notifications.php | |
parent | d49e59fbacb5051a614da7ae8fcf126e6e621a05 (diff) | |
download | pfsense-4392e82299d6fbd28e468d431ed3578c6fcface9.zip pfsense-4392e82299d6fbd28e468d431ed3578c6fcface9.tar.gz |
Fixed #5087
Programmer had changed the input names such that they no longer matched the config system nasmes (again)
Diffstat (limited to 'src/usr/local/www/system_advanced_notifications.php')
-rw-r--r-- | src/usr/local/www/system_advanced_notifications.php | 96 |
1 files changed, 62 insertions, 34 deletions
diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index 438d00d..a0d2995 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -2,31 +2,58 @@ /* $Id$ */ /* system_advanced_notifications.php - part of pfSense - Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2015 Electric Sheep Fencing, LP - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. */ +/* ==================================================================== + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2004, 2005 Scott Ullrich + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution. (http://www.pfsense.org/). + * + * 4. The names "pfSense" and "pfSense Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * coreteam@pfsense.org. + * + * 5. Products derived from this software may not be called "pfSense" + * nor may "pfSense" appear in their names without prior written + * permission of the Electric Sheep Fencing, LLC. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution (http://www.pfsense.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ==================================================================== + * + */ /* pfSense_MODULE: system */ @@ -97,17 +124,16 @@ if ($config['notifications']['smtp']['fromaddress']) { $pconfig['disablebeep'] = isset($config['system']['disablebeep']); if ($_POST) { - unset($input_errors); $pconfig = $_POST; if (isset($_POST['save'])) { // Growl - $config['notifications']['growl']['ipaddress'] = $_POST['ip-address']; + $config['notifications']['growl']['ipaddress'] = $_POST['ipaddress']; $config['notifications']['growl']['password'] = $_POST['password']; - $config['notifications']['growl']['name'] = $_POST['registration-name']; - $config['notifications']['growl']['notification_name'] = $_POST['notification-name']; + $config['notifications']['growl']['name'] = $_POST['name']; + $config['notifications']['growl']['notification_name'] = $_POST['notification_name']; if ($_POST['disable_growl'] == "yes") { $config['notifications']['growl']['disable'] = true; @@ -150,8 +176,9 @@ if ($_POST) { } write_config(); - pfSenseHeader("system_advanced_notifications.php"); - return; + +// pfSenseHeader("system_advanced_notifications.php"); +// return; } @@ -179,8 +206,9 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); + if ($savemsg) - print_info_box($savemsg); + print_info_box($savemsg, 'success'); $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); @@ -191,10 +219,10 @@ $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl. $tab_array[] = array(gettext("Notifications"), true, "system_advanced_notifications.php"); display_top_tabs($tab_array); -?><div id="container"><?php - require_once('classes/Form.class.php'); + $form = new Form; + $section = new Form_Section('Growl'); $section->addInput(new Form_Checkbox( @@ -340,6 +368,6 @@ $section->addInput(new Form_Checkbox( 'play.'); $form->add($section); -print $form; +print($form); include("foot.inc");
\ No newline at end of file |