Completed
Push — master ( 821021...ec9c1e )
by frank
02:20
created
classes/autoptimizeBase.php 2 patches
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -343,45 +343,45 @@  discard block
 block discarded – undo
343 343
     }
344 344
     
345 345
     protected function minify_single($pathIn) {
346
-		// determine JS or CSS and set var (also mimetype), return false if neither
347
-		if ( $this->str_ends_in($pathIn,".js") === true ) {
348
-			$codeType="js";
349
-			$codeMime="text/javascript";
350
-		} else if ( $this->str_ends_in($pathIn,".css") === true ) {
351
-			$codeType="css";
352
-			$codeMime="text/css";			
353
-		} else {
354
-			return false;
355
-		}
346
+        // determine JS or CSS and set var (also mimetype), return false if neither
347
+        if ( $this->str_ends_in($pathIn,".js") === true ) {
348
+            $codeType="js";
349
+            $codeMime="text/javascript";
350
+        } else if ( $this->str_ends_in($pathIn,".css") === true ) {
351
+            $codeType="css";
352
+            $codeMime="text/css";			
353
+        } else {
354
+            return false;
355
+        }
356 356
 		
357
-		// if min.js or min.css return false
358
-		if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
359
-			return false;
360
-		}
357
+        // if min.js or min.css return false
358
+        if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
359
+            return false;
360
+        }
361 361
 		
362
-		// read file, return false if empty
363
-		$_toMinify = file_get_contents($pathIn);
364
-		if ( empty($_toMinify) ) return false;
362
+        // read file, return false if empty
363
+        $_toMinify = file_get_contents($pathIn);
364
+        if ( empty($_toMinify) ) return false;
365 365
 		
366
-		// check cache
367
-		$_md5hash = "single_".md5($_toMinify);
368
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
369
-		if ($_cache->check() ) {
370
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
371
-		} else {
372
-			// if not in cache first minify
373
-			$_Minified = $_toMinify;
374
-			if ($codeType === "js") {
375
-				if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
376
-					if (@is_callable(array("JSMin","minify"))) {
377
-						$tmp_code = trim(JSMin::minify($_toMinify));
378
-					}
379
-				}
380
-			} else if ($codeType === "css") {
366
+        // check cache
367
+        $_md5hash = "single_".md5($_toMinify);
368
+        $_cache = new autoptimizeCache($_md5hash,$codeType);
369
+        if ($_cache->check() ) {
370
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
371
+        } else {
372
+            // if not in cache first minify
373
+            $_Minified = $_toMinify;
374
+            if ($codeType === "js") {
375
+                if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
376
+                    if (@is_callable(array("JSMin","minify"))) {
377
+                        $tmp_code = trim(JSMin::minify($_toMinify));
378
+                    }
379
+                }
380
+            } else if ($codeType === "css") {
381 381
                 // make sure paths to background images/ imported css/ fonts .. are OK
382 382
                 $_toMinify = $this->fixurls($pathIn,$_toMinify);
383 383
                 if (class_exists('Minify_CSS_Compressor')) {
384
-					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
384
+                    $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
385 385
                 } else if(class_exists('CSSmin')) {
386 386
                     $cssmin = new CSSmin();
387 387
                     if (method_exists($cssmin,"run")) {
@@ -390,31 +390,31 @@  discard block
 block discarded – undo
390 390
                         $tmp_code = trim(CssMin::minify($_toMinify));
391 391
                     }
392 392
                 }
393
-			}
394
-			if (!empty($tmp_code)) {
395
-				$_Minified = $tmp_code;
396
-				unset($tmp_code);
397
-			}
398
-			// and then cache
399
-			$_cache->cache($_Minified,$codeMime);
400
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
401
-		}
402
-		unset($_cache);
393
+            }
394
+            if (!empty($tmp_code)) {
395
+                $_Minified = $tmp_code;
396
+                unset($tmp_code);
397
+            }
398
+            // and then cache
399
+            $_cache->cache($_Minified,$codeMime);
400
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
401
+        }
402
+        unset($_cache);
403 403
 	
