lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 09:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: move files back, the update system isn't ready for this

Browse Source
This commit is contained in:
Franco Fichtner 2015-03-06 17:27:42 +01:00
parent 5e648312ac
commit cabdbf8c28
33 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/easyrule
View File

@ -28,7 +28,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("easyrule.inc");
require_once("filter.inc");
require_once("shaper.inc");
@ -43,7 +43,7 @@ foreach ($ifdisp as $kif => $kdescr) {
/* Borrow this function from guiconfig.inc since we can't include it for use at the CLI
- Maybe these need to be moved to util.inc or legacy.inc?
- Maybe these need to be moved to util.inc or pfsense-utils.inc?
*/
function pconfig_to_address(&$adr, $padr, $pmask, $pnot=false, $pbeginport=0, $pendport=0) {

2
src/etc/inc/functions.inc
View File

@ -138,7 +138,7 @@ if(!function_exists("dom_title")) {
require_once("interfaces.inc");
require_once("gwlb.inc");
require_once("services.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("certs.inc");
require_once("system.inc");
require_once("vslb.inc");

2
src/etc/inc/openvpn.inc
View File

@ -31,7 +31,7 @@
require_once('config.inc');
require_once('certs.inc');
require_once('legacy.inc');
require_once('pfsense-utils.inc');
require_once('auth.inc');
global $openvpn_prots;

0
src/etc/inc/legacy.inc → src/etc/inc/pfsense-utils.inc
View File

4
src/etc/inc/pkg-utils.inc
View File

@ -32,7 +32,7 @@ require_once("globals.inc");
require_once("xmlrpc.inc");
require_once("service-utils.inc");
require_once("xmlparse.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
if(!function_exists("update_status")) {
function update_status($status) {
@ -1251,7 +1251,7 @@ function stop_packages()
require_once("shaper.inc");
require_once("captiveportal.inc");
require_once("pkg-utils.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("service-utils.inc");
global $config, $g;

2
src/etc/rc.bootup
View File

@ -111,7 +111,7 @@ require_once("captiveportal.inc");
echo ".";
require_once("rrd.inc");
echo ".";
require_once("legacy.inc");
require_once("pfsense-utils.inc");
echo ".";
/* get system memory amount */

2
src/etc/rc.start_packages
View File

@ -33,7 +33,7 @@ require_once("filter.inc");
require_once("shaper.inc");
require_once("captiveportal.inc");
require_once("pkg-utils.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("service-utils.inc");
log_error("Restarting/Starting all packages.");

2
src/etc/rc.update_urltables
View File

@ -3,7 +3,7 @@
require_once("config.inc");
require_once("util.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
if (!is_array($config['aliases']['alias'])) {
// No aliases

2
src/www/bandwidth_by_ip.php
View File

@ -35,7 +35,7 @@
require_once('guiconfig.inc');
require_once('interfaces.inc');
require_once('legacy.inc');
require_once('pfsense-utils.inc');
require_once('util.inc');
$listedIPs = "";

3
src/www/diag_packet_capture.php
View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2014 Deciso B.V.
@ -73,7 +74,7 @@ if ($_POST['downloadbtn'] == gettext("Download Capture"))
$pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture"));
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
$fp = "/root/";
$fn = "packetcapture.cap";

0
src/etc/inc/fbegin.inc → src/www/fbegin.inc
View File

0
src/etc/inc/fend.inc → src/www/fend.inc
View File

0
src/etc/inc/foot.inc → src/www/foot.inc
View File

2
src/www/getserviceproviders.php
View File

@ -28,7 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
$serviceproviders_xml = "/usr/local/share/mobile-broadband-provider-info/serviceproviders.xml";
$serviceproviders_contents = file_get_contents($serviceproviders_xml);

0
src/etc/inc/guiconfig.inc → src/www/guiconfig.inc
View File

0
src/etc/inc/head.inc → src/www/head.inc
View File

2
src/www/includes/functions.inc.php
View File

@ -5,7 +5,7 @@ if(Connection_Aborted()) {
}
require_once("config.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
function get_stats() {
$stats['cpu'] = cpu_usage();

0
src/etc/inc/shortcuts.inc → src/www/shortcuts.inc
View File

2
src/www/system_firmware_auto.php
View File

@ -31,7 +31,7 @@
$nocsrf = true;
require_once('guiconfig.inc');
require_once('legacy.inc');
require_once('pfsense-utils.inc');
$curcfg = $config['system']['firmware'];

2
src/www/system_firmware_check.php
View File

@ -29,7 +29,7 @@
*/
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("script/load_phalcon.php");
/* Setup variables for upgrade procedure */

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

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

2
src/www/widgets/widgets/carp_status.widget.php
View File

@ -30,7 +30,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/carp_status.inc");

2
src/www/widgets/widgets/dyn_dns_status.widget.php
View File

@ -31,7 +31,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/dyn_dns_status.inc");

2
src/www/widgets/widgets/gateways.widget.php
View File

@ -29,7 +29,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/gateways.inc");

2
src/www/widgets/widgets/interface_list.widget.php
View File

@ -32,7 +32,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/interfaces.inc");

2
src/www/widgets/widgets/interface_statistics.widget.php
View File

@ -32,7 +32,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/interface_statistics.inc");

2
src/www/widgets/widgets/load_balancer_status.widget.php
View File

@ -34,7 +34,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("vslb.inc");

2
src/www/widgets/widgets/log.widget.php
View File

@ -32,7 +32,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("filter_log.inc");

2
src/www/widgets/widgets/ntp_status.widget.php
View File

@ -32,7 +32,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/ntp_status.inc");

2
src/www/widgets/widgets/picture.widget.php
View File

@ -29,7 +29,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
if($_GET['getpic']=="true") {

2
src/www/widgets/widgets/rss.widget.php
View File

@ -29,7 +29,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
if($_POST['rssfeed']) {

2
src/www/widgets/widgets/smart_status.widget.php
View File

@ -28,7 +28,7 @@
*/
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
require_once("widgets/include/smart_status.inc");

2
src/www/widgets/widgets/traffic_graphs.widget.php
View File

@ -32,7 +32,7 @@
$nocsrf = true;
require_once("guiconfig.inc");
require_once("legacy.inc");
require_once("pfsense-utils.inc");
require_once("functions.inc");
$first_time = false;