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

src/bin/easyrule

@@ -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) {

src/etc/inc/functions.inc

@@ -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");

src/etc/inc/openvpn.inc

@@ -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;

src/etc/inc/pkg-utils.inc

@@ -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;

src/etc/rc.bootup

@@ -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 */

src/etc/rc.start_packages

@@ -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.");

src/etc/rc.update_urltables

@@ -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

src/www/bandwidth_by_ip.php

@@ -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 = "";

src/www/diag_packet_capture.php

 <?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";

src/www/getserviceproviders.php

@@ -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);

src/www/includes/functions.inc.php

@@ -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();

src/www/system_firmware_auto.php

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

src/www/system_firmware_check.php

@@ -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 */

src/www/widgets/widgets/captive_portal_status.widget.php

@@ -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");
 

src/www/widgets/widgets/carp_status.widget.php

@@ -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");
 

src/www/widgets/widgets/dyn_dns_status.widget.php

@@ -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");
 

src/www/widgets/widgets/gateways.widget.php

@@ -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");
 

src/www/widgets/widgets/interface_list.widget.php

@@ -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");
 

src/www/widgets/widgets/interface_statistics.widget.php

@@ -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");
 

src/www/widgets/widgets/load_balancer_status.widget.php

@@ -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");
 

src/www/widgets/widgets/log.widget.php

@@ -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");
 

src/www/widgets/widgets/ntp_status.widget.php

@@ -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");
 

src/www/widgets/widgets/picture.widget.php

@@ -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") {

src/www/widgets/widgets/rss.widget.php

@@ -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']) {

src/www/widgets/widgets/smart_status.widget.php

@@ -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");
 

src/www/widgets/widgets/traffic_graphs.widget.php

@@ -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;