404
-		// if CDN, then CDN
405
-		$_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
404
+        // if CDN, then CDN
405
+        $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
406 406
 
407
-		return $_CachedMinifiedUrl;
408
-	}
407
+        return $_CachedMinifiedUrl;
408
+    }
409 409
 	
410
-	protected function str_ends_in($haystack,$needle) {
411
-		$needleLength = strlen($needle);
412
-		$haystackLength = strlen($haystack);
413
-		$lastPos=strrpos($haystack,$needle);
414
-		if ($lastPos === $haystackLength - $needleLength) {
415
-			return true;
416
-		} else {
417
-			return false;
418
-		}
419
-	}
410
+    protected function str_ends_in($haystack,$needle) {
411
+        $needleLength = strlen($needle);
412
+        $haystackLength = strlen($haystack);
413
+        $lastPos=strrpos($haystack,$needle);
414
+        if ($lastPos === $haystackLength - $needleLength) {
415
+            return true;
416
+        } else {
417
+            return false;
418
+        }
419
+    }
420 420
 }
Please login to merge, or discard this patch.
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
2
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
3 3
 
4 4
 abstract class autoptimizeBase {
5 5
     protected $content = '';
@@ -23,37 +23,37 @@  discard block
 block discarded – undo
23 23
     
24 24
     //Converts an URL to a full path
25 25
     protected function getpath($url) {
26
-        $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url);
26
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
27 27
         
28
-        if (strpos($url,'%')!==false) {
29
-            $url=urldecode($url);
28
+        if (strpos($url, '%') !== false) {
29
+            $url = urldecode($url);
30 30
         }
31 31
 
32
-        $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST);
33
-        $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST);
32
+        $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
33
+        $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
34 34
         
35 35
         // normalize
36
-        if (strpos($url,'//')===0) {
36
+        if (strpos($url, '//') === 0) {
37 37
             if (is_ssl()) {
38 38
                 $url = "https:".$url;
39 39
             } else {
40 40
                 $url = "http:".$url;
41 41
             }
42
-        } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) {
42
+        } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) {
43 43
             if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) {
44 44
                 $url = AUTOPTIMIZE_WP_SITE_URL.$url;
45 45
             } else {
46
-                $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/");
47
-                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url;
46
+                $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/");
47
+                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url;
48 48
             }
49 49
         }
50 50
         
51 51
         if ($siteHost !== $contentHost) {
52
-            $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url);
52
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
53 53
         }
54 54
 
55 55
         // first check; hostname wp site should be hostname of url
56
-        $thisHost=@parse_url($url,PHP_URL_HOST);
56
+        $thisHost = @parse_url($url, PHP_URL_HOST);
57 57
         if ($thisHost !== $siteHost) {
58 58
             /* 
59 59
             * first try to get all domains from WPML (if available)
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
             
66 66
             $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains');
67 67
             if (!empty($multidomainsWPML)) {
68
-                $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML);
68
+                $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML);
69 69
             }
70 70
             
71 71
             if (!empty($this->cdn_url)) {
72
-                $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST);
72
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
73 73
             }
74 74
             
75 75
             $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
76 76
             
77 77
             if (!empty($multidomains)) {
78
-                if (in_array($thisHost,$multidomains)) {
79
-                    $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url);
78
+                if (in_array($thisHost, $multidomains)) {
79
+                    $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url);
80 80
                 } else {
81 81
                     return false;
82 82
                 }
@@ -86,22 +86,22 @@  discard block
 block discarded – undo
86 86
         }
87 87
         
88 88
         // try to remove "wp root url" from url while not minding http<>https
89
-        $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL);
89
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
90 90
         if ($siteHost !== $contentHost) {
91 91
             // as we replaced the content-domain with the site-domain, we should match against that 
92
-            $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL);
92
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
93 93
         }
94
-        $tmp_url = preg_replace('/https?:/','',$url);
95
-        $path = str_replace($tmp_ao_root,'',$tmp_url);
94
+        $tmp_url = preg_replace('/https?:/', '', $url);
95
+        $path = str_replace($tmp_ao_root, '', $tmp_url);
96 96
         
97 97
         // if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate
98
-        if (preg_match('#^:?//#',$path)) {
98
+        if (preg_match('#^:?//#', $path)) {
99 99
             /** External script/css (adsense, etc) */
100 100
             return false;
101 101
         }
