diff options
Diffstat (limited to 'src/usr/local/www/shortcuts.inc')
-rw-r--r-- | src/usr/local/www/shortcuts.inc | 68 |
1 files changed, 17 insertions, 51 deletions
diff --git a/src/usr/local/www/shortcuts.inc b/src/usr/local/www/shortcuts.inc index a172616..291eeb9 100644 --- a/src/usr/local/www/shortcuts.inc +++ b/src/usr/local/www/shortcuts.inc @@ -1,56 +1,22 @@ <?php /* - shortcuts.inc -*/ -/* ==================================================================== - * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * shortcuts.inc * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: + * part of pfSense (https://www.pfsense.org) + * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * All rights reserved. * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * 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. - * - * ==================================================================== + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // On the page, add in like so: @@ -168,14 +134,14 @@ function get_shortcut_log_link($shortcut_section, $addspace = true) { $dir_array = get_shortcut_files("/usr/local/www/shortcuts"); foreach ($dir_array as $file) { if (!is_dir("/usr/local/www/shortcuts/{$file}") && stristr($file, ".inc")) { - include("/usr/local/www/shortcuts/{$file}"); + include_once("/usr/local/www/shortcuts/{$file}"); } } if (is_dir("/usr/local/pkg/shortcuts")) { $dir_array = get_shortcut_files("/usr/local/pkg/shortcuts"); foreach ($dir_array as $file) { if (!is_dir("/usr/local/pkg/shortcuts/{$file}") && stristr($file, ".inc")) { - include("/usr/local/pkg/shortcuts/{$file}"); + include_once("/usr/local/pkg/shortcuts/{$file}"); } } } @@ -211,7 +177,7 @@ $shortcuts['dhcp']['service'] = "dhcpd"; $shortcuts['dhcp6'] = array(); $shortcuts['dhcp6']['main'] = "services_dhcpv6.php"; -$shortcuts['dhcp6']['log'] = "status_logs.php?logfile=dhcp"; +$shortcuts['dhcp6']['log'] = "status_logs.php?logfile=dhcpd"; $shortcuts['dhcp6']['status'] = "status_dhcpv6_leases.php"; @@ -303,7 +269,7 @@ $shortcuts['snmp']['service'] = "bsnmpd"; $shortcuts['authentication'] = array(); $shortcuts['authentication']['main'] = "system_authservers.php"; -$shortcuts['authentication']['status'] = "diag_authentication.php"; +// $shortcuts['authentication']['status'] = "diag_authentication.php"; $shortcuts['aliases'] = array(); $shortcuts['aliases']['main'] = "firewall_aliases.php"; |