(legacy) dependency cleanups related to functions.inc / interfaces.inc

This commit is contained in:
Ad Schellevis 2015-07-22 16:56:38 +00:00
parent d440d59a34
commit 465e699e71
182 changed files with 119 additions and 120 deletions

View File

@ -29,7 +29,7 @@
require_once("config.inc");
require_once("auth.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("captiveportal.inc");
require_once("util.inc");

View File

@ -36,7 +36,6 @@
/* include all configuration functions */
require_once("config.inc");
require_once("functions.inc");
require_once("radius.inc");
require_once("captiveportal.radius_accounting.inc");
require_once("captiveportal.radius_authentication.inc");

View File

@ -1,6 +1,5 @@
<?php
require_once("functions.inc");
/* MiniUPnPd */

View File

@ -26,9 +26,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
/* include all configuration functions */
require_once("functions.inc");
/* Optimize Unbound for environment */
function unbound_optimization() {
global $config;

View File

@ -28,7 +28,7 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("util.inc");
require_once("filter.inc");
require_once("captiveportal.inc");

View File

@ -27,7 +27,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("functions.inc");
require_once("config.inc");
require_once("openvpn.inc");
require_once("interfaces.inc");

View File

@ -27,7 +27,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("functions.inc");
require_once("config.inc");
require_once("openvpn.inc");
require_once("interfaces.inc");

View File

@ -29,7 +29,7 @@
require_once("config.inc");
require_once("gwlb.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("util.inc");
require_once("filter.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
$removed = 0;

View File

@ -28,13 +28,12 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("util.inc");
require_once("filter.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
require_once("system.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
filter_configure_sync();

View File

@ -33,7 +33,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("util.inc");
require_once("xmlrpc.inc");

View File

@ -32,7 +32,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("util.inc");
require_once("interfaces.inc");

View File

@ -30,7 +30,6 @@
/* parse the configuration and include all functions used below */
require_once("util.inc");
require_once("config.lib.inc");
require_once("functions.inc");
require_once("pfsense-utils.inc");
$fp = fopen('php://stdin', 'r');

View File

@ -29,7 +29,6 @@
require_once('config.inc');
require_once('auth.inc');
require_once('functions.inc');
$fp = fopen('php://stdin', 'r');

View File

@ -29,7 +29,6 @@
/* parse the configuration and include all functions used below */
require_once("config.inc");
require_once("functions.inc");
require_once("util.inc");
$fp = fopen('php://stdin', 'r');

View File

@ -29,7 +29,7 @@
/* parse the configuration and include all functions used below */
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("util.inc");
require_once("filter.inc");
require_once("rrd.inc");

View File

@ -30,7 +30,6 @@
/* parse the configuration and include all functions used below */
require_once("config.inc");
require_once("config.console.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("util.inc");
require_once("ipsec.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("util.inc");
require_once("filter.inc");
require_once("system.inc");

View File

@ -32,11 +32,11 @@
require_once("util.inc");
require_once("config.inc");
require_once("gwlb.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
/* make sure to wait until the boot scripts have finished */
if (file_exists('/var/run/booting')) {

View File

@ -30,7 +30,6 @@
/* parse the configuration and include all functions used below */
require_once("util.inc");
require_once("config.inc");
require_once("functions.inc");
require_once("system.inc");
require_once("pfsense-utils.inc");

View File

@ -30,7 +30,6 @@
/* parse the configuration and include all functions used below */
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("ipsec.inc");
require_once("vpn.inc");

View File

@ -30,7 +30,7 @@
/* parse the configuration and include all functions used below */
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
require_once("ipsec.inc");
require_once("vpn.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
$arguments = getopt("egm:");

View File

@ -31,7 +31,7 @@
/* parse the configuration and include all functions used below */
require_once("util.inc");
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
require_once("gwlb.inc");
require_once("openvpn.inc");

View File

@ -10,7 +10,6 @@
require_once('util.inc');
require_once('xmlparse.inc');
require_once('config.lib.inc');
require_once('functions.inc');
$config = parse_config();

View File

@ -28,7 +28,7 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
require_once("captiveportal.inc");
require_once("util.inc");

View File

@ -28,7 +28,7 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
require_once("ipsec.inc");
require_once("vpn.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("util.inc");
require_once("openvpn.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("system.inc");
require_once("pfsense-utils.inc");

View File

@ -2,7 +2,7 @@
<?php
require_once('config.inc');
require_once('functions.inc');
require_once('interfaces.inc');
require_once('captiveportal.inc');
require_once('rrd.inc');
require_once("util.inc");

View File

@ -30,7 +30,6 @@
*/
require_once('config.inc');
require_once('functions.inc');
require_once("util.inc");
$bin_ssh_keygen = '/usr/local/bin/ssh-keygen';

View File

@ -28,7 +28,6 @@
*/
require_once("config.inc");
require_once("functions.inc");
require_once("util.inc");
require_once("pfsense-utils.inc");

View File

@ -27,7 +27,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("functions.inc");
require_once("interfaces.inc");
require_once("config.inc");
require_once("captiveportal.inc");
require_once("util.inc");

View File

@ -29,6 +29,7 @@
require_once("guiconfig.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
function interfaces_carp_set_maintenancemode($carp_maintenancemode){
global $config;

View File

@ -29,7 +29,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("captiveportal.inc");
define("FILE_SIZE", 450000);

View File

@ -32,6 +32,7 @@
require_once("guiconfig.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
function leasecmp($a, $b) {
return strcmp($a[$_GET['order']], $b[$_GET['order']]);

View File

@ -37,7 +37,7 @@ $omit_nocacheheaders = true;
$nocsrf = true;
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
require_once("services.inc");
require_once("rrd.inc");

View File

@ -37,6 +37,7 @@ $shortcut_section = "ipsec";
require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
include("head.inc");
function ipsec_get_descr($ikeid) {

View File

@ -29,6 +29,7 @@
require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
$pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("Leases"));

View File

@ -30,6 +30,7 @@
require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
$pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SAD"));

View File

@ -30,6 +30,7 @@
require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("services.inc");
require_once("interfaces.inc");
$pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SPD"));
$shortcut_section = "ipsec";

View File

@ -32,6 +32,7 @@ global $g;
require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("interfaces.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();

View File

@ -30,6 +30,7 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
$system_logfile = '/var/log/system.log';

View File

@ -30,6 +30,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$portal_logfile = '/var/log/portalauth.log';

View File

@ -31,6 +31,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$dhcpd_logfile = '/var/log/dhcpd.log';

View File

@ -36,11 +36,11 @@ require_once("filter.inc");
require_once("filter_log.inc");
require_once("system.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
/********************************************************************************************************************
* imported from easyrule.inc/php
********************************************************************************************************************/
require_once("functions.inc");
function easyrule_find_rule_interface($int) {
global $config;

View File

@ -31,6 +31,7 @@
require_once("guiconfig.inc");
require_once("filter_log.inc");
require_once("system.inc");
require_once("interfaces.inc");
$filter_logfile = '/var/log/filter.log';

View File

@ -31,6 +31,7 @@ $pgtitle = gettext("Status").": ".gettext("System logs").": ".gettext("Firewall
$shortcut_section = "firewall";
require_once("guiconfig.inc");
require_once("filter_log.inc");
require_once("interfaces.inc");
$filter_logfile = '/var/log/filter.log';
$lines = 5000;

View File

@ -32,6 +32,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$system_logfile = '/var/log/gateways.log';

View File

@ -32,6 +32,7 @@ require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "", $grepreverse = false) {

View File

@ -31,6 +31,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$ntpd_logfile = '/var/log/ntpd.log';

View File

@ -32,6 +32,7 @@ require_once("guiconfig.inc");
require_once("vpn.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN"));
$shortcut_section = "openvpn";

View File

@ -30,6 +30,7 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
$ppps_logfile = '/var/log/ppps.log';

View File

@ -31,6 +31,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$relayd_logfile = '/var/log/relayd.log';

View File

@ -32,6 +32,7 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("interfaces.inc");
$system_logfile = '/var/log/resolver.log';

View File

@ -29,6 +29,7 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
$routing_logfile = '/var/log/routing.log';

View File

@ -28,7 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
require_once("system.inc");
require_once("pfsense-utils.inc");

View File

@ -31,6 +31,7 @@ $pgtitle = array(gettext("Status"), gettext("System logs"), gettext("VPN"));
require_once("guiconfig.inc");
require_once("vpn.inc");
require_once("system.inc");
require_once("interfaces.inc");
$nentries = $config['syslog']['nentries'];
if (!$nentries)

View File

@ -31,6 +31,7 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
$wireless_logfile = '/var/log/wireless.log';

View File

@ -73,6 +73,7 @@ if ($_POST['downloadbtn'] == gettext("Download Capture"))
$pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture"));
require_once("guiconfig.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
$fp = "/root/";
$fn = "packetcapture.cap";

View File

@ -29,6 +29,7 @@
$pgtitle = array(gettext("Diagnostics"), gettext("Ping"));
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
define('MAX_COUNT', 10);
define('DEFAULT_COUNT', 3);

View File

@ -30,6 +30,7 @@
$pgtitle = array(gettext("Diagnostics"), gettext("Test Port"));
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
define('NC_TIMEOUT', 10);
$do_testport = false;

View File

@ -28,6 +28,7 @@
require_once("guiconfig.inc");
require_once("system.inc");
require_once("interfaces.inc");
$pgtitle = array(gettext("Diagnostics"),gettext("Traceroute"));
include("head.inc");

View File

@ -28,7 +28,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("functions.inc");
require_once("shortcuts.inc");
function find_service_by_name($name) {

View File

@ -29,7 +29,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
if (!is_array($config['aliases'])) {

View File

@ -31,7 +31,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("pfsense-utils.inc");
/* returns an array consisting of every element of $haystack that is not equal to $needle. */

View File

@ -29,7 +29,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
/****f* legacy/have_natpfruleint_access

View File

@ -27,7 +27,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
if (!is_array($config['nat']['onetoone']))

View File

@ -27,8 +27,8 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("interfaces.inc");
if (!is_array($config['nat']['npt'])) {
$config['nat']['npt'] = array();

View File

@ -28,9 +28,9 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
global $GatewaysList;

View File

@ -29,7 +29,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("pfsense-utils.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");

View File

@ -30,7 +30,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("filter.inc");
if (!is_array($config['virtualip']['vip'])) {

View File

@ -30,6 +30,7 @@
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
require_once("pfsense-utils.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');

View File

@ -29,6 +29,7 @@
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" );
header("Expires: " . gmdate( "D, j M Y H:i:s", time() ) . " GMT" );

View File

@ -7,6 +7,7 @@ if(Connection_Aborted()) {
require_once("config.inc");
require_once("filter.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
function get_uptime_sec() {
$boottime = "";

View File

@ -32,7 +32,6 @@ $pgtitle = array(gettext("Interfaces"),gettext("Assign network ports"));
$shortcut_section = "interfaces";
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("ipsec.inc");
require_once("vpn.inc");

View File

@ -28,6 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
if (!is_array($config['bridges'])) {
$config['bridges'] = array();

View File

@ -27,6 +27,7 @@
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
if (!is_array($config['gifs']['gif']))
$config['gifs']['gif'] = array();

View File

@ -27,7 +27,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
if (!is_array($config['gres']['gre']))
$config['gres']['gre'] = array();

View File

@ -27,7 +27,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("system.inc");
require_once("interfaces.inc");
require_once("pfsense-utils.inc");

View File

@ -28,7 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
if (!is_array($config['ifgroups']['ifgroupentry']))
$config['ifgroups']['ifgroupentry'] = array();

View File

@ -28,7 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
$pgtitle = array(gettext("Interfaces"),gettext("Groups"),gettext("Edit"));
$shortcut_section = "interfaces";

View File

@ -27,7 +27,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
function ppp_inuse($num) {
global $config, $g;

View File

@ -29,7 +29,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_ppps.php');

View File

@ -27,7 +27,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
if (!is_array($config['qinqs']['qinqentry']))
$config['qinqs']['qinqentry'] = array();

View File

@ -31,6 +31,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("QinQ"), gettext("Edit"));
$shortcut_section = "interfaces";
require_once("guiconfig.inc");
require_once("interfaces.inc");
if (!is_array($config['qinqs']['qinqentry']))
$config['qinqs']['qinqentry'] = array();

View File

@ -28,6 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
if (!is_array($config['vlans'])) {
$config['vlans'] = array();

View File

@ -28,6 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_wireless.php');

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("load_balancer_maintable.inc");
require_once("services.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("load_balancer_maintable.inc");
require_once("services.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("load_balancer_maintable.inc");
require_once("services.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("load_balancer_maintable.inc");
require_once("services.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("services.inc");
require_once("vslb.inc");

View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("vslb.inc");
require_once("load_balancer_maintable.inc");

View File

@ -27,7 +27,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("captiveportal.inc");
require_once("system.inc");

View File

@ -28,7 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("interfaces.inc");
require_once("captiveportal.inc");
require_once("filter.inc");
require_once("services.inc");

View File

@ -28,7 +28,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("captiveportal.inc");
require_once("services.inc");

View File

@ -27,7 +27,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("captiveportal.inc");
require_once("services.inc");

View File

@ -29,7 +29,6 @@
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("captiveportal.inc");
require_once("services.inc");

Some files were not shown because too many files have changed in this diff Show More