102 102
 
103 103
         // prepend with WP_ROOT_DIR to have full path to file
104
-        $path = str_replace('//','/',WP_ROOT_DIR.$path);
104
+        $path = str_replace('//', '/', WP_ROOT_DIR.$path);
105 105
         
106 106
         // final check: does file exist and is it readable
107 107
         if (file_exists($path) && is_file($path) && is_readable($path)) {
@@ -114,25 +114,25 @@  discard block
 block discarded – undo
114 114
     // needed for WPML-filter
115 115
     protected function ao_getDomain($in) {
116 116
         // make sure the url starts with something vaguely resembling a protocol
117
-        if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) {
118
-            $in="http://".$in;
117
+        if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) {
118
+            $in = "http://".$in;
119 119
         }
120 120
         
121 121
         // do the actual parse_url
122
-        $out = parse_url($in,PHP_URL_HOST);
122
+        $out = parse_url($in, PHP_URL_HOST);
123 123
         
124 124
         // fallback if parse_url does not understand the url is in fact a url
125
-        if (empty($out)) $out=$in;
125
+        if (empty($out)) $out = $in;
126 126
         
127 127
         return $out;
128 128
     }
129 129
 
130 130
 
131 131
     // logger
132
-    protected function ao_logger($logmsg,$appendHTML=true) {
132
+    protected function ao_logger($logmsg, $appendHTML = true) {
133 133
         if ($appendHTML) {
134
-            $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
135
-            $this->content.=$logmsg;
134
+            $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
135
+            $this->content .= $logmsg;
136 136
         } else {
137 137
             error_log("Autoptimize: ".$logmsg);
138 138
         }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
     // hide everything between noptimize-comment tags
142 142
     protected function hide_noptimize($noptimize_in) {
143
-        if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
143
+        if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { 
144 144
             $noptimize_out = preg_replace_callback(
145 145
                 '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is',
146 146
                 create_function(
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
     
158 158
     // unhide noptimize-tags
159 159
     protected function restore_noptimize($noptimize_in) {
160
-        if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { 
160
+        if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { 
161 161
             $noptimize_out = preg_replace_callback(
162 162
                 '#%%NOPTIMIZE'.AUTOPTIMIZE_HASH.'%%(.*?)%%NOPTIMIZE%%#is',
163 163
                 create_function(
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
     }
174 174
 
175 175
     protected function hide_iehacks($iehacks_in) {
176
-        if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { 
176
+        if (strpos($iehacks_in, '<!--[if') !== false) { 
177 177
             $iehacks_out = preg_replace_callback(
178 178
                 '#<!--\[if.*?\[endif\]-->#is',
179 179
                 create_function(
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     }
190 190
 
191 191
     protected function restore_iehacks($iehacks_in) {
192
-        if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { 
192
+        if (strpos($iehacks_in, '%%IEHACK%%') !== false) { 
193 193
             $iehacks_out = preg_replace_callback(
194 194
                 '#%%IEHACK'.AUTOPTIMIZE_HASH.'%%(.*?)%%IEHACK%%#is',
195 195
                 create_function(
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
                 $iehacks_in
200 200
             );
201 201
         } else {
202
-            $iehacks_out=$iehacks_in;
202
+            $iehacks_out = $iehacks_in;
203 203
         }
204 204
         return $iehacks_out;
205 205
     }
206 206
 
207 207
     protected function hide_comments($comments_in) {
208
-        if ( strpos( $comments_in, '<!--' ) !== false ) {
208
+        if (strpos($comments_in, '<!--') !== false) {
209 209
             $comments_out = preg_replace_callback(
210 210
                 '#<!--.*?-->#is',
211 211
                 create_function(
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
     }
222 222
 
223 223
     protected function restore_comments($comments_in) {
224
-        if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) {
224
+        if (strpos($comments_in, '%%COMMENTS%%') !== false) {
225 225
             $comments_out = preg_replace_callback(
226 226
                 '#%%COMMENTS'.AUTOPTIMIZE_HASH.'%%(.*?)%%COMMENTS%%#is',
227 227
                 create_function(
@@ -231,31 +231,31 @@  discard block
 block discarded – undo
231 231
                 $comments_in
232 232
             );
233 233
         } else {
234
-            $comments_out=$comments_in;
234
+            $comments_out = $comments_in;
235 235
         }
236 236
         return $comments_out;
237 237
     }
238 238
 
239
-    protected function url_replace_cdn( $url ) {
239
+    protected function url_replace_cdn($url) {
240 240
         // API filter to change base CDN URL
241
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url );
241
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url);
242 242
 
243
-        if ( !empty($cdn_url) )  {
243
+        if (!empty($cdn_url)) {
244 244
             // prepend domain-less absolute URL's
245
-            if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) {
246
-                $url = rtrim( $cdn_url, '/' ) . $url;
245
+            if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) {
246
+                $url = rtrim($cdn_url, '/').$url;
247 247
             } else {
248 248
                 // get wordpress base URL
249
-                $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL );
250
-                $WPBaseUrl       = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host'];
251
-                if ( ! empty( $WPSiteBreakdown['port'] ) ) {
252
-                    $WPBaseUrl .= ":" . $WPSiteBreakdown['port'];
249
+                $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL);
250
+                $WPBaseUrl       = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host'];
251
+                if (!empty($WPSiteBreakdown['port'])) {
252
+                    $WPBaseUrl .= ":".$WPSiteBreakdown['port'];
253 253
                 }
254 254
                 // replace full url's with scheme
255
-                $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url );
256
-                if ( $tmp_url === $url ) {
255
+                $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url);
256
+                if ($tmp_url === $url) {
257 257
                     // last attempt; replace scheme-less URL's
258
-                    $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url );
258
+                    $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url);
259 259
                 } else {
260 260
                     $url = $tmp_url;
261 261
                 }
@@ -263,32 +263,32 @@  discard block
 block discarded – undo
263 263
         }
264 264
 
265 265
         // allow API filter to alter URL after CDN replacement
266
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
266
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
267 267
         return $url;
268 268
     }
269 269
 
270
-    protected function inject_in_html($payload,$replaceTag) {
271
-        if (strpos($this->content,$replaceTag[0])!== false) {
272
-            if ($replaceTag[1]==="after") {
273
-                $replaceBlock=$replaceTag[0].$payload;
274
-            } else if ($replaceTag[1]==="replace"){
275
-                $replaceBlock=$payload;
270
+    protected function inject_in_html($payload, $replaceTag) {
271
+        if (strpos($this->content, $replaceTag[0]) !== false) {
272
+            if ($replaceTag[1] === "after") {
273
+                $replaceBlock = $replaceTag[0].$payload;
274
+            } else if ($replaceTag[1] === "replace") {
275
+                $replaceBlock = $payload;
276 276
             } else {
277
-                $replaceBlock=$payload.$replaceTag[0];
277
+                $replaceBlock = $payload.$replaceTag[0];
278 278
             }
279
-            $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0]));
279
+            $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0]));
280 280
         } else {
281 281
             $this->content .= $payload;
282 282
             if (!$this->tagWarning) {
283
-                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->";
284
-                $this->tagWarning=true;
283
+                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->";
284
+                $this->tagWarning = true;
285 285
             }
286 286
         }
287 287
     }
288 288
     
289 289
     protected function isremovable($tag, $removables) {
290 290
         foreach ($removables as $match) {
291
-            if (strpos($tag,$match)!==false) {
291
+            if (strpos($tag, $match) !== false) {
292 292
                 return true;
293 293
             }
294 294
         }
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
     
298 298
     // inject already minified code in optimized JS/CSS
299 299
     protected function inject_minified($in) {
300
-        if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
300
+        if (strpos($in, '%%INJECTLATER%%') !== false) {
301 301
             $out = preg_replace_callback(
302 302
                 '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is',
303 303
                 create_function(
@@ -344,49 +344,49 @@  discard block
 block discarded – undo
344 344
     
345 345
     protected function minify_single($pathIn) {
346 346
 		// determine JS or CSS and set var (also mimetype), return false if neither
347
-		if ( $this->str_ends_in($pathIn,".js") === true ) {
348
-			$codeType="js";
349
-			$codeMime="text/javascript";
350
-		} else if ( $this->str_ends_in($pathIn,".css") === true ) {
351
-			$codeType="css";
352
-			$codeMime="text/css";			
347
+		if ($this->str_ends_in($pathIn, ".js") === true) {
348
+			$codeType = "js";
349
+			$codeMime = "text/javascript";
350
+		} else if ($this->str_ends_in($pathIn, ".css") === true) {
351
+			$codeType = "css";
352
+			$codeMime = "text/css";			
353 353
 		} else {
354 354
 			return false;
355 355
 		}
356 356
 		
357 357
 		// if min.js or min.css return false
358
-		if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
358
+		if (($this->str_ends_in($pathIn, "-min.".$codeType) === true) || ($this->str_ends_in($pathIn, ".min.".$codeType) === true) || ($this->str_ends_in($pathIn, "js/jquery/jquery.js") === true)) {
359 359
 			return false;
360 360
 		}
361 361
 		
362 362
 		// read file, return false if empty
363 363
 		$_toMinify = file_get_contents($pathIn);
364
-		if ( empty($_toMinify) ) return false;
364
+		if (empty($_toMinify)) return false;
365 365
 		
366 366
 		// check cache
367 367
 		$_md5hash = "single_".md5($_toMinify);
368
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
369
-		if ($_cache->check() ) {
368
+		$_cache = new autoptimizeCache($_md5hash, $codeType);
369
+		if ($_cache->check()) {
370 370
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
371 371
 		} else {
372 372
 			// if not in cache first minify
373 373
 			$_Minified = $_toMinify;
374 374
 			if ($codeType === "js") {
375
-				if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
376
-					if (@is_callable(array("JSMin","minify"))) {
375
+				if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) {
376
+					if (@is_callable(array("JSMin", "minify"))) {
377 377
 						$tmp_code = trim(JSMin::minify($_toMinify));
378 378
 					}
379 379
 				}
380 380
 			} else if ($codeType === "css") {
381 381
                 // make sure paths to background images/ imported css/ fonts .. are OK
382
-                $_toMinify = $this->fixurls($pathIn,$_toMinify);
382
+                $_toMinify = $this->fixurls($pathIn, $_toMinify);
383 383
                 if (class_exists('Minify_CSS_Compressor')) {
384 384
 					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
385
-                } else if(class_exists('CSSmin')) {
385
+                } else if (class_exists('CSSmin')) {
386 386
                     $cssmin = new CSSmin();
387
-                    if (method_exists($cssmin,"run")) {
387
+                    if (method_exists($cssmin, "run")) {
388 388
                         $tmp_code = trim($cssmin->run($_toMinify));
389
-                    } elseif (@is_callable(array($cssmin,"minify"))) {
389
+                    } elseif (@is_callable(array($cssmin, "minify"))) {
390 390
                         $tmp_code = trim(CssMin::minify($_toMinify));
391 391
                     }
392 392
                 }
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 				unset($tmp_code);
397 397
 			}
398 398
 			// and then cache
399
-			$_cache->cache($_Minified,$codeMime);
399
+			$_cache->cache($_Minified, $codeMime);
400 400
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
401 401
 		}
402 402
 		unset($_cache);
@@ -407,10 +407,10 @@  discard block
 block discarded – undo
407 407
 		return $_CachedMinifiedUrl;
408 408
 	}
409 409
 	
410
-	protected function str_ends_in($haystack,$needle) {
410
+	protected function str_ends_in($haystack, $needle) {
411 411
 		$needleLength = strlen($needle);
412 412
 		$haystackLength = strlen($haystack);
413
-		$lastPos=strrpos($haystack,$needle);
413
+		$lastPos = strrpos($haystack, $needle);
414 414
 		if ($lastPos === $haystackLength - $needleLength) {
415 415
 			return true;
416 416
 		} else {
Please login to merge, or discard this patch.