From f6f6947e2b447ed277ef91c8de42dddc590dfb57 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfSense.org>
Date: Sat, 6 Feb 2010 15:44:11 -0500
Subject: Stop using the inline output function to include javascript and css
 files.   Even with this function speeding up embedded installs it slows down
 all installation via WAN links since it is loading so much data on every
 request.

---
 usr/local/www/head.inc  | 31 +++++++++++++++----------------
 usr/local/www/index.php | 10 ++++++----
 2 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index c31c56c..2bbe61f 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -33,34 +33,33 @@ $pagetitle = gentitle( $pgtitle );
 	<link rel="apple-touch-icon" href="/themes/<?php echo $g['theme']; ?>/apple-touch-icon.png"/>
         <?php if (strpos($_SERVER["SCRIPT_FILENAME"], "wizard.php") !== false &&
                   file_exists("{$g['www_path']}/themes/{$g['theme']}/wizard.css")): ?>
-					<?php outputCSSFileInline("{$g['www_path']}/themes/{$g['theme']}/wizard.css"); ?>
+					<?php echo "<style type=\"text/css\" src=\"{$g['www_path']}/themes/{$g['theme']}/wizard.css\"></style>"; ?>
         <?php else: ?>
         	<link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" />
         <?php endif; ?>
 		<?php 
 			if(file_exists("{$g['www_path']}/niftycssCode.css")) 
-				outputCSSFileInline("{$g['www_path']}/niftycssCode.css"); 
+				echo "<style type=\"text/css\" src=\"{$g['www_path']}/niftycssCode.css\"></style>";
 			if(file_exists("{$g['www_path']}/niftycssprintCode.css")) 
-				outputCSSPrintFileInline("{$g['www_path']}/niftycssprintCode.css");
+				echo "<style type=\"text/css\" src=\"{$g['www_path']}/niftycssprintCode.css\"></style>";
 			if(file_exists("{$g['www_path']}/javascript/niftyjsCode.js")) 
-				outputJavaScriptFileInline("{$g['www_path']}/javascript/niftyjsCode.js"); 
+				echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/niftyjsCode.js\"></script>\n";
 		?>
 		<script type="text/javascript">
 			var theme = "<?php echo $g['theme']; ?>";
 		</script>
-		<?php outputJavaScriptFileInline("{$g['www_path']}/themes/{$g['theme']}/loader.js"); ?>
+		<?php echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/themes/{$g['theme']}/loader.js\"></script>\n"; ?>
 <?php
 		if($_GET['enablefirebuglite']) {
-			outputJavaScriptFileInline("{$g['www_path']}/javascript/pi.js");
-			outputJavaScriptFileInline("{$g['www_path']}/javascript/firebug-lite.js");
+			echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/pi.js\"></script>\n";
+			echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/firebug-lite.js\"></script>\n";
 		}
-		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/prototype.js");
-		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/scriptaculous.js");
-		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/effects.js");
-		outputJavaScriptFileInline("{$g['www_path']}/javascript/scriptaculous/dragdrop.js");
+		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/prototype.js\"></script>\n";
+		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/scriptaculous.js\"></script>\n";
+		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/effects.js\"></script>\n";
+		echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/scriptaculous/dragdrop.js\"></script>\n";
 		if(file_exists("{$g['www_path']}/javascript/global.js"))
-			outputJavaScriptFileInline("{$g['www_path']}/javascript/global.js");
-
+			echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/global.js\"></script>\n";
 	/*
 	 *	Find all javascript files that need to be included
 	 *	for this page ... from the arrays ... :)
@@ -72,9 +71,9 @@ $pagetitle = gentitle( $pgtitle );
 	if (is_dir($path)) {
 		if ($dh = opendir($path)) {
 			while (($file = readdir($dh)) !== false) {
-		   		if (is_dir($file)) continue;
-				//echo "\t".'<script type="text/javascript" src="/javascript/'.$dir.'/'.$file.'"></script>'."\n";
-				outputJavaScriptFileInline("{$g['www_path']}/javascript/{$dir}/{$file}"); 
+		   		if (is_dir($file)) 
+					continue;
+				echo "\t<script type=\"text/javascript\" src=\"{$g['www_path']}/javascript/{$dir}/{$file}\"></script>\n";
 			}
 			closedir($dh);
 		}
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 6327001..b03d4f0 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -424,10 +424,12 @@ $closehead = false;
 ## Set Page Title and Include Header
 $pgtitle = array("{$g['product_name']} Dashboard");
 include("head.inc");
-outputJavaScriptFileInline("javascript/domTT/domLib.js");
-outputJavaScriptFileInline("javascript/domTT/domTT.js");
-outputJavaScriptFileInline("javascript/domTT/behaviour.js");
-outputJavaScriptFileInline("javascript/domTT/fadomatic.js");
+
+echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/domLib.js\"></script>\n";
+echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/domTT.js\"></script>\n";
+echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/behaviour.js\"></script>\n";
+echo "\t<script type=\"text/javascript\" src=\"javascript/domTT/fadomatic.js\"></script>\n";
+
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-- 
cgit v1.1