From 5bfc08bba2a2c8c145a933f073bf13df07d54938 Mon Sep 17 00:00:00 2001
From: Eddie Monge <eddie@eddiemonge.com>
Date: Wed, 21 Sep 2011 23:19:37 -0700
Subject: [PATCH] Issue 2499: Some php improvements

---
 combine.php               | 20 +++++++++++++++-----
 js/index.php              |  6 +++---
 themes/default/index.php  |  6 +++---
 themes/valencia/index.php |  6 +++---
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/combine.php b/combine.php
index 294076c1..deb1d798 100644
--- a/combine.php
+++ b/combine.php
@@ -1,17 +1,27 @@
 <?php
-
-if ( ! isset($type) || ! isset($elements) )
+// Get the filetype and array of files
+if ( ! isset($type) || ! isset($files) )
 {
-	echo '$type and $elements must be specified!';
+	echo '$type and $files must be specified!';
 	exit;
 }
 
 $contents = '';
 
-foreach ( $elements as $file ) {
+// Loop through the files adding them to a string
+foreach ( $files as $file ) {
 	$contents .= file_get_contents($file). "\n\n";
 }
 
+// If gzip is supported, send the file gzipped
+if (substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')) {
+	ob_start("ob_gzhandler");
+}
+
+// Set the content type, filesize and an expiration so its not cached
 header('Content-Type: ' . $type);
 header('Content-Length: ' . strlen($contents));
-echo $contents;
\ No newline at end of file
+header('Expires: Fri, 01 Jan 2010 05:00:00 GMT');
+
+// Deliver the file
+echo $contents;
diff --git a/js/index.php b/js/index.php
index 93f1014c..07cb99a1 100644
--- a/js/index.php
+++ b/js/index.php
@@ -1,6 +1,6 @@
 <?php
-$type = "text/javascript";
-$elements = array(
+$type = 'text/javascript';
+$files = array(
 	'jquery.ui.widget.js',
 	'jquery.mobile.widget.js',
 	'jquery.mobile.media.js',
@@ -38,4 +38,4 @@ $elements = array(
 	'jquery.mobile.init.js'
 );
 
-include('../combine.php');
\ No newline at end of file
+require_once('../combine.php');
diff --git a/themes/default/index.php b/themes/default/index.php
index 456873de..6e1a247c 100644
--- a/themes/default/index.php
+++ b/themes/default/index.php
@@ -1,6 +1,6 @@
 <?php
-$type = "text/css";
-$elements = array(
+$type = 'text/css';
+$files = array(
 	'jquery.mobile.theme.css',
 	'jquery.mobile.core.css',
 	'jquery.mobile.transitions.css',
@@ -19,4 +19,4 @@ $elements = array(
 	'jquery.mobile.forms.slider.css'
 );
 
-include('../../combine.php');
\ No newline at end of file
+require_once('../../combine.php');
diff --git a/themes/valencia/index.php b/themes/valencia/index.php
index 12322284..670add61 100644
--- a/themes/valencia/index.php
+++ b/themes/valencia/index.php
@@ -1,6 +1,6 @@
 <?php
-$type = "text/css";
-$elements = array(
+$type = 'text/css';
+$files = array(
 	'jquery.mobile.theme.css',
 	'../default/jquery.mobile.core.css',
 	'../default/jquery.mobile.transitions.css',
@@ -19,4 +19,4 @@ $elements = array(
 	'../default/jquery.mobile.forms.slider.css'
 );
 
-include('../../combine.php');
+require_once('../../combine.php');