mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Completed #5333
This commit is contained in:
Stephen Beaver
parent
4eeb2809d0
commit
995df6c32c
@ -1,46 +1,59 @@
|
||||
<?php
|
||||
/* $Id$ */
|
||||
/*
|
||||
Copyright (C) 2010 Ermal Luçi
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2007, 2008 Scott Ullrich <sullrich@gmail.com>
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2006 Paul Taylor <paultaylor@winn-dixie.com>.
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
|
||||
All rights reserved.
|
||||
|
||||
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.
|
||||
|
||||
pfSense_BUILDER_BINARIES: /usr/sbin/pw /bin/cp
|
||||
pfSense_MODULE: auth
|
||||
*/
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved.
|
||||
* Copyright (c) 2004, 2005 Scott Ullrich
|
||||
* Copyright (c) 2010 Ermal Luçi
|
||||
* Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
|
||||
* Copyright (c) 2006 Paul Taylor <paultaylor@winn-dixie.com>Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* ====================================================================
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* NOTE : Portions of the mschapv2 support was based on the BSD licensed CHAP.php
|
||||
* file courtesy of Michael Retterklieber.
|
||||
|
||||
@ -1,42 +1,62 @@
|
||||
<?php
|
||||
/* $Id$ */
|
||||
/*
|
||||
Copyright (C) 2007, 2008 Scott Ullrich <sullrich@gmail.com>
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2006 Paul Taylor <paultaylor@winn-dixie.com>.
|
||||
All rights reserved.
|
||||
|
||||
Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
|
||||
All rights reserved.
|
||||
|
||||
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.
|
||||
|
||||
pfSense_MODULE: authgui
|
||||
*/
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved.
|
||||
* Copyright (c) 2004, 2005 Scott Ullrich
|
||||
* Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
|
||||
* Copyright (c) 2006 Paul Taylor <paultaylor@winn-dixie.com>.
|
||||
* Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net>.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* ====================================================================
|
||||
*
|
||||
*/
|
||||
include_once("auth.inc");
|
||||
include_once("priv.inc");
|
||||
if (!function_exists('platform_booting')) {
|
||||
@ -103,7 +123,7 @@ session_commit();
|
||||
*/
|
||||
function display_error_form($http_code, $desc) {
|
||||
global $config, $g;
|
||||
$g['theme'] = get_current_theme();
|
||||
|
||||
if (isAjax()) {
|
||||
printf(gettext('Error: %1$s Description: %2$s'), $http_code, $desc);
|
||||
return;
|
||||
@ -136,7 +156,6 @@ function display_error_form($http_code, $desc) {
|
||||
function display_login_form() {
|
||||
require_once("globals.inc");
|
||||
global $config, $g;
|
||||
$g['theme'] = get_current_theme();
|
||||
|
||||
unset($input_errors);
|
||||
|
||||
|
||||
@ -1,34 +1,56 @@
|
||||
<?php
|
||||
/* $Id$ */
|
||||
/*
|
||||
filter_log.inc
|
||||
part of pfSesne by Scott Ullrich
|
||||
originally based on m0n0wall (http://m0n0.ch/wall)
|
||||
|
||||
Copyright (C) 2009 Jim Pingle <myfirstname>@<mylastname>.org
|
||||
All rights reserved.
|
||||
|
||||
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_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/local/sbin/clog
|
||||
pfSense_MODULE: filter
|
||||
@ -386,7 +408,7 @@ function find_rule_by_number_buffer($rulenum, $trackernum, $type) {
|
||||
} else {
|
||||
$ruleString = $buffer_rules_normal[$lookup_key];
|
||||
list(,$rulename,) = explode("\"", $ruleString);
|
||||
$rulename = str_replace("USER_RULE: ", '<img src="/themes/' . $g['theme'] . '/images/icons/icon_frmfld_user.png" width="11" height="12" title="USER_RULE" alt="USER_RULE"/> ', $rulename);
|
||||
$rulename = str_replace("USER_RULE: ", '<i class="icon-large icon-user"></i> ', $rulename);
|
||||
}
|
||||
return "{$rulename} ({$lookup_key})";
|
||||
}
|
||||
@ -394,11 +416,11 @@ function find_rule_by_number_buffer($rulenum, $trackernum, $type) {
|
||||
function find_action_image($action) {
|
||||
global $g;
|
||||
if ((strstr(strtolower($action), "p")) || (strtolower($action) == "rdr")) {
|
||||
return "/themes/{$g['theme']}/images/icons/icon_pass.gif";
|
||||
return "icon-ok-circle";
|
||||
} else if (strstr(strtolower($action), "r")) {
|
||||
return "/themes/{$g['theme']}/images/icons/icon_reject.gif";
|
||||
return "icon-remove-circle";
|
||||
} else {
|
||||
return "/themes/{$g['theme']}/images/icons/icon_block.gif";
|
||||
return "icon-ban-circle";
|
||||
}
|
||||
}
|
||||
|
||||
@ -423,7 +445,7 @@ function handle_ajax($nentries, $tail = 50) {
|
||||
$filterlog = isset($config['syslog']['reverse']) ? array_reverse($filterlog) : $filterlog;
|
||||
foreach ($filterlog as $log_row) {
|
||||
$row_time = strtotime($log_row['time']);
|
||||
$img = "<img border='0' src='" . find_action_image($log_row['act']) . "' alt={$log_row['act']} title={$log_row['act']} />";
|
||||
$img = '<i class="icon-large ' . find_action_image($log_row['act']) . '" alt={$log_row[\'act\']} title={$log_row[\'act\']} ></i>"';
|
||||
if ($row_time > $lastsawtime) {
|
||||
if ($log_row['proto'] == "TCP") {
|
||||
$log_row['proto'] .= ":{$log_row['tcpflags']}";
|
||||
|
||||
@ -1,35 +1,58 @@
|
||||
<?php
|
||||
/*
|
||||
upgrade_config.inc
|
||||
Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com>
|
||||
All rights reserved.
|
||||
|
||||
originally part of m0n0wall (http://m0n0.ch/wall)
|
||||
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
|
||||
All rights reserved.
|
||||
|
||||
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_BUILDER_BINARIES: /usr/bin/find /bin/cd /usr/local/bin/rrdtool /usr/bin/nice
|
||||
pfSense_MODULE: config
|
||||
@ -378,7 +401,6 @@ function upgrade_017_to_018() {
|
||||
|
||||
function upgrade_018_to_019() {
|
||||
global $config;
|
||||
$config['theme'] = "metallic";
|
||||
}
|
||||
|
||||
|
||||
@ -2428,13 +2450,7 @@ function upgrade_061_to_062() {
|
||||
|
||||
function upgrade_062_to_063() {
|
||||
/* Upgrade legacy Themes to the new pfsense_ng */
|
||||
global $config;
|
||||
|
||||
switch ($config['theme']) {
|
||||
case "nervecenter":
|
||||
$config['theme'] = "pfsense_ng";
|
||||
break;
|
||||
}
|
||||
// Not supported in 2.3+
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,34 +1,58 @@
|
||||
<?php
|
||||
/*
|
||||
util.inc
|
||||
part of the pfSense project (https://www.pfsense.org)
|
||||
|
||||
originally part of m0n0wall (http://m0n0.ch/wall)
|
||||
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
|
||||
All rights reserved.
|
||||
|
||||
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_BUILDER_BINARIES: /bin/ps /bin/kill /usr/bin/killall /sbin/ifconfig /usr/bin/netstat
|
||||
pfSense_BUILDER_BINARIES: /usr/bin/awk /sbin/dmesg /sbin/ping /usr/local/sbin/gzsig /usr/sbin/arp
|
||||
@ -2182,32 +2206,6 @@ function array_exclude($needle, $haystack) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
function get_current_theme() {
|
||||
global $config, $g;
|
||||
/*
|
||||
* if user has selected a custom template, use it.
|
||||
* otherwise default to pfsense template
|
||||
*/
|
||||
if (($g["disablethemeselection"] === true) && !empty($g["default_theme"]) && (is_dir($g["www_path"].'/themes/'.$g["default_theme"]))) {
|
||||
$theme = $g["default_theme"];
|
||||
} elseif ($config['theme'] <> "" && (is_dir($g["www_path"].'/themes/'.$config['theme']))) {
|
||||
$theme = $config['theme'];
|
||||
} else {
|
||||
$theme = "pfsense";
|
||||
}
|
||||
/*
|
||||
* If this device is an apple ipod/iphone
|
||||
* switch the theme to one that works with it.
|
||||
*/
|
||||
$lowres_ua = array("iPhone", "iPod", "iPad", "Android", "BlackBerry", "Opera Mini", "Opera Mobi", "PlayBook", "IEMobile");
|
||||
foreach ($lowres_ua as $useragent) {
|
||||
if (strstr($_SERVER['HTTP_USER_AGENT'], $useragent)) {
|
||||
$theme = (empty($g['theme_lowres']) && (is_dir($g["www_path"].'/themes/'.$g['theme_lowres']))) ? "pfsense" : $g['theme_lowres'];
|
||||
}
|
||||
}
|
||||
return $theme;
|
||||
}
|
||||
|
||||
/* Define what is preferred, IPv4 or IPv6 */
|
||||
function prefer_ipv4_or_ipv6() {
|
||||
global $config;
|
||||
|
||||
@ -7,9 +7,8 @@
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved.
|
||||
* Copyright (c) 2004-2009 Scott Ullrich
|
||||
* Copyright (c) 2003-2009 Manuel Kasper <mk@neon1.net>
|
||||
* Jim Pingle jim@pingle.org
|
||||
* originally based on m0n0wall (http://m0n0.ch/wall)
|
||||
* Copyright (c) 2003-2009 Manuel Kasper <mk@neon1.net>
|
||||
* Copyright (c) Jim Pingle jim@pingle.org
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
@ -539,11 +538,6 @@ function resolve_ip_callback(transport) {
|
||||
var resolve_text = '<small><br />' + htmlspecialchars(response.resolve_text) + '<\/small>';
|
||||
|
||||
jQuery('span.RESOLVE-' + resolve_class).html(resolve_text);
|
||||
jQuery('img.ICON-' + resolve_class).removeAttr('title');
|
||||
jQuery('img.ICON-' + resolve_class).removeAttr('alt');
|
||||
jQuery('img.ICON-' + resolve_class).attr('src', '/themes/<?= $g['theme']; ?>/images/icons/icon_log_d.gif');
|
||||
jQuery('img.ICON-' + resolve_class).prop('onclick', null);
|
||||
// jQuery cautions that "removeAttr('onclick')" fails in some versions of IE
|
||||
}
|
||||
|
||||
// From http://stackoverflow.com/questions/5499078/fastest-method-to-escape-html-tags-as-html-entities
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved.
|
||||
* Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net>
|
||||
* part of m0n0wall (http://m0n0.ch/wall)
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
@ -136,9 +135,9 @@ function dump_clog_vpn($logfile, $tail) {
|
||||
echo "<td>" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "</td>\n";
|
||||
|
||||
if ($llent[0] == "login") {
|
||||
echo "<td class=\"listr\"><img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" title=\"login\" alt=\"in\" /></td>\n";
|
||||
echo "<td><i class=\"icon-large icon-arrow-left\" alt=\"in\"></i></td>\n";
|
||||
} else {
|
||||
echo "<td class=\"listr\"><img src=\"/themes/{$g['theme']}/images/icons/icon_out.gif\" width=\"11\" height=\"11\" title=\"logout\" alt=\"out\" /></td>\n";
|
||||
echo "<td><i class=\"icon-large icon-arrow-right\" alt=\"out\"></i></td>\n";
|
||||
}
|
||||
|
||||
echo "<td>" . htmlspecialchars($llent[3]) . "</td>\n";
|
||||
|
||||
@ -605,7 +605,9 @@ for ($i = 0; isset($a_filter[$i]); $i++):
|
||||
?>
|
||||
</td>
|
||||
<td>
|
||||
<?php if ($printicon) { ?><img src="./themes/<?= $g['theme'];?>/images/icons/<?=$image;?>.gif" title="<?=$alttext;?>" border="0" alt="icon" /><?php } ?>
|
||||
<?php if ($printicon) { ?>
|
||||
<i class="icon-large <?=$image;?>" title="<?=$alttext;?>" alt="icon" />
|
||||
<?php } ?>
|
||||
<?=$schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?> <?=$schedule_span_end;?>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
@ -122,12 +122,6 @@ $width=200; //SVG internal width : do not modify
|
||||
|
||||
$fetch_link = "ifstats.php?if=" . htmlspecialchars($ifnum);
|
||||
|
||||
/* check for custom theme colors */
|
||||
if (file_exists("/usr/local/www/themes/{$g['theme']}/graph.php")) {
|
||||
$themetxt = file_get_contents("/usr/local/www/themes/{$g['theme']}/graph.php");
|
||||
eval($themetxt);
|
||||
}
|
||||
|
||||
/********* Graph DATA **************/
|
||||
print('<?xml version="1.0" encoding="UTF-8"?>' . "\n");?>
|
||||
<svg width="100%" height="100%" viewBox="0 0 <?=$width?> <?=$height?>" preserveAspectRatio="none" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="init(evt)">
|
||||
|
||||
@ -212,7 +212,7 @@ events.push(function(){
|
||||
});
|
||||
function save_changes_to_xml(xml) {
|
||||
var ids=jQuery('#mainarea table tbody').sortable('serialize', {key:"ids[]"});
|
||||
var strloading="<img src='/themes/<?= $g['theme']; ?>/images/misc/loader.gif' alt='loader' /> " + "<?=gettext('Saving changes...')?>";
|
||||
var strloading="<?=gettext('Saving changes...')?>";
|
||||
if (confirm("<?=gettext("Do you really want to save changes?")?>")) {
|
||||
jQuery.ajax({
|
||||
type: 'get',
|
||||
@ -503,12 +503,12 @@ if ($savemsg)
|
||||
#Show custom description to edit button if defined
|
||||
$edit_msg=($pkg['adddeleteeditpagefields']['edittext']?$pkg['adddeleteeditpagefields']['edittext']:"Edit this item");
|
||||
?>
|
||||
<td valign="middle"><a href="pkg_edit.php?xml=<?=$xml?>&act=edit&id=<?=$i?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" <?=domTT_title($edit_msg)?> alt="edit" /></a></td>
|
||||
<td><a class="btn btn-xs btn-info" href="pkg_edit.php?xml=<?=$xml?>&act=edit&id=<?=$i?>"><?=$edit_msg?></a></td>
|
||||
<?php
|
||||
#Show custom description to delete button if defined
|
||||
$delete_msg=($pkg['adddeleteeditpagefields']['deletetext']?$pkg['adddeleteeditpagefields']['deletetext']:"Delete this item");
|
||||
?>
|
||||
<td valign="middle"><a href="pkg.php?xml=<?=$xml?>&act=del&id=<?=$i?>" onclick="return confirm('<?=gettext("Do you really want to delete this item?")?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" <?=domTT_title($delete_msg)?> alt="delete" /></a></td>
|
||||
<td><a class="btn btn-xs btn-danger" href="pkg.php?xml=<?=$xml?>&act=del&id=<?=$i?>"><?=gettext("Delete")?></a></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
@ -562,12 +562,14 @@ if ($savemsg)
|
||||
#Show custom description to add button if defined
|
||||
$add_msg=($pkg['adddeleteeditpagefields']['addtext']?$pkg['adddeleteeditpagefields']['addtext']:"Add a new item");
|
||||
?>
|
||||
<td valign="middle"><a href="pkg_edit.php?xml=<?=$xml?>&id=<?=$i?>" class="btn btn-xs btn-success"><?=gettext('Add')?></a></td>
|
||||
<td><a href="pkg_edit.php?xml=<?=$xml?>&id=<?=$i?>" class="btn btn-xs btn-success"><?=gettext('Add')?></a></td>
|
||||
<?php
|
||||
#Show description button and info if defined
|
||||
if ($pkg['adddeleteeditpagefields']['description']) {
|
||||
?>
|
||||
<td valign="middle"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_info_pkg.gif" <?=domTT_title($pkg['adddeleteeditpagefields']['description'])?> alt="info" /></td>
|
||||
<td>
|
||||
<i class="icon-large icon-info-sign"><?=$pkg['adddeleteeditpagefields']['description'])?></i>
|
||||
</td>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
@ -162,8 +162,10 @@ if(!$pkg_info || !is_array($pkg_info)):?>
|
||||
<option value="2" selected><?=gettext("Both")?></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-3"><a id="btnsearch" type="button" title="<?=gettext("Search")?>" class="btn btn-primary btn-sm"><?=gettext("Search")?></a>
|
||||
<a id="btnclear" type="button" title="<?=gettext("Clear")?>" class="btn btn-default btn-sm"><?=gettext("Clear")?></a></div>
|
||||
<div class="col-sm-3">
|
||||
<a id="btnsearch" type="button" title="<?=gettext("Search")?>" class="btn btn-primary btn-sm"><?=gettext("Search")?></a>
|
||||
<a id="btnclear" type="button" title="<?=gettext("Clear")?>" class="btn btn-default btn-sm"><?=gettext("Clear")?></a>
|
||||
</div>
|
||||
<div class="col-sm-10 col-sm-offset-2">
|
||||
<span class="help-block">Enter a search string or *nix regular expression to seach package names and descriptions.</span>
|
||||
</div>
|
||||
@ -213,14 +215,7 @@ if(!$pkg_info || !is_array($pkg_info)):?>
|
||||
<?php
|
||||
if (!$g['disablepackagehistory']):?>
|
||||
<td>
|
||||
<!-- We no longer have a package revision history URL
|
||||
$changeloglink is undefined
|
||||
<a target="_blank" title="<?=gettext("View changelog")?>" href="<?=htmlspecialchars($changeloglink)?>">
|
||||
-->
|
||||
<?=htmlspecialchars($index['version'])?>
|
||||
<!--
|
||||
</a>
|
||||
-->
|
||||
</td>
|
||||
<?php
|
||||
endif;
|
||||
|
||||
@ -2,31 +2,58 @@
|
||||
/* $Id$ */
|
||||
/*
|
||||
status_filter_reload.php
|
||||
Copyright (C) 2013-2015 Electric Sheep Fencing, LP
|
||||
Copyright (C) 2006 Scott Ullrich
|
||||
All rights reserved.
|
||||
|
||||
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: filter
|
||||
*/
|
||||
@ -111,12 +138,12 @@ function update_data(obj) {
|
||||
result_text = result_text.replace("\n", "");
|
||||
result_text = result_text.replace("\r", "");
|
||||
if (result_text) {
|
||||
jQuery('#status').html('<img src="/themes/<?=$g['theme']?>/images/misc/loader.gif" alt="loader" /> ' + result_text + '...');
|
||||
jQuery('#status').html(result_text + '...');
|
||||
} else {
|
||||
jQuery('#status').html('<img src="/themes/<?=$g['theme']?>/images/misc/loader.gif" alt="loader" /> Obtaining filter status...');
|
||||
jQuery('#status').html('Obtaining filter status...');
|
||||
}
|
||||
if (result_text == "Initializing") {
|
||||
jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif" alt="loader" /> Initializing...');
|
||||
jQuery('#status').html('Initializing...');
|
||||
} else if (result_text == "Done") {
|
||||
jQuery('#status').effect('highlight');
|
||||
jQuery('#status').html('Done. The filter rules have been reloaded.');
|
||||
|
||||
@ -227,8 +227,7 @@ if ($altq_list_queues[$curif]) {
|
||||
|
||||
$speedlimit = ($upstream + $downstream);
|
||||
|
||||
/* Set default colors explicitly, the theme can then override them below.
|
||||
This prevents missing colors in themes from crashing the graphs. */
|
||||
/* Set default colors explicitly.*/
|
||||
/* Traffic Outbound Out-P-4, Out-B-4, Out-P-6, Out-B-6 */
|
||||
$colortrafficup = array('666666', 'CCCCCC', '2217AA', '625AE7');
|
||||
|
||||
@ -287,17 +286,6 @@ $colorntpd = array('0080FF', '00E344', 'FF0000', '000000');
|
||||
/* Captive Portal Concurrent Concurrent Users */
|
||||
$colorcaptiveportalusers = array('990000');
|
||||
|
||||
/* select theme colors if the include file exists
|
||||
Note: Themes are no longer used in pfSense 2.3.x so don't try this any more
|
||||
|
||||
$rrdcolors = "{$g['www_path']}/themes/{$g['theme']}/rrdcolors.inc.php";
|
||||
if (file_exists($rrdcolors)) {
|
||||
include($rrdcolors);
|
||||
} else {
|
||||
log_error(sprintf(gettext("rrdcolors.inc.php for theme %s does not exist, using defaults!"), $g['theme']));
|
||||
}
|
||||
*/
|
||||
|
||||
switch ($curstyle) {
|
||||
case "absolute":
|
||||
$multiplier = 1;
|
||||
@ -1291,8 +1279,8 @@ if (($graphcmdreturn <> 0) || (!$data)) {
|
||||
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
|
||||
header("Cache-Control: no-cache, no-store, must-revalidate");
|
||||
header("Pragma: no-cache");
|
||||
$file= "/usr/local/www/themes/{$g['theme']}/images/misc/rrd_error.png";
|
||||
readfile($file);
|
||||
$input_errors[] = gettext("There has been an error in rendering the graph. Please check your system logs.");
|
||||
print_input_errors($input_errors);
|
||||
} else {
|
||||
$file = "$rrdtmppath$curdatabase-$curgraph.png";
|
||||
if (file_exists("$file")) {
|
||||
|
||||
@ -89,7 +89,6 @@ $pconfig['dnsallowoverride'] = isset($config['system']['dnsallowoverride']);
|
||||
$pconfig['timezone'] = $config['system']['timezone'];
|
||||
$pconfig['timeupdateinterval'] = $config['system']['time-update-interval'];
|
||||
$pconfig['timeservers'] = $config['system']['timeservers'];
|
||||
$pconfig['theme'] = $config['system']['theme'];
|
||||
$pconfig['language'] = $config['system']['language'];
|
||||
|
||||
$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
|
||||
@ -216,11 +215,6 @@ if ($_POST) {
|
||||
set_language($config['system']['language']);
|
||||
}
|
||||
|
||||
/* pfSense themes */
|
||||
if (!$g['disablethemeselection']) {
|
||||
update_if_changed("System Theme", $config['theme'], $_POST['theme']);
|
||||
}
|
||||
|
||||
/* XXX - billm: these still need updating after figuring out how to check if they actually changed */
|
||||
$olddnsservers = $config['system']['dnsserver'];
|
||||
unset($config['system']['dnsserver']);
|
||||
|
||||
@ -614,7 +614,6 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
$caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png";
|
||||
// Map CRLs to CAs in one pass
|
||||
$ca_crl_map = array();
|
||||
foreach($a_crl as $crl)
|
||||
|
||||
@ -2,35 +2,58 @@
|
||||
/* $Id$ */
|
||||
/*
|
||||
system_firmware.php
|
||||
Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com>
|
||||
Copyright (C) 2013-2015 Electric Sheep Fencing, LP
|
||||
All rights reserved.
|
||||
|
||||
originally part of m0n0wall (http://m0n0.ch/wall)
|
||||
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
|
||||
All rights reserved.
|
||||
|
||||
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_BUILDER_BINARIES: /usr/bin/tar
|
||||
pfSense_MODULE: firmware
|
||||
@ -105,7 +128,7 @@ if (is_subsystem_dirty('firmwarelock')) {
|
||||
$pgtitle = array(gettext("System"), gettext("Firmware"), gettext("Manual Update"));
|
||||
include("head.inc");
|
||||
include("fbegin.inc");
|
||||
print_info_box(gettext("An upgrade is currently in progress. The firewall will reboot when the operation is complete.") . "<p><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif' alt='update' /></p>");
|
||||
print_info_box(gettext("An upgrade is currently in progress. The firewall will reboot when the operation is complete."));
|
||||
include("foot.inc");
|
||||
exit;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user