lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(legacy) restructure requires/includes, move globals.inc

Browse Source
This commit is contained in:
Ad Schellevis 2015-07-20 16:16:28 +00:00
parent 315b71acb2
commit 3cd79bd2a1
32 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/inc/auth.inc
View File

@ -36,9 +36,6 @@
* file courtesy of Michael Retterklieber.
*/
// previous in config.gui.inc
require_once("globals.inc");
/* include globals from notices.inc /utility/XML parser files */
require_once('config.lib.inc');
require_once("util.inc");

1
src/etc/inc/authgui.inc
View File

@ -33,7 +33,6 @@
require_once("auth.inc");
require_once("filter.inc");
require_once("functions.inc");
require_once("globals.inc");
// provided via legacy_bindings.inc
global $priv_list;

1
src/etc/inc/config.inc
View File

@ -44,7 +44,6 @@ require_once("util.inc");
require_once("IPv6.inc");
require_once("xmlparse.inc");
require_once("crypt.inc");
require_once("globals.inc");
$config = parse_config();

14
src/etc/inc/interfaces.inc
View File

@ -30,9 +30,12 @@
*/
require_once("interfaces.lib.inc");
require_once("globals.inc");
require_once("util.inc");
require_once("gwlb.inc");
require_once('services.inc');
require_once('openvpn.inc');
require_once("services.inc");
/*
* converts a string like "a,b,c,d"
@ -1343,8 +1346,6 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
}
if (!empty($track6) && is_array($track6)) {
if (!function_exists('services_dhcp_configure'))
require_once('services.inc');
/* Bring down radvd and dhcp6 on these interfaces */
services_dhcpd_configure('inet6', $track6);
}
@ -2833,8 +2834,6 @@ function interface_virtual_create($interface) {
if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'])) {
foreach ($config['openvpn']['openvpn-server'] as $server) {
if ($interface == "ovpns{$server['vpnid']}") {
if (!function_exists('openvpn_resync'))
require_once('openvpn.inc');
log_error("OpenVPN: Resync server {$server['description']}");
openvpn_resync('server', $server);
}
@ -2845,8 +2844,6 @@ function interface_virtual_create($interface) {
if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'])) {
foreach ($config['openvpn']['openvpn-client'] as $client) {
if ($interface == "ovpnc{$client['vpnid']}") {
if (!function_exists('openvpn_resync'))
require_once('openvpn.inc');
log_error("OpenVPN: Resync server {$client['description']}");
openvpn_resync('client', $client);
}
@ -3213,9 +3210,6 @@ function interface_track6_configure($interface = 'lan', $wancfg, $linkupevent =
}
if (!file_exists("/var/run/booting") && $linkupevent == false) {
if (!function_exists('services_dhcpd_configure'))
require_once("services.inc");
services_dhcpd_configure("inet6");
}

1
src/etc/inc/ipsec.auth-user.php
View File

@ -34,7 +34,6 @@
* in our config.xml file and check the credentials.
*/
require_once("globals.inc");
require_once("config.inc");
require_once("radius.inc");
require_once("auth.inc");

7
src/etc/inc/notices.inc
View File

@ -28,7 +28,6 @@
*
*/
require_once("globals.inc");
require_once("led.inc");
require_once("util.inc");
require_once("notices.growl.class");
@ -90,8 +89,6 @@ function file_notice($id, $notice, $category = "General", $url = "", $priority =
******/
function get_notices($category = 'all')
{
global $g;
if (file_exists('/tmp/notices')) {
$queue = unserialize(file_get_contents('/tmp/notices'));
if(!$queue) return false;
@ -218,7 +215,7 @@ function are_notices_pending($category = 'all')
* returns true if message was sent
******/
function notify_via_smtp($message, $force = false) {
global $config, $g;
global $config;
if(file_exists("/var/run/booting"))
return;
@ -242,7 +239,7 @@ function notify_via_smtp($message, $force = false) {
}
function send_smtp_message($message, $subject = "(no subject)") {
global $config, $g;
global $config;
if(!$config['notifications']['smtp']['ipaddress'])
return;

1
src/etc/inc/openvpn-client-export.inc
View File

@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("globals.inc");
require_once("openvpn.inc");
require_once("filter.inc");
require_once("util.inc");

1
src/etc/inc/openvpn.auth-user.php
View File

@ -34,7 +34,6 @@
* in our config.xml file and check the credentials.
*/
require_once("globals.inc");
require_once("config.inc");
require_once("radius.inc");
require_once("auth.inc");

1
src/etc/inc/openvpn.tls-verify.php
View File

@ -35,7 +35,6 @@
* intermediates.
*/
require_once("globals.inc");
require_once("config.inc");
require_once("interfaces.inc");

2
src/etc/rc.bootup
View File

@ -103,8 +103,6 @@ echo " done.\n";
echo "Initializing...";
echo ".";
require_once("globals.inc");
echo ".";
require_once("led.inc");
led_normalize();
echo ".";

1
src/etc/rc.filter_configure_xmlrpc
View File

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

1
src/etc/rc.filter_synchronize
View File

@ -31,7 +31,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("globals.inc");
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");

1
src/etc/rc.kill_states
View File

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

1
src/etc/rc.linkup
View File

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

1
src/etc/rc.newwanip
View File

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

1
src/etc/rc.newwanipv6
View File

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

1
src/etc/rc.php_test_run
View File

@ -7,7 +7,6 @@
small tests to ensure the php environment is sane.
*/
require_once('globals.inc');
require_once('util.inc');
require_once('xmlparse.inc');
require_once('config.lib.inc');

1
src/etc/rc.resolv_conf_generate
View File

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

1
src/etc/rc.sshd
View File

@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once('globals.inc');
require_once('config.inc');
require_once('functions.inc');

1
src/sbin/gmirror_status_check.php
View File

@ -27,7 +27,6 @@
*/
require_once("config.inc");
require_once("globals.inc");
require_once("gmirror.inc");
global $g;

1
src/www/carp_status.php
View File

@ -28,7 +28,6 @@
*/
require_once("guiconfig.inc");
require_once("globals.inc");
function interfaces_carp_set_maintenancemode($carp_maintenancemode){
global $config;

1
src/www/fbegin.inc
View File

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

1
src/www/graph.php
View File

@ -28,7 +28,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("globals.inc");
require_once("guiconfig.inc");
header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" );

5
src/www/services_dhcp_edit.php
View File

@ -27,6 +27,8 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
function staticmapcmp($a, $b) {
return ipcmp($a['ipaddr'], $b['ipaddr']);
}
@ -37,9 +39,6 @@ function staticmaps_sort($ifgui) {
usort($config['dhcpd'][$ifgui]['staticmap'], "staticmapcmp");
}
require_once('globals.inc');
require_once("guiconfig.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcp.php');
$if = $_GET['if'];

3
src/www/services_dhcpv6_edit.php
View File

@ -27,6 +27,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
function staticmapcmp($a, $b) {
return ipcmp($a['ipaddrv6'], $b['ipaddrv6']);
@ -38,8 +39,6 @@ function staticmaps_sort($ifgui) {
usort($config['dhcpdv6'][$ifgui]['staticmap'], "staticmapcmp");
}
require_once('globals.inc');
require_once("guiconfig.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcpv6.php');

1
src/www/status_filter_reload.php
View File

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

1
src/www/status_rrd_graph_img.php
View File

@ -27,7 +27,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("globals.inc");
require_once("guiconfig.inc");
require_once("filter.inc");
require_once("rrd.inc");

1
src/www/system_gateways_edit.php
View File

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

1
src/www/vpn_openvpn_export.php
View File

@ -30,7 +30,6 @@
DISABLE_PHP_LINT_CHECKING
*/
require_once("globals.inc");
require_once("guiconfig.inc");
require("openvpn-client-export.inc");

1
src/www/vpn_openvpn_export_shared.php
View File

@ -27,7 +27,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("globals.inc");
require_once("guiconfig.inc");
require_once("openvpn-client-export.inc");

1
src/www/widgets/widgets/captive_portal_status.widget.php
View File

@ -30,7 +30,6 @@
$nocsrf = true;
require_once("globals.inc");
require_once("guiconfig.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");

1
src/www/wizard.php
View File

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