Minor tweaks to smartoptimizer

Author: Jamie Snape

core/public/smartoptimizer/config.php

@@ -17,46 +17,48 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
+
 /*
  * SmartOptimizer Configuration File
  */
+
 if(file_exists('../../configs/application.local.ini'))
 	{
-	$config=parse_ini_file('../../configs/application.local.ini');
+	$config = parse_ini_file('../../configs/application.local.ini');
 	}
 else
 	{
-	$config=parse_ini_file('../../configs/application.ini');
+	$config = parse_ini_file('../../configs/application.ini');
 	}
-  
-if(isset($config['smartoptimizer'])&&$config['smartoptimizer']==1)
-{
-//use this to set gzip compression On or Off
-$settings['gzip'] = true;
 
-//use this to set Minifier On or Off
-$settings['minify'] = true;
+if(isset($config['smartoptimizer']) && $config['smartoptimizer'] == 1 && is_writable('../../../tmp/cache/smartoptimizer/'))
+  {
+  //use this to set gzip compression On or Off
+  $settings['gzip'] = true;
 
-//use this to set file concatenation On or Off
-$settings['concatenate'] = true;
+  //use this to set Minifier On or Off
+  $settings['minify'] = true;
 
-//specifies whether to emebed files included in css files using the data URI scheme or not 
-$settings['embed'] = false;
-}
+  //use this to set file concatenation On or Off
+  $settings['concatenate'] = true;
+
+  //specifies whether to emebed files included in css files using the data URI scheme or not 
+  $settings['embed'] = false;
+  }
 else
-{
-//use this to set gzip compression On or Off
-$settings['gzip'] = false;
+  {
+  //use this to set gzip compression On or Off
+  $settings['gzip'] = false;
 
-//use this to set Minifier On or Off
-$settings['minify'] = false;
+  //use this to set Minifier On or Off
+  $settings['minify'] = false;
 
-//use this to set file concatenation On or Off
-$settings['concatenate'] = false;
+  //use this to set file concatenation On or Off
+  $settings['concatenate'] = false;
 
-//specifies whether to emebed files included in css files using the data URI scheme or not 
-$settings['embed'] = false;
-}
+  //specifies whether to emebed files included in css files using the data URI scheme or not 
+  $settings['embed'] = false;
+  }
 
 //base dir (a relative path to the base directory)
 $settings['baseDir'] = '../';
@@ -67,15 +69,12 @@
 //Show error messages if any error occurs (true or false)
 $settings['debug'] = false;
 
-
 //use this to set gzip compression level (an integer between 1 and 9)
 $settings['compressionLevel'] = 9;
 
 //these types of files will not be gzipped nor minified
 $settings['gzipExceptions'] = array('gif','jpeg','jpg','png','swf'); 
 
-
-
 //separator for files to be concatenated
 $settings['separator'] = ',';
 
@@ -102,5 +101,3 @@
 
 //Setting this to false will force the browser to use cached files without checking for changes.
 $settings['clientCacheCheck'] = true;
-
-?>

core/public/smartoptimizer/index.php

@@ -17,6 +17,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
+
 /* SmartOptimizer v1.8
  * SmartOptimizer enhances your website performance using techniques
  * such as compression, concatenation, minifying, caching, and embedding on demand.
@@ -212,5 +213,3 @@ function_exists('gzencode'));
 		readfile($cachedFile);
 	}
 } else headerExit('304 Not Modified');
-
-?>

core/public/smartoptimizer/minifiers/css.php

@@ -17,10 +17,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
+
 /*
  * SmartOptimizer CSS Minifier
  */
-
 function convertUrl($url, $count)
 {
 	global $settings, $mimeTypes, $fileDir;
@@ -51,7 +51,7 @@ function convertUrl($url, $count)
 	}
 
 	$contents = file_get_contents($fileDir.$url);
-	 
+	
 	if ($fileType == 'css') {
 		$oldFileDir = $fileDir;
 		$fileDir = rtrim(dirname($fileDir.$url), '\/').'/';
@@ -62,7 +62,7 @@ function convertUrl($url, $count)
 		$baseUrl = $oldBaseUrl;
 	}
 
-	$base64   = base64_encode($contents); 
+	$base64   = base64_encode($contents);
 	return 'data:' . $mimeType . ';base64,' . $base64;
 }
 
@@ -131,4 +131,3 @@ function minify_css($str) {
 	if ($i<strlen($str) && preg_match('/[^\n\r\t ]/', $str[$i])) $res .= $str[$i];
 	return $res;
 }
-?>

core/public/smartoptimizer/minifiers/js.php

@@ -17,6 +17,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
+
 /*
  * SmartOptimizer JavaScript Minifier
  */
@@ -64,8 +65,6 @@ function minify_js($str) {
 			while ($i<strlen($str) && $str[$i]!="\n" && $str[$i]!="\r") $i++;
 		}
 
-
-
 		$LF_needed = false;
 		if (preg_match('/[\n\r\t ]/', $str[$i])) {
 			if (strlen($res) && preg_match('/[\n ]/', $res[strlen($res)-1])) {
@@ -112,4 +111,3 @@ function minify_js($str) {
 	if ($i<strlen($str) && preg_match('/[^\n\r\t ]/', $str[$i])) $res .= $str[$i];
 	return $res;
 }
-?>