Changeset 1081305

Timestamp:

02/03/2015 02:42:19 AM (11 years ago)

Author:

NodeCode

Message:

version 1.4.0

Location:

wp-minify-fix

Files:

• tags/1.4.0 (copied) (copied from wp-minify-fix/trunk)
• tags/1.4.0/min/config.php (copied) (copied from wp-minify-fix/trunk/min/config.php)
• tags/1.4.0/min/lib/CSSmin.php (copied) (copied from wp-minify-fix/trunk/min/lib/CSSmin.php)
• tags/1.4.0/min/lib/DooDigestAuth.php (copied) (copied from wp-minify-fix/trunk/min/lib/DooDigestAuth.php)
• tags/1.4.0/min/lib/Minify/ClosureCompiler.php (copied) (copied from wp-minify-fix/trunk/min/lib/Minify/ClosureCompiler.php)
• tags/1.4.0/min/lib/Minify/DebugDetector.php (copied) (copied from wp-minify-fix/trunk/min/lib/Minify/DebugDetector.php)
• tags/1.4.0/min/lib/Minify/HTML (copied) (copied from wp-minify-fix/trunk/min/lib/Minify/HTML)
• tags/1.4.0/min/lib/Minify/JS (copied) (copied from wp-minify-fix/trunk/min/lib/Minify/JS)
• tags/1.4.0/min/lib/Minify/Loader.php (copied) (copied from wp-minify-fix/trunk/min/lib/Minify/Loader.php)
• tags/1.4.0/min/lib/Minify/YUI (copied) (copied from wp-minify-fix/trunk/min/lib/Minify/YUI)
• tags/1.4.0/min/lib/MrClay (copied) (copied from wp-minify-fix/trunk/min/lib/MrClay)
• tags/1.4.0/options-generic.php (modified) (1 diff)
• tags/1.4.0/readme.txt (copied) (copied from wp-minify-fix/trunk/readme.txt) (5 diffs)
• tags/1.4.0/wp-minify.php (copied) (copied from wp-minify-fix/trunk/wp-minify.php) (2 diffs)
• trunk/options-generic.php (modified) (1 diff)
• trunk/readme.txt (modified) (5 diffs)
• trunk/wp-minify.php (modified) (2 diffs)

wp-minify-fix/tags/1.4.0/options-generic.php

@@ -1 +1 @@
 <script type="text/javascript">
 function confirm_reset() {
-  var answer = confirm("<?php _e('All of options will return to default settings.  Are you sure you want to reset all settings?'); ?>");
-  if(answer)
-    return true;
-  else
-    return false;
+    var answer = confirm("<?php _e('All of options will return to default settings.  Are you sure you want to reset all settings?'); ?>");
+    if(answer)
+        return true;
+    else
+        return false;
 }
 
 jQuery(document).ready(function($){
-  $("#wpm_options_toggle_advanced").click(function(e){
-    e.preventDefault();
-    state = $(this).attr("state");
-    if(state == "visible"){
-      $(".wpm_advanced").slideUp();
-      $("#wpm_options_reset").fadeOut();
-      $(this).attr("state", "hidden");
-      $(this).attr("value", "<?php echo __('Show Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
-      $.ajax({
-        type    : "POST",
-        url     : "admin-ajax.php",
-        data    : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "hide_advanced" },
-        success : function(resp){
-          // do nothing visually
-        },
-        error   : function(resp){
-          alert("Error:" + resp);
-        }
-      });
-    }
-    else{
-      $(".wpm_advanced").slideDown();
-      $("#wpm_options_reset").fadeIn();
-      $(this).attr("state", "visible");
-      $(this).attr("value", "<?php echo __('Hide Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
-      $.ajax({
-        type    : "POST",
-        url     : "admin-ajax.php",
-        data    : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "show_advanced" },
-        success : function(resp){
-          // do nothing visually
-        },
-        error   : function(resp){
-          alert("Error:" + resp);
-        }
-      });
-    }
-  });
-  $('#cache_external_checkbox').click(function(e) {
-    state = $(this).attr("state");
-    if (state == "on") {
-      $(".wpm_include").slideDown();
-      $(this).attr("state", "off");
-    } else {
-      $(".wpm_include").slideUp();
-      $(this).attr("state", "on");
-    }
-  });
+    $("#wpm_options_toggle_advanced").click(function(e){
+        e.preventDefault();
+        state = $(this).attr("state");
+        if(state == "visible"){
+            $(".wpm_advanced").slideUp();
+            $("#wpm_options_reset").fadeOut();
+            $(this).attr("state", "hidden");
+            $(this).attr("value", "<?php echo __('Show Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
+            $.ajax({
+                type        : "POST",
+                url         : "admin-ajax.php",
+                data        : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "hide_advanced" },
+                success : function(resp){
+                    // do nothing visually
+                },
+                error       : function(resp){
+                    alert("Error:" + resp);
+                }
+            });
+        }
+        else{
+            $(".wpm_advanced").slideDown();
+            $("#wpm_options_reset").fadeIn();
+            $(this).attr("state", "visible");
+            $(this).attr("value", "<?php echo __('Hide Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
+            $.ajax({
+                type        : "POST",
+                url         : "admin-ajax.php",
+                data        : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "show_advanced" },
+                success : function(resp){
+                    // do nothing visually
+                },
+                error       : function(resp){
+                    alert("Error:" + resp);
+                }
+            });
+        }
+    });
+    $('#cache_external_checkbox').click(function(e) {
+        state = $(this).attr("state");
+        if (state == "on") {
+            $(".wpm_include").slideDown();
+            $(this).attr("state", "off");
+        } else {
+            $(".wpm_include").slideUp();
+            $(this).attr("state", "on");
+        }
+    });
 });
 </script>
 <form method="post"><fieldset>
 <?php
-    // take care of advanced options
-    if ($wpm_options['show_advanced']) {
-      $advanced_style = '';
-      $advanced_toggle_text = __('Hide Advanced Options', $this->name);
-      $advanced_toggle_state = 'visible';
-    }
-    else {
-      $advanced_style = 'style="display:none"';
-      $advanced_toggle_text = __('Show Advanced Options', $this->name);
-      $advanced_toggle_state = 'hidden';
-    }
-    
-    if ($wpm_options['cache_external']) {
-      $include_style = 'style="display:none"';
-      $include_toggle_state = 'on';
-    } else {
-      $include_style = '';
-      $include_toggle_state = 'off';
-    }
-
-    printf('
-      <h2>%s</h2>
-      <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="on" type="radio" '.checked(true, $wpm_options['show_link'], false).'/></label></p>
-      <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="off" type="radio" '.checked(false, $wpm_options['show_link'], false).'/></label></p>
-      ',
-      __('Support this plugin!', $this->name),
-      __('Display "Page optimized by WP Minify" link in the footer', $this->name),
-      __('Do not display "Page optimized by WP Minify" link.', $this->name)
-    );
-
-    printf('
-      <h2>%s</h2>
-      <p><label>%s &nbsp; <input name="wpm_options_update[enable_js]" type="checkbox" '.checked(true, $wpm_options['enable_js'], false).'/></label></p>
-      <p><label>%s &nbsp; <input name="wpm_options_update[enable_css]" type="checkbox" '.checked(true, $wpm_options['enable_css'], false).'/></label></p>
-      <p><label>%s &nbsp; <input name="wpm_options_update[enable_html]" type="checkbox" '.checked(true, $wpm_options['enable_html'], false).'/></label></p>
-      ',
-      __('General Configuration', $this->name),
-      __('Enable JavaScript Minification', $this->name),
-      __('Enable CSS Minification', $this->name),
-      __('Enable HTML Minification', $this->name)
-    );
-    
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[debug_nominify]" type="checkbox" '.checked(true, $wpm_options['debug_nominify'], false).'/></label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label><a href="http://omninoggin.com/wordpress-posts/troubleshooting-wp-minify-with-firephp/">%s</a> &nbsp; <input name="wpm_options_update[debug_firephp]" type="checkbox" '.checked(true, $wpm_options['debug_firephp'], false).'/></label></p>
-      ',
-      __('Debugging', $this->name),
-      __('Combine files but do not minify', $this->name),
-      __('Show minify errors through FirePHP', $this->name)
-    );
-    
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
-      <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
-      ',
-      __('Local Files Minification', $this->name),
-      __('JavaScript files to exclude from minify (line delimited).', $this->name),
-      __('CSS files to exclude from minify (line delimited).', $this->name),
-      __('URIs on which WP-Minify-Fix parsing will be disabled (line delimited)', $this->name)
-    );
-
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[cache_external]" id="cache_external_checkbox" state="'.$include_toggle_state.'" type="checkbox" '.checked(true, $wpm_options['cache_external'], false).'/> &nbsp; (%s)</label></p>
-      <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
-      <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
-      ',
-      __('Non-Local Files Minification', $this->name),
-      __('Enable minification on external files', $this->name),
-      __('Not recommended unless you want to exclude a bunch of external .js/.css files', $this->name),
-      __('External JavaScript files to include into minify.', $this->name),
-      __('Only useful if "Minification on external files" is unchecked', $this->name),
-      __('more info', $this->name),
-      __('External CSS files to include into minify.', $this->name),
-      __('Only useful if "Minification on external files" is unchecked', $this->name),
-      __('more info', $this->name)
-    );
-
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.attribute_escape($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
-      ',
-      __('Caching', $this->name),
-      __('Cache expires after every', $this->name),
-      __('seconds', $this->name),
-      __('Manually Clear Cache', $this->name)
-    );
-
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[pretty_url]" type="checkbox" '.checked(true, $wpm_options['pretty_url'], false).'/> &nbsp; (%s)</label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_in_footer]" type="checkbox" '.checked(true, $wpm_options['js_in_footer'], false).'/> &nbsp; (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#manual_placement">%s</a>)</label></p>
-      ',
-      __('Tweaking/Tuning', $this->name),
-      __('Use "pretty" URL"', $this->name),
-      __('i.e. use "wp-minify-fix/cache/1234abcd.js" instead of "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js"', $this->name),
-      __('Place Minified JavaScript in footer', $this->name),
-      __('Not recommended', $this->name),
-      __('more info', $this->name)
-    );
-
-    printf('
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[force_https]" type="checkbox" '.checked(true, $wpm_options['force_https'], false).'/></label></p>
-      ',
-      __('Force all JavaScript/CSS calls to be HTTPS on HTTPS pages', $this->name)
-    );
-
-    printf('
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[auto_base]" type="checkbox" '.checked(true, $wpm_options['auto_base'], false).'/></label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.attribute_escape($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
-      ',
-      __('Automatically set your Minify base per siteurl setting (recommended)', $this->name),
-      __('Extra arguments to pass to minify engine. This value will get append to calls to URL "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js".', $this->name),
-      __('e.g. You can specify this value to be b=somepath to specify the base path for all files passed into Minify.', $this->name)
-    );
-
-    if ( function_exists( 'wp_nonce_field' ) && wp_nonce_field( $this->name ) ) {
-      printf('
-        <p class="submit">
-          <input type="submit" name="wpm_options_update_submit" value="%s &#187;" />
-          <input type="submit" name="wpm_options_reset_submit" id="wpm_options_reset" value="%s &#187;" onclick="return confirm_reset()" '.$advanced_style.'/>
-          <input type="button" id="wpm_options_toggle_advanced" state="'.$advanced_toggle_state.'" value="'.$advanced_toggle_text.' &#187;"/>
-        </p>
-        ',
-        __('Update Options', $this->name),
-        __('Reset ALL Options', $this->name)
-      );
-    }
+        // take care of advanced options
+        if ($wpm_options['show_advanced']) {
+            $advanced_style = '';
+            $advanced_toggle_text = __('Hide Advanced Options', $this->name);
+            $advanced_toggle_state = 'visible';
+        }
+        else {
+            $advanced_style = 'style="display:none"';
+            $advanced_toggle_text = __('Show Advanced Options', $this->name);
+            $advanced_toggle_state = 'hidden';
+        }
+        
+        if ($wpm_options['cache_external']) {
+            $include_style = 'style="display:none"';
+            $include_toggle_state = 'on';
+        } else {
+            $include_style = '';
+            $include_toggle_state = 'off';
+        }
+
+        printf('
+            <h2>%s</h2>
+            <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="on" type="radio" '.checked(true, $wpm_options['show_link'], false).'/></label></p>
+            <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="off" type="radio" '.checked(false, $wpm_options['show_link'], false).'/></label></p>
+            ',
+            __('Support this plugin!', $this->name),
+            __('Display "Page optimized by WP Minify" link in the footer', $this->name),
+            __('Do not display "Page optimized by WP Minify" link.', $this->name)
+        );
+
+        printf('
+            <h2>%s</h2>
+            <p><label>%s &nbsp; <input name="wpm_options_update[enable_js]" type="checkbox" '.checked(true, $wpm_options['enable_js'], false).'/></label></p>
+            <p><label>%s &nbsp; <input name="wpm_options_update[enable_css]" type="checkbox" '.checked(true, $wpm_options['enable_css'], false).'/></label></p>
+            <p><label>%s &nbsp; <input name="wpm_options_update[enable_html]" type="checkbox" '.checked(true, $wpm_options['enable_html'], false).'/></label></p>
+            ',
+            __('General Configuration', $this->name),
+            __('Enable JavaScript Minification', $this->name),
+            __('Enable CSS Minification', $this->name),
+            __('Enable HTML Minification', $this->name)
+        );
+        
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[debug_nominify]" type="checkbox" '.checked(true, $wpm_options['debug_nominify'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label><a href="http://omninoggin.com/wordpress-posts/troubleshooting-wp-minify-with-firephp/">%s</a> &nbsp; <input name="wpm_options_update[debug_firephp]" type="checkbox" '.checked(true, $wpm_options['debug_firephp'], false).'/></label></p>
+            ',
+            __('Debugging', $this->name),
+            __('Combine files but do not minify', $this->name),
+            __('Show minify errors through FirePHP', $this->name)
+        );
+        
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
+            <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
+            ',
+            __('Local Files Minification', $this->name),
+            __('JavaScript files to exclude from minify (line delimited).', $this->name),
+            __('CSS files to exclude from minify (line delimited).', $this->name),
+            __('URIs on which WP-Minify-Fix parsing will be disabled (line delimited)', $this->name)
+        );
+
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[cache_external]" id="cache_external_checkbox" state="'.$include_toggle_state.'" type="checkbox" '.checked(true, $wpm_options['cache_external'], false).'/> &nbsp; (%s)</label></p>
+            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
+            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
+            ',
+            __('Non-Local Files Minification', $this->name),
+            __('Enable minification on external files', $this->name),
+            __('Not recommended unless you want to exclude a bunch of external .js/.css files', $this->name),
+            __('External JavaScript files to include into minify.', $this->name),
+            __('Only useful if "Minification on external files" is unchecked', $this->name),
+            __('more info', $this->name),
+            __('External CSS files to include into minify.', $this->name),
+            __('Only useful if "Minification on external files" is unchecked', $this->name),
+            __('more info', $this->name)
+        );
+
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.attribute_escape($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
+            ',
+            __('Caching', $this->name),
+            __('Cache expires after every', $this->name),
+            __('seconds', $this->name),
+            __('Manually Clear Cache', $this->name)
+        );
+        
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_placement]" value="header-footer" type="radio" '.checked('header-footer', $wpm_options['js_placement'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_placement]" value="header" type="radio" '.checked('header', $wpm_options['js_placement'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_placement]" value="footer" type="radio" '.checked('footer', $wpm_options['js_placement'], false).'/></label></p>
+            ',
+            __('JavaScript Placement', $this->name),
+            __('In the header, and if necessary also in the footer (recommended)', $this->name),
+            __('Everything in the header', $this->name),
+            __('Everything in the footer', $this->name)
+        );
+
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[pretty_url]" type="checkbox" '.checked(true, $wpm_options['pretty_url'], false).'/> &nbsp; (%s)</label></p>',
+            __('Tweaking/Tuning', $this->name),
+            __('Use "pretty" URL"', $this->name),
+            __('i.e. use "wp-minify-fix/cache/1234abcd.js" instead of "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js"', $this->name)
+        );
+        
+        printf('
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_async]" type="checkbox" '.checked(true, $wpm_options['js_async'], false).'/> &nbsp; (%s, <a href="http://css-tricks.com/async-attribute-scripts-bottom/" target="_blank">%s</a>)</label></p>
+            ',
+            __('Add the HTML5 async tag', $this->name),
+            __('Only for the header', $this->name),
+            __('more info', $this->name)
+        );
+
+        printf('
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[force_https]" type="checkbox" '.checked(true, $wpm_options['force_https'], false).'/></label></p>
+            ',
+            __('Force all JavaScript/CSS calls to be HTTPS on HTTPS pages', $this->name)
+        );
+
+        printf('
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[auto_base]" type="checkbox" '.checked(true, $wpm_options['auto_base'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.attribute_escape($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
+            ',
+            __('Automatically set your Minify base per siteurl setting (recommended)', $this->name),
+            __('Extra arguments to pass to minify engine. This value will get append to calls to URL "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js".', $this->name),
+            __('e.g. You can specify this value to be b=somepath to specify the base path for all files passed into Minify.', $this->name)
+        );
+
+        if ( function_exists( 'wp_nonce_field' ) && wp_nonce_field( $this->name ) ) {
+            printf('
+                <p class="submit">
+                    <input type="submit" name="wpm_options_update_submit" value="%s &#187;" />
+                    <input type="submit" name="wpm_options_reset_submit" id="wpm_options_reset" value="%s &#187;" onclick="return confirm_reset()" '.$advanced_style.'/>
+                    <input type="button" id="wpm_options_toggle_advanced" state="'.$advanced_toggle_state.'" value="'.$advanced_toggle_text.' &#187;"/>
+                </p>
+                ',
+                __('Update Options', $this->name),
+                __('Reset ALL Options', $this->name)
+            );
+        }
 ?>
 </fieldset></form>

wp-minify-fix/tags/1.4.0/readme.txt

@@ -3 +3 @@
 Contributors: NodeCode, madeinthayaland
 Requires at least: 2.7
-Tested up to: 3.8.1
-Stable Tag: 1.3.4
+Tested up to: 4.1
+Stable Tag: 1.4.0
 
 [Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files
@@ -10 +10 @@
 
 == Description ==
-This plugin is a fork of [WP Minify](http://wordpress.org/plugins/wp-minify/) to fix bugs, because it has not been updated since 2012-6-4.
+This plugin is a fork of [WP Minify](http://wordpress.org/plugins/wp-minify/) to fix bugs and add features, because it has not been updated since 2012-6-4.
 
 This plugin integrates the [Minify engine](http://code.google.com/p/minify/)
@@ -18 +18 @@
 = What has been fixed? =
 
-* Minify engine 2.1.7 updated
-* cache interval option fixed
-* move CSS-@imports to the top of the output
-* bottom CSS- and JavaScript output fixed
-* support for script-tags without `type="text/javascript"`
-* detection of protocol-relative URLs as external file (e.g. Google AdSense)
+* Minify engine updated to version 2.1.7
+* Cache interval option has been fixed
+* Move CSS-@imports to the top of the output
+* Bottom CSS- and JavaScript output fixed
+* Support for script tags without `type="text/javascript"`
+* Detection of protocol-relative URLs as external file (e.g. Google AdSense)
+* New option for the HTML5 async attribute
+* A separate JavaScript file in the footer is now possible
 
 = How Does it Work? =
@@ -47 +49 @@
 
 == Changelog ==
+= 1.4.0 =
+* Added option for the HTML5 async attribute
+* Added option for a separate JavaScript file in the footer
+* Tabs are used instead of spaces in the PHP code
+* Bugfixes
+* Small changes
+
 = 1.3.4 =
-* support for script-tags without `type="text/javascript"`
-* detection of protocol-relative URLs as external file (e.g. Google AdSense)
+* Support for script-tags without `type="text/javascript"`
+* Detection of protocol-relative URLs as external file (e.g. Google AdSense)
 
 = 1.3.3 =
-* bottom CSS- and JavaScript output fixed 
+* Bottom CSS- and JavaScript output fixed 
 
 = 1.3.2 =
-* move CSS-@imports to the top of the output
+* Move CSS-@imports to the top of the output
 
 = 1.3.1 =
@@ -62 +71 @@
 = 1.3.0 =
 * WP Minify Fix released
-* cache interval fixed
+* Cache interval fixed
 
 = 1.2.0 =

wp-minify-fix/tags/1.4.0/wp-minify.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/plugins/wp-minify-fixed/
 Description: [Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files to improve page load time.
-Version: 1.3.4
+Version: 1.4.0
 Author: NodeCode
 Author URI: http://nodecode.de
@@ -20 +20 @@
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.    If not, see <http://www.gnu.org/licenses/>.
 */
 
 class WPMinify {
 
-  var $author_homepage = 'http://nodecode.de/';
-  var $homepage = 'http://wordpress.org/plugins/wp-minify-fixed/';
-  var $name = 'wp_minify'; 
-  var $name_dashed = 'wp-minify-fix'; 
-  var $name_proper = 'WP Minify Fix'; 
-  var $required_wp_version = '2.7';
-  var $version = '1.3.4';
-
-  var $c = null;
-  var $debug = false;
-  var $cache_location = 'wp-content/plugins/wp-minify-fix/cache/';
-  var $url_len_limit = 2000;
-  var $minify_limit = 50;
-  var $buffer_started = false;
-  var $default_exclude = array();
-
-  function WPMinify() {
-    // initialize common functions
-    $this->c = new WPMinifyCommon($this);
-
-    // load translation
-    $this->c->load_text_domain();
-
-    // register admin scripts
-    add_action('admin_init', array($this->c, 'a_register_scripts'));
-    add_action('admin_init', array($this->c, 'a_register_styles'));
-
-    // check wp version
-    add_action('admin_head', array($this->c, 'a_check_version'));
-
-    // load admin menu
-    add_action('admin_menu', array($this, 'a_menu'));
-
-    // register ajax handler
-    add_action('wp_ajax_wpm', array($this, 'a_ajax_handler'));
-
-    // No need to minify admin stuff
-    if (!is_admin() && !is_feed() && !defined('XMLRPC_REQUEST')) {
-      // Don't minify if if user passes wp-minify-off=1 in GET parameter
-      if (!(isset($_GET['wp-minify-off']) && $_GET['wp-minify-off'])) {
-        add_action('init', array($this, 'pre_content'), 99999);
-        add_action('wp_footer', array($this, 'post_content'), 99999);
-      }
-      // advertise hook
-      add_action('wp_footer', array($this, 'advertise'));
-    }
-  }
-
-  // admin functions
-
-  function a_default_options() {
-    return array(
-      'cache_external' => false,
-      'cache_interval' => 3600,
-      'css_exclude' => array(),
-      'css_include' => array(),
-      'debug_nominify' => false,
-      'debug_firephp' => false,
-      'enable_css' => true,
-      'enable_js' => true,
-      'enable_html' => true,
-      'auto_base' => true,
-      'extra_minify_options' => '',
-      'js_exclude' => array(),
-      'js_include' => array(),
-      'js_in_footer' => false,
-      'force_https' => false,
-      'pretty_url' => false,
-      'show_link' => false,
-      'show_advanced' => false,
-      'uri_exclude' => array(),
-      'version' => $this->version,
-      'deprecated' => array(
-        'wp_path', 'debug', 'debug_noprettyurl'
-      )
-    );
-  }
-
-  function a_update_options() {
-    // new options
-    $wpm_new_options = stripslashes_deep($_POST['wpm_options_update']);
-
-    // current options
-    $wpm_current_options = get_option($this->name);
-
-    // convert "on" to true and "off" to false for checkbox fields
-    // and set defaults for fields that are left blank
-    if (isset($wpm_new_options['show_link']) && $wpm_new_options['show_link'] == "on")
-      $wpm_new_options['show_link'] = true;
-    else
-      $wpm_new_options['show_link'] = false;
-
-    if (isset($wpm_new_options['enable_js']))
-      $wpm_new_options['enable_js'] = true;
-    else
-      $wpm_new_options['enable_js'] = false;
-
-    if (isset($wpm_new_options['enable_css']))
-      $wpm_new_options['enable_css'] = true;
-    else
-      $wpm_new_options['enable_css'] = false;
-
-    if (isset($wpm_new_options['enable_html']))
-      $wpm_new_options['enable_html'] = true;
-    else
-      $wpm_new_options['enable_html'] = false;
-
-    if (isset($wpm_new_options['auto_base']))
-      $wpm_new_options['auto_base'] = true;
-    else
-      $wpm_new_options['auto_base'] = false;
-
-    if (isset($wpm_new_options['cache_external']))
-      $wpm_new_options['cache_external'] = true;
-    else
-      $wpm_new_options['cache_external'] = false;
-
-    if (isset($wpm_new_options['js_in_footer']))
-      $wpm_new_options['js_in_footer'] = true;
-    else
-      $wpm_new_options['js_in_footer'] = false;
-
-    if (isset($wpm_new_options['pretty_url']))
-      $wpm_new_options['pretty_url'] = true;
-    else
-      $wpm_new_options['pretty_url'] = false;
-
-    if (isset($wpm_new_options['debug_nominify']))
-      $wpm_new_options['debug_nominify'] = true;
-    else
-      $wpm_new_options['debug_nominify'] = false;
-
-    if (isset($wpm_new_options['debug_firephp']))
-      $wpm_new_options['debug_firephp'] = true;
-    else
-      $wpm_new_options['debug_firephp'] = false;
-
-    $this->a_set_minify_config($wpm_new_options['debug_nominify'], $wpm_new_options['debug_firephp']);
-
-    if ( isset($wpm_new_options['force_https']) )
-      $wpm_new_options['force_https'] = true;
-    else
-      $wpm_new_options['force_https'] = false;
-
-    if (strlen(trim($wpm_new_options['js_include'])) > 0)
-      $wpm_new_options['js_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_include'])));
-    else
-      $wpm_new_options['js_include'] = array();
-
-    if (strlen(trim($wpm_new_options['js_exclude'])) > 0)
-      $wpm_new_options['js_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_exclude'])));
-    else
-      $wpm_new_options['js_exclude'] = array();
-
-    if (strlen(trim($wpm_new_options['css_include'])) > 0)
-      $wpm_new_options['css_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_include'])));
-    else
-      $wpm_new_options['css_include'] = array();
-
-    if (strlen(trim($wpm_new_options['css_exclude'])) > 0)
-      $wpm_new_options['css_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_exclude'])));
-    else
-      $wpm_new_options['css_exclude'] = array();
-
-    if ( strlen(trim($wpm_new_options['uri_exclude'])) > 0 )
-      $wpm_new_options['uri_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['uri_exclude'])));
-    else
-      $wpm_new_options['uri_exclude'] = array();
-
-    // Update options
-    foreach ($wpm_new_options as $key => $value) {
-      $wpm_current_options[$key] = $value;
-    }
-
-    update_option($this->name, $wpm_current_options);
-  }
-
-  function a_set_advanced_options($val) {
-    $wpm_options = get_option($this->name);
-    $wpm_options['show_advanced'] = $val;
-    update_option($this->name, $wpm_options);
-  }
-
-  function a_ajax_handler() {
-    check_ajax_referer($this->name);
-    if (isset($_POST['wpm_action'])) {
-      if (strtolower($_POST['wpm_action']) == 'show_advanced') {
-        $this->a_set_advanced_options(true);
-      }
-      elseif (strtolower($_POST['wpm_action']) == 'hide_advanced') {
-        $this->a_set_advanced_options(false);
-      }
-      else {
-        echo 'Invalid wpm_action.';
-      }
-    }
-    exit();
-  }
-
-  function a_request_handler() {
-    if (isset($_POST['wpm_options_update_submit'])) {
-      check_admin_referer($this->name);
-      $this->a_update_options();
-      add_action('admin_notices', array($this->c, 'a_notify_updated'));
-    }
-    elseif (isset($_POST['wpm_options_clear_cache_submit'])) {
-      // if user wants to regenerate nonce
-      check_admin_referer($this->name);
-      $this->c->a_clear_cache();
-      add_action('admin_notices', array($this->c, 'a_notify_cache_cleared'));
-    }
-    elseif (isset($_POST['wpm_options_upgrade_submit'])) {
-      // if user wants to upgrade options (for new options on version upgrades)
-      check_admin_referer($this->name);
-      $this->c->a_upgrade_options();
-      add_action('admin_notices', array($this->c, 'a_notify_upgraded'));
-    }
-    elseif (isset($_POST['wpm_options_reset_submit'])) {
-      // if user wants to reset all options
-      check_admin_referer($this->name);
-      $this->c->a_reset_options();
-      add_action('admin_notices', array($this->c, 'a_notify_reset'));
-    }
-
-    // only check these on plugin settings page
-    $this->c->a_check_dir_writable($this->c->get_plugin_dir().'cache/', array($this, 'a_notify_cache_not_writable'));
-    $this->c->a_check_orphan_options(array($this, 'a_notify_orphan_options'));
-    if ($this->c->a_check_dir_writable($this->c->get_plugin_dir().'min/config.php', array($this, 'a_notify_config_not_writable'))) {
-      $this->a_check_minify_config();
-    }
-  }
-
-  function a_check_minify_config() {
-    $fname = $this->c->get_plugin_dir().'min/config.php';
-    $fhandle = fopen($fname,'r');
-    $content = fread($fhandle,filesize($fname));
-
-    $config_modified = false;
-    
-    preg_match('/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s', $content, $matches);
-    $cache_path_code = $matches[1];
-    if (!preg_match('/\$min_cachePath.*?/', $cache_path_code)) {
-      $content = preg_replace(
-        '/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s',
-        "//###WPM-CACHE-PATH-BEFORE###\n".'$min_cachePath = \''.$this->c->get_plugin_dir()."cache/';\n//###WPM-CACHE-PATH-AFTER###",
-        $content);
-      $config_modified = true;
-    }
-
-    preg_match('/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s', $content, $matches);
-    $cache_age_code = $matches[1];
-    if (!preg_match('/\$min_serveOptions\[\'maxAge\'].*?/', $cache_age_code)) {
-      $content = preg_replace(
-        '/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s',
-        "//###WPM-CACHE-AGE-BEFORE###\n".'$min_serveOptions[\'maxAge\'] = 2592000;'."\n//###WPM-CACHE-AGE-AFTER###",
-        $content);
-      $config_modified = true;
-    }
-
-    if ($config_modified) {
-      $this->a_notify_modified_minify_config();
-    }
-    
-    $fhandle = fopen($fname,"w");
-    fwrite($fhandle,$content);
-    fclose($fhandle);
-  }
-
-  function a_set_minify_config($nominify = false, $firephp = false) {
-    if ($nominify) {
-      $nominify = 'true';
-    } else {
-      $nominify = 'false';
-    }
-    if ($firephp) {
-      $firephp = 'true';
-    } else {
-      $firephp = 'false';
-    }
-    $fname = $this->c->get_plugin_dir().'min/config.php';
-    $fhandle = fopen($fname,'r');
-    $content = fread($fhandle,filesize($fname));
-
-    $content = preg_replace(
-      '/\/\/###WPM-DEBUG-FLAG-BEFORE###(.*)\/\/###WPM-DEBUG-FLAG-AFTER###/s',
-      "//###WPM-DEBUG-FLAG-BEFORE###\n".'$min_allowDebugFlag = '.$nominify.";\n//###WPM-DEBUG-FLAG-AFTER###",
-      $content);
-
-    $content = preg_replace(
-      '/\/\/###WPM-ERROR-LOGGER-BEFORE###(.*)\/\/###WPM-ERROR-LOGGER-AFTER###/s',
-      "//###WPM-ERROR-LOGGER-BEFORE###\n".'$min_errorLogger = '.$firephp.";\n//###WPM-ERROR-LOGGER-AFTER###",
-      $content);
-
-    $fhandle = fopen($fname,"w");
-    fwrite($fhandle,$content);
-    fclose($fhandle);
-  }
-
-  function a_notify_cache_not_writable() {
-    $this->c->a_notify(
-      sprintf('%s: %s',
-        __('Cache directory is not writable. Please grant your server write permissions to the directory', $this->name),
-        $this->c->get_plugin_dir().'cache/'),
-      true);
-  }
-
-  function a_notify_config_not_writable() {
-    $this->c->a_notify(
-      sprintf('%s: %s',
-        __('Minify Engine config.php is not writable. Please grant your server write permissions to file', $this->name),
-        $this->c->get_plugin_dir().'min/config.php'));
-  }
-
-  function a_notify_orphan_options() {
-    $this->c->a_notify(
-      sprintf('%s',
-        __('Some option settings are missing (possibly from plugin upgrade).', $this->name)));
-  }
-
-  function a_notify_modified_minify_config() {
-    $this->c->a_notify(__('Minify Engine config.php was configured automatically.', $this->name));
-  }
-
-  function a_menu() {
-    $options_page = add_options_page($this->name_proper, $this->name_proper, 'manage_options', 'wp-minify-fix', array($this, 'a_page'));
-    add_action('admin_head-'.$options_page, array($this, 'a_request_handler'));
-    add_action('admin_print_scripts-'.$options_page, array($this->c, 'a_enqueue_scripts'));
-    add_action('admin_print_styles-'.$options_page, array($this->c, 'a_enqueue_styles'));
-  }
-
-  function a_page() {
-    $wpm_options = get_option($this->name);
-    printf('
-      <div class="wrap omni_admin_content">
-        <h2>%s</h2>
-        <div>
-          <a href="'.preg_replace('/&wpm-page=[^&]*/', '', $_SERVER['REQUEST_URI']).'">%s</a>&nbsp;|&nbsp;
-          <a href="'.$this->homepage.'">%s</a>
-        </div>',
-      __('WP Minify Options', $this->name),
-      __('General Configuration', $this->name),
-      __('Documentation', $this->name)
-    );
-    printf('<div class="omni_admin_main">');
-    if (isset($_GET['wpm-page'])) {
-      if ($_GET['wpm-page'] || !$_GET['wpm-page']) {
-        require_once('options-generic.php');
-      }
-    }
-    else {
-      require_once('options-generic.php');
-    }
-    printf('</div>'); // omni_admin_main
-    require_once('options-sidebar.php');
-    printf('</div>'); // wrap
-
-  } // admin_page()
-
-  // other functions
-
-  function fetch_and_cache($url, $cache_file) {
-    $ch = curl_init();
-    $timeout = 5; // set to zero for no timeout
-    curl_setopt ($ch, CURLOPT_URL, $url);
-    curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-    curl_setopt ($ch, CURLOPT_USERAGENT, 'WP-Minify Fix');
-    $content = curl_exec($ch);
-    curl_close($ch);
-    if ($content) {
-      if (is_array($content)) {
-        $content = implode($content);
-      }
-
-      // save cache file
-      $fh = fopen($cache_file, 'w');
-      if ($fh) {
-        fwrite($fh, $content);
-        fclose($fh);
-      }
-      else {
-        // cannot open for write.  no error b/c something else is probably writing to the file.
-      }
-
-      return $content;
-    }
-    else {
-      printf(
-        '%s: '.$url.'. %s<br/>',
-        __('Error: Could not fetch and cache URL'),
-        __('You might need to exclude this file in WP Minify options.')
-      );
-      return '';
-    }
-  }
-
-  function refetch_cache_if_expired($url, $cache_file) {
-    $wpm_options = get_option($this->name);
-    $cache_file_mtime = filemtime($cache_file);
-    if ((time() - $cache_file_mtime) > $wpm_options['cache_interval']) {
-      $this->fetch_and_cache($url, $cache_file);
-    }
-  }
-
-  function tiny_filename($str) {
-    $f = __FILE__;
-    // no fancy shortening for Windows
-    return ('/' === $f[0]) ? strtr(base64_encode(md5($str, true)), '+/=', '-_(') : md5($str);
-  }
-
-  function array_trim($arr, $charlist=null) {
-    foreach ($arr as $key => $value) {
-      if (is_array($value)) $result[$key] = array_trim($value, $charlist);
-      else $result[$key] = trim($value, $charlist);
-    }
-    return $result;
-  }
-
-  function check_and_split_url($url, $latest_modified = 0) {
-    $url_chunk = explode('?f=', $url);
-    $base_url = array_shift($url_chunk);
-    $files = explode(',', array_shift($url_chunk));
-    $num_files = sizeof($files);
-
-    if ($this->url_needs_splitting($url, $files)) {
-      $first_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, 0, $num_files/2)), $latest_modified);
-      $second_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, $num_files/2)), $latest_modified);
-      return $first_half + $second_half;
-    }
-    else {
-      $wpm_options = get_option($this->name);
-
-      // append &debug if we need to
-      if ($wpm_options['debug_nominify']) {
-        $debug_string = '&amp;debug=true';
-      } else {
-        $debug_string = '';
-      }
-
-      // append base directory if needed
-      $base = $this->get_base();
-      if ($base != '') {
-        $base_string = '&amp;b='.$base;
-      } else {
-        $base_string = '';
-      }
-
-      // get rid of any base directory specification in extra options
-      $extra_minify_options = preg_replace('/(&|&amp;|\b)b=[^&]*/', '', trim($wpm_options['extra_minify_options']));
-      if (trim($extra_minify_options) != '') {
-        $extra_string = '&amp;'.$extra_minify_options;
-      } else {
-        $extra_string = '';
-      }
-
-      // append last modified time
-      $latest_modified_string = '&amp;m='.$latest_modified;
-
-      return array($base_url . '?f=' . implode(',', $files) . $debug_string . $base_string . $extra_string . $latest_modified_string);
-    }
-  }
-
-  function fetch_content($url, $type = '') {
-    $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
-    $content = '';
-    if (file_exists($cache_file)) {
-      // check cache expiration
-      $this->refetch_cache_if_expired($url, $cache_file);
-
-      $fh = fopen($cache_file, 'r');
-      if ($fh && filesize($cache_file) > 0) {
-        $content = fread($fh, filesize($cache_file));
-        fclose($fh);
-      }
-      else {
-        // cannot open cache file so fetch it
-        $content = $this->fetch_and_cache($url, $cache_file);
-      }
-    }
-    else {
-      // no cache file.  fetch from internet and save to local cache
-      $content = $this->fetch_and_cache($url, $cache_file);
-    }
-    return $content;
-  }
-
-  function local_version($url) {
-    $site_url = trailingslashit(get_option('siteurl'));
-    $url = str_replace($site_url, '', $url); // relative paths only for local urls
-    //$url = preg_replace('/^\//', '', $url); // strip front / if any
-    $url = preg_replace('/\?.*/i', '', $url); // throws away parameters, if any
-    return $url;
-  }
-
-  function is_external($url, $localize=true) {
-    if ($localize) {
-      $url = $this->local_version($url);
-    }
-
-    if (substr($url, 0, 4) != 'http' && substr($url, 0, 2) != '//'
-      && (substr($url, -3, 3) == '.js' || substr($url, -4, 4) == '.css')) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  function get_js_location($src) {
-    if ($this->debug)
-      echo 'Script URL:'.$src."<br/>\n";
-
-    $script_path = $this->local_version($src);
-    if ($this->is_external($script_path, false)) {
-      // fetch scripts if necessary
-      $this->fetch_content($src, '.js');
-      $location = $this->cache_location . md5($src) . '.js';
-      if ($this->debug)
-        echo 'External script detected, cached as:'. md5($src) . "<br/>\n";
-    } else {
-      // if script is local to server
-      $location = $script_path;
-      if ($this->debug)
-        echo 'Local script detected:'.$script_path."<br/>\n";
-    }
-
-    return $location;
-  }
-
-  function get_css_location($src) {
-    if ($this->debug)
-      echo 'Style URL:'.$src."<br/>\n";
-
-    $css_path = $this->local_version($src);
-    if ($this->is_external($css_path, false)) {
-      // fetch scripts if necessary
-      $this->fetch_content($src, '.css');
-      $location = $this->cache_location . md5($src) . '.css';
-      if ($this->debug)
-        echo 'External css detected, cached as:'. md5($src) . "<br/>\n";
-    } else {
-      $location = $css_path;
-      // if css is local to server
-      if ($this->debug)
-        echo 'Local css detected:'.$css_path."<br/>\n";
-    }
-
-    return $location;
-  }
-
-  function url_needs_splitting($url, $locations) {
-    if ($url > $this->url_len_limit || count($locations) > $this->minify_limit) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  function build_minify_urls($locations, $type) {
-    $wpm_options = get_option($this->name);
-    $minify_url = $this->c->get_plugin_url().'min/?f=';
-    if ($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on") {
-      $minify_url = preg_replace('/^http:\/\//', 'https://', $minify_url);
-    }
-    $minify_url .= implode(',', $locations);
-    $latest_modified = $this->get_latest_modified_time($locations);
-    $minify_urls = $this->check_and_split_url($minify_url, $latest_modified);
-
-    if ($wpm_options['pretty_url']) {
-      return $this->get_cached_minify_urls($minify_urls, $type);
-    } else {
-      return $minify_urls;
-    }
-  }
-  
-  function get_cached_minify_urls($urls, $type) {
-    $wpm_options = get_option($this->name);
-    $cached_urls = array();
-    foreach ($urls as $url) {
-      $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
-      if (file_exists($cache_file)) {
-        // check cache expiration
-        $this->refetch_cache_if_expired($url, $cache_file);
-  
-        $fh = fopen($cache_file, 'r');
-        if ($fh && filesize($cache_file) > 0) {
-          $content = fread($fh, filesize($cache_file));
-          fclose($fh);
-        } else {
-          // cannot open cache file so fetch it
-          $this->fetch_and_cache($url, $cache_file);
-        }
-      } else {
-        // no cache file. fetch it
-        $this->fetch_and_cache($url, $cache_file);
-      }
-      $cache_url = $this->c->get_plugin_url().'cache/'.md5($url).$type.'?m='.filemtime($cache_file);
-      $cached_urls[] = $cache_url;
-    }
-    return $cached_urls;
-  }
-
-  function get_base_from_minify_args() {
-    $wpm_options = get_option($this->name);
-    if (!empty($wpm_options['extra_minify_options'])) {
-      if (preg_match('/\bb=([^&]*?)(&|$)/', trim($wpm_options['extra_minify_options']), $matches)) {
-        return rtrim(trim($matches[1]), '\\/');
-      }
-    }
-    return '';
-  }
-
-  function get_base_from_siteurl() {
-    $site_url = trailingslashit(get_option('siteurl'));
-    return rtrim(preg_replace('/^https?:\/\/.*?\//', '', $site_url), '\\/');
-  }
-
-  function get_base() {
-    $base_from_min_args = $this->get_base_from_minify_args();
-    if ($base_from_min_args != '') {
-      return $base_from_min_args;
-    }
-
-    $wpm_options = get_option($this->name);
-    if ($wpm_options['auto_base']) {
-      return $this->get_base_from_siteurl();
-    } else {
-      return '';
-    }
-  }
-
-  function get_latest_modified_time($locations = array()) {
-    $latest_modified = 0;
-    if (!empty($locations)) {
-      $base_path = trailingslashit($_SERVER['DOCUMENT_ROOT']);
-      $base_path .= trailingslashit($this->get_base());
-
-      foreach ($locations as $location) {
-        $path = $base_path.$location;
-        $mtime = filemtime($path);
-        if ($latest_modified < $mtime) {
-          $latest_modified = $mtime;
-        }
-      }
-    }
-    return $latest_modified;
-  }
-
-  function extract_css($content) {
-    $wpm_options = get_option($this->name);
-    $css_locations = array();
-
-    preg_match_all('/<link([^>]*?)>/i', $content, $link_tags_match);
-
-    foreach ($link_tags_match[0] as $link_tag) {
-      if (strpos(strtolower($link_tag), 'stylesheet')) {
-        // check CSS media type
-        if (!strpos(strtolower($link_tag), 'media=')
-          || preg_match('/media=["\'](?:["\']|[^"\']*?(all|screen)[^"\']*?["\'])/', $link_tag)
-        ) {
-          preg_match('/href=[\'"]([^\'"]+)/', $link_tag, $href_match);
-          if ($href_match[1]) {
-            // include it if it is in the include list
-            $include = false;
-            $inclusions = $wpm_options['css_include'];
-            foreach ($inclusions as $include_pat) {
-              $include_pat = trim($include_pat);
-              if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
-                $include = true;
-                break;
-              }
-            }
-
-            if (!$include) {
-              // support external files?
-              if (!$wpm_options['cache_external'] && $this->is_external($href_match[1])) {
-                continue; // skip if we don't cache externals and this file is external
-              }
-
-              // do not include anything in excluded list
-              $skip = false;
-              $exclusions = array_merge($this->default_exclude, $wpm_options['css_exclude']);
-              foreach ($exclusions as $exclude_pat) {
-                $exclude_pat = trim($exclude_pat);
-                if (strlen($exclude_pat) > 0 && strpos($href_match[1], $exclude_pat) !== false) {
-                  $skip = true;
-                  break;
-                }
-              }
-              if ($skip) continue;
-            }
-
-            $content = str_replace($link_tag . '</link>', '', $content);
-            $content = str_replace($link_tag, '', $content);
-            $css_locations[] = $this->get_css_location($href_match[1]);
-          }
-        }
-      }
-    }
-
-    $css_locations = array_unique($css_locations);
-
-    return array($content, $css_locations);
-  }
-
-  function inject_css($content, $css_locations) {
-    if (count($css_locations) > 0) {
-      $wpm_options = get_option($this->name);
-      // build minify URLS
-      $css_tags = '';
-      $minify_urls = $this->build_minify_urls($css_locations, '.css');
-
-      foreach ($minify_urls as $minify_url) {
-        $minify_url = apply_filters('wp_minify_css_url', $minify_url); // Allow plugins to modify final minify URL
-        $css_tags .= "<link rel='stylesheet' href='$minify_url' type='text/css' media='screen' />";
-      }
-
-      $matches = preg_match('/<!-- WP-Minify CSS -->/', $content);
-
-      if ($matches) {
-        $content = preg_replace('/<!-- WP-Minify CSS -->/', "$css_tags", $content, 1); // limit 1 replacement
-      } else {
-        // HTML5 has <header> tags so account for those in regex
-        $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$css_tags", $content, 1); // limit 1 replacement
-      }
-    }
-    return $content;
-  }
-
-  function extract_conditionals($content) {
-    preg_match_all('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', $content, $conditionals_match);
-    $content = preg_replace('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', '###WPM-CSS-CONDITIONAL###', $content);
-
-    $conditionals = array();
-    foreach ($conditionals_match[0] as $conditional) {
-      $conditionals[] = $conditional;
-    }
-
-    return array($content, $conditionals);
-  }
-
-  function inject_conditionals($content, $conditionals) {
-    while (count($conditionals) > 0 && strpos($content, '###WPM-CSS-CONDITIONAL###')) {
-      $conditional = array_shift($conditionals);
-      $content = preg_replace('/###WPM-CSS-CONDITIONAL###/', $conditional, $content, 1);
-    }
-
-    return $content;
-  }
-
-  function extract_js($content) {
-    $wpm_options = get_option($this->name);
-    $js_locations = array();
-
-    preg_match_all('/<script([^>]*?)><\/script>/i', $content, $script_tags_match);
-
-    foreach ($script_tags_match[0] as $script_tag) {
-      preg_match('/src=[\'"]([^\'"]+)/', $script_tag, $src_match);
-      if ($src_match[1]) {
-        // include it if it is in the include list
-        $include = false;
-        $inclusions = $wpm_options['js_include'];
-        foreach ($inclusions as $include_pat) {
-          $include_pat = trim($include_pat);
-          if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
-            $include = true;
-            break;
-          }
-        }
-
-        if (!$include) {
-          // support external files?
-          if (!$wpm_options['cache_external'] && $this->is_external($src_match[1])) {
-            continue; // skip if we don't cache externals and this file is external
-          }
-
-          // do not include anything in excluded list
-          $skip = false;
-          $exclusions = array_merge($this->default_exclude, $wpm_options['js_exclude']);
-          foreach ($exclusions as $exclude_pat) {
-            $exclude_pat = trim($exclude_pat);
-            if (strlen($exclude_pat) > 0 && strpos($src_match[1], $exclude_pat) !== false) {
-              $skip = true;
-              break;
-            }
-          }
-          if ($skip) continue;
-        }
-
-        $content = str_replace($script_tag, '', $content);
-        $js_locations[] = $this->get_js_location($src_match[1]);
-      }
-    }
-
-    $js_locations = array_unique($js_locations);
-
-    return array($content, $js_locations);
-  }
-
-  function inject_js($content, $js_locations) {
-    if (count($js_locations) > 0) {
-      // build minify URLS
-      $js_tags = '';
-      $minify_urls = $this->build_minify_urls($js_locations, '.js');
-
-      foreach ($minify_urls as $minify_url) {
-        $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
-        $js_tags .= "<script type='text/javascript' src='$minify_url'></script>";
-      }
-
-      $matches = preg_match('/<!-- WP-Minify JS -->/', $content);
-
-      if ($matches) {
-        $content = preg_replace('/<!-- WP-Minify JS -->/', "$js_tags", $content, 1); // limit 1 replacement
-      } else {
-        $wpm_options = get_option($this->name);
-        if ($wpm_options['js_in_footer']) {
-          $content = preg_replace('/<\/body>/', "$js_tags\n</body>", $content, 1); // limit 1 replacement
-        } else {
-          // HTML5 has <header> tags so account for those in regex
-          $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$js_tags", $content, 1); // limit 1 replacement
-        }
-      }
-    }
-    return $content;
-  }
-
-  function pre_content() {
-    $wpm_options = get_option($this->name);
-    if ($wpm_options['uri_exclude'] && count($wpm_options['uri_exclude'])) {
-      foreach ($wpm_options['uri_exclude'] as $exclude_pat) {
-        $exclude_pat = trim($exclude_pat);
-        if (strlen($exclude_pat) > 0 && strpos($_SERVER['REQUEST_URI'], $exclude_pat) !== false) {
-          return;
-        }
-      }
-    }
-
-    ob_start(array($this, 'modify_buffer'));
-
-    // variable for sanity checking
-    $this->buffer_started = true;
-  }
-
-  function modify_buffer($buffer) {
-    $wpm_options = get_option($this->name);
-
-    // if we do not want to force http to https then we need to exclude https
-    if (!($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on")) {
-      $this->default_exclude[] = 'https://';
-    }
-
-    // minify JS
-    if ($wpm_options['enable_js']) {
-      list($buffer, $js_locations) = $this->extract_js($buffer);
-      $buffer= $this->inject_js($buffer, $js_locations);
-    }
-
-    // minify CSS (make sure to exclude CSS conditionals)
-    if ($wpm_options['enable_css']) {
-      list($buffer, $conditionals) = $this->extract_conditionals($buffer);
-      list($buffer, $css_locations) = $this->extract_css($buffer);
-      $buffer = $this->inject_css($buffer, $css_locations);
-      $buffer = $this->inject_conditionals($buffer, $conditionals);
-    }
-
-    // get rid of empty lines
-    $buffer = preg_replace('/\s*(\r?\n)(\r?\n)*/', '$1', $buffer);
-
-    // minify HTML
-    if ($wpm_options['enable_html']) {
-      if (!class_exists('Minify_HTML')) {
-        require_once('min/lib/Minify/HTML.php');
-      }
-      $buffer = Minify_HTML::minify($buffer);
-    }
-
-    $buffer = apply_filters('wp_minify_content', $buffer); // allow plugins to modify buffer
-
-    return $buffer;
-  }
-
-  function post_content() {
-    // sanity checking
-    if ($this->buffer_started) {
-      ob_end_flush();
-    }
-  }
-
-  function advertise() {
-    $wpm_options = get_option($this->name);
-    if ($wpm_options['show_link']) {
-      printf("<p align='center'><small>Page optimized by <a href='$this->homepage' title='$this->name_proper WordPress Plugin' style='text-decoration:none;'>$this->name_proper</a> <a href='$this->author_homepage' title='WordPress Plugin' style='text-decoration:none;'>WordPress Plugin</a></small></p>");
-    }
-  }
+    var $author_homepage = 'http://nodecode.de/';
+    var $homepage = 'http://wordpress.org/plugins/wp-minify-fixed/';
+    var $name = 'wp_minify'; 
+    var $name_dashed = 'wp-minify-fix'; 
+    var $name_proper = 'WP Minify Fix'; 
+    var $required_wp_version = '2.7';
+    var $version = '1.4.0';
+
+    var $c = null;
+    var $debug = false;
+    var $cache_location = 'wp-content/plugins/wp-minify-fix/cache/';
+    var $url_len_limit = 2000;
+    var $minify_limit = 50;
+    var $buffer_started = false;
+    var $default_exclude = array();
+    
+    var $footer_scripts_string = 'abc';
+
+    function WPMinify() {
+        // initialize common functions
+        $this->c = new WPMinifyCommon($this);
+
+        // load translation
+        $this->c->load_text_domain();
+
+        // register admin scripts
+        add_action('admin_init', array($this->c, 'a_register_scripts'));
+        add_action('admin_init', array($this->c, 'a_register_styles'));
+
+        // check wp version
+        add_action('admin_head', array($this->c, 'a_check_version'));
+
+        // load admin menu
+        add_action('admin_menu', array($this, 'a_menu'));
+
+        // register ajax handler
+        add_action('wp_ajax_wpm', array($this, 'a_ajax_handler'));
+
+        // No need to minify admin stuff
+        if (!is_admin() && !defined('XMLRPC_REQUEST')) {
+            // Don't minify if if user passes wp-minify-off=1 in GET parameter
+            if (!(isset($_GET['wp-minify-off']) && $_GET['wp-minify-off'])) {
+                // footer scripts hook
+                add_action('wp_footer', array($this, 'footer_placeholder'), 1);
+                
+                add_action('init', array($this, 'pre_content'), 99999);
+                add_action('wp_footer', array($this, 'post_content'), 99999);
+            }
+            // advertise hook
+            add_action('wp_footer', array($this, 'advertise'));
+        }
+    }
+
+    // admin functions
+
+    function a_default_options() {
+        return array(
+            'cache_external' => false,
+            'cache_interval' => 3600,
+            'css_exclude' => array(),
+            'css_include' => array(),
+            'debug_nominify' => false,
+            'debug_firephp' => false,
+            'enable_css' => true,
+            'enable_js' => true,
+            'enable_html' => true,
+            'auto_base' => true,
+            'extra_minify_options' => '',
+            'js_exclude' => array(),
+            'js_include' => array(),
+            'js_placement' => 'header-footer', // header-footer, header or footer
+            'js_async' => false, // Header only, see http://css-tricks.com/async-attribute-scripts-bottom/
+            'force_https' => false,
+            'pretty_url' => false,
+            'show_link' => false,
+            'show_advanced' => false,
+            'uri_exclude' => array(),
+            'version' => $this->version,
+            'deprecated' => array(
+                'wp_path', 'debug', 'debug_noprettyurl', 'js_in_footer'
+            )
+        );
+    }
+
+    function a_update_options() {
+        // new options
+        $wpm_new_options = stripslashes_deep($_POST['wpm_options_update']);
+
+        // current options
+        $wpm_current_options = get_option($this->name);
+
+        // convert "on" to true and "off" to false for checkbox fields
+        // and set defaults for fields that are left blank
+        if (isset($wpm_new_options['show_link']) && $wpm_new_options['show_link'] == "on")
+            $wpm_new_options['show_link'] = true;
+        else
+            $wpm_new_options['show_link'] = false;
+
+        if (isset($wpm_new_options['enable_js']))
+            $wpm_new_options['enable_js'] = true;
+        else
+            $wpm_new_options['enable_js'] = false;
+
+        if (isset($wpm_new_options['enable_css']))
+            $wpm_new_options['enable_css'] = true;
+        else
+            $wpm_new_options['enable_css'] = false;
+
+        if (isset($wpm_new_options['enable_html']))
+            $wpm_new_options['enable_html'] = true;
+        else
+            $wpm_new_options['enable_html'] = false;
+
+        if (isset($wpm_new_options['auto_base']))
+            $wpm_new_options['auto_base'] = true;
+        else
+            $wpm_new_options['auto_base'] = false;
+
+        if (isset($wpm_new_options['cache_external']))
+            $wpm_new_options['cache_external'] = true;
+        else
+            $wpm_new_options['cache_external'] = false;
+
+        if (isset($wpm_new_options['js_in_footer']))
+            $wpm_new_options['js_in_footer'] = true;
+        else
+            $wpm_new_options['js_in_footer'] = false;
+
+        if (isset($wpm_new_options['pretty_url']))
+            $wpm_new_options['pretty_url'] = true;
+        else
+            $wpm_new_options['pretty_url'] = false;
+
+        if (isset($wpm_new_options['debug_nominify']))
+            $wpm_new_options['debug_nominify'] = true;
+        else
+            $wpm_new_options['debug_nominify'] = false;
+
+        if (isset($wpm_new_options['debug_firephp']))
+            $wpm_new_options['debug_firephp'] = true;
+        else
+            $wpm_new_options['debug_firephp'] = false;
+
+        $this->a_set_minify_config($wpm_new_options['debug_nominify'], $wpm_new_options['debug_firephp']);
+        
+        if ( isset($wpm_new_options['js_async']) )
+            $wpm_new_options['js_async'] = true;
+        else
+            $wpm_new_options['js_async'] = false;
+
+        if ( isset($wpm_new_options['force_https']) )
+            $wpm_new_options['force_https'] = true;
+        else
+            $wpm_new_options['force_https'] = false;
+
+        if (strlen(trim($wpm_new_options['js_include'])) > 0)
+            $wpm_new_options['js_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_include'])));
+        else
+            $wpm_new_options['js_include'] = array();
+
+        if (strlen(trim($wpm_new_options['js_exclude'])) > 0)
+            $wpm_new_options['js_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_exclude'])));
+        else
+            $wpm_new_options['js_exclude'] = array();
+
+        if (strlen(trim($wpm_new_options['css_include'])) > 0)
+            $wpm_new_options['css_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_include'])));
+        else
+            $wpm_new_options['css_include'] = array();
+
+        if (strlen(trim($wpm_new_options['css_exclude'])) > 0)
+            $wpm_new_options['css_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_exclude'])));
+        else
+            $wpm_new_options['css_exclude'] = array();
+
+        if ( strlen(trim($wpm_new_options['uri_exclude'])) > 0 )
+            $wpm_new_options['uri_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['uri_exclude'])));
+        else
+            $wpm_new_options['uri_exclude'] = array();
+
+        // Update options
+        foreach ($wpm_new_options as $key => $value) {
+            $wpm_current_options[$key] = $value;
+        }
+
+        update_option($this->name, $wpm_current_options);
+    }
+
+    function a_set_advanced_options($val) {
+        $wpm_options = get_option($this->name);
+        $wpm_options['show_advanced'] = $val;
+        update_option($this->name, $wpm_options);
+    }
+
+    function a_ajax_handler() {
+        check_ajax_referer($this->name);
+        if (isset($_POST['wpm_action'])) {
+            if (strtolower($_POST['wpm_action']) == 'show_advanced') {
+                $this->a_set_advanced_options(true);
+            }
+            elseif (strtolower($_POST['wpm_action']) == 'hide_advanced') {
+                $this->a_set_advanced_options(false);
+            }
+            else {
+                echo 'Invalid wpm_action.';
+            }
+        }
+        exit();
+    }
+
+    function a_request_handler() {
+        if (isset($_POST['wpm_options_update_submit'])) {
+            check_admin_referer($this->name);
+            $this->a_update_options();
+            add_action('admin_notices', array($this->c, 'a_notify_updated'));
+        }
+        elseif (isset($_POST['wpm_options_clear_cache_submit'])) {
+            // if user wants to regenerate nonce
+            check_admin_referer($this->name);
+            $this->c->a_clear_cache();
+            add_action('admin_notices', array($this->c, 'a_notify_cache_cleared'));
+        }
+        elseif (isset($_POST['wpm_options_upgrade_submit'])) {
+            // if user wants to upgrade options (for new options on version upgrades)
+            check_admin_referer($this->name);
+            $this->c->a_upgrade_options();
+            add_action('admin_notices', array($this->c, 'a_notify_upgraded'));
+        }
+        elseif (isset($_POST['wpm_options_reset_submit'])) {
+            // if user wants to reset all options
+            check_admin_referer($this->name);
+            $this->c->a_reset_options();
+            add_action('admin_notices', array($this->c, 'a_notify_reset'));
+        }
+
+        // only check these on plugin settings page
+        $this->c->a_check_dir_writable($this->c->get_plugin_dir().'cache/', array($this, 'a_notify_cache_not_writable'));
+        $this->c->a_check_orphan_options(array($this, 'a_notify_orphan_options'));
+        if ($this->c->a_check_dir_writable($this->c->get_plugin_dir().'min/config.php', array($this, 'a_notify_config_not_writable'))) {
+            $this->a_check_minify_config();
+        }
+    }
+
+    function a_check_minify_config() {
+        $fname = $this->c->get_plugin_dir().'min/config.php';
+        $fhandle = fopen($fname,'r');
+        $content = fread($fhandle,filesize($fname));
+
+        $config_modified = false;
+        
+        preg_match('/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s', $content, $matches);
+        $cache_path_code = $matches[1];
+        if (!preg_match('/\$min_cachePath.*?/', $cache_path_code)) {
+            $content = preg_replace(
+                '/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s',
+                "//###WPM-CACHE-PATH-BEFORE###\n".'$min_cachePath = \''.$this->c->get_plugin_dir()."cache/';\n//###WPM-CACHE-PATH-AFTER###",
+                $content);
+            $config_modified = true;
+        }
+
+        preg_match('/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s', $content, $matches);
+        $cache_age_code = $matches[1];
+        if (!preg_match('/\$min_serveOptions\[\'maxAge\'].*?/', $cache_age_code)) {
+            $content = preg_replace(
+                '/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s',
+                "//###WPM-CACHE-AGE-BEFORE###\n".'$min_serveOptions[\'maxAge\'] = 2592000;'."\n//###WPM-CACHE-AGE-AFTER###",
+                $content);
+            $config_modified = true;
+        }
+
+        if ($config_modified) {
+            $this->a_notify_modified_minify_config();
+        }
+        
+        $fhandle = fopen($fname,"w");
+        fwrite($fhandle,$content);
+        fclose($fhandle);
+    }
+
+    function a_set_minify_config($nominify = false, $firephp = false) {
+        if ($nominify) {
+            $nominify = 'true';
+        } else {
+            $nominify = 'false';
+        }
+        if ($firephp) {
+            $firephp = 'true';
+        } else {
+            $firephp = 'false';
+        }
+        $fname = $this->c->get_plugin_dir().'min/config.php';
+        $fhandle = fopen($fname,'r');
+        $content = fread($fhandle,filesize($fname));
+
+        $content = preg_replace(
+            '/\/\/###WPM-DEBUG-FLAG-BEFORE###(.*)\/\/###WPM-DEBUG-FLAG-AFTER###/s',
+            "//###WPM-DEBUG-FLAG-BEFORE###\n".'$min_allowDebugFlag = '.$nominify.";\n//###WPM-DEBUG-FLAG-AFTER###",
+            $content);
+
+        $content = preg_replace(
+            '/\/\/###WPM-ERROR-LOGGER-BEFORE###(.*)\/\/###WPM-ERROR-LOGGER-AFTER###/s',
+            "//###WPM-ERROR-LOGGER-BEFORE###\n".'$min_errorLogger = '.$firephp.";\n//###WPM-ERROR-LOGGER-AFTER###",
+            $content);
+
+        $fhandle = fopen($fname,"w");
+        fwrite($fhandle,$content);
+        fclose($fhandle);
+    }
+
+    function a_notify_cache_not_writable() {
+        $this->c->a_notify(
+            sprintf('%s: %s',
+                __('Cache directory is not writable. Please grant your server write permissions to the directory', $this->name),
+                $this->c->get_plugin_dir().'cache/'),
+            true);
+    }
+
+    function a_notify_config_not_writable() {
+        $this->c->a_notify(
+            sprintf('%s: %s',
+                __('Minify Engine config.php is not writable. Please grant your server write permissions to file', $this->name),
+                $this->c->get_plugin_dir().'min/config.php'));
+    }
+
+    function a_notify_orphan_options() {
+        $this->c->a_notify(
+            sprintf('%s',
+                __('Some option settings are missing (possibly from plugin upgrade).', $this->name)));
+    }
+
+    function a_notify_modified_minify_config() {
+        $this->c->a_notify(__('Minify Engine config.php was configured automatically.', $this->name));
+    }
+
+    function a_menu() {
+        $options_page = add_options_page($this->name_proper, $this->name_proper, 'manage_options', 'wp-minify-fix', array($this, 'a_page'));
+        add_action('admin_head-'.$options_page, array($this, 'a_request_handler'));
+        add_action('admin_print_scripts-'.$options_page, array($this->c, 'a_enqueue_scripts'));
+        add_action('admin_print_styles-'.$options_page, array($this->c, 'a_enqueue_styles'));
+    }
+
+    function a_page() {
+        $wpm_options = get_option($this->name);
+        printf('
+            <div class="wrap omni_admin_content">
+                <h2>%s</h2>
+                <div>
+                    <a href="'.preg_replace('/&wpm-page=[^&]*/', '', $_SERVER['REQUEST_URI']).'">%s</a>&nbsp;|&nbsp;
+                    <a href="'.$this->homepage.'">%s</a>
+                </div>',
+            __('WP Minify Options', $this->name),
+            __('General Configuration', $this->name),
+            __('Documentation', $this->name)
+        );
+        printf('<div class="omni_admin_main">');
+        if (isset($_GET['wpm-page'])) {
+            if ($_GET['wpm-page'] || !$_GET['wpm-page']) {
+                require_once('options-generic.php');
+            }
+        }
+        else {
+            require_once('options-generic.php');
+        }
+        printf('</div>'); // omni_admin_main
+        require_once('options-sidebar.php');
+        printf('</div>'); // wrap
+
+    } // admin_page()
+
+    // other functions
+
+    function fetch_and_cache($url, $cache_file) {
+        $ch = curl_init();
+        $timeout = 5; // set to zero for no timeout
+        curl_setopt ($ch, CURLOPT_URL, $url);
+        curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+        curl_setopt ($ch, CURLOPT_USERAGENT, 'WP-Minify Fix');
+        $content = curl_exec($ch);
+        curl_close($ch);
+        if ($content) {
+            if (is_array($content)) {
+                $content = implode($content);
+            }
+
+            // save cache file
+            $fh = fopen($cache_file, 'w');
+            if ($fh) {
+                fwrite($fh, $content);
+                fclose($fh);
+            }
+            else {
+                // cannot open for write.    no error b/c something else is probably writing to the file.
+            }
+
+            return $content;
+        }
+        else {
+            printf(
+                '%s: '.$url.'. %s<br/>',
+                __('Error: Could not fetch and cache URL'),
+                __('You might need to exclude this file in WP Minify options.')
+            );
+            return '';
+        }
+    }
+
+    function refetch_cache_if_expired($url, $cache_file) {
+        $wpm_options = get_option($this->name);
+        $cache_file_mtime = filemtime($cache_file);
+        if ((time() - $cache_file_mtime) > $wpm_options['cache_interval']) {
+            $this->fetch_and_cache($url, $cache_file);
+        }
+    }
+
+    function tiny_filename($str) {
+        $f = __FILE__;
+        // no fancy shortening for Windows
+        return ('/' === $f[0]) ? strtr(base64_encode(md5($str, true)), '+/=', '-_(') : md5($str);
+    }
+
+    function array_trim($arr, $charlist=null) {
+        foreach ($arr as $key => $value) {
+            if (is_array($value)) $result[$key] = array_trim($value, $charlist);
+            else $result[$key] = trim($value, $charlist);
+        }
+        return $result;
+    }
+
+    function check_and_split_url($url, $latest_modified = 0) {
+        $url_chunk = explode('?f=', $url);
+        $base_url = array_shift($url_chunk);
+        $files = explode(',', array_shift($url_chunk));
+        $num_files = sizeof($files);
+
+        if ($this->url_needs_splitting($url, $files)) {
+            $first_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, 0, $num_files/2)), $latest_modified);
+            $second_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, $num_files/2)), $latest_modified);
+            return $first_half + $second_half;
+        }
+        else {
+            $wpm_options = get_option($this->name);
+
+            // append &debug if we need to
+            if ($wpm_options['debug_nominify']) {
+                $debug_string = '&amp;debug=true';
+            } else {
+                $debug_string = '';
+            }
+
+            // append base directory if needed
+            $base = $this->get_base();
+            if ($base != '') {
+                $base_string = '&amp;b='.$base;
+            } else {
+                $base_string = '';
+            }
+
+            // get rid of any base directory specification in extra options
+            $extra_minify_options = preg_replace('/(&|&amp;|\b)b=[^&]*/', '', trim($wpm_options['extra_minify_options']));
+            if (trim($extra_minify_options) != '') {
+                $extra_string = '&amp;'.$extra_minify_options;
+            } else {
+                $extra_string = '';
+            }
+
+            // append last modified time
+            $latest_modified_string = '&amp;m='.$latest_modified;
+
+            return array($base_url . '?f=' . implode(',', $files) . $debug_string . $base_string . $extra_string . $latest_modified_string);
+        }
+    }
+
+    function fetch_content($url, $type = '') {
+        $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
+        $content = '';
+        if (file_exists($cache_file)) {
+            // check cache expiration
+            $this->refetch_cache_if_expired($url, $cache_file);
+
+            $fh = fopen($cache_file, 'r');
+            if ($fh && filesize($cache_file) > 0) {
+                $content = fread($fh, filesize($cache_file));
+                fclose($fh);
+            }
+            else {
+                // cannot open cache file so fetch it
+                $content = $this->fetch_and_cache($url, $cache_file);
+            }
+        }
+        else {
+            // no cache file.    fetch from internet and save to local cache
+            $content = $this->fetch_and_cache($url, $cache_file);
+        }
+        return $content;
+    }
+
+    function local_version($url) {
+        $site_url = trailingslashit(get_option('siteurl'));
+        $url = str_replace($site_url, '', $url); // relative paths only for local urls
+        //$url = preg_replace('/^\//', '', $url); // strip front / if any
+        $url = preg_replace('/\?.*/i', '', $url); // throws away parameters, if any
+        return $url;
+    }
+
+    function is_external($url, $localize=true) {
+        if ($localize) {
+            $url = $this->local_version($url);
+        }
+
+        if (substr($url, 0, 4) != 'http' && substr($url, 0, 2) != '//'
+            && (substr($url, -3, 3) == '.js' || substr($url, -4, 4) == '.css')) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function get_js_location($src) {
+        if ($this->debug)
+            echo 'Script URL:'.$src."<br/>\n";
+
+        $script_path = $this->local_version($src);
+        if ($this->is_external($script_path, false)) {
+            // fetch scripts if necessary
+            $this->fetch_content($src, '.js');
+            $location = $this->cache_location . md5($src) . '.js';
+            if ($this->debug)
+                echo 'External script detected, cached as:'. md5($src) . "<br/>\n";
+        } else {
+            // if script is local to server
+            $location = $script_path;
+            if ($this->debug)
+                echo 'Local script detected:'.$script_path."<br/>\n";
+        }
+
+        return $location;
+    }
+
+    function get_css_location($src) {
+        if ($this->debug)
+            echo 'Style URL:'.$src."<br/>\n";
+
+        $css_path = $this->local_version($src);
+        if ($this->is_external($css_path, false)) {
+            // fetch scripts if necessary
+            $this->fetch_content($src, '.css');
+            $location = $this->cache_location . md5($src) . '.css';
+            if ($this->debug)
+                echo 'External css detected, cached as:'. md5($src) . "<br/>\n";
+        } else {
+            $location = $css_path;
+            // if css is local to server
+            if ($this->debug)
+                echo 'Local css detected:'.$css_path."<br/>\n";
+        }
+
+        return $location;
+    }
+
+    function url_needs_splitting($url, $locations) {
+        if ($url > $this->url_len_limit || count($locations) > $this->minify_limit) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function build_minify_urls($locations, $type) {
+        $wpm_options = get_option($this->name);
+        $minify_url = $this->c->get_plugin_url().'min/?f=';
+        if ($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on") {
+            $minify_url = preg_replace('/^http:\/\//', 'https://', $minify_url);
+        }
+        $minify_url .= implode(',', $locations);
+        $latest_modified = $this->get_latest_modified_time($locations);
+        $minify_urls = $this->check_and_split_url($minify_url, $latest_modified);
+
+        if ($wpm_options['pretty_url']) {
+            return $this->get_cached_minify_urls($minify_urls, $type);
+        } else {
+            return $minify_urls;
+        }
+    }
+    
+    function get_cached_minify_urls($urls, $type) {
+        $wpm_options = get_option($this->name);
+        $cached_urls = array();
+        foreach ($urls as $url) {
+            $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
+            if (file_exists($cache_file)) {
+                // check cache expiration
+                $this->refetch_cache_if_expired($url, $cache_file);
+    
+                $fh = fopen($cache_file, 'r');
+                if ($fh && filesize($cache_file) > 0) {
+                    $content = fread($fh, filesize($cache_file));
+                    fclose($fh);
+                } else {
+                    // cannot open cache file so fetch it
+                    $this->fetch_and_cache($url, $cache_file);
+                }
+            } else {
+                // no cache file. fetch it
+                $this->fetch_and_cache($url, $cache_file);
+            }
+            $cache_url = $this->c->get_plugin_url().'cache/'.md5($url).$type.'?m='.filemtime($cache_file);
+            $cached_urls[] = $cache_url;
+        }
+        return $cached_urls;
+    }
+
+    function get_base_from_minify_args() {
+        $wpm_options = get_option($this->name);
+        if (!empty($wpm_options['extra_minify_options'])) {
+            if (preg_match('/\bb=([^&]*?)(&|$)/', trim($wpm_options['extra_minify_options']), $matches)) {
+                return rtrim(trim($matches[1]), '\\/');
+            }
+        }
+        return '';
+    }
+
+    function get_base_from_siteurl() {
+        $site_url = trailingslashit(get_option('siteurl'));
+        return rtrim(preg_replace('/^https?:\/\/.*?\//', '', $site_url), '\\/');
+    }
+
+    function get_base() {
+        $base_from_min_args = $this->get_base_from_minify_args();
+        if ($base_from_min_args != '') {
+            return $base_from_min_args;
+        }
+
+        $wpm_options = get_option($this->name);
+        if ($wpm_options['auto_base']) {
+            return $this->get_base_from_siteurl();
+        } else {
+            return '';
+        }
+    }
+
+    function get_latest_modified_time($locations = array()) {
+        $latest_modified = 0;
+        if (!empty($locations)) {
+            $base_path = trailingslashit($_SERVER['DOCUMENT_ROOT']);
+            $base_path .= trailingslashit($this->get_base());
+
+            foreach ($locations as $location) {
+                $path = $base_path.$location;
+                $mtime = filemtime($path);
+                if ($latest_modified < $mtime) {
+                    $latest_modified = $mtime;
+                }
+            }
+        }
+        return $latest_modified;
+    }
+
+    function extract_css($content) {
+        $wpm_options = get_option($this->name);
+        $css_locations = array();
+
+        preg_match_all('/<link([^>]*?)>/i', $content, $link_tags_match);
+
+        foreach ($link_tags_match[0] as $link_tag) {
+            if (strpos(strtolower($link_tag), 'stylesheet')) {
+                // check CSS media type
+                if (!strpos(strtolower($link_tag), 'media=')
+                    || preg_match('/media=["\'](?:["\']|[^"\']*?(all|screen)[^"\']*?["\'])/', $link_tag)
+                ) {
+                    preg_match('/href=[\'"]([^\'"]+)/', $link_tag, $href_match);
+                    if ($href_match[1]) {
+                        // include it if it is in the include list
+                        $include = false;
+                        $inclusions = $wpm_options['css_include'];
+                        foreach ($inclusions as $include_pat) {
+                            $include_pat = trim($include_pat);
+                            if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
+                                $include = true;
+                                break;
+                            }
+                        }
+
+                        if (!$include) {
+                            // support external files?
+                            if (!$wpm_options['cache_external'] && $this->is_external($href_match[1])) {
+                                continue; // skip if we don't cache externals and this file is external
+                            }
+
+                            // do not include anything in excluded list
+                            $skip = false;
+                            $exclusions = array_merge($this->default_exclude, $wpm_options['css_exclude']);
+                            foreach ($exclusions as $exclude_pat) {
+                                $exclude_pat = trim($exclude_pat);
+                                if (strlen($exclude_pat) > 0 && strpos($href_match[1], $exclude_pat) !== false) {
+                                    $skip = true;
+                                    break;
+                                }
+                            }
+                            if ($skip) continue;
+                        }
+
+                        $content = str_replace($link_tag . '</link>', '', $content);
+                        $content = str_replace($link_tag, '', $content);
+                        $css_locations[] = $this->get_css_location($href_match[1]);
+                    }
+                }
+            }
+        }
+
+        $css_locations = array_unique($css_locations);
+
+        return array($content, $css_locations);
+    }
+
+    function inject_css($content, $css_locations) {
+        if (count($css_locations) > 0) {
+            $wpm_options = get_option($this->name);
+            // build minify URLS
+            $css_tags = '';
+            $minify_urls = $this->build_minify_urls($css_locations, '.css');
+
+            foreach ($minify_urls as $minify_url) {
+                $minify_url = apply_filters('wp_minify_css_url', $minify_url); // Allow plugins to modify final minify URL
+                $css_tags .= "<link rel='stylesheet' href='$minify_url' type='text/css' media='screen' />";
+            }
+
+            $matches = preg_match('/<!-- WP-Minify CSS -->/', $content);
+
+            if ($matches) {
+                $content = preg_replace('/<!-- WP-Minify CSS -->/', "$css_tags", $content, 1); // limit 1 replacement
+            } else {
+                // HTML5 has <header> tags so account for those in regex
+                $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$css_tags", $content, 1); // limit 1 replacement
+            }
+        }
+        return $content;
+    }
+
+    function extract_conditionals($content) {
+        preg_match_all('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', $content, $conditionals_match);
+        $content = preg_replace('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', '###WPM-CSS-CONDITIONAL###', $content);
+
+        $conditionals = array();
+        foreach ($conditionals_match[0] as $conditional) {
+            $conditionals[] = $conditional;
+        }
+
+        return array($content, $conditionals);
+    }
+
+    function inject_conditionals($content, $conditionals) {
+        while (count($conditionals) > 0 && strpos($content, '###WPM-CSS-CONDITIONAL###')) {
+            $conditional = array_shift($conditionals);
+            $content = preg_replace('/###WPM-CSS-CONDITIONAL###/', $conditional, $content, 1);
+        }
+
+        return $content;
+    }
+
+    function extract_js($content) {
+        $wpm_options = get_option($this->name);
+        $js_locations = array();
+        
+        if ($wpm_options['js_placement'] === 'header-footer') {
+            // Header and footer
+            $split = explode('</head>', $content); // Head tag required
+            preg_match_all('/<script([^>]*?)><\/script>/i', $split[0], $script_tags_match); // Header scripts
+            preg_match_all('/<script([^>]*?)><\/script>/i', $split[1], $script_tags_footer_match); // Footer scripts
+        } else {
+            // Only one placement
+            preg_match_all('/<script([^>]*?)><\/script>/i', $content, $script_tags_match);
+        }
+
+        foreach ($script_tags_match[0] as $script_tag) {
+            preg_match('/src=[\'"]([^\'"]+)/', $script_tag, $src_match);
+            if ($src_match[1]) {
+                // include it if it is in the include list
+                $include = false;
+                $inclusions = $wpm_options['js_include'];
+                foreach ($inclusions as $include_pat) {
+                    $include_pat = trim($include_pat);
+                    if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
+                        $include = true;
+                        break;
+                    }
+                }
+
+                if (!$include) {
+                    // support external files?
+                    if (!$wpm_options['cache_external'] && $this->is_external($src_match[1])) {
+                        continue; // skip if we don't cache externals and this file is external
+                    }
+
+                    // do not include anything in excluded list
+                    $skip = false;
+                    $exclusions = array_merge($this->default_exclude, $wpm_options['js_exclude']);
+                    foreach ($exclusions as $exclude_pat) {
+                        $exclude_pat = trim($exclude_pat);
+                        if (strlen($exclude_pat) > 0 && strpos($src_match[1], $exclude_pat) !== false) {
+                            $skip = true;
+                            break;
+                        }
+                    }
+                    if ($skip) continue;
+                }
+
+                $content = str_replace($script_tag, '', $content);
+                $js_locations[] = $this->get_js_location($src_match[1]);
+            }
+        }
+
+        $js_locations = array_unique($js_locations);
+        
+        if ($wpm_options['js_placement'] === 'header-footer') {
+            foreach ($script_tags_footer_match[0] as $script_tag) {
+                preg_match('/src=[\'"]([^\'"]+)/', $script_tag, $src_match);
+                if ($src_match[1]) {
+                    // include it if it is in the include list
+                    $include = false;
+                    $inclusions = $wpm_options['js_include'];
+                    foreach ($inclusions as $include_pat) {
+                        $include_pat = trim($include_pat);
+                        if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
+                            $include = true;
+                            break;
+                        }
+                    }
+    
+                    if (!$include) {
+                        // support external files?
+                        if (!$wpm_options['cache_external'] && $this->is_external($src_match[1])) {
+                            continue; // skip if we don't cache externals and this file is external
+                        }
+    
+                        // do not include anything in excluded list
+                        $skip = false;
+                        $exclusions = array_merge($this->default_exclude, $wpm_options['js_exclude']);
+                        foreach ($exclusions as $exclude_pat) {
+                            $exclude_pat = trim($exclude_pat);
+                            if (strlen($exclude_pat) > 0 && strpos($src_match[1], $exclude_pat) !== false) {
+                                $skip = true;
+                                break;
+                            }
+                        }
+                        if ($skip) continue;
+                    }
+    
+                    $content = str_replace($script_tag, '', $content);
+                    $js_locations_footer[] = $this->get_js_location($src_match[1]);
+                }
+            }
+    
+            $js_locations_footer = array_unique($js_locations_footer);
+        }
+
+        return array($content, $js_locations, $js_locations_footer);
+    }
+
+    function inject_js($content, $js_locations, $js_locations_footer) {
+        if (count($js_locations) > 0) {
+            // build minify URLS
+            $js_tags = '';
+            $minify_urls = $this->build_minify_urls($js_locations, '.js');
+            if ($js_locations_footer) {
+                $minify_urls_footer = $this->build_minify_urls($js_locations_footer, '.js');
+            }
+            
+            $placeholderRemoved = false;
+
+            // Primary placement
+            foreach ($minify_urls as $minify_url) {
+                echo $minify_url;
+                $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
+                $js_tags .= "<script type=\"text/javascript\" src=\"$minify_url\"". ($wpm_options['js_async'] === true && $wpm_options['js_placement'] !== 'footer' ? ' async' : '') ."></script>";
+            }
+
+            $matches = preg_match('/<!-- WP-Minify JS -->/', $content);
+
+            if ($matches) {
+                $content = preg_replace('/<!-- WP-Minify JS -->/', "$js_tags", $content, 1); // limit 1 replacement
+            } else {
+                $wpm_options = get_option($this->name);
+                if ($wpm_options['js_placement'] === 'footer') {
+                    $content = preg_replace('/<!-- WP Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
+                    $placeholderRemoved = true;
+                } else {
+                    // HTML5 has <header> tags so account for those in regex
+                    $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$js_tags", $content, 1); // limit 1 replacement
+                }
+            }
+        
+            // If separate footer
+            if ($js_locations_footer) {
+                foreach ($minify_urls_footer as $minify_url) {
+                    $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
+                    $js_tags .= "<script type='text/javascript' src='$minify_url'></script>";
+                }
+    
+                $matches = preg_match('/<!-- WP-Minify JS Footer -->/', $content);
+    
+                if ($matches) {
+                    $content = preg_replace('/<!-- WP-Minify JS Footer -->/', "$js_tags", $content, 1); // limit 1 replacement
+                } else {
+                    $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
+                    $placeholderRemoved = true;
+                }
+            }
+            
+            // If necessary, remove placeholder comment
+            if ($placeholderRemoved === false) {
+                $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
+            }
+        }
+        return $content;
+    }
+
+    function pre_content() {
+        if ( is_feed() ) return;
+        $wpm_options = get_option($this->name);
+        if ($wpm_options['uri_exclude'] && count($wpm_options['uri_exclude'])) {
+            foreach ($wpm_options['uri_exclude'] as $exclude_pat) {
+                $exclude_pat = trim($exclude_pat);
+                if (strlen($exclude_pat) > 0 && strpos($_SERVER['REQUEST_URI'], $exclude_pat) !== false) {
+                    return;
+                }
+            }
+        }
+
+        ob_start(array($this, 'modify_buffer'));
+
+        // variable for sanity checking
+        $this->buffer_started = true;
+    }
+
+    function modify_buffer($buffer) {
+        $wpm_options = get_option($this->name);
+
+        // if we do not want to force http to https then we need to exclude https
+        if (!($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on")) {
+            $this->default_exclude[] = 'https://';
+        }
+
+        // minify JS
+        if ($wpm_options['enable_js']) {
+            list($buffer, $js_locations, $js_locations_footer) = $this->extract_js($buffer);
+            $buffer= $this->inject_js($buffer, $js_locations, $js_locations_footer);
+        }
+
+        // minify CSS (make sure to exclude CSS conditionals)
+        if ($wpm_options['enable_css']) {
+            list($buffer, $conditionals) = $this->extract_conditionals($buffer);
+            list($buffer, $css_locations) = $this->extract_css($buffer);
+            $buffer = $this->inject_css($buffer, $css_locations);
+            $buffer = $this->inject_conditionals($buffer, $conditionals);
+        }
+
+        // get rid of empty lines
+        $buffer = preg_replace('/\s*(\r?\n)(\r?\n)*/', '$1', $buffer);
+
+        // minify HTML
+        if ($wpm_options['enable_html']) {
+            if (!class_exists('Minify_HTML')) {
+                require_once('min/lib/Minify/HTML.php');
+            }
+            $buffer = Minify_HTML::minify($buffer);
+        }
+
+        $buffer = apply_filters('wp_minify_content', $buffer); // allow plugins to modify buffer
+
+        return $buffer;
+    }
+
+    function post_content() {
+        if ( is_feed() ) return;
+        // sanity checking
+        if ($this->buffer_started) {
+            ob_end_flush();
+        }
+    }
+    
+    function footer_placeholder() {
+            printf('<!-- WP-Minify Footer Placeholder -->');
+    }
+
+    function advertise() {
+        $wpm_options = get_option($this->name);
+        if ($wpm_options['show_link']) {
+            printf("<p align='center'><small>Page optimized by <a href='$this->homepage' title='$this->name_proper WordPress Plugin' style='text-decoration:none;'>$this->name_proper</a> <a href='$this->author_homepage' title='WordPress Plugin' style='text-decoration:none;'>WordPress Plugin</a></small></p>");
+        }
+    }
 
 } // class WPMinify

wp-minify-fix/trunk/options-generic.php

@@ -1 +1 @@
 <script type="text/javascript">
 function confirm_reset() {
-  var answer = confirm("<?php _e('All of options will return to default settings.  Are you sure you want to reset all settings?'); ?>");
-  if(answer)
-    return true;
-  else
-    return false;
+    var answer = confirm("<?php _e('All of options will return to default settings.  Are you sure you want to reset all settings?'); ?>");
+    if(answer)
+        return true;
+    else
+        return false;
 }
 
 jQuery(document).ready(function($){
-  $("#wpm_options_toggle_advanced").click(function(e){
-    e.preventDefault();
-    state = $(this).attr("state");
-    if(state == "visible"){
-      $(".wpm_advanced").slideUp();
-      $("#wpm_options_reset").fadeOut();
-      $(this).attr("state", "hidden");
-      $(this).attr("value", "<?php echo __('Show Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
-      $.ajax({
-        type    : "POST",
-        url     : "admin-ajax.php",
-        data    : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "hide_advanced" },
-        success : function(resp){
-          // do nothing visually
-        },
-        error   : function(resp){
-          alert("Error:" + resp);
-        }
-      });
-    }
-    else{
-      $(".wpm_advanced").slideDown();
-      $("#wpm_options_reset").fadeIn();
-      $(this).attr("state", "visible");
-      $(this).attr("value", "<?php echo __('Hide Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
-      $.ajax({
-        type    : "POST",
-        url     : "admin-ajax.php",
-        data    : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "show_advanced" },
-        success : function(resp){
-          // do nothing visually
-        },
-        error   : function(resp){
-          alert("Error:" + resp);
-        }
-      });
-    }
-  });
-  $('#cache_external_checkbox').click(function(e) {
-    state = $(this).attr("state");
-    if (state == "on") {
-      $(".wpm_include").slideDown();
-      $(this).attr("state", "off");
-    } else {
-      $(".wpm_include").slideUp();
-      $(this).attr("state", "on");
-    }
-  });
+    $("#wpm_options_toggle_advanced").click(function(e){
+        e.preventDefault();
+        state = $(this).attr("state");
+        if(state == "visible"){
+            $(".wpm_advanced").slideUp();
+            $("#wpm_options_reset").fadeOut();
+            $(this).attr("state", "hidden");
+            $(this).attr("value", "<?php echo __('Show Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
+            $.ajax({
+                type        : "POST",
+                url         : "admin-ajax.php",
+                data        : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "hide_advanced" },
+                success : function(resp){
+                    // do nothing visually
+                },
+                error       : function(resp){
+                    alert("Error:" + resp);
+                }
+            });
+        }
+        else{
+            $(".wpm_advanced").slideDown();
+            $("#wpm_options_reset").fadeIn();
+            $(this).attr("state", "visible");
+            $(this).attr("value", "<?php echo __('Hide Advanced Options', $this->name); ?>" + " " + String.fromCharCode(187));
+            $.ajax({
+                type        : "POST",
+                url         : "admin-ajax.php",
+                data        : { action : "wpm", _ajax_nonce: "<?php echo wp_create_nonce($this->name); ?>", wpm_action : "show_advanced" },
+                success : function(resp){
+                    // do nothing visually
+                },
+                error       : function(resp){
+                    alert("Error:" + resp);
+                }
+            });
+        }
+    });
+    $('#cache_external_checkbox').click(function(e) {
+        state = $(this).attr("state");
+        if (state == "on") {
+            $(".wpm_include").slideDown();
+            $(this).attr("state", "off");
+        } else {
+            $(".wpm_include").slideUp();
+            $(this).attr("state", "on");
+        }
+    });
 });
 </script>
 <form method="post"><fieldset>
 <?php
-    // take care of advanced options
-    if ($wpm_options['show_advanced']) {
-      $advanced_style = '';
-      $advanced_toggle_text = __('Hide Advanced Options', $this->name);
-      $advanced_toggle_state = 'visible';
-    }
-    else {
-      $advanced_style = 'style="display:none"';
-      $advanced_toggle_text = __('Show Advanced Options', $this->name);
-      $advanced_toggle_state = 'hidden';
-    }
-    
-    if ($wpm_options['cache_external']) {
-      $include_style = 'style="display:none"';
-      $include_toggle_state = 'on';
-    } else {
-      $include_style = '';
-      $include_toggle_state = 'off';
-    }
-
-    printf('
-      <h2>%s</h2>
-      <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="on" type="radio" '.checked(true, $wpm_options['show_link'], false).'/></label></p>
-      <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="off" type="radio" '.checked(false, $wpm_options['show_link'], false).'/></label></p>
-      ',
-      __('Support this plugin!', $this->name),
-      __('Display "Page optimized by WP Minify" link in the footer', $this->name),
-      __('Do not display "Page optimized by WP Minify" link.', $this->name)
-    );
-
-    printf('
-      <h2>%s</h2>
-      <p><label>%s &nbsp; <input name="wpm_options_update[enable_js]" type="checkbox" '.checked(true, $wpm_options['enable_js'], false).'/></label></p>
-      <p><label>%s &nbsp; <input name="wpm_options_update[enable_css]" type="checkbox" '.checked(true, $wpm_options['enable_css'], false).'/></label></p>
-      <p><label>%s &nbsp; <input name="wpm_options_update[enable_html]" type="checkbox" '.checked(true, $wpm_options['enable_html'], false).'/></label></p>
-      ',
-      __('General Configuration', $this->name),
-      __('Enable JavaScript Minification', $this->name),
-      __('Enable CSS Minification', $this->name),
-      __('Enable HTML Minification', $this->name)
-    );
-    
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[debug_nominify]" type="checkbox" '.checked(true, $wpm_options['debug_nominify'], false).'/></label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label><a href="http://omninoggin.com/wordpress-posts/troubleshooting-wp-minify-with-firephp/">%s</a> &nbsp; <input name="wpm_options_update[debug_firephp]" type="checkbox" '.checked(true, $wpm_options['debug_firephp'], false).'/></label></p>
-      ',
-      __('Debugging', $this->name),
-      __('Combine files but do not minify', $this->name),
-      __('Show minify errors through FirePHP', $this->name)
-    );
-    
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
-      <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
-      ',
-      __('Local Files Minification', $this->name),
-      __('JavaScript files to exclude from minify (line delimited).', $this->name),
-      __('CSS files to exclude from minify (line delimited).', $this->name),
-      __('URIs on which WP-Minify-Fix parsing will be disabled (line delimited)', $this->name)
-    );
-
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[cache_external]" id="cache_external_checkbox" state="'.$include_toggle_state.'" type="checkbox" '.checked(true, $wpm_options['cache_external'], false).'/> &nbsp; (%s)</label></p>
-      <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
-      <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
-      ',
-      __('Non-Local Files Minification', $this->name),
-      __('Enable minification on external files', $this->name),
-      __('Not recommended unless you want to exclude a bunch of external .js/.css files', $this->name),
-      __('External JavaScript files to include into minify.', $this->name),
-      __('Only useful if "Minification on external files" is unchecked', $this->name),
-      __('more info', $this->name),
-      __('External CSS files to include into minify.', $this->name),
-      __('Only useful if "Minification on external files" is unchecked', $this->name),
-      __('more info', $this->name)
-    );
-
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.attribute_escape($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
-      ',
-      __('Caching', $this->name),
-      __('Cache expires after every', $this->name),
-      __('seconds', $this->name),
-      __('Manually Clear Cache', $this->name)
-    );
-
-    printf('
-      <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[pretty_url]" type="checkbox" '.checked(true, $wpm_options['pretty_url'], false).'/> &nbsp; (%s)</label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_in_footer]" type="checkbox" '.checked(true, $wpm_options['js_in_footer'], false).'/> &nbsp; (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#manual_placement">%s</a>)</label></p>
-      ',
-      __('Tweaking/Tuning', $this->name),
-      __('Use "pretty" URL"', $this->name),
-      __('i.e. use "wp-minify-fix/cache/1234abcd.js" instead of "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js"', $this->name),
-      __('Place Minified JavaScript in footer', $this->name),
-      __('Not recommended', $this->name),
-      __('more info', $this->name)
-    );
-
-    printf('
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[force_https]" type="checkbox" '.checked(true, $wpm_options['force_https'], false).'/></label></p>
-      ',
-      __('Force all JavaScript/CSS calls to be HTTPS on HTTPS pages', $this->name)
-    );
-
-    printf('
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[auto_base]" type="checkbox" '.checked(true, $wpm_options['auto_base'], false).'/></label></p>
-      <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.attribute_escape($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
-      ',
-      __('Automatically set your Minify base per siteurl setting (recommended)', $this->name),
-      __('Extra arguments to pass to minify engine. This value will get append to calls to URL "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js".', $this->name),
-      __('e.g. You can specify this value to be b=somepath to specify the base path for all files passed into Minify.', $this->name)
-    );
-
-    if ( function_exists( 'wp_nonce_field' ) && wp_nonce_field( $this->name ) ) {
-      printf('
-        <p class="submit">
-          <input type="submit" name="wpm_options_update_submit" value="%s &#187;" />
-          <input type="submit" name="wpm_options_reset_submit" id="wpm_options_reset" value="%s &#187;" onclick="return confirm_reset()" '.$advanced_style.'/>
-          <input type="button" id="wpm_options_toggle_advanced" state="'.$advanced_toggle_state.'" value="'.$advanced_toggle_text.' &#187;"/>
-        </p>
-        ',
-        __('Update Options', $this->name),
-        __('Reset ALL Options', $this->name)
-      );
-    }
+        // take care of advanced options
+        if ($wpm_options['show_advanced']) {
+            $advanced_style = '';
+            $advanced_toggle_text = __('Hide Advanced Options', $this->name);
+            $advanced_toggle_state = 'visible';
+        }
+        else {
+            $advanced_style = 'style="display:none"';
+            $advanced_toggle_text = __('Show Advanced Options', $this->name);
+            $advanced_toggle_state = 'hidden';
+        }
+        
+        if ($wpm_options['cache_external']) {
+            $include_style = 'style="display:none"';
+            $include_toggle_state = 'on';
+        } else {
+            $include_style = '';
+            $include_toggle_state = 'off';
+        }
+
+        printf('
+            <h2>%s</h2>
+            <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="on" type="radio" '.checked(true, $wpm_options['show_link'], false).'/></label></p>
+            <p><label>%s &nbsp; <input name="wpm_options_update[show_link]" value="off" type="radio" '.checked(false, $wpm_options['show_link'], false).'/></label></p>
+            ',
+            __('Support this plugin!', $this->name),
+            __('Display "Page optimized by WP Minify" link in the footer', $this->name),
+            __('Do not display "Page optimized by WP Minify" link.', $this->name)
+        );
+
+        printf('
+            <h2>%s</h2>
+            <p><label>%s &nbsp; <input name="wpm_options_update[enable_js]" type="checkbox" '.checked(true, $wpm_options['enable_js'], false).'/></label></p>
+            <p><label>%s &nbsp; <input name="wpm_options_update[enable_css]" type="checkbox" '.checked(true, $wpm_options['enable_css'], false).'/></label></p>
+            <p><label>%s &nbsp; <input name="wpm_options_update[enable_html]" type="checkbox" '.checked(true, $wpm_options['enable_html'], false).'/></label></p>
+            ',
+            __('General Configuration', $this->name),
+            __('Enable JavaScript Minification', $this->name),
+            __('Enable CSS Minification', $this->name),
+            __('Enable HTML Minification', $this->name)
+        );
+        
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[debug_nominify]" type="checkbox" '.checked(true, $wpm_options['debug_nominify'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label><a href="http://omninoggin.com/wordpress-posts/troubleshooting-wp-minify-with-firephp/">%s</a> &nbsp; <input name="wpm_options_update[debug_firephp]" type="checkbox" '.checked(true, $wpm_options['debug_firephp'], false).'/></label></p>
+            ',
+            __('Debugging', $this->name),
+            __('Combine files but do not minify', $this->name),
+            __('Show minify errors through FirePHP', $this->name)
+        );
+        
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
+            <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
+            ',
+            __('Local Files Minification', $this->name),
+            __('JavaScript files to exclude from minify (line delimited).', $this->name),
+            __('CSS files to exclude from minify (line delimited).', $this->name),
+            __('URIs on which WP-Minify-Fix parsing will be disabled (line delimited)', $this->name)
+        );
+
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[cache_external]" id="cache_external_checkbox" state="'.$include_toggle_state.'" type="checkbox" '.checked(true, $wpm_options['cache_external'], false).'/> &nbsp; (%s)</label></p>
+            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
+            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
+            ',
+            __('Non-Local Files Minification', $this->name),
+            __('Enable minification on external files', $this->name),
+            __('Not recommended unless you want to exclude a bunch of external .js/.css files', $this->name),
+            __('External JavaScript files to include into minify.', $this->name),
+            __('Only useful if "Minification on external files" is unchecked', $this->name),
+            __('more info', $this->name),
+            __('External CSS files to include into minify.', $this->name),
+            __('Only useful if "Minification on external files" is unchecked', $this->name),
+            __('more info', $this->name)
+        );
+
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.attribute_escape($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
+            ',
+            __('Caching', $this->name),
+            __('Cache expires after every', $this->name),
+            __('seconds', $this->name),
+            __('Manually Clear Cache', $this->name)
+        );
+        
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_placement]" value="header-footer" type="radio" '.checked('header-footer', $wpm_options['js_placement'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_placement]" value="header" type="radio" '.checked('header', $wpm_options['js_placement'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_placement]" value="footer" type="radio" '.checked('footer', $wpm_options['js_placement'], false).'/></label></p>
+            ',
+            __('JavaScript Placement', $this->name),
+            __('In the header, and if necessary also in the footer (recommended)', $this->name),
+            __('Everything in the header', $this->name),
+            __('Everything in the footer', $this->name)
+        );
+
+        printf('
+            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[pretty_url]" type="checkbox" '.checked(true, $wpm_options['pretty_url'], false).'/> &nbsp; (%s)</label></p>',
+            __('Tweaking/Tuning', $this->name),
+            __('Use "pretty" URL"', $this->name),
+            __('i.e. use "wp-minify-fix/cache/1234abcd.js" instead of "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js"', $this->name)
+        );
+        
+        printf('
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[js_async]" type="checkbox" '.checked(true, $wpm_options['js_async'], false).'/> &nbsp; (%s, <a href="http://css-tricks.com/async-attribute-scripts-bottom/" target="_blank">%s</a>)</label></p>
+            ',
+            __('Add the HTML5 async tag', $this->name),
+            __('Only for the header', $this->name),
+            __('more info', $this->name)
+        );
+
+        printf('
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[force_https]" type="checkbox" '.checked(true, $wpm_options['force_https'], false).'/></label></p>
+            ',
+            __('Force all JavaScript/CSS calls to be HTTPS on HTTPS pages', $this->name)
+        );
+
+        printf('
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[auto_base]" type="checkbox" '.checked(true, $wpm_options['auto_base'], false).'/></label></p>
+            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.attribute_escape($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
+            ',
+            __('Automatically set your Minify base per siteurl setting (recommended)', $this->name),
+            __('Extra arguments to pass to minify engine. This value will get append to calls to URL "wp-minify-fix/min/?f=file1.js,file2.js,...,fileN.js".', $this->name),
+            __('e.g. You can specify this value to be b=somepath to specify the base path for all files passed into Minify.', $this->name)
+        );
+
+        if ( function_exists( 'wp_nonce_field' ) && wp_nonce_field( $this->name ) ) {
+            printf('
+                <p class="submit">
+                    <input type="submit" name="wpm_options_update_submit" value="%s &#187;" />
+                    <input type="submit" name="wpm_options_reset_submit" id="wpm_options_reset" value="%s &#187;" onclick="return confirm_reset()" '.$advanced_style.'/>
+                    <input type="button" id="wpm_options_toggle_advanced" state="'.$advanced_toggle_state.'" value="'.$advanced_toggle_text.' &#187;"/>
+                </p>
+                ',
+                __('Update Options', $this->name),
+                __('Reset ALL Options', $this->name)
+            );
+        }
 ?>
 </fieldset></form>

wp-minify-fix/trunk/readme.txt

@@ -3 +3 @@
 Contributors: NodeCode, madeinthayaland
 Requires at least: 2.7
-Tested up to: 3.8.1
-Stable Tag: 1.3.4
+Tested up to: 4.1
+Stable Tag: 1.4.0
 
 [Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files
@@ -10 +10 @@
 
 == Description ==
-This plugin is a fork of [WP Minify](http://wordpress.org/plugins/wp-minify/) to fix bugs, because it has not been updated since 2012-6-4.
+This plugin is a fork of [WP Minify](http://wordpress.org/plugins/wp-minify/) to fix bugs and add features, because it has not been updated since 2012-6-4.
 
 This plugin integrates the [Minify engine](http://code.google.com/p/minify/)
@@ -18 +18 @@
 = What has been fixed? =
 
-* Minify engine 2.1.7 updated
-* cache interval option fixed
-* move CSS-@imports to the top of the output
-* bottom CSS- and JavaScript output fixed
-* support for script-tags without `type="text/javascript"`
-* detection of protocol-relative URLs as external file (e.g. Google AdSense)
+* Minify engine updated to version 2.1.7
+* Cache interval option has been fixed
+* Move CSS-@imports to the top of the output
+* Bottom CSS- and JavaScript output fixed
+* Support for script tags without `type="text/javascript"`
+* Detection of protocol-relative URLs as external file (e.g. Google AdSense)
+* New option for the HTML5 async attribute
+* A separate JavaScript file in the footer is now possible
 
 = How Does it Work? =
@@ -47 +49 @@
 
 == Changelog ==
+= 1.4.0 =
+* Added option for the HTML5 async attribute
+* Added option for a separate JavaScript file in the footer
+* Tabs are used instead of spaces in the PHP code
+* Bugfixes
+* Small changes
+
 = 1.3.4 =
-* support for script-tags without `type="text/javascript"`
-* detection of protocol-relative URLs as external file (e.g. Google AdSense)
+* Support for script-tags without `type="text/javascript"`
+* Detection of protocol-relative URLs as external file (e.g. Google AdSense)
 
 = 1.3.3 =
-* bottom CSS- and JavaScript output fixed 
+* Bottom CSS- and JavaScript output fixed 
 
 = 1.3.2 =
-* move CSS-@imports to the top of the output
+* Move CSS-@imports to the top of the output
 
 = 1.3.1 =
@@ -62 +71 @@
 = 1.3.0 =
 * WP Minify Fix released
-* cache interval fixed
+* Cache interval fixed
 
 = 1.2.0 =

wp-minify-fix/trunk/wp-minify.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/plugins/wp-minify-fixed/
 Description: [Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files to improve page load time.
-Version: 1.3.4
+Version: 1.4.0
 Author: NodeCode
 Author URI: http://nodecode.de
@@ -20 +20 @@
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.    If not, see <http://www.gnu.org/licenses/>.
 */
 
 class WPMinify {
 
-  var $author_homepage = 'http://nodecode.de/';
-  var $homepage = 'http://wordpress.org/plugins/wp-minify-fixed/';
-  var $name = 'wp_minify'; 
-  var $name_dashed = 'wp-minify-fix'; 
-  var $name_proper = 'WP Minify Fix'; 
-  var $required_wp_version = '2.7';
-  var $version = '1.3.4';
-
-  var $c = null;
-  var $debug = false;
-  var $cache_location = 'wp-content/plugins/wp-minify-fix/cache/';
-  var $url_len_limit = 2000;
-  var $minify_limit = 50;
-  var $buffer_started = false;
-  var $default_exclude = array();
-
-  function WPMinify() {
-    // initialize common functions
-    $this->c = new WPMinifyCommon($this);
-
-    // load translation
-    $this->c->load_text_domain();
-
-    // register admin scripts
-    add_action('admin_init', array($this->c, 'a_register_scripts'));
-    add_action('admin_init', array($this->c, 'a_register_styles'));
-
-    // check wp version
-    add_action('admin_head', array($this->c, 'a_check_version'));
-
-    // load admin menu
-    add_action('admin_menu', array($this, 'a_menu'));
-
-    // register ajax handler
-    add_action('wp_ajax_wpm', array($this, 'a_ajax_handler'));
-
-    // No need to minify admin stuff
-    if (!is_admin() && !is_feed() && !defined('XMLRPC_REQUEST')) {
-      // Don't minify if if user passes wp-minify-off=1 in GET parameter
-      if (!(isset($_GET['wp-minify-off']) && $_GET['wp-minify-off'])) {
-        add_action('init', array($this, 'pre_content'), 99999);
-        add_action('wp_footer', array($this, 'post_content'), 99999);
-      }
-      // advertise hook
-      add_action('wp_footer', array($this, 'advertise'));
-    }
-  }
-
-  // admin functions
-
-  function a_default_options() {
-    return array(
-      'cache_external' => false,
-      'cache_interval' => 3600,
-      'css_exclude' => array(),
-      'css_include' => array(),
-      'debug_nominify' => false,
-      'debug_firephp' => false,
-      'enable_css' => true,
-      'enable_js' => true,
-      'enable_html' => true,
-      'auto_base' => true,
-      'extra_minify_options' => '',
-      'js_exclude' => array(),
-      'js_include' => array(),
-      'js_in_footer' => false,
-      'force_https' => false,
-      'pretty_url' => false,
-      'show_link' => false,
-      'show_advanced' => false,
-      'uri_exclude' => array(),
-      'version' => $this->version,
-      'deprecated' => array(
-        'wp_path', 'debug', 'debug_noprettyurl'
-      )
-    );
-  }
-
-  function a_update_options() {
-    // new options
-    $wpm_new_options = stripslashes_deep($_POST['wpm_options_update']);
-
-    // current options
-    $wpm_current_options = get_option($this->name);
-
-    // convert "on" to true and "off" to false for checkbox fields
-    // and set defaults for fields that are left blank
-    if (isset($wpm_new_options['show_link']) && $wpm_new_options['show_link'] == "on")
-      $wpm_new_options['show_link'] = true;
-    else
-      $wpm_new_options['show_link'] = false;
-
-    if (isset($wpm_new_options['enable_js']))
-      $wpm_new_options['enable_js'] = true;
-    else
-      $wpm_new_options['enable_js'] = false;
-
-    if (isset($wpm_new_options['enable_css']))
-      $wpm_new_options['enable_css'] = true;
-    else
-      $wpm_new_options['enable_css'] = false;
-
-    if (isset($wpm_new_options['enable_html']))
-      $wpm_new_options['enable_html'] = true;
-    else
-      $wpm_new_options['enable_html'] = false;
-
-    if (isset($wpm_new_options['auto_base']))
-      $wpm_new_options['auto_base'] = true;
-    else
-      $wpm_new_options['auto_base'] = false;
-
-    if (isset($wpm_new_options['cache_external']))
-      $wpm_new_options['cache_external'] = true;
-    else
-      $wpm_new_options['cache_external'] = false;
-
-    if (isset($wpm_new_options['js_in_footer']))
-      $wpm_new_options['js_in_footer'] = true;
-    else
-      $wpm_new_options['js_in_footer'] = false;
-
-    if (isset($wpm_new_options['pretty_url']))
-      $wpm_new_options['pretty_url'] = true;
-    else
-      $wpm_new_options['pretty_url'] = false;
-
-    if (isset($wpm_new_options['debug_nominify']))
-      $wpm_new_options['debug_nominify'] = true;
-    else
-      $wpm_new_options['debug_nominify'] = false;
-
-    if (isset($wpm_new_options['debug_firephp']))
-      $wpm_new_options['debug_firephp'] = true;
-    else
-      $wpm_new_options['debug_firephp'] = false;
-
-    $this->a_set_minify_config($wpm_new_options['debug_nominify'], $wpm_new_options['debug_firephp']);
-
-    if ( isset($wpm_new_options['force_https']) )
-      $wpm_new_options['force_https'] = true;
-    else
-      $wpm_new_options['force_https'] = false;
-
-    if (strlen(trim($wpm_new_options['js_include'])) > 0)
-      $wpm_new_options['js_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_include'])));
-    else
-      $wpm_new_options['js_include'] = array();
-
-    if (strlen(trim($wpm_new_options['js_exclude'])) > 0)
-      $wpm_new_options['js_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_exclude'])));
-    else
-      $wpm_new_options['js_exclude'] = array();
-
-    if (strlen(trim($wpm_new_options['css_include'])) > 0)
-      $wpm_new_options['css_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_include'])));
-    else
-      $wpm_new_options['css_include'] = array();
-
-    if (strlen(trim($wpm_new_options['css_exclude'])) > 0)
-      $wpm_new_options['css_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_exclude'])));
-    else
-      $wpm_new_options['css_exclude'] = array();
-
-    if ( strlen(trim($wpm_new_options['uri_exclude'])) > 0 )
-      $wpm_new_options['uri_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['uri_exclude'])));
-    else
-      $wpm_new_options['uri_exclude'] = array();
-
-    // Update options
-    foreach ($wpm_new_options as $key => $value) {
-      $wpm_current_options[$key] = $value;
-    }
-
-    update_option($this->name, $wpm_current_options);
-  }
-
-  function a_set_advanced_options($val) {
-    $wpm_options = get_option($this->name);
-    $wpm_options['show_advanced'] = $val;
-    update_option($this->name, $wpm_options);
-  }
-
-  function a_ajax_handler() {
-    check_ajax_referer($this->name);
-    if (isset($_POST['wpm_action'])) {
-      if (strtolower($_POST['wpm_action']) == 'show_advanced') {
-        $this->a_set_advanced_options(true);
-      }
-      elseif (strtolower($_POST['wpm_action']) == 'hide_advanced') {
-        $this->a_set_advanced_options(false);
-      }
-      else {
-        echo 'Invalid wpm_action.';
-      }
-    }
-    exit();
-  }
-
-  function a_request_handler() {
-    if (isset($_POST['wpm_options_update_submit'])) {
-      check_admin_referer($this->name);
-      $this->a_update_options();
-      add_action('admin_notices', array($this->c, 'a_notify_updated'));
-    }
-    elseif (isset($_POST['wpm_options_clear_cache_submit'])) {
-      // if user wants to regenerate nonce
-      check_admin_referer($this->name);
-      $this->c->a_clear_cache();
-      add_action('admin_notices', array($this->c, 'a_notify_cache_cleared'));
-    }
-    elseif (isset($_POST['wpm_options_upgrade_submit'])) {
-      // if user wants to upgrade options (for new options on version upgrades)
-      check_admin_referer($this->name);
-      $this->c->a_upgrade_options();
-      add_action('admin_notices', array($this->c, 'a_notify_upgraded'));
-    }
-    elseif (isset($_POST['wpm_options_reset_submit'])) {
-      // if user wants to reset all options
-      check_admin_referer($this->name);
-      $this->c->a_reset_options();
-      add_action('admin_notices', array($this->c, 'a_notify_reset'));
-    }
-
-    // only check these on plugin settings page
-    $this->c->a_check_dir_writable($this->c->get_plugin_dir().'cache/', array($this, 'a_notify_cache_not_writable'));
-    $this->c->a_check_orphan_options(array($this, 'a_notify_orphan_options'));
-    if ($this->c->a_check_dir_writable($this->c->get_plugin_dir().'min/config.php', array($this, 'a_notify_config_not_writable'))) {
-      $this->a_check_minify_config();
-    }
-  }
-
-  function a_check_minify_config() {
-    $fname = $this->c->get_plugin_dir().'min/config.php';
-    $fhandle = fopen($fname,'r');
-    $content = fread($fhandle,filesize($fname));
-
-    $config_modified = false;
-    
-    preg_match('/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s', $content, $matches);
-    $cache_path_code = $matches[1];
-    if (!preg_match('/\$min_cachePath.*?/', $cache_path_code)) {
-      $content = preg_replace(
-        '/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s',
-        "//###WPM-CACHE-PATH-BEFORE###\n".'$min_cachePath = \''.$this->c->get_plugin_dir()."cache/';\n//###WPM-CACHE-PATH-AFTER###",
-        $content);
-      $config_modified = true;
-    }
-
-    preg_match('/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s', $content, $matches);
-    $cache_age_code = $matches[1];
-    if (!preg_match('/\$min_serveOptions\[\'maxAge\'].*?/', $cache_age_code)) {
-      $content = preg_replace(
-        '/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s',
-        "//###WPM-CACHE-AGE-BEFORE###\n".'$min_serveOptions[\'maxAge\'] = 2592000;'."\n//###WPM-CACHE-AGE-AFTER###",
-        $content);
-      $config_modified = true;
-    }
-
-    if ($config_modified) {
-      $this->a_notify_modified_minify_config();
-    }
-    
-    $fhandle = fopen($fname,"w");
-    fwrite($fhandle,$content);
-    fclose($fhandle);
-  }
-
-  function a_set_minify_config($nominify = false, $firephp = false) {
-    if ($nominify) {
-      $nominify = 'true';
-    } else {
-      $nominify = 'false';
-    }
-    if ($firephp) {
-      $firephp = 'true';
-    } else {
-      $firephp = 'false';
-    }
-    $fname = $this->c->get_plugin_dir().'min/config.php';
-    $fhandle = fopen($fname,'r');
-    $content = fread($fhandle,filesize($fname));
-
-    $content = preg_replace(
-      '/\/\/###WPM-DEBUG-FLAG-BEFORE###(.*)\/\/###WPM-DEBUG-FLAG-AFTER###/s',
-      "//###WPM-DEBUG-FLAG-BEFORE###\n".'$min_allowDebugFlag = '.$nominify.";\n//###WPM-DEBUG-FLAG-AFTER###",
-      $content);
-
-    $content = preg_replace(
-      '/\/\/###WPM-ERROR-LOGGER-BEFORE###(.*)\/\/###WPM-ERROR-LOGGER-AFTER###/s',
-      "//###WPM-ERROR-LOGGER-BEFORE###\n".'$min_errorLogger = '.$firephp.";\n//###WPM-ERROR-LOGGER-AFTER###",
-      $content);
-
-    $fhandle = fopen($fname,"w");
-    fwrite($fhandle,$content);
-    fclose($fhandle);
-  }
-
-  function a_notify_cache_not_writable() {
-    $this->c->a_notify(
-      sprintf('%s: %s',
-        __('Cache directory is not writable. Please grant your server write permissions to the directory', $this->name),
-        $this->c->get_plugin_dir().'cache/'),
-      true);
-  }
-
-  function a_notify_config_not_writable() {
-    $this->c->a_notify(
-      sprintf('%s: %s',
-        __('Minify Engine config.php is not writable. Please grant your server write permissions to file', $this->name),
-        $this->c->get_plugin_dir().'min/config.php'));
-  }
-
-  function a_notify_orphan_options() {
-    $this->c->a_notify(
-      sprintf('%s',
-        __('Some option settings are missing (possibly from plugin upgrade).', $this->name)));
-  }
-
-  function a_notify_modified_minify_config() {
-    $this->c->a_notify(__('Minify Engine config.php was configured automatically.', $this->name));
-  }
-
-  function a_menu() {
-    $options_page = add_options_page($this->name_proper, $this->name_proper, 'manage_options', 'wp-minify-fix', array($this, 'a_page'));
-    add_action('admin_head-'.$options_page, array($this, 'a_request_handler'));
-    add_action('admin_print_scripts-'.$options_page, array($this->c, 'a_enqueue_scripts'));
-    add_action('admin_print_styles-'.$options_page, array($this->c, 'a_enqueue_styles'));
-  }
-
-  function a_page() {
-    $wpm_options = get_option($this->name);
-    printf('
-      <div class="wrap omni_admin_content">
-        <h2>%s</h2>
-        <div>
-          <a href="'.preg_replace('/&wpm-page=[^&]*/', '', $_SERVER['REQUEST_URI']).'">%s</a>&nbsp;|&nbsp;
-          <a href="'.$this->homepage.'">%s</a>
-        </div>',
-      __('WP Minify Options', $this->name),
-      __('General Configuration', $this->name),
-      __('Documentation', $this->name)
-    );
-    printf('<div class="omni_admin_main">');
-    if (isset($_GET['wpm-page'])) {
-      if ($_GET['wpm-page'] || !$_GET['wpm-page']) {
-        require_once('options-generic.php');
-      }
-    }
-    else {
-      require_once('options-generic.php');
-    }
-    printf('</div>'); // omni_admin_main
-    require_once('options-sidebar.php');
-    printf('</div>'); // wrap
-
-  } // admin_page()
-
-  // other functions
-
-  function fetch_and_cache($url, $cache_file) {
-    $ch = curl_init();
-    $timeout = 5; // set to zero for no timeout
-    curl_setopt ($ch, CURLOPT_URL, $url);
-    curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-    curl_setopt ($ch, CURLOPT_USERAGENT, 'WP-Minify Fix');
-    $content = curl_exec($ch);
-    curl_close($ch);
-    if ($content) {
-      if (is_array($content)) {
-        $content = implode($content);
-      }
-
-      // save cache file
-      $fh = fopen($cache_file, 'w');
-      if ($fh) {
-        fwrite($fh, $content);
-        fclose($fh);
-      }
-      else {
-        // cannot open for write.  no error b/c something else is probably writing to the file.
-      }
-
-      return $content;
-    }
-    else {
-      printf(
-        '%s: '.$url.'. %s<br/>',
-        __('Error: Could not fetch and cache URL'),
-        __('You might need to exclude this file in WP Minify options.')
-      );
-      return '';
-    }
-  }
-
-  function refetch_cache_if_expired($url, $cache_file) {
-    $wpm_options = get_option($this->name);
-    $cache_file_mtime = filemtime($cache_file);
-    if ((time() - $cache_file_mtime) > $wpm_options['cache_interval']) {
-      $this->fetch_and_cache($url, $cache_file);
-    }
-  }
-
-  function tiny_filename($str) {
-    $f = __FILE__;
-    // no fancy shortening for Windows
-    return ('/' === $f[0]) ? strtr(base64_encode(md5($str, true)), '+/=', '-_(') : md5($str);
-  }
-
-  function array_trim($arr, $charlist=null) {
-    foreach ($arr as $key => $value) {
-      if (is_array($value)) $result[$key] = array_trim($value, $charlist);
-      else $result[$key] = trim($value, $charlist);
-    }
-    return $result;
-  }
-
-  function check_and_split_url($url, $latest_modified = 0) {
-    $url_chunk = explode('?f=', $url);
-    $base_url = array_shift($url_chunk);
-    $files = explode(',', array_shift($url_chunk));
-    $num_files = sizeof($files);
-
-    if ($this->url_needs_splitting($url, $files)) {
-      $first_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, 0, $num_files/2)), $latest_modified);
-      $second_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, $num_files/2)), $latest_modified);
-      return $first_half + $second_half;
-    }
-    else {
-      $wpm_options = get_option($this->name);
-
-      // append &debug if we need to
-      if ($wpm_options['debug_nominify']) {
-        $debug_string = '&amp;debug=true';
-      } else {
-        $debug_string = '';
-      }
-
-      // append base directory if needed
-      $base = $this->get_base();
-      if ($base != '') {
-        $base_string = '&amp;b='.$base;
-      } else {
-        $base_string = '';
-      }
-
-      // get rid of any base directory specification in extra options
-      $extra_minify_options = preg_replace('/(&|&amp;|\b)b=[^&]*/', '', trim($wpm_options['extra_minify_options']));
-      if (trim($extra_minify_options) != '') {
-        $extra_string = '&amp;'.$extra_minify_options;
-      } else {
-        $extra_string = '';
-      }
-
-      // append last modified time
-      $latest_modified_string = '&amp;m='.$latest_modified;
-
-      return array($base_url . '?f=' . implode(',', $files) . $debug_string . $base_string . $extra_string . $latest_modified_string);
-    }
-  }
-
-  function fetch_content($url, $type = '') {
-    $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
-    $content = '';
-    if (file_exists($cache_file)) {
-      // check cache expiration
-      $this->refetch_cache_if_expired($url, $cache_file);
-
-      $fh = fopen($cache_file, 'r');
-      if ($fh && filesize($cache_file) > 0) {
-        $content = fread($fh, filesize($cache_file));
-        fclose($fh);
-      }
-      else {
-        // cannot open cache file so fetch it
-        $content = $this->fetch_and_cache($url, $cache_file);
-      }
-    }
-    else {
-      // no cache file.  fetch from internet and save to local cache
-      $content = $this->fetch_and_cache($url, $cache_file);
-    }
-    return $content;
-  }
-
-  function local_version($url) {
-    $site_url = trailingslashit(get_option('siteurl'));
-    $url = str_replace($site_url, '', $url); // relative paths only for local urls
-    //$url = preg_replace('/^\//', '', $url); // strip front / if any
-    $url = preg_replace('/\?.*/i', '', $url); // throws away parameters, if any
-    return $url;
-  }
-
-  function is_external($url, $localize=true) {
-    if ($localize) {
-      $url = $this->local_version($url);
-    }
-
-    if (substr($url, 0, 4) != 'http' && substr($url, 0, 2) != '//'
-      && (substr($url, -3, 3) == '.js' || substr($url, -4, 4) == '.css')) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  function get_js_location($src) {
-    if ($this->debug)
-      echo 'Script URL:'.$src."<br/>\n";
-
-    $script_path = $this->local_version($src);
-    if ($this->is_external($script_path, false)) {
-      // fetch scripts if necessary
-      $this->fetch_content($src, '.js');
-      $location = $this->cache_location . md5($src) . '.js';
-      if ($this->debug)
-        echo 'External script detected, cached as:'. md5($src) . "<br/>\n";
-    } else {
-      // if script is local to server
-      $location = $script_path;
-      if ($this->debug)
-        echo 'Local script detected:'.$script_path."<br/>\n";
-    }
-
-    return $location;
-  }
-
-  function get_css_location($src) {
-    if ($this->debug)
-      echo 'Style URL:'.$src."<br/>\n";
-
-    $css_path = $this->local_version($src);
-    if ($this->is_external($css_path, false)) {
-      // fetch scripts if necessary
-      $this->fetch_content($src, '.css');
-      $location = $this->cache_location . md5($src) . '.css';
-      if ($this->debug)
-        echo 'External css detected, cached as:'. md5($src) . "<br/>\n";
-    } else {
-      $location = $css_path;
-      // if css is local to server
-      if ($this->debug)
-        echo 'Local css detected:'.$css_path."<br/>\n";
-    }
-
-    return $location;
-  }
-
-  function url_needs_splitting($url, $locations) {
-    if ($url > $this->url_len_limit || count($locations) > $this->minify_limit) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  function build_minify_urls($locations, $type) {
-    $wpm_options = get_option($this->name);
-    $minify_url = $this->c->get_plugin_url().'min/?f=';
-    if ($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on") {
-      $minify_url = preg_replace('/^http:\/\//', 'https://', $minify_url);
-    }
-    $minify_url .= implode(',', $locations);
-    $latest_modified = $this->get_latest_modified_time($locations);
-    $minify_urls = $this->check_and_split_url($minify_url, $latest_modified);
-
-    if ($wpm_options['pretty_url']) {
-      return $this->get_cached_minify_urls($minify_urls, $type);
-    } else {
-      return $minify_urls;
-    }
-  }
-  
-  function get_cached_minify_urls($urls, $type) {
-    $wpm_options = get_option($this->name);
-    $cached_urls = array();
-    foreach ($urls as $url) {
-      $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
-      if (file_exists($cache_file)) {
-        // check cache expiration
-        $this->refetch_cache_if_expired($url, $cache_file);
-  
-        $fh = fopen($cache_file, 'r');
-        if ($fh && filesize($cache_file) > 0) {
-          $content = fread($fh, filesize($cache_file));
-          fclose($fh);
-        } else {
-          // cannot open cache file so fetch it
-          $this->fetch_and_cache($url, $cache_file);
-        }
-      } else {
-        // no cache file. fetch it
-        $this->fetch_and_cache($url, $cache_file);
-      }
-      $cache_url = $this->c->get_plugin_url().'cache/'.md5($url).$type.'?m='.filemtime($cache_file);
-      $cached_urls[] = $cache_url;
-    }
-    return $cached_urls;
-  }
-
-  function get_base_from_minify_args() {
-    $wpm_options = get_option($this->name);
-    if (!empty($wpm_options['extra_minify_options'])) {
-      if (preg_match('/\bb=([^&]*?)(&|$)/', trim($wpm_options['extra_minify_options']), $matches)) {
-        return rtrim(trim($matches[1]), '\\/');
-      }
-    }
-    return '';
-  }
-
-  function get_base_from_siteurl() {
-    $site_url = trailingslashit(get_option('siteurl'));
-    return rtrim(preg_replace('/^https?:\/\/.*?\//', '', $site_url), '\\/');
-  }
-
-  function get_base() {
-    $base_from_min_args = $this->get_base_from_minify_args();
-    if ($base_from_min_args != '') {
-      return $base_from_min_args;
-    }
-
-    $wpm_options = get_option($this->name);
-    if ($wpm_options['auto_base']) {
-      return $this->get_base_from_siteurl();
-    } else {
-      return '';
-    }
-  }
-
-  function get_latest_modified_time($locations = array()) {
-    $latest_modified = 0;
-    if (!empty($locations)) {
-      $base_path = trailingslashit($_SERVER['DOCUMENT_ROOT']);
-      $base_path .= trailingslashit($this->get_base());
-
-      foreach ($locations as $location) {
-        $path = $base_path.$location;
-        $mtime = filemtime($path);
-        if ($latest_modified < $mtime) {
-          $latest_modified = $mtime;
-        }
-      }
-    }
-    return $latest_modified;
-  }
-
-  function extract_css($content) {
-    $wpm_options = get_option($this->name);
-    $css_locations = array();
-
-    preg_match_all('/<link([^>]*?)>/i', $content, $link_tags_match);
-
-    foreach ($link_tags_match[0] as $link_tag) {
-      if (strpos(strtolower($link_tag), 'stylesheet')) {
-        // check CSS media type
-        if (!strpos(strtolower($link_tag), 'media=')
-          || preg_match('/media=["\'](?:["\']|[^"\']*?(all|screen)[^"\']*?["\'])/', $link_tag)
-        ) {
-          preg_match('/href=[\'"]([^\'"]+)/', $link_tag, $href_match);
-          if ($href_match[1]) {
-            // include it if it is in the include list
-            $include = false;
-            $inclusions = $wpm_options['css_include'];
-            foreach ($inclusions as $include_pat) {
-              $include_pat = trim($include_pat);
-              if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
-                $include = true;
-                break;
-              }
-            }
-
-            if (!$include) {
-              // support external files?
-              if (!$wpm_options['cache_external'] && $this->is_external($href_match[1])) {
-                continue; // skip if we don't cache externals and this file is external
-              }
-
-              // do not include anything in excluded list
-              $skip = false;
-              $exclusions = array_merge($this->default_exclude, $wpm_options['css_exclude']);
-              foreach ($exclusions as $exclude_pat) {
-                $exclude_pat = trim($exclude_pat);
-                if (strlen($exclude_pat) > 0 && strpos($href_match[1], $exclude_pat) !== false) {
-                  $skip = true;
-                  break;
-                }
-              }
-              if ($skip) continue;
-            }
-
-            $content = str_replace($link_tag . '</link>', '', $content);
-            $content = str_replace($link_tag, '', $content);
-            $css_locations[] = $this->get_css_location($href_match[1]);
-          }
-        }
-      }
-    }
-
-    $css_locations = array_unique($css_locations);
-
-    return array($content, $css_locations);
-  }
-
-  function inject_css($content, $css_locations) {
-    if (count($css_locations) > 0) {
-      $wpm_options = get_option($this->name);
-      // build minify URLS
-      $css_tags = '';
-      $minify_urls = $this->build_minify_urls($css_locations, '.css');
-
-      foreach ($minify_urls as $minify_url) {
-        $minify_url = apply_filters('wp_minify_css_url', $minify_url); // Allow plugins to modify final minify URL
-        $css_tags .= "<link rel='stylesheet' href='$minify_url' type='text/css' media='screen' />";
-      }
-
-      $matches = preg_match('/<!-- WP-Minify CSS -->/', $content);
-
-      if ($matches) {
-        $content = preg_replace('/<!-- WP-Minify CSS -->/', "$css_tags", $content, 1); // limit 1 replacement
-      } else {
-        // HTML5 has <header> tags so account for those in regex
-        $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$css_tags", $content, 1); // limit 1 replacement
-      }
-    }
-    return $content;
-  }
-
-  function extract_conditionals($content) {
-    preg_match_all('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', $content, $conditionals_match);
-    $content = preg_replace('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', '###WPM-CSS-CONDITIONAL###', $content);
-
-    $conditionals = array();
-    foreach ($conditionals_match[0] as $conditional) {
-      $conditionals[] = $conditional;
-    }
-
-    return array($content, $conditionals);
-  }
-
-  function inject_conditionals($content, $conditionals) {
-    while (count($conditionals) > 0 && strpos($content, '###WPM-CSS-CONDITIONAL###')) {
-      $conditional = array_shift($conditionals);
-      $content = preg_replace('/###WPM-CSS-CONDITIONAL###/', $conditional, $content, 1);
-    }
-
-    return $content;
-  }
-
-  function extract_js($content) {
-    $wpm_options = get_option($this->name);
-    $js_locations = array();
-
-    preg_match_all('/<script([^>]*?)><\/script>/i', $content, $script_tags_match);
-
-    foreach ($script_tags_match[0] as $script_tag) {
-      preg_match('/src=[\'"]([^\'"]+)/', $script_tag, $src_match);
-      if ($src_match[1]) {
-        // include it if it is in the include list
-        $include = false;
-        $inclusions = $wpm_options['js_include'];
-        foreach ($inclusions as $include_pat) {
-          $include_pat = trim($include_pat);
-          if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
-            $include = true;
-            break;
-          }
-        }
-
-        if (!$include) {
-          // support external files?
-          if (!$wpm_options['cache_external'] && $this->is_external($src_match[1])) {
-            continue; // skip if we don't cache externals and this file is external
-          }
-
-          // do not include anything in excluded list
-          $skip = false;
-          $exclusions = array_merge($this->default_exclude, $wpm_options['js_exclude']);
-          foreach ($exclusions as $exclude_pat) {
-            $exclude_pat = trim($exclude_pat);
-            if (strlen($exclude_pat) > 0 && strpos($src_match[1], $exclude_pat) !== false) {
-              $skip = true;
-              break;
-            }
-          }
-          if ($skip) continue;
-        }
-
-        $content = str_replace($script_tag, '', $content);
-        $js_locations[] = $this->get_js_location($src_match[1]);
-      }
-    }
-
-    $js_locations = array_unique($js_locations);
-
-    return array($content, $js_locations);
-  }
-
-  function inject_js($content, $js_locations) {
-    if (count($js_locations) > 0) {
-      // build minify URLS
-      $js_tags = '';
-      $minify_urls = $this->build_minify_urls($js_locations, '.js');
-
-      foreach ($minify_urls as $minify_url) {
-        $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
-        $js_tags .= "<script type='text/javascript' src='$minify_url'></script>";
-      }
-
-      $matches = preg_match('/<!-- WP-Minify JS -->/', $content);
-
-      if ($matches) {
-        $content = preg_replace('/<!-- WP-Minify JS -->/', "$js_tags", $content, 1); // limit 1 replacement
-      } else {
-        $wpm_options = get_option($this->name);
-        if ($wpm_options['js_in_footer']) {
-          $content = preg_replace('/<\/body>/', "$js_tags\n</body>", $content, 1); // limit 1 replacement
-        } else {
-          // HTML5 has <header> tags so account for those in regex
-          $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$js_tags", $content, 1); // limit 1 replacement
-        }
-      }
-    }
-    return $content;
-  }
-
-  function pre_content() {
-    $wpm_options = get_option($this->name);
-    if ($wpm_options['uri_exclude'] && count($wpm_options['uri_exclude'])) {
-      foreach ($wpm_options['uri_exclude'] as $exclude_pat) {
-        $exclude_pat = trim($exclude_pat);
-        if (strlen($exclude_pat) > 0 && strpos($_SERVER['REQUEST_URI'], $exclude_pat) !== false) {
-          return;
-        }
-      }
-    }
-
-    ob_start(array($this, 'modify_buffer'));
-
-    // variable for sanity checking
-    $this->buffer_started = true;
-  }
-
-  function modify_buffer($buffer) {
-    $wpm_options = get_option($this->name);
-
-    // if we do not want to force http to https then we need to exclude https
-    if (!($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on")) {
-      $this->default_exclude[] = 'https://';
-    }
-
-    // minify JS
-    if ($wpm_options['enable_js']) {
-      list($buffer, $js_locations) = $this->extract_js($buffer);
-      $buffer= $this->inject_js($buffer, $js_locations);
-    }
-
-    // minify CSS (make sure to exclude CSS conditionals)
-    if ($wpm_options['enable_css']) {
-      list($buffer, $conditionals) = $this->extract_conditionals($buffer);
-      list($buffer, $css_locations) = $this->extract_css($buffer);
-      $buffer = $this->inject_css($buffer, $css_locations);
-      $buffer = $this->inject_conditionals($buffer, $conditionals);
-    }
-
-    // get rid of empty lines
-    $buffer = preg_replace('/\s*(\r?\n)(\r?\n)*/', '$1', $buffer);
-
-    // minify HTML
-    if ($wpm_options['enable_html']) {
-      if (!class_exists('Minify_HTML')) {
-        require_once('min/lib/Minify/HTML.php');
-      }
-      $buffer = Minify_HTML::minify($buffer);
-    }
-
-    $buffer = apply_filters('wp_minify_content', $buffer); // allow plugins to modify buffer
-
-    return $buffer;
-  }
-
-  function post_content() {
-    // sanity checking
-    if ($this->buffer_started) {
-      ob_end_flush();
-    }
-  }
-
-  function advertise() {
-    $wpm_options = get_option($this->name);
-    if ($wpm_options['show_link']) {
-      printf("<p align='center'><small>Page optimized by <a href='$this->homepage' title='$this->name_proper WordPress Plugin' style='text-decoration:none;'>$this->name_proper</a> <a href='$this->author_homepage' title='WordPress Plugin' style='text-decoration:none;'>WordPress Plugin</a></small></p>");
-    }
-  }
+    var $author_homepage = 'http://nodecode.de/';
+    var $homepage = 'http://wordpress.org/plugins/wp-minify-fixed/';
+    var $name = 'wp_minify'; 
+    var $name_dashed = 'wp-minify-fix'; 
+    var $name_proper = 'WP Minify Fix'; 
+    var $required_wp_version = '2.7';
+    var $version = '1.4.0';
+
+    var $c = null;
+    var $debug = false;
+    var $cache_location = 'wp-content/plugins/wp-minify-fix/cache/';
+    var $url_len_limit = 2000;
+    var $minify_limit = 50;
+    var $buffer_started = false;
+    var $default_exclude = array();
+    
+    var $footer_scripts_string = 'abc';
+
+    function WPMinify() {
+        // initialize common functions
+        $this->c = new WPMinifyCommon($this);
+
+        // load translation
+        $this->c->load_text_domain();
+
+        // register admin scripts
+        add_action('admin_init', array($this->c, 'a_register_scripts'));
+        add_action('admin_init', array($this->c, 'a_register_styles'));
+
+        // check wp version
+        add_action('admin_head', array($this->c, 'a_check_version'));
+
+        // load admin menu
+        add_action('admin_menu', array($this, 'a_menu'));
+
+        // register ajax handler
+        add_action('wp_ajax_wpm', array($this, 'a_ajax_handler'));
+
+        // No need to minify admin stuff
+        if (!is_admin() && !defined('XMLRPC_REQUEST')) {
+            // Don't minify if if user passes wp-minify-off=1 in GET parameter
+            if (!(isset($_GET['wp-minify-off']) && $_GET['wp-minify-off'])) {
+                // footer scripts hook
+                add_action('wp_footer', array($this, 'footer_placeholder'), 1);
+                
+                add_action('init', array($this, 'pre_content'), 99999);
+                add_action('wp_footer', array($this, 'post_content'), 99999);
+            }
+            // advertise hook
+            add_action('wp_footer', array($this, 'advertise'));
+        }
+    }
+
+    // admin functions
+
+    function a_default_options() {
+        return array(
+            'cache_external' => false,
+            'cache_interval' => 3600,
+            'css_exclude' => array(),
+            'css_include' => array(),
+            'debug_nominify' => false,
+            'debug_firephp' => false,
+            'enable_css' => true,
+            'enable_js' => true,
+            'enable_html' => true,
+            'auto_base' => true,
+            'extra_minify_options' => '',
+            'js_exclude' => array(),
+            'js_include' => array(),
+            'js_placement' => 'header-footer', // header-footer, header or footer
+            'js_async' => false, // Header only, see http://css-tricks.com/async-attribute-scripts-bottom/
+            'force_https' => false,
+            'pretty_url' => false,
+            'show_link' => false,
+            'show_advanced' => false,
+            'uri_exclude' => array(),
+            'version' => $this->version,
+            'deprecated' => array(
+                'wp_path', 'debug', 'debug_noprettyurl', 'js_in_footer'
+            )
+        );
+    }
+
+    function a_update_options() {
+        // new options
+        $wpm_new_options = stripslashes_deep($_POST['wpm_options_update']);
+
+        // current options
+        $wpm_current_options = get_option($this->name);
+
+        // convert "on" to true and "off" to false for checkbox fields
+        // and set defaults for fields that are left blank
+        if (isset($wpm_new_options['show_link']) && $wpm_new_options['show_link'] == "on")
+            $wpm_new_options['show_link'] = true;
+        else
+            $wpm_new_options['show_link'] = false;
+
+        if (isset($wpm_new_options['enable_js']))
+            $wpm_new_options['enable_js'] = true;
+        else
+            $wpm_new_options['enable_js'] = false;
+
+        if (isset($wpm_new_options['enable_css']))
+            $wpm_new_options['enable_css'] = true;
+        else
+            $wpm_new_options['enable_css'] = false;
+
+        if (isset($wpm_new_options['enable_html']))
+            $wpm_new_options['enable_html'] = true;
+        else
+            $wpm_new_options['enable_html'] = false;
+
+        if (isset($wpm_new_options['auto_base']))
+            $wpm_new_options['auto_base'] = true;
+        else
+            $wpm_new_options['auto_base'] = false;
+
+        if (isset($wpm_new_options['cache_external']))
+            $wpm_new_options['cache_external'] = true;
+        else
+            $wpm_new_options['cache_external'] = false;
+
+        if (isset($wpm_new_options['js_in_footer']))
+            $wpm_new_options['js_in_footer'] = true;
+        else
+            $wpm_new_options['js_in_footer'] = false;
+
+        if (isset($wpm_new_options['pretty_url']))
+            $wpm_new_options['pretty_url'] = true;
+        else
+            $wpm_new_options['pretty_url'] = false;
+
+        if (isset($wpm_new_options['debug_nominify']))
+            $wpm_new_options['debug_nominify'] = true;
+        else
+            $wpm_new_options['debug_nominify'] = false;
+
+        if (isset($wpm_new_options['debug_firephp']))
+            $wpm_new_options['debug_firephp'] = true;
+        else
+            $wpm_new_options['debug_firephp'] = false;
+
+        $this->a_set_minify_config($wpm_new_options['debug_nominify'], $wpm_new_options['debug_firephp']);
+        
+        if ( isset($wpm_new_options['js_async']) )
+            $wpm_new_options['js_async'] = true;
+        else
+            $wpm_new_options['js_async'] = false;
+
+        if ( isset($wpm_new_options['force_https']) )
+            $wpm_new_options['force_https'] = true;
+        else
+            $wpm_new_options['force_https'] = false;
+
+        if (strlen(trim($wpm_new_options['js_include'])) > 0)
+            $wpm_new_options['js_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_include'])));
+        else
+            $wpm_new_options['js_include'] = array();
+
+        if (strlen(trim($wpm_new_options['js_exclude'])) > 0)
+            $wpm_new_options['js_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['js_exclude'])));
+        else
+            $wpm_new_options['js_exclude'] = array();
+
+        if (strlen(trim($wpm_new_options['css_include'])) > 0)
+            $wpm_new_options['css_include'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_include'])));
+        else
+            $wpm_new_options['css_include'] = array();
+
+        if (strlen(trim($wpm_new_options['css_exclude'])) > 0)
+            $wpm_new_options['css_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['css_exclude'])));
+        else
+            $wpm_new_options['css_exclude'] = array();
+
+        if ( strlen(trim($wpm_new_options['uri_exclude'])) > 0 )
+            $wpm_new_options['uri_exclude'] = $this->array_trim(split(chr(10), str_replace(chr(13), '', $wpm_new_options['uri_exclude'])));
+        else
+            $wpm_new_options['uri_exclude'] = array();
+
+        // Update options
+        foreach ($wpm_new_options as $key => $value) {
+            $wpm_current_options[$key] = $value;
+        }
+
+        update_option($this->name, $wpm_current_options);
+    }
+
+    function a_set_advanced_options($val) {
+        $wpm_options = get_option($this->name);
+        $wpm_options['show_advanced'] = $val;
+        update_option($this->name, $wpm_options);
+    }
+
+    function a_ajax_handler() {
+        check_ajax_referer($this->name);
+        if (isset($_POST['wpm_action'])) {
+            if (strtolower($_POST['wpm_action']) == 'show_advanced') {
+                $this->a_set_advanced_options(true);
+            }
+            elseif (strtolower($_POST['wpm_action']) == 'hide_advanced') {
+                $this->a_set_advanced_options(false);
+            }
+            else {
+                echo 'Invalid wpm_action.';
+            }
+        }
+        exit();
+    }
+
+    function a_request_handler() {
+        if (isset($_POST['wpm_options_update_submit'])) {
+            check_admin_referer($this->name);
+            $this->a_update_options();
+            add_action('admin_notices', array($this->c, 'a_notify_updated'));
+        }
+        elseif (isset($_POST['wpm_options_clear_cache_submit'])) {
+            // if user wants to regenerate nonce
+            check_admin_referer($this->name);
+            $this->c->a_clear_cache();
+            add_action('admin_notices', array($this->c, 'a_notify_cache_cleared'));
+        }
+        elseif (isset($_POST['wpm_options_upgrade_submit'])) {
+            // if user wants to upgrade options (for new options on version upgrades)
+            check_admin_referer($this->name);
+            $this->c->a_upgrade_options();
+            add_action('admin_notices', array($this->c, 'a_notify_upgraded'));
+        }
+        elseif (isset($_POST['wpm_options_reset_submit'])) {
+            // if user wants to reset all options
+            check_admin_referer($this->name);
+            $this->c->a_reset_options();
+            add_action('admin_notices', array($this->c, 'a_notify_reset'));
+        }
+
+        // only check these on plugin settings page
+        $this->c->a_check_dir_writable($this->c->get_plugin_dir().'cache/', array($this, 'a_notify_cache_not_writable'));
+        $this->c->a_check_orphan_options(array($this, 'a_notify_orphan_options'));
+        if ($this->c->a_check_dir_writable($this->c->get_plugin_dir().'min/config.php', array($this, 'a_notify_config_not_writable'))) {
+            $this->a_check_minify_config();
+        }
+    }
+
+    function a_check_minify_config() {
+        $fname = $this->c->get_plugin_dir().'min/config.php';
+        $fhandle = fopen($fname,'r');
+        $content = fread($fhandle,filesize($fname));
+
+        $config_modified = false;
+        
+        preg_match('/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s', $content, $matches);
+        $cache_path_code = $matches[1];
+        if (!preg_match('/\$min_cachePath.*?/', $cache_path_code)) {
+            $content = preg_replace(
+                '/\/\/###WPM-CACHE-PATH-BEFORE###(.*)\/\/###WPM-CACHE-PATH-AFTER###/s',
+                "//###WPM-CACHE-PATH-BEFORE###\n".'$min_cachePath = \''.$this->c->get_plugin_dir()."cache/';\n//###WPM-CACHE-PATH-AFTER###",
+                $content);
+            $config_modified = true;
+        }
+
+        preg_match('/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s', $content, $matches);
+        $cache_age_code = $matches[1];
+        if (!preg_match('/\$min_serveOptions\[\'maxAge\'].*?/', $cache_age_code)) {
+            $content = preg_replace(
+                '/\/\/###WPM-CACHE-AGE-BEFORE###(.*)\/\/###WPM-CACHE-AGE-AFTER###/s',
+                "//###WPM-CACHE-AGE-BEFORE###\n".'$min_serveOptions[\'maxAge\'] = 2592000;'."\n//###WPM-CACHE-AGE-AFTER###",
+                $content);
+            $config_modified = true;
+        }
+
+        if ($config_modified) {
+            $this->a_notify_modified_minify_config();
+        }
+        
+        $fhandle = fopen($fname,"w");
+        fwrite($fhandle,$content);
+        fclose($fhandle);
+    }
+
+    function a_set_minify_config($nominify = false, $firephp = false) {
+        if ($nominify) {
+            $nominify = 'true';
+        } else {
+            $nominify = 'false';
+        }
+        if ($firephp) {
+            $firephp = 'true';
+        } else {
+            $firephp = 'false';
+        }
+        $fname = $this->c->get_plugin_dir().'min/config.php';
+        $fhandle = fopen($fname,'r');
+        $content = fread($fhandle,filesize($fname));
+
+        $content = preg_replace(
+            '/\/\/###WPM-DEBUG-FLAG-BEFORE###(.*)\/\/###WPM-DEBUG-FLAG-AFTER###/s',
+            "//###WPM-DEBUG-FLAG-BEFORE###\n".'$min_allowDebugFlag = '.$nominify.";\n//###WPM-DEBUG-FLAG-AFTER###",
+            $content);
+
+        $content = preg_replace(
+            '/\/\/###WPM-ERROR-LOGGER-BEFORE###(.*)\/\/###WPM-ERROR-LOGGER-AFTER###/s',
+            "//###WPM-ERROR-LOGGER-BEFORE###\n".'$min_errorLogger = '.$firephp.";\n//###WPM-ERROR-LOGGER-AFTER###",
+            $content);
+
+        $fhandle = fopen($fname,"w");
+        fwrite($fhandle,$content);
+        fclose($fhandle);
+    }
+
+    function a_notify_cache_not_writable() {
+        $this->c->a_notify(
+            sprintf('%s: %s',
+                __('Cache directory is not writable. Please grant your server write permissions to the directory', $this->name),
+                $this->c->get_plugin_dir().'cache/'),
+            true);
+    }
+
+    function a_notify_config_not_writable() {
+        $this->c->a_notify(
+            sprintf('%s: %s',
+                __('Minify Engine config.php is not writable. Please grant your server write permissions to file', $this->name),
+                $this->c->get_plugin_dir().'min/config.php'));
+    }
+
+    function a_notify_orphan_options() {
+        $this->c->a_notify(
+            sprintf('%s',
+                __('Some option settings are missing (possibly from plugin upgrade).', $this->name)));
+    }
+
+    function a_notify_modified_minify_config() {
+        $this->c->a_notify(__('Minify Engine config.php was configured automatically.', $this->name));
+    }
+
+    function a_menu() {
+        $options_page = add_options_page($this->name_proper, $this->name_proper, 'manage_options', 'wp-minify-fix', array($this, 'a_page'));
+        add_action('admin_head-'.$options_page, array($this, 'a_request_handler'));
+        add_action('admin_print_scripts-'.$options_page, array($this->c, 'a_enqueue_scripts'));
+        add_action('admin_print_styles-'.$options_page, array($this->c, 'a_enqueue_styles'));
+    }
+
+    function a_page() {
+        $wpm_options = get_option($this->name);
+        printf('
+            <div class="wrap omni_admin_content">
+                <h2>%s</h2>
+                <div>
+                    <a href="'.preg_replace('/&wpm-page=[^&]*/', '', $_SERVER['REQUEST_URI']).'">%s</a>&nbsp;|&nbsp;
+                    <a href="'.$this->homepage.'">%s</a>
+                </div>',
+            __('WP Minify Options', $this->name),
+            __('General Configuration', $this->name),
+            __('Documentation', $this->name)
+        );
+        printf('<div class="omni_admin_main">');
+        if (isset($_GET['wpm-page'])) {
+            if ($_GET['wpm-page'] || !$_GET['wpm-page']) {
+                require_once('options-generic.php');
+            }
+        }
+        else {
+            require_once('options-generic.php');
+        }
+        printf('</div>'); // omni_admin_main
+        require_once('options-sidebar.php');
+        printf('</div>'); // wrap
+
+    } // admin_page()
+
+    // other functions
+
+    function fetch_and_cache($url, $cache_file) {
+        $ch = curl_init();
+        $timeout = 5; // set to zero for no timeout
+        curl_setopt ($ch, CURLOPT_URL, $url);
+        curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+        curl_setopt ($ch, CURLOPT_USERAGENT, 'WP-Minify Fix');
+        $content = curl_exec($ch);
+        curl_close($ch);
+        if ($content) {
+            if (is_array($content)) {
+                $content = implode($content);
+            }
+
+            // save cache file
+            $fh = fopen($cache_file, 'w');
+            if ($fh) {
+                fwrite($fh, $content);
+                fclose($fh);
+            }
+            else {
+                // cannot open for write.    no error b/c something else is probably writing to the file.
+            }
+
+            return $content;
+        }
+        else {
+            printf(
+                '%s: '.$url.'. %s<br/>',
+                __('Error: Could not fetch and cache URL'),
+                __('You might need to exclude this file in WP Minify options.')
+            );
+            return '';
+        }
+    }
+
+    function refetch_cache_if_expired($url, $cache_file) {
+        $wpm_options = get_option($this->name);
+        $cache_file_mtime = filemtime($cache_file);
+        if ((time() - $cache_file_mtime) > $wpm_options['cache_interval']) {
+            $this->fetch_and_cache($url, $cache_file);
+        }
+    }
+
+    function tiny_filename($str) {
+        $f = __FILE__;
+        // no fancy shortening for Windows
+        return ('/' === $f[0]) ? strtr(base64_encode(md5($str, true)), '+/=', '-_(') : md5($str);
+    }
+
+    function array_trim($arr, $charlist=null) {
+        foreach ($arr as $key => $value) {
+            if (is_array($value)) $result[$key] = array_trim($value, $charlist);
+            else $result[$key] = trim($value, $charlist);
+        }
+        return $result;
+    }
+
+    function check_and_split_url($url, $latest_modified = 0) {
+        $url_chunk = explode('?f=', $url);
+        $base_url = array_shift($url_chunk);
+        $files = explode(',', array_shift($url_chunk));
+        $num_files = sizeof($files);
+
+        if ($this->url_needs_splitting($url, $files)) {
+            $first_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, 0, $num_files/2)), $latest_modified);
+            $second_half = $this->check_and_split_url($base_url . '?f=' . implode(',', array_slice($files, $num_files/2)), $latest_modified);
+            return $first_half + $second_half;
+        }
+        else {
+            $wpm_options = get_option($this->name);
+
+            // append &debug if we need to
+            if ($wpm_options['debug_nominify']) {
+                $debug_string = '&amp;debug=true';
+            } else {
+                $debug_string = '';
+            }
+
+            // append base directory if needed
+            $base = $this->get_base();
+            if ($base != '') {
+                $base_string = '&amp;b='.$base;
+            } else {
+                $base_string = '';
+            }
+
+            // get rid of any base directory specification in extra options
+            $extra_minify_options = preg_replace('/(&|&amp;|\b)b=[^&]*/', '', trim($wpm_options['extra_minify_options']));
+            if (trim($extra_minify_options) != '') {
+                $extra_string = '&amp;'.$extra_minify_options;
+            } else {
+                $extra_string = '';
+            }
+
+            // append last modified time
+            $latest_modified_string = '&amp;m='.$latest_modified;
+
+            return array($base_url . '?f=' . implode(',', $files) . $debug_string . $base_string . $extra_string . $latest_modified_string);
+        }
+    }
+
+    function fetch_content($url, $type = '') {
+        $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
+        $content = '';
+        if (file_exists($cache_file)) {
+            // check cache expiration
+            $this->refetch_cache_if_expired($url, $cache_file);
+
+            $fh = fopen($cache_file, 'r');
+            if ($fh && filesize($cache_file) > 0) {
+                $content = fread($fh, filesize($cache_file));
+                fclose($fh);
+            }
+            else {
+                // cannot open cache file so fetch it
+                $content = $this->fetch_and_cache($url, $cache_file);
+            }
+        }
+        else {
+            // no cache file.    fetch from internet and save to local cache
+            $content = $this->fetch_and_cache($url, $cache_file);
+        }
+        return $content;
+    }
+
+    function local_version($url) {
+        $site_url = trailingslashit(get_option('siteurl'));
+        $url = str_replace($site_url, '', $url); // relative paths only for local urls
+        //$url = preg_replace('/^\//', '', $url); // strip front / if any
+        $url = preg_replace('/\?.*/i', '', $url); // throws away parameters, if any
+        return $url;
+    }
+
+    function is_external($url, $localize=true) {
+        if ($localize) {
+            $url = $this->local_version($url);
+        }
+
+        if (substr($url, 0, 4) != 'http' && substr($url, 0, 2) != '//'
+            && (substr($url, -3, 3) == '.js' || substr($url, -4, 4) == '.css')) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function get_js_location($src) {
+        if ($this->debug)
+            echo 'Script URL:'.$src."<br/>\n";
+
+        $script_path = $this->local_version($src);
+        if ($this->is_external($script_path, false)) {
+            // fetch scripts if necessary
+            $this->fetch_content($src, '.js');
+            $location = $this->cache_location . md5($src) . '.js';
+            if ($this->debug)
+                echo 'External script detected, cached as:'. md5($src) . "<br/>\n";
+        } else {
+            // if script is local to server
+            $location = $script_path;
+            if ($this->debug)
+                echo 'Local script detected:'.$script_path."<br/>\n";
+        }
+
+        return $location;
+    }
+
+    function get_css_location($src) {
+        if ($this->debug)
+            echo 'Style URL:'.$src."<br/>\n";
+
+        $css_path = $this->local_version($src);
+        if ($this->is_external($css_path, false)) {
+            // fetch scripts if necessary
+            $this->fetch_content($src, '.css');
+            $location = $this->cache_location . md5($src) . '.css';
+            if ($this->debug)
+                echo 'External css detected, cached as:'. md5($src) . "<br/>\n";
+        } else {
+            $location = $css_path;
+            // if css is local to server
+            if ($this->debug)
+                echo 'Local css detected:'.$css_path."<br/>\n";
+        }
+
+        return $location;
+    }
+
+    function url_needs_splitting($url, $locations) {
+        if ($url > $this->url_len_limit || count($locations) > $this->minify_limit) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function build_minify_urls($locations, $type) {
+        $wpm_options = get_option($this->name);
+        $minify_url = $this->c->get_plugin_url().'min/?f=';
+        if ($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on") {
+            $minify_url = preg_replace('/^http:\/\//', 'https://', $minify_url);
+        }
+        $minify_url .= implode(',', $locations);
+        $latest_modified = $this->get_latest_modified_time($locations);
+        $minify_urls = $this->check_and_split_url($minify_url, $latest_modified);
+
+        if ($wpm_options['pretty_url']) {
+            return $this->get_cached_minify_urls($minify_urls, $type);
+        } else {
+            return $minify_urls;
+        }
+    }
+    
+    function get_cached_minify_urls($urls, $type) {
+        $wpm_options = get_option($this->name);
+        $cached_urls = array();
+        foreach ($urls as $url) {
+            $cache_file = $this->c->get_plugin_dir().'cache/'.md5($url).$type;
+            if (file_exists($cache_file)) {
+                // check cache expiration
+                $this->refetch_cache_if_expired($url, $cache_file);
+    
+                $fh = fopen($cache_file, 'r');
+                if ($fh && filesize($cache_file) > 0) {
+                    $content = fread($fh, filesize($cache_file));
+                    fclose($fh);
+                } else {
+                    // cannot open cache file so fetch it
+                    $this->fetch_and_cache($url, $cache_file);
+                }
+            } else {
+                // no cache file. fetch it
+                $this->fetch_and_cache($url, $cache_file);
+            }
+            $cache_url = $this->c->get_plugin_url().'cache/'.md5($url).$type.'?m='.filemtime($cache_file);
+            $cached_urls[] = $cache_url;
+        }
+        return $cached_urls;
+    }
+
+    function get_base_from_minify_args() {
+        $wpm_options = get_option($this->name);
+        if (!empty($wpm_options['extra_minify_options'])) {
+            if (preg_match('/\bb=([^&]*?)(&|$)/', trim($wpm_options['extra_minify_options']), $matches)) {
+                return rtrim(trim($matches[1]), '\\/');
+            }
+        }
+        return '';
+    }
+
+    function get_base_from_siteurl() {
+        $site_url = trailingslashit(get_option('siteurl'));
+        return rtrim(preg_replace('/^https?:\/\/.*?\//', '', $site_url), '\\/');
+    }
+
+    function get_base() {
+        $base_from_min_args = $this->get_base_from_minify_args();
+        if ($base_from_min_args != '') {
+            return $base_from_min_args;
+        }
+
+        $wpm_options = get_option($this->name);
+        if ($wpm_options['auto_base']) {
+            return $this->get_base_from_siteurl();
+        } else {
+            return '';
+        }
+    }
+
+    function get_latest_modified_time($locations = array()) {
+        $latest_modified = 0;
+        if (!empty($locations)) {
+            $base_path = trailingslashit($_SERVER['DOCUMENT_ROOT']);
+            $base_path .= trailingslashit($this->get_base());
+
+            foreach ($locations as $location) {
+                $path = $base_path.$location;
+                $mtime = filemtime($path);
+                if ($latest_modified < $mtime) {
+                    $latest_modified = $mtime;
+                }
+            }
+        }
+        return $latest_modified;
+    }
+
+    function extract_css($content) {
+        $wpm_options = get_option($this->name);
+        $css_locations = array();
+
+        preg_match_all('/<link([^>]*?)>/i', $content, $link_tags_match);
+
+        foreach ($link_tags_match[0] as $link_tag) {
+            if (strpos(strtolower($link_tag), 'stylesheet')) {
+                // check CSS media type
+                if (!strpos(strtolower($link_tag), 'media=')
+                    || preg_match('/media=["\'](?:["\']|[^"\']*?(all|screen)[^"\']*?["\'])/', $link_tag)
+                ) {
+                    preg_match('/href=[\'"]([^\'"]+)/', $link_tag, $href_match);
+                    if ($href_match[1]) {
+                        // include it if it is in the include list
+                        $include = false;
+                        $inclusions = $wpm_options['css_include'];
+                        foreach ($inclusions as $include_pat) {
+                            $include_pat = trim($include_pat);
+                            if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
+                                $include = true;
+                                break;
+                            }
+                        }
+
+                        if (!$include) {
+                            // support external files?
+                            if (!$wpm_options['cache_external'] && $this->is_external($href_match[1])) {
+                                continue; // skip if we don't cache externals and this file is external
+                            }
+
+                            // do not include anything in excluded list
+                            $skip = false;
+                            $exclusions = array_merge($this->default_exclude, $wpm_options['css_exclude']);
+                            foreach ($exclusions as $exclude_pat) {
+                                $exclude_pat = trim($exclude_pat);
+                                if (strlen($exclude_pat) > 0 && strpos($href_match[1], $exclude_pat) !== false) {
+                                    $skip = true;
+                                    break;
+                                }
+                            }
+                            if ($skip) continue;
+                        }
+
+                        $content = str_replace($link_tag . '</link>', '', $content);
+                        $content = str_replace($link_tag, '', $content);
+                        $css_locations[] = $this->get_css_location($href_match[1]);
+                    }
+                }
+            }
+        }
+
+        $css_locations = array_unique($css_locations);
+
+        return array($content, $css_locations);
+    }
+
+    function inject_css($content, $css_locations) {
+        if (count($css_locations) > 0) {
+            $wpm_options = get_option($this->name);
+            // build minify URLS
+            $css_tags = '';
+            $minify_urls = $this->build_minify_urls($css_locations, '.css');
+
+            foreach ($minify_urls as $minify_url) {
+                $minify_url = apply_filters('wp_minify_css_url', $minify_url); // Allow plugins to modify final minify URL
+                $css_tags .= "<link rel='stylesheet' href='$minify_url' type='text/css' media='screen' />";
+            }
+
+            $matches = preg_match('/<!-- WP-Minify CSS -->/', $content);
+
+            if ($matches) {
+                $content = preg_replace('/<!-- WP-Minify CSS -->/', "$css_tags", $content, 1); // limit 1 replacement
+            } else {
+                // HTML5 has <header> tags so account for those in regex
+                $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$css_tags", $content, 1); // limit 1 replacement
+            }
+        }
+        return $content;
+    }
+
+    function extract_conditionals($content) {
+        preg_match_all('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', $content, $conditionals_match);
+        $content = preg_replace('/<!--\[if[^\]]*?\]>.*?<!\[endif\]-->/is', '###WPM-CSS-CONDITIONAL###', $content);
+
+        $conditionals = array();
+        foreach ($conditionals_match[0] as $conditional) {
+            $conditionals[] = $conditional;
+        }
+
+        return array($content, $conditionals);
+    }
+
+    function inject_conditionals($content, $conditionals) {
+        while (count($conditionals) > 0 && strpos($content, '###WPM-CSS-CONDITIONAL###')) {
+            $conditional = array_shift($conditionals);
+            $content = preg_replace('/###WPM-CSS-CONDITIONAL###/', $conditional, $content, 1);
+        }
+
+        return $content;
+    }
+
+    function extract_js($content) {
+        $wpm_options = get_option($this->name);
+        $js_locations = array();
+        
+        if ($wpm_options['js_placement'] === 'header-footer') {
+            // Header and footer
+            $split = explode('</head>', $content); // Head tag required
+            preg_match_all('/<script([^>]*?)><\/script>/i', $split[0], $script_tags_match); // Header scripts
+            preg_match_all('/<script([^>]*?)><\/script>/i', $split[1], $script_tags_footer_match); // Footer scripts
+        } else {
+            // Only one placement
+            preg_match_all('/<script([^>]*?)><\/script>/i', $content, $script_tags_match);
+        }
+
+        foreach ($script_tags_match[0] as $script_tag) {
+            preg_match('/src=[\'"]([^\'"]+)/', $script_tag, $src_match);
+            if ($src_match[1]) {
+                // include it if it is in the include list
+                $include = false;
+                $inclusions = $wpm_options['js_include'];
+                foreach ($inclusions as $include_pat) {
+                    $include_pat = trim($include_pat);
+                    if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
+                        $include = true;
+                        break;
+                    }
+                }
+
+                if (!$include) {
+                    // support external files?
+                    if (!$wpm_options['cache_external'] && $this->is_external($src_match[1])) {
+                        continue; // skip if we don't cache externals and this file is external
+                    }
+
+                    // do not include anything in excluded list
+                    $skip = false;
+                    $exclusions = array_merge($this->default_exclude, $wpm_options['js_exclude']);
+                    foreach ($exclusions as $exclude_pat) {
+                        $exclude_pat = trim($exclude_pat);
+                        if (strlen($exclude_pat) > 0 && strpos($src_match[1], $exclude_pat) !== false) {
+                            $skip = true;
+                            break;
+                        }
+                    }
+                    if ($skip) continue;
+                }
+
+                $content = str_replace($script_tag, '', $content);
+                $js_locations[] = $this->get_js_location($src_match[1]);
+            }
+        }
+
+        $js_locations = array_unique($js_locations);
+        
+        if ($wpm_options['js_placement'] === 'header-footer') {
+            foreach ($script_tags_footer_match[0] as $script_tag) {
+                preg_match('/src=[\'"]([^\'"]+)/', $script_tag, $src_match);
+                if ($src_match[1]) {
+                    // include it if it is in the include list
+                    $include = false;
+                    $inclusions = $wpm_options['js_include'];
+                    foreach ($inclusions as $include_pat) {
+                        $include_pat = trim($include_pat);
+                        if (strlen($include_pat) > 0 && strpos($src_match[1], $include_pat) !== false) {
+                            $include = true;
+                            break;
+                        }
+                    }
+    
+                    if (!$include) {
+                        // support external files?
+                        if (!$wpm_options['cache_external'] && $this->is_external($src_match[1])) {
+                            continue; // skip if we don't cache externals and this file is external
+                        }
+    
+                        // do not include anything in excluded list
+                        $skip = false;
+                        $exclusions = array_merge($this->default_exclude, $wpm_options['js_exclude']);
+                        foreach ($exclusions as $exclude_pat) {
+                            $exclude_pat = trim($exclude_pat);
+                            if (strlen($exclude_pat) > 0 && strpos($src_match[1], $exclude_pat) !== false) {
+                                $skip = true;
+                                break;
+                            }
+                        }
+                        if ($skip) continue;
+                    }
+    
+                    $content = str_replace($script_tag, '', $content);
+                    $js_locations_footer[] = $this->get_js_location($src_match[1]);
+                }
+            }
+    
+            $js_locations_footer = array_unique($js_locations_footer);
+        }
+
+        return array($content, $js_locations, $js_locations_footer);
+    }
+
+    function inject_js($content, $js_locations, $js_locations_footer) {
+        if (count($js_locations) > 0) {
+            // build minify URLS
+            $js_tags = '';
+            $minify_urls = $this->build_minify_urls($js_locations, '.js');
+            if ($js_locations_footer) {
+                $minify_urls_footer = $this->build_minify_urls($js_locations_footer, '.js');
+            }
+            
+            $placeholderRemoved = false;
+
+            // Primary placement
+            foreach ($minify_urls as $minify_url) {
+                echo $minify_url;
+                $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
+                $js_tags .= "<script type=\"text/javascript\" src=\"$minify_url\"". ($wpm_options['js_async'] === true && $wpm_options['js_placement'] !== 'footer' ? ' async' : '') ."></script>";
+            }
+
+            $matches = preg_match('/<!-- WP-Minify JS -->/', $content);
+
+            if ($matches) {
+                $content = preg_replace('/<!-- WP-Minify JS -->/', "$js_tags", $content, 1); // limit 1 replacement
+            } else {
+                $wpm_options = get_option($this->name);
+                if ($wpm_options['js_placement'] === 'footer') {
+                    $content = preg_replace('/<!-- WP Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
+                    $placeholderRemoved = true;
+                } else {
+                    // HTML5 has <header> tags so account for those in regex
+                    $content = preg_replace('/<head(>|\s[^>]*?>)/', "\\0\n$js_tags", $content, 1); // limit 1 replacement
+                }
+            }
+        
+            // If separate footer
+            if ($js_locations_footer) {
+                foreach ($minify_urls_footer as $minify_url) {
+                    $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
+                    $js_tags .= "<script type='text/javascript' src='$minify_url'></script>";
+                }
+    
+                $matches = preg_match('/<!-- WP-Minify JS Footer -->/', $content);
+    
+                if ($matches) {
+                    $content = preg_replace('/<!-- WP-Minify JS Footer -->/', "$js_tags", $content, 1); // limit 1 replacement
+                } else {
+                    $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
+                    $placeholderRemoved = true;
+                }
+            }
+            
+            // If necessary, remove placeholder comment
+            if ($placeholderRemoved === false) {
+                $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
+            }
+        }
+        return $content;
+    }
+
+    function pre_content() {
+        if ( is_feed() ) return;
+        $wpm_options = get_option($this->name);
+        if ($wpm_options['uri_exclude'] && count($wpm_options['uri_exclude'])) {
+            foreach ($wpm_options['uri_exclude'] as $exclude_pat) {
+                $exclude_pat = trim($exclude_pat);
+                if (strlen($exclude_pat) > 0 && strpos($_SERVER['REQUEST_URI'], $exclude_pat) !== false) {
+                    return;
+                }
+            }
+        }
+
+        ob_start(array($this, 'modify_buffer'));
+
+        // variable for sanity checking
+        $this->buffer_started = true;
+    }
+
+    function modify_buffer($buffer) {
+        $wpm_options = get_option($this->name);
+
+        // if we do not want to force http to https then we need to exclude https
+        if (!($wpm_options['force_https'] && $_SERVER["HTTPS"] == "on")) {
+            $this->default_exclude[] = 'https://';
+        }
+
+        // minify JS
+        if ($wpm_options['enable_js']) {
+            list($buffer, $js_locations, $js_locations_footer) = $this->extract_js($buffer);
+            $buffer= $this->inject_js($buffer, $js_locations, $js_locations_footer);
+        }
+
+        // minify CSS (make sure to exclude CSS conditionals)
+        if ($wpm_options['enable_css']) {
+            list($buffer, $conditionals) = $this->extract_conditionals($buffer);
+            list($buffer, $css_locations) = $this->extract_css($buffer);
+            $buffer = $this->inject_css($buffer, $css_locations);
+            $buffer = $this->inject_conditionals($buffer, $conditionals);
+        }
+
+        // get rid of empty lines
+        $buffer = preg_replace('/\s*(\r?\n)(\r?\n)*/', '$1', $buffer);
+
+        // minify HTML
+        if ($wpm_options['enable_html']) {
+            if (!class_exists('Minify_HTML')) {
+                require_once('min/lib/Minify/HTML.php');
+            }
+            $buffer = Minify_HTML::minify($buffer);
+        }
+
+        $buffer = apply_filters('wp_minify_content', $buffer); // allow plugins to modify buffer
+
+        return $buffer;
+    }
+
+    function post_content() {
+        if ( is_feed() ) return;
+        // sanity checking
+        if ($this->buffer_started) {
+            ob_end_flush();
+        }
+    }
+    
+    function footer_placeholder() {
+            printf('<!-- WP-Minify Footer Placeholder -->');
+    }
+
+    function advertise() {
+        $wpm_options = get_option($this->name);
+        if ($wpm_options['show_link']) {
+            printf("<p align='center'><small>Page optimized by <a href='$this->homepage' title='$this->name_proper WordPress Plugin' style='text-decoration:none;'>$this->name_proper</a> <a href='$this->author_homepage' title='WordPress Plugin' style='text-decoration:none;'>WordPress Plugin</a></small></p>");
+        }
+    }
 
 } // class WPMinify