diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-09 15:43:05 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-09 15:43:05 -0400 |
commit | 888c3c1bdfc7e146ab9c2f48875a87620d25339f (patch) | |
tree | 5b73890f77f5ef53121d45af38ce467dd37ff587 | |
parent | d7218f770cd25418bfb09e42df71f47ae9b92849 (diff) | |
download | pfsense-888c3c1bdfc7e146ab9c2f48875a87620d25339f.zip pfsense-888c3c1bdfc7e146ab9c2f48875a87620d25339f.tar.gz |
head.inc modal notices display now calls index.php via ajax to clear any pending notices
-rwxr-xr-x | src/usr/local/www/head.inc | 90 | ||||
-rw-r--r-- | src/usr/local/www/index.php | 5 |
2 files changed, 52 insertions, 43 deletions
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index d6ba383..7ce7de2 100755 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -3,57 +3,57 @@ pfSense_MODULE: head.inc */ /* ==================================================================== - * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. - * Copyright (c) 2004, 2005 Scott Ullrich + * 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: + * 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. + * 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. + * 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/). + * 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. + * 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. + * 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: + * 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 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. + * 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. * - * ==================================================================== + * ==================================================================== * */ - + require_once("globals.inc"); require_once("functions.inc"); require_once("shortcuts.inc"); @@ -521,10 +521,20 @@ if (are_notices_pending()):?> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> - <a type="button" class="btn btn-primary" href="/?closenotice=all">Mark all as read</a> + <a type="button" class="btn btn-primary" href="javascript:clear_notices();">Mark all as read</a> </div> </div> </div> </div> +<script> + // Do some Ajax to make index.php clear the notices + function clear_notices() { + xmlhttp=new XMLHttpRequest(); + xmlhttp.open("GET","index.php?closenotice=all",true); + xmlhttp.send(); + location.reload(); // reload the page to clear the notices indicator and dismiss the modal dialog all in one + } +</script> + <?php endif;
\ No newline at end of file diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 9c94727..a6657ba 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -72,15 +72,14 @@ ini_set('output_buffering', 'true'); // Start buffering with a cache size of 100000 ob_start(null, "1000"); - ## Load Essential Includes require_once('guiconfig.inc'); require_once('functions.inc'); require_once('notices.inc'); require_once("pkg-utils.inc"); -if (isset($_REQUEST['closenotice'])) { - close_notice($_REQUEST['closenotice']); +if (isset($_GET['closenotice'])) { + close_notice($_GET['closenotice']); echo get_menu_messages(); exit; } |