futtta /
autoptimize
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html)); |
| 72 | 72 | if (isset($options['xhtml'])) { |
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) { |
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | 115 | $this->_html = preg_replace_callback( |
| 116 | 116 | '/<!--([\\s\\S]*?)-->/' |
| 117 | 117 | ,array($this, '_commentCB') |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | protected function _reservePlace($content) |
| 175 | 175 | { |
| 176 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 176 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 177 | 177 | $this->_placeholders[$placeholder] = $content; |
| 178 | 178 | return $placeholder; |
| 179 | 179 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
| 190 | - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; |
|
| 190 | + return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | protected function _removePreCB($m) |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | protected function _removeCdata($str) |
| 260 | 260 | { |
| 261 | 261 | return (false !== strpos($str, '<![CDATA[')) |
| 262 | - ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str) |
|
| 262 | + ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 263 | 263 | : $str; |
| 264 | 264 | } |
| 265 | 265 | |
@@ -3,12 +3,12 @@ discard block |
||
| 3 | 3 | * WP-CLI commands for Autoptimize. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // This is a WP-CLI command, so bail if it's not available. |
| 11 | -if ( ! defined( 'WP_CLI' ) ) { |
|
| 11 | +if (!defined('WP_CLI')) { |
|
| 12 | 12 | return; |
| 13 | 13 | } |
| 14 | 14 | |
@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | * |
| 25 | 25 | * @return void |
| 26 | 26 | */ |
| 27 | - public function clear( $args, $args_assoc ) { |
|
| 28 | - WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) ); |
|
| 27 | + public function clear($args, $args_assoc) { |
|
| 28 | + WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize')); |
|
| 29 | 29 | autoptimizeCache::clearall(); |
| 30 | - WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) ); |
|
| 30 | + WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize')); |
|
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' ); |
|
| 34 | +WP_CLI::add_command('autoptimize', 'autoptimizeCLI'); |
|
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | * addons and/or affiliate services. |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 7 | +if (!defined('ABSPATH')) { |
|
| 8 | 8 | exit; |
| 9 | 9 | } |
| 10 | 10 | |
@@ -17,64 +17,64 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function run() |
| 19 | 19 | { |
| 20 | - if ( $this->enabled() ) { |
|
| 21 | - add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_partner_tabs' ), 10, 1 ); |
|
| 20 | + if ($this->enabled()) { |
|
| 21 | + add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_partner_tabs'), 10, 1); |
|
| 22 | 22 | } |
| 23 | - add_action( 'admin_menu', array( $this, 'add_admin_menu' ) ); |
|
| 23 | + add_action('admin_menu', array($this, 'add_admin_menu')); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | protected function enabled() |
| 27 | 27 | { |
| 28 | - return apply_filters( 'autoptimize_filter_show_partner_tabs', true ); |
|
| 28 | + return apply_filters('autoptimize_filter_show_partner_tabs', true); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - public function add_partner_tabs( $in ) |
|
| 31 | + public function add_partner_tabs($in) |
|
| 32 | 32 | { |
| 33 | - $in = array_merge( $in, array( |
|
| 34 | - 'ao_partners' => __( 'Optimize More!', 'autoptimize' ), |
|
| 35 | - ) ); |
|
| 33 | + $in = array_merge($in, array( |
|
| 34 | + 'ao_partners' => __('Optimize More!', 'autoptimize'), |
|
| 35 | + )); |
|
| 36 | 36 | |
| 37 | 37 | return $in; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function add_admin_menu() |
| 41 | 41 | { |
| 42 | - if ( $this->enabled() ) { |
|
| 43 | - add_submenu_page( null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array( $this, 'ao_partners_page' ) ); |
|
| 42 | + if ($this->enabled()) { |
|
| 43 | + add_submenu_page(null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array($this, 'ao_partners_page')); |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | protected function get_ao_partner_feed_markup() |
| 48 | 48 | { |
| 49 | - $no_feed_text = __( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' ); |
|
| 49 | + $no_feed_text = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize'); |
|
| 50 | 50 | $output = ''; |
| 51 | - if ( apply_filters( 'autoptimize_settingsscreen_remotehttp', true ) ) { |
|
| 52 | - $rss = fetch_feed( 'http://feeds.feedburner.com/OptimizingMattersDownloads' ); |
|
| 51 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 52 | + $rss = fetch_feed('http://feeds.feedburner.com/OptimizingMattersDownloads'); |
|
| 53 | 53 | $maxitems = 0; |
| 54 | 54 | |
| 55 | - if ( ! is_wp_error( $rss ) ) { |
|
| 56 | - $maxitems = $rss->get_item_quantity( 20 ); |
|
| 57 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
| 55 | + if (!is_wp_error($rss)) { |
|
| 56 | + $maxitems = $rss->get_item_quantity(20); |
|
| 57 | + $rss_items = $rss->get_items(0, $maxitems); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - if ( 0 == $maxitems ) { |
|
| 60 | + if (0 == $maxitems) { |
|
| 61 | 61 | $output .= $no_feed_text; |
| 62 | 62 | } else { |
| 63 | 63 | $output .= '<ul>'; |
| 64 | - foreach ( $rss_items as $item ) { |
|
| 65 | - $item_url = esc_url( $item->get_permalink() ); |
|
| 64 | + foreach ($rss_items as $item) { |
|
| 65 | + $item_url = esc_url($item->get_permalink()); |
|
| 66 | 66 | $enclosure = $item->get_enclosure(); |
| 67 | 67 | |
| 68 | 68 | $output .= '<li class="itemDetail">'; |
| 69 | - $output .= '<h3 class="itemTitle"><a href="' . $item_url . '" target="_blank">' . esc_html( $item->get_title() ) . '</a></h3>'; |
|
| 69 | + $output .= '<h3 class="itemTitle"><a href="'.$item_url.'" target="_blank">'.esc_html($item->get_title()).'</a></h3>'; |
|
| 70 | 70 | |
| 71 | - if ( $enclosure && ( false !== strpos( $enclosure->get_type(), 'image' ) ) ) { |
|
| 72 | - $img_url = esc_url( $enclosure->get_link() ); |
|
| 73 | - $output .= '<div class="itemImage"><a href="' . $item_url . '" target="_blank"><img src="' . $img_url . '"></a></div>'; |
|
| 71 | + if ($enclosure && (false !== strpos($enclosure->get_type(), 'image'))) { |
|
| 72 | + $img_url = esc_url($enclosure->get_link()); |
|
| 73 | + $output .= '<div class="itemImage"><a href="'.$item_url.'" target="_blank"><img src="'.$img_url.'"></a></div>'; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - $output .= '<div class="itemDescription">' . wp_kses_post( $item->get_description() ) . '</div>'; |
|
| 77 | - $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="' . $item_url . '" target="_blank">' . __( 'More info', 'autoptimize' ) . '</a></div></div>'; |
|
| 76 | + $output .= '<div class="itemDescription">'.wp_kses_post($item->get_description()).'</div>'; |
|
| 77 | + $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="'.$item_url.'" target="_blank">'.__('More info', 'autoptimize').'</a></div></div>'; |
|
| 78 | 78 | $output .= '</li>'; |
| 79 | 79 | } |
| 80 | 80 | $output .= '</ul>'; |
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | </style> |
| 135 | 135 | <div class="wrap"> |
| 136 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
| 136 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
| 137 | 137 | <?php echo autoptimizeConfig::ao_admin_tabs(); ?> |
| 138 | - <?php echo '<h2>' . __( "These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize' ) . '</h2>'; ?> |
|
| 138 | + <?php echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>'; ?> |
|
| 139 | 139 | <div> |
| 140 | 140 | <?php echo $this->get_ao_partner_feed_markup(); ?> |
| 141 | 141 | </div> |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Thin wrapper around css minifiers to avoid rewriting a bunch of existing code. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -21,9 +21,9 @@ discard block |
||
| 21 | 21 | * |
| 22 | 22 | * @param bool $raise_limits Whether to raise memory limits or not. Default true. |
| 23 | 23 | */ |
| 24 | - public function __construct( $raise_limits = true ) |
|
| 24 | + public function __construct($raise_limits = true) |
|
| 25 | 25 | { |
| 26 | - $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier( $raise_limits ); |
|
| 26 | + $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier($raise_limits); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @return string |
| 36 | 36 | */ |
| 37 | - public function run( $css ) |
|
| 37 | + public function run($css) |
|
| 38 | 38 | { |
| 39 | - $result = $this->minifier->run( $css ); |
|
| 39 | + $result = $this->minifier->run($css); |
|
| 40 | 40 | |
| 41 | 41 | return $result; |
| 42 | 42 | } |
@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | * |
| 49 | 49 | * @return string |
| 50 | 50 | */ |
| 51 | - public static function minify( $css ) |
|
| 51 | + public static function minify($css) |
|
| 52 | 52 | { |
| 53 | 53 | $minifier = new self(); |
| 54 | 54 | |
| 55 | - return $minifier->run( $css ); |
|
| 55 | + return $minifier->run($css); |
|
| 56 | 56 | } |
| 57 | 57 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Handles version updates and should only be instantiated in autoptimize.php if/when needed. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -16,9 +16,9 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | protected $current_major_version = null; |
| 18 | 18 | |
| 19 | - public function __construct( $current_version ) |
|
| 19 | + public function __construct($current_version) |
|
| 20 | 20 | { |
| 21 | - $this->current_major_version = substr( $current_version, 0, 3 ); |
|
| 21 | + $this->current_major_version = substr($current_version, 0, 3); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $major_update = false; |
| 31 | 31 | |
| 32 | - switch ( $this->current_major_version ) { |
|
| 32 | + switch ($this->current_major_version) { |
|
| 33 | 33 | case '1.6': |
| 34 | 34 | $this->upgrade_from_1_6(); |
| 35 | 35 | $major_update = true; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | // No break, intentionally, so all upgrades are ran during a single request... |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - if ( true === $major_update ) { |
|
| 51 | + if (true === $major_update) { |
|
| 52 | 52 | $this->on_major_version_update(); |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -60,19 +60,19 @@ discard block |
||
| 60 | 60 | * |
| 61 | 61 | * @param string $target Target version to check against (ie., the currently running one). |
| 62 | 62 | */ |
| 63 | - public static function check_installed_and_update( $target ) |
|
| 63 | + public static function check_installed_and_update($target) |
|
| 64 | 64 | { |
| 65 | - $db_version = get_option( 'autoptimize_version', 'none' ); |
|
| 66 | - if ( $db_version !== $target ) { |
|
| 67 | - if ( 'none' === $db_version ) { |
|
| 68 | - add_action( 'admin_notices', 'autoptimizeMain::notice_installed' ); |
|
| 65 | + $db_version = get_option('autoptimize_version', 'none'); |
|
| 66 | + if ($db_version !== $target) { |
|
| 67 | + if ('none' === $db_version) { |
|
| 68 | + add_action('admin_notices', 'autoptimizeMain::notice_installed'); |
|
| 69 | 69 | } else { |
| 70 | - $updater = new self( $db_version ); |
|
| 70 | + $updater = new self($db_version); |
|
| 71 | 71 | $updater->run_needed_major_upgrades(); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // Versions differed, upgrades happened if needed, store the new version. |
| 75 | - update_option( 'autoptimize_version', $target ); |
|
| 75 | + update_option('autoptimize_version', $target); |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
@@ -83,10 +83,10 @@ discard block |
||
| 83 | 83 | protected function on_major_version_update() |
| 84 | 84 | { |
| 85 | 85 | // The transients guard here prevents stale object caches from busting the cache on every request. |
| 86 | - if ( false == get_transient( 'autoptimize_stale_option_buster' ) ) { |
|
| 87 | - set_transient( 'autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS ); |
|
| 86 | + if (false == get_transient('autoptimize_stale_option_buster')) { |
|
| 87 | + set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS); |
|
| 88 | 88 | autoptimizeCache::clearall(); |
| 89 | - add_action( 'admin_notices', 'autoptimizeMain::notice_updated' ); |
|
| 89 | + add_action('admin_notices', 'autoptimizeMain::notice_updated'); |
|
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | private function upgrade_from_1_6() |
| 97 | 97 | { |
| 98 | 98 | // If user was on version 1.6.x, force advanced options to be shown by default. |
| 99 | - update_option( 'autoptimize_show_adv', '1' ); |
|
| 99 | + update_option('autoptimize_show_adv', '1'); |
|
| 100 | 100 | |
| 101 | 101 | // And remove old options. |
| 102 | 102 | $to_delete_options = array( |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | 'autoptimize_cdn_img_url', |
| 109 | 109 | 'autoptimize_css_yui', |
| 110 | 110 | ); |
| 111 | - foreach ( $to_delete_options as $del_opt ) { |
|
| 112 | - delete_option( $del_opt ); |
|
| 111 | + foreach ($to_delete_options as $del_opt) { |
|
| 112 | + delete_option($del_opt); |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | |
@@ -120,29 +120,29 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | private function upgrade_from_1_7() |
| 122 | 122 | { |
| 123 | - if ( ! is_multisite() ) { |
|
| 124 | - $css_exclude = get_option( 'autoptimize_css_exclude' ); |
|
| 125 | - if ( empty( $css_exclude ) ) { |
|
| 123 | + if (!is_multisite()) { |
|
| 124 | + $css_exclude = get_option('autoptimize_css_exclude'); |
|
| 125 | + if (empty($css_exclude)) { |
|
| 126 | 126 | $css_exclude = 'admin-bar.min.css, dashicons.min.css'; |
| 127 | - } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) { |
|
| 127 | + } elseif (false === strpos($css_exclude, 'dashicons.min.css')) { |
|
| 128 | 128 | $css_exclude .= ', dashicons.min.css'; |
| 129 | 129 | } |
| 130 | - update_option( 'autoptimize_css_exclude', $css_exclude ); |
|
| 130 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 131 | 131 | } else { |
| 132 | 132 | global $wpdb; |
| 133 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 133 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 134 | 134 | $original_blog_id = get_current_blog_id(); |
| 135 | - foreach ( $blog_ids as $blog_id ) { |
|
| 136 | - switch_to_blog( $blog_id ); |
|
| 137 | - $css_exclude = get_option( 'autoptimize_css_exclude' ); |
|
| 138 | - if ( empty( $css_exclude ) ) { |
|
| 135 | + foreach ($blog_ids as $blog_id) { |
|
| 136 | + switch_to_blog($blog_id); |
|
| 137 | + $css_exclude = get_option('autoptimize_css_exclude'); |
|
| 138 | + if (empty($css_exclude)) { |
|
| 139 | 139 | $css_exclude = 'admin-bar.min.css, dashicons.min.css'; |
| 140 | - } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) { |
|
| 140 | + } elseif (false === strpos($css_exclude, 'dashicons.min.css')) { |
|
| 141 | 141 | $css_exclude .= ', dashicons.min.css'; |
| 142 | 142 | } |
| 143 | - update_option( 'autoptimize_css_exclude', $css_exclude ); |
|
| 143 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 144 | 144 | } |
| 145 | - switch_to_blog( $original_blog_id ); |
|
| 145 | + switch_to_blog($original_blog_id); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | |
@@ -154,19 +154,19 @@ discard block |
||
| 154 | 154 | */ |
| 155 | 155 | private function upgrade_from_1_9() |
| 156 | 156 | { |
| 157 | - if ( ! is_multisite() ) { |
|
| 158 | - update_option( 'autoptimize_css_include_inline', 'on' ); |
|
| 159 | - update_option( 'autoptimize_js_include_inline', 'on' ); |
|
| 157 | + if (!is_multisite()) { |
|
| 158 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 159 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 160 | 160 | } else { |
| 161 | 161 | global $wpdb; |
| 162 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 162 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 163 | 163 | $original_blog_id = get_current_blog_id(); |
| 164 | - foreach ( $blog_ids as $blog_id ) { |
|
| 165 | - switch_to_blog( $blog_id ); |
|
| 166 | - update_option( 'autoptimize_css_include_inline', 'on' ); |
|
| 167 | - update_option( 'autoptimize_js_include_inline', 'on' ); |
|
| 164 | + foreach ($blog_ids as $blog_id) { |
|
| 165 | + switch_to_blog($blog_id); |
|
| 166 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 167 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 168 | 168 | } |
| 169 | - switch_to_blog( $original_blog_id ); |
|
| 169 | + switch_to_blog($original_blog_id); |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
@@ -177,17 +177,17 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | private function upgrade_from_2_2() |
| 179 | 179 | { |
| 180 | - if ( ! is_multisite() ) { |
|
| 180 | + if (!is_multisite()) { |
|
| 181 | 181 | $this->do_2_2_settings_update(); |
| 182 | 182 | } else { |
| 183 | 183 | global $wpdb; |
| 184 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 184 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 185 | 185 | $original_blog_id = get_current_blog_id(); |
| 186 | - foreach ( $blog_ids as $blog_id ) { |
|
| 187 | - switch_to_blog( $blog_id ); |
|
| 186 | + foreach ($blog_ids as $blog_id) { |
|
| 187 | + switch_to_blog($blog_id); |
|
| 188 | 188 | $this->do_2_2_settings_update(); |
| 189 | 189 | } |
| 190 | - switch_to_blog( $original_blog_id ); |
|
| 190 | + switch_to_blog($original_blog_id); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
@@ -196,11 +196,11 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | private function do_2_2_settings_update() |
| 198 | 198 | { |
| 199 | - $nogooglefont = get_option( 'autoptimize_css_nogooglefont', '' ); |
|
| 200 | - $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' ); |
|
| 201 | - if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) { |
|
| 202 | - update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() ); |
|
| 199 | + $nogooglefont = get_option('autoptimize_css_nogooglefont', ''); |
|
| 200 | + $ao_extrasetting = get_option('autoptimize_extra_settings', ''); |
|
| 201 | + if (($nogooglefont) && (empty($ao_extrasetting))) { |
|
| 202 | + update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options()); |
|
| 203 | 203 | } |
| 204 | - delete_option( 'autoptimize_css_nogooglefont' ); |
|
| 204 | + delete_option('autoptimize_css_nogooglefont'); |
|
| 205 | 205 | } |
| 206 | 206 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | * new in Autoptimize 2.2 |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 7 | +if (!defined('ABSPATH')) { |
|
| 8 | 8 | exit; |
| 9 | 9 | } |
| 10 | 10 | |
@@ -17,94 +17,94 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function add_hooks() |
| 19 | 19 | { |
| 20 | - if ( apply_filters( 'autoptimize_js_do_minify', true ) ) { |
|
| 21 | - add_filter( 'autoptimize_js_individual_script', array( $this, 'js_snippetcacher' ), 10, 2 ); |
|
| 22 | - add_filter( 'autoptimize_js_after_minify', array( $this, 'js_cleanup' ), 10, 1 ); |
|
| 20 | + if (apply_filters('autoptimize_js_do_minify', true)) { |
|
| 21 | + add_filter('autoptimize_js_individual_script', array($this, 'js_snippetcacher'), 10, 2); |
|
| 22 | + add_filter('autoptimize_js_after_minify', array($this, 'js_cleanup'), 10, 1); |
|
| 23 | 23 | } |
| 24 | - if ( apply_filters( 'autoptimize_css_do_minify', true ) ) { |
|
| 25 | - add_filter( 'autoptimize_css_individual_style', array( $this, 'css_snippetcacher' ), 10, 2 ); |
|
| 26 | - add_filter( 'autoptimize_css_after_minify', array( $this, 'css_cleanup' ), 10, 1 ); |
|
| 24 | + if (apply_filters('autoptimize_css_do_minify', true)) { |
|
| 25 | + add_filter('autoptimize_css_individual_style', array($this, 'css_snippetcacher'), 10, 2); |
|
| 26 | + add_filter('autoptimize_css_after_minify', array($this, 'css_cleanup'), 10, 1); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function js_snippetcacher( $jsin, $jsfilename ) |
|
| 30 | + public function js_snippetcacher($jsin, $jsfilename) |
|
| 31 | 31 | { |
| 32 | - $md5hash = 'snippet_' . md5( $jsin ); |
|
| 33 | - $ccheck = new autoptimizeCache( $md5hash, 'js' ); |
|
| 34 | - if ( $ccheck->check() ) { |
|
| 32 | + $md5hash = 'snippet_'.md5($jsin); |
|
| 33 | + $ccheck = new autoptimizeCache($md5hash, 'js'); |
|
| 34 | + if ($ccheck->check()) { |
|
| 35 | 35 | $scriptsrc = $ccheck->retrieve(); |
| 36 | 36 | } else { |
| 37 | - if ( false === ( strpos( $jsfilename, 'min.js' ) ) && ( false === strpos( $jsfilename, 'js/jquery/jquery.js' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_js_consider_minified', false ), '', $jsfilename ) === $jsfilename ) ) { |
|
| 38 | - $tmp_jscode = trim( JSMin::minify( $jsin ) ); |
|
| 39 | - if ( ! empty( $tmp_jscode ) ) { |
|
| 37 | + if (false === (strpos($jsfilename, 'min.js')) && (false === strpos($jsfilename, 'js/jquery/jquery.js')) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) { |
|
| 38 | + $tmp_jscode = trim(JSMin::minify($jsin)); |
|
| 39 | + if (!empty($tmp_jscode)) { |
|
| 40 | 40 | $scriptsrc = $tmp_jscode; |
| 41 | - unset( $tmp_jscode ); |
|
| 41 | + unset($tmp_jscode); |
|
| 42 | 42 | } else { |
| 43 | 43 | $scriptsrc = $jsin; |
| 44 | 44 | } |
| 45 | 45 | } else { |
| 46 | 46 | // Removing comments, linebreaks and stuff! |
| 47 | - $scriptsrc = preg_replace( '#^\s*\/\/.*$#Um', '', $jsin ); |
|
| 48 | - $scriptsrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc ); |
|
| 49 | - $scriptsrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc ); |
|
| 47 | + $scriptsrc = preg_replace('#^\s*\/\/.*$#Um', '', $jsin); |
|
| 48 | + $scriptsrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc); |
|
| 49 | + $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - $last_char = substr( $scriptsrc, -1, 1 ); |
|
| 53 | - if ( ';' !== $last_char && '}' !== $last_char ) { |
|
| 52 | + $last_char = substr($scriptsrc, -1, 1); |
|
| 53 | + if (';' !== $last_char && '}' !== $last_char) { |
|
| 54 | 54 | $scriptsrc .= ';'; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - if ( ! empty( $jsfilename ) && str_replace( apply_filters( 'autoptimize_filter_js_speedup_cache', false ), '', $jsfilename ) === $jsfilename ) { |
|
| 57 | + if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) { |
|
| 58 | 58 | // Don't cache inline CSS or if filter says no! |
| 59 | - $ccheck->cache( $scriptsrc, 'text/javascript' ); |
|
| 59 | + $ccheck->cache($scriptsrc, 'text/javascript'); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | - unset( $ccheck ); |
|
| 62 | + unset($ccheck); |
|
| 63 | 63 | |
| 64 | 64 | return $scriptsrc; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function css_snippetcacher( $cssin, $cssfilename ) |
|
| 67 | + public function css_snippetcacher($cssin, $cssfilename) |
|
| 68 | 68 | { |
| 69 | - $md5hash = 'snippet_' . md5( $cssin ); |
|
| 70 | - $ccheck = new autoptimizeCache( $md5hash, 'css' ); |
|
| 71 | - if ( $ccheck->check() ) { |
|
| 69 | + $md5hash = 'snippet_'.md5($cssin); |
|
| 70 | + $ccheck = new autoptimizeCache($md5hash, 'css'); |
|
| 71 | + if ($ccheck->check()) { |
|
| 72 | 72 | $stylesrc = $ccheck->retrieve(); |
| 73 | 73 | } else { |
| 74 | - if ( ( false === strpos( $cssfilename, 'min.css' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_css_consider_minified', false ), '', $cssfilename ) === $cssfilename ) ) { |
|
| 74 | + if ((false === strpos($cssfilename, 'min.css')) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) { |
|
| 75 | 75 | $cssmin = new autoptimizeCSSmin(); |
| 76 | - $tmp_code = trim( $cssmin->run( $cssin ) ); |
|
| 76 | + $tmp_code = trim($cssmin->run($cssin)); |
|
| 77 | 77 | |
| 78 | - if ( ! empty( $tmp_code ) ) { |
|
| 78 | + if (!empty($tmp_code)) { |
|
| 79 | 79 | $stylesrc = $tmp_code; |
| 80 | - unset( $tmp_code ); |
|
| 80 | + unset($tmp_code); |
|
| 81 | 81 | } else { |
| 82 | 82 | $stylesrc = $cssin; |
| 83 | 83 | } |
| 84 | 84 | } else { |
| 85 | 85 | // .min.css -> no heavy-lifting, just some cleanup! |
| 86 | - $stylesrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin ); |
|
| 87 | - $stylesrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc ); |
|
| 88 | - $stylesrc = autoptimizeStyles::fixurls( $cssfilename, $stylesrc ); |
|
| 86 | + $stylesrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin); |
|
| 87 | + $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc); |
|
| 88 | + $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc); |
|
| 89 | 89 | } |
| 90 | - if ( ! empty( $cssfilename ) && ( str_replace( apply_filters( 'autoptimize_filter_css_speedup_cache', false ), '', $cssfilename ) === $cssfilename ) ) { |
|
| 90 | + if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) { |
|
| 91 | 91 | // Only caching CSS if it's not inline and is allowed by filter! |
| 92 | - $ccheck->cache( $stylesrc, 'text/css' ); |
|
| 92 | + $ccheck->cache($stylesrc, 'text/css'); |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | - unset( $ccheck ); |
|
| 95 | + unset($ccheck); |
|
| 96 | 96 | |
| 97 | 97 | return $stylesrc; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - public function css_cleanup( $cssin ) |
|
| 100 | + public function css_cleanup($cssin) |
|
| 101 | 101 | { |
| 102 | 102 | // Speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating needs to be removed. |
| 103 | - return trim( str_replace( array( '/*FILESTART*/', '/*FILESTART2*/' ), '', $cssin ) ); |
|
| 103 | + return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - public function js_cleanup( $jsin ) |
|
| 106 | + public function js_cleanup($jsin) |
|
| 107 | 107 | { |
| 108 | - return trim( $jsin ); |
|
| 108 | + return trim($jsin); |
|
| 109 | 109 | } |
| 110 | 110 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Handles toolbar-related stuff. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -12,32 +12,32 @@ discard block |
||
| 12 | 12 | public function __construct() |
| 13 | 13 | { |
| 14 | 14 | // If Cache is not available we don't add the toolbar. |
| 15 | - if ( ! autoptimizeCache::cacheavail() ) { |
|
| 15 | + if (!autoptimizeCache::cacheavail()) { |
|
| 16 | 16 | return; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated. |
| 20 | - add_action( 'wp_loaded', array( $this, 'load_toolbar' ) ); |
|
| 20 | + add_action('wp_loaded', array($this, 'load_toolbar')); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | public function load_toolbar() |
| 24 | 24 | { |
| 25 | 25 | // Check permissions and that toolbar is not hidden via filter. |
| 26 | - if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) { |
|
| 26 | + if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) { |
|
| 27 | 27 | |
| 28 | 28 | // Create a handler for the AJAX toolbar requests. |
| 29 | - add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) ); |
|
| 29 | + add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache')); |
|
| 30 | 30 | |
| 31 | 31 | // Load custom styles, scripts and menu only when needed. |
| 32 | - if ( is_admin_bar_showing() ) { |
|
| 33 | - if ( is_admin() ) { |
|
| 34 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 32 | + if (is_admin_bar_showing()) { |
|
| 33 | + if (is_admin()) { |
|
| 34 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 35 | 35 | } else { |
| 36 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 36 | + add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // Add the Autoptimize Toolbar to the Admin bar. |
| 40 | - add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 ); |
|
| 40 | + add_action('admin_bar_menu', array($this, 'add_toolbar'), 100); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -50,17 +50,17 @@ discard block |
||
| 50 | 50 | $stats = autoptimizeCache::stats(); |
| 51 | 51 | |
| 52 | 52 | // Set the Max Size recommended for cache files. |
| 53 | - $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 ); |
|
| 53 | + $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024); |
|
| 54 | 54 | |
| 55 | 55 | // Retrieve the current Total Files in cache. |
| 56 | 56 | $files = $stats[0]; |
| 57 | 57 | // Retrieve the current Total Size of the cache. |
| 58 | 58 | $bytes = $stats[1]; |
| 59 | - $size = $this->format_filesize( $bytes ); |
|
| 59 | + $size = $this->format_filesize($bytes); |
|
| 60 | 60 | |
| 61 | 61 | // Calculate the percentage of cache used. |
| 62 | - $percentage = ceil( $bytes / $max_size * 100 ); |
|
| 63 | - if ( $percentage > 100 ) { |
|
| 62 | + $percentage = ceil($bytes/$max_size*100); |
|
| 63 | + if ($percentage > 100) { |
|
| 64 | 64 | $percentage = 100; |
| 65 | 65 | } |
| 66 | 66 | |
@@ -70,81 +70,81 @@ discard block |
||
| 70 | 70 | * - "orange" if over 80%. |
| 71 | 71 | * - "red" if over 100%. |
| 72 | 72 | */ |
| 73 | - $color = ( 100 == $percentage ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' ); |
|
| 73 | + $color = (100 == $percentage) ? 'red' : (($percentage > 80) ? 'orange' : 'green'); |
|
| 74 | 74 | |
| 75 | 75 | // Create or add new items into the Admin Toolbar. |
| 76 | 76 | // Main "Autoptimize" node. |
| 77 | - $wp_admin_bar->add_node( array( |
|
| 77 | + $wp_admin_bar->add_node(array( |
|
| 78 | 78 | 'id' => 'autoptimize', |
| 79 | - 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Autoptimize', 'autoptimize' ) . '</span>', |
|
| 80 | - 'href' => admin_url( 'options-general.php?page=autoptimize' ), |
|
| 81 | - 'meta' => array( 'class' => 'bullet-' . $color ), |
|
| 79 | + 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__('Autoptimize', 'autoptimize').'</span>', |
|
| 80 | + 'href' => admin_url('options-general.php?page=autoptimize'), |
|
| 81 | + 'meta' => array('class' => 'bullet-'.$color), |
|
| 82 | 82 | )); |
| 83 | 83 | |
| 84 | 84 | // "Cache Info" node. |
| 85 | - $wp_admin_bar->add_node( array( |
|
| 85 | + $wp_admin_bar->add_node(array( |
|
| 86 | 86 | 'id' => 'autoptimize-cache-info', |
| 87 | - 'title' => '<p>' . __( 'Cache Info', 'autoptimize' ) . '</p>' . |
|
| 88 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 89 | - '<div class="autoptimize-circle">' . |
|
| 90 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>' . |
|
| 91 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>' . |
|
| 92 | - '<div class="shadow"></div>' . |
|
| 93 | - '</div>' . |
|
| 94 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>' . |
|
| 95 | - '</div>' . |
|
| 96 | - '<table>' . |
|
| 97 | - '<tr><td>' . __( 'Size', 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 98 | - '<tr><td>' . __( 'Files', 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 87 | + 'title' => '<p>'.__('Cache Info', 'autoptimize').'</p>'. |
|
| 88 | + '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'. |
|
| 89 | + '<div class="autoptimize-circle">'. |
|
| 90 | + '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 91 | + '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 92 | + '<div class="shadow"></div>'. |
|
| 93 | + '</div>'. |
|
| 94 | + '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'. |
|
| 95 | + '</div>'. |
|
| 96 | + '<table>'. |
|
| 97 | + '<tr><td>'.__('Size', 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'. |
|
| 98 | + '<tr><td>'.__('Files', 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'. |
|
| 99 | 99 | '</table>', |
| 100 | 100 | 'parent' => 'autoptimize', |
| 101 | 101 | )); |
| 102 | 102 | |
| 103 | 103 | // "Delete Cache" node. |
| 104 | - $wp_admin_bar->add_node( array( |
|
| 104 | + $wp_admin_bar->add_node(array( |
|
| 105 | 105 | 'id' => 'autoptimize-delete-cache', |
| 106 | - 'title' => __( 'Delete Cache', 'autoptimize' ), |
|
| 106 | + 'title' => __('Delete Cache', 'autoptimize'), |
|
| 107 | 107 | 'parent' => 'autoptimize', |
| 108 | 108 | )); |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | public function delete_cache() |
| 112 | 112 | { |
| 113 | - check_ajax_referer( 'ao_delcache_nonce', 'nonce' ); |
|
| 113 | + check_ajax_referer('ao_delcache_nonce', 'nonce'); |
|
| 114 | 114 | |
| 115 | 115 | $result = false; |
| 116 | - if ( current_user_can( 'manage_options' ) ) { |
|
| 116 | + if (current_user_can('manage_options')) { |
|
| 117 | 117 | // We call the function for cleaning the Autoptimize cache. |
| 118 | 118 | $result = autoptimizeCache::clearall(); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - wp_send_json( $result ); |
|
| 121 | + wp_send_json($result); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | public function enqueue_scripts() |
| 125 | 125 | { |
| 126 | 126 | // Autoptimize Toolbar Styles. |
| 127 | - wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all' ); |
|
| 127 | + wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all'); |
|
| 128 | 128 | |
| 129 | 129 | // Autoptimize Toolbar Javascript. |
| 130 | - wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true ); |
|
| 130 | + wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), AUTOPTIMIZE_PLUGIN_VERSION, true); |
|
| 131 | 131 | |
| 132 | 132 | // Localizes a registered script with data for a JavaScript variable. |
| 133 | 133 | // Needed for the AJAX to work properly on the frontend. |
| 134 | - wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 135 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
| 136 | - 'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ), |
|
| 137 | - 'dismiss_msg' => __( 'Dismiss this notice.' ), |
|
| 138 | - 'nonce' => wp_create_nonce( 'ao_delcache_nonce' ), |
|
| 139 | - ) ); |
|
| 134 | + wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 135 | + 'ajaxurl' => admin_url('admin-ajax.php'), |
|
| 136 | + 'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'), |
|
| 137 | + 'dismiss_msg' => __('Dismiss this notice.'), |
|
| 138 | + 'nonce' => wp_create_nonce('ao_delcache_nonce'), |
|
| 139 | + )); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - public function format_filesize( $bytes, $decimals = 2 ) |
|
| 142 | + public function format_filesize($bytes, $decimals = 2) |
|
| 143 | 143 | { |
| 144 | - $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ); |
|
| 144 | + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 145 | 145 | |
| 146 | - for ( $i = 0; ( $bytes / 1024) > 0.9; $i++, $bytes /= 1024 ) {} // @codingStandardsIgnoreLine |
|
| 146 | + for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} // @codingStandardsIgnoreLine |
|
| 147 | 147 | |
| 148 | - return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[ $i ] ); |
|
| 148 | + return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * be inlined into a data: URI. Defaults to 4096, passed through |
| 283 | 283 | * `autoptimize_filter_css_datauri_maxsize` filter. |
| 284 | 284 | * |
| 285 | - * @return mixed |
|
| 285 | + * @return integer|null |
|
| 286 | 286 | */ |
| 287 | 287 | private function get_datauri_maxsize() |
| 288 | 288 | { |
@@ -303,6 +303,9 @@ discard block |
||
| 303 | 303 | return $max_size; |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | + /** |
|
| 307 | + * @param false|string $url |
|
| 308 | + */ |
|
| 306 | 309 | private function check_datauri_exclude_list( $url ) |
| 307 | 310 | { |
| 308 | 311 | static $exclude_list = null; |
@@ -328,6 +331,9 @@ discard block |
||
| 328 | 331 | return $matched; |
| 329 | 332 | } |
| 330 | 333 | |
| 334 | + /** |
|
| 335 | + * @param false|string $path |
|
| 336 | + */ |
|
| 331 | 337 | private function build_or_get_datauri_image( $path ) |
| 332 | 338 | { |
| 333 | 339 | /** |
@@ -746,6 +752,11 @@ discard block |
||
| 746 | 752 | return true; |
| 747 | 753 | } |
| 748 | 754 | |
| 755 | + /** |
|
| 756 | + * @param string $code |
|
| 757 | + * |
|
| 758 | + * @return string |
|
| 759 | + */ |
|
| 749 | 760 | public function run_minifier_on( $code ) |
| 750 | 761 | { |
| 751 | 762 | if ( ! $this->alreadyminified ) { |
@@ -945,6 +956,9 @@ discard block |
||
| 945 | 956 | return $code; |
| 946 | 957 | } |
| 947 | 958 | |
| 959 | + /** |
|
| 960 | + * @param string $tag |
|
| 961 | + */ |
|
| 948 | 962 | private function ismovable( $tag ) |
| 949 | 963 | { |
| 950 | 964 | if ( ! $this->aggregate ) { |
@@ -1005,7 +1019,7 @@ discard block |
||
| 1005 | 1019 | * @param string $filepath Filepath. |
| 1006 | 1020 | * @param bool $cache_miss Optional. Force a cache miss. Default false. |
| 1007 | 1021 | * |
| 1008 | - * @return bool|string Url pointing to the minified css file or false. |
|
| 1022 | + * @return false|string Url pointing to the minified css file or false. |
|
| 1009 | 1023 | */ |
| 1010 | 1024 | public function minify_single( $filepath, $cache_miss = false ) |
| 1011 | 1025 | { |
@@ -1057,6 +1071,9 @@ discard block |
||
| 1057 | 1071 | $this->options = $options; |
| 1058 | 1072 | } |
| 1059 | 1073 | |
| 1074 | + /** |
|
| 1075 | + * @param string $name |
|
| 1076 | + */ |
|
| 1060 | 1077 | public function setOption( $name, $value ) |
| 1061 | 1078 | { |
| 1062 | 1079 | $this->options[$name] = $value; |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Class for CSS optimization. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -48,53 +48,53 @@ discard block |
||
| 48 | 48 | // public $cdn_url; // Used all over the place implicitly, so will have to be either public or protected :/ . |
| 49 | 49 | |
| 50 | 50 | // Reads the page and collects style tags. |
| 51 | - public function read( $options ) |
|
| 51 | + public function read($options) |
|
| 52 | 52 | { |
| 53 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 54 | - if ( $noptimizeCSS ) { |
|
| 53 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content); |
|
| 54 | + if ($noptimizeCSS) { |
|
| 55 | 55 | return false; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content ); |
|
| 59 | - if ( ! empty( $whitelistCSS ) ) { |
|
| 60 | - $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistCSS ) ) ); |
|
| 58 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content); |
|
| 59 | + if (!empty($whitelistCSS)) { |
|
| 60 | + $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistCSS))); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', '' ); |
|
| 64 | - if ( ! empty( $removableCSS ) ) { |
|
| 65 | - $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removableCSS ) ) ); |
|
| 63 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', ''); |
|
| 64 | + if (!empty($removableCSS)) { |
|
| 65 | + $this->cssremovables = array_filter(array_map('trim', explode(',', $removableCSS))); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $this->cssinlinesize = apply_filters( 'autoptimize_filter_css_inlinesize', 256 ); |
|
| 68 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256); |
|
| 69 | 69 | |
| 70 | 70 | // filter to "late inject minified CSS", default to true for now (it is faster). |
| 71 | - $this->inject_min_late = apply_filters( 'autoptimize_filter_css_inject_min_late', true ); |
|
| 71 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true); |
|
| 72 | 72 | |
| 73 | 73 | // Remove everything that's not the header. |
| 74 | - if ( apply_filters( 'autoptimize_filter_css_justhead', $options['justhead'] ) ) { |
|
| 75 | - $content = explode( '</head>', $this->content, 2 ); |
|
| 76 | - $this->content = $content[0] . '</head>'; |
|
| 74 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) { |
|
| 75 | + $content = explode('</head>', $this->content, 2); |
|
| 76 | + $this->content = $content[0].'</head>'; |
|
| 77 | 77 | $this->restofcontent = $content[1]; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | // Determine whether we're doing CSS-files aggregation or not. |
| 81 | - if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) { |
|
| 81 | + if (isset($options['aggregate']) && !$options['aggregate']) { |
|
| 82 | 82 | $this->aggregate = false; |
| 83 | 83 | } |
| 84 | 84 | // Returning true for "dontaggregate" turns off aggregation. |
| 85 | - if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) { |
|
| 85 | + if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) { |
|
| 86 | 86 | $this->aggregate = false; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | // include inline? |
| 90 | - if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) { |
|
| 90 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) { |
|
| 91 | 91 | $this->include_inline = true; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // List of CSS strings which are excluded from autoptimization. |
| 95 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content ); |
|
| 96 | - if ( '' !== $excludeCSS ) { |
|
| 97 | - $this->dontmove = array_filter( array_map( 'trim', explode( ',', $excludeCSS ) ) ); |
|
| 95 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content); |
|
| 96 | + if ('' !== $excludeCSS) { |
|
| 97 | + $this->dontmove = array_filter(array_map('trim', explode(',', $excludeCSS))); |
|
| 98 | 98 | } else { |
| 99 | 99 | $this->dontmove = array(); |
| 100 | 100 | } |
@@ -105,16 +105,16 @@ discard block |
||
| 105 | 105 | // Should we defer css? |
| 106 | 106 | // value: true / false. |
| 107 | 107 | $this->defer = $options['defer']; |
| 108 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content ); |
|
| 108 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content); |
|
| 109 | 109 | |
| 110 | 110 | // Should we inline while deferring? |
| 111 | 111 | // value: inlined CSS. |
| 112 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content ); |
|
| 112 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content); |
|
| 113 | 113 | |
| 114 | 114 | // Should we inline? |
| 115 | 115 | // value: true / false. |
| 116 | 116 | $this->inline = $options['inline']; |
| 117 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content ); |
|
| 117 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content); |
|
| 118 | 118 | |
| 119 | 119 | // Store cdn url. |
| 120 | 120 | $this->cdn_url = $options['cdn_url']; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $this->datauris = $options['datauris']; |
| 124 | 124 | |
| 125 | 125 | // noptimize me. |
| 126 | - $this->content = $this->hide_noptimize( $this->content ); |
|
| 126 | + $this->content = $this->hide_noptimize($this->content); |
|
| 127 | 127 | |
| 128 | 128 | // Exclude (no)script, as those may contain CSS which should be left as is. |
| 129 | 129 | $this->content = $this->replace_contents_with_marker_if_exists( |
@@ -134,26 +134,26 @@ discard block |
||
| 134 | 134 | ); |
| 135 | 135 | |
| 136 | 136 | // Save IE hacks. |
| 137 | - $this->content = $this->hide_iehacks( $this->content ); |
|
| 137 | + $this->content = $this->hide_iehacks($this->content); |
|
| 138 | 138 | |
| 139 | 139 | // Hide HTML comments. |
| 140 | - $this->content = $this->hide_comments( $this->content ); |
|
| 140 | + $this->content = $this->hide_comments($this->content); |
|
| 141 | 141 | |
| 142 | 142 | // Get <style> and <link>. |
| 143 | - if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) { |
|
| 143 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) { |
|
| 144 | 144 | |
| 145 | - foreach ( $matches[0] as $tag ) { |
|
| 146 | - if ( $this->isremovable( $tag, $this->cssremovables ) ) { |
|
| 147 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 148 | - } elseif ( $this->ismovable( $tag ) ) { |
|
| 145 | + foreach ($matches[0] as $tag) { |
|
| 146 | + if ($this->isremovable($tag, $this->cssremovables)) { |
|
| 147 | + $this->content = str_replace($tag, '', $this->content); |
|
| 148 | + } elseif ($this->ismovable($tag)) { |
|
| 149 | 149 | // Get the media. |
| 150 | - if ( false !== strpos( $tag, 'media=' ) ) { |
|
| 151 | - preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias ); |
|
| 152 | - $medias = explode( ',', $medias[1] ); |
|
| 150 | + if (false !== strpos($tag, 'media=')) { |
|
| 151 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias); |
|
| 152 | + $medias = explode(',', $medias[1]); |
|
| 153 | 153 | $media = array(); |
| 154 | - foreach ( $medias as $elem ) { |
|
| 154 | + foreach ($medias as $elem) { |
|
| 155 | 155 | /* $media[] = current(explode(' ',trim($elem),2)); */ |
| 156 | - if ( empty( $elem ) ) { |
|
| 156 | + if (empty($elem)) { |
|
| 157 | 157 | $elem = 'all'; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -161,59 +161,59 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | } else { |
| 163 | 163 | // No media specified - applies to all. |
| 164 | - $media = array( 'all' ); |
|
| 164 | + $media = array('all'); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia', $media, $tag ); |
|
| 167 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag); |
|
| 168 | 168 | |
| 169 | - if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) { |
|
| 169 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) { |
|
| 170 | 170 | // <link>. |
| 171 | - $url = current( explode( '?', $source[2], 2 ) ); |
|
| 172 | - $path = $this->getpath( $url ); |
|
| 171 | + $url = current(explode('?', $source[2], 2)); |
|
| 172 | + $path = $this->getpath($url); |
|
| 173 | 173 | |
| 174 | - if ( false !== $path && preg_match( '#\.css$#', $path ) ) { |
|
| 174 | + if (false !== $path && preg_match('#\.css$#', $path)) { |
|
| 175 | 175 | // Good link. |
| 176 | - $this->css[] = array( $media, $path ); |
|
| 176 | + $this->css[] = array($media, $path); |
|
| 177 | 177 | } else { |
| 178 | 178 | // Link is dynamic (.php etc). |
| 179 | 179 | $tag = ''; |
| 180 | 180 | } |
| 181 | 181 | } else { |
| 182 | 182 | // Inline css in style tags can be wrapped in comment tags, so restore comments. |
| 183 | - $tag = $this->restore_comments( $tag ); |
|
| 184 | - preg_match( '#<style.*>(.*)</style>#Usmi', $tag, $code ); |
|
| 183 | + $tag = $this->restore_comments($tag); |
|
| 184 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code); |
|
| 185 | 185 | |
| 186 | 186 | // And re-hide them to be able to to the removal based on tag. |
| 187 | - $tag = $this->hide_comments( $tag ); |
|
| 187 | + $tag = $this->hide_comments($tag); |
|
| 188 | 188 | |
| 189 | - if ( $this->include_inline ) { |
|
| 190 | - $code = preg_replace( '#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1] ); |
|
| 191 | - $this->css[] = array( $media, 'INLINE;' . $code ); |
|
| 189 | + if ($this->include_inline) { |
|
| 190 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]); |
|
| 191 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 192 | 192 | } else { |
| 193 | 193 | $tag = ''; |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | // Remove the original style tag. |
| 198 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 198 | + $this->content = str_replace($tag, '', $this->content); |
|
| 199 | 199 | } else { |
| 200 | 200 | // Excluded CSS, minify if getpath and filter says so... |
| 201 | - if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) { |
|
| 202 | - $exploded_url = explode( '?', $source[2], 2 ); |
|
| 201 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) { |
|
| 202 | + $exploded_url = explode('?', $source[2], 2); |
|
| 203 | 203 | $url = $exploded_url[0]; |
| 204 | - $path = $this->getpath( $url ); |
|
| 204 | + $path = $this->getpath($url); |
|
| 205 | 205 | |
| 206 | - if ( $path && apply_filters( 'autoptimize_filter_css_minify_excluded', true, $url ) ) { |
|
| 207 | - $minified_url = $this->minify_single( $path ); |
|
| 208 | - if ( ! empty( $minified_url ) ) { |
|
| 206 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', true, $url)) { |
|
| 207 | + $minified_url = $this->minify_single($path); |
|
| 208 | + if (!empty($minified_url)) { |
|
| 209 | 209 | // Replace orig URL with cached minified URL. |
| 210 | - $new_tag = str_replace( $url, $minified_url, $tag ); |
|
| 210 | + $new_tag = str_replace($url, $minified_url, $tag); |
|
| 211 | 211 | } else { |
| 212 | 212 | $new_tag = $tag; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | // Defer single CSS if "inline & defer" is ON and there is inline CSS. |
| 216 | - if ( $this->defer && ! empty( $this->defer_inline ) ) { |
|
| 216 | + if ($this->defer && !empty($this->defer_inline)) { |
|
| 217 | 217 | // Get/ set (via filter) the JS to be triggers onload of the preloaded CSS. |
| 218 | 218 | $_preload_onload = apply_filters( |
| 219 | 219 | 'autoptimize_filter_css_preload_onload', |
@@ -221,18 +221,18 @@ discard block |
||
| 221 | 221 | $url |
| 222 | 222 | ); |
| 223 | 223 | // Adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback. |
| 224 | - $new_tag = '<noscript>' . $new_tag . '</noscript>' . str_replace( |
|
| 224 | + $new_tag = '<noscript>'.$new_tag.'</noscript>'.str_replace( |
|
| 225 | 225 | array( |
| 226 | 226 | "rel='stylesheet'", |
| 227 | 227 | 'rel="stylesheet"', |
| 228 | 228 | ), |
| 229 | - "rel='preload' as='style' onload=\"" . $_preload_onload . "\"", |
|
| 229 | + "rel='preload' as='style' onload=\"".$_preload_onload."\"", |
|
| 230 | 230 | $new_tag |
| 231 | 231 | ); |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | // And replace! |
| 235 | - $this->content = str_replace( $tag, $new_tag, $this->content ); |
|
| 235 | + $this->content = str_replace($tag, $new_tag, $this->content); |
|
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | } |
@@ -251,22 +251,22 @@ discard block |
||
| 251 | 251 | * @param string $path |
| 252 | 252 | * @return boolean |
| 253 | 253 | */ |
| 254 | - private function is_datauri_candidate( $path ) |
|
| 254 | + private function is_datauri_candidate($path) |
|
| 255 | 255 | { |
| 256 | 256 | // Call only once since it's called from a loop. |
| 257 | 257 | static $max_size = null; |
| 258 | - if ( null === $max_size ) { |
|
| 258 | + if (null === $max_size) { |
|
| 259 | 259 | $max_size = $this->get_datauri_maxsize(); |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | - if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) && |
|
| 263 | - file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) { |
|
| 262 | + if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) && |
|
| 263 | + file_exists($path) && is_readable($path) && filesize($path) <= $max_size) { |
|
| 264 | 264 | |
| 265 | 265 | // Seems we have a candidate. |
| 266 | 266 | $is_candidate = true; |
| 267 | 267 | } else { |
| 268 | 268 | // Filter allows overriding default decision (which checks for local file existence). |
| 269 | - $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path ); |
|
| 269 | + $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path); |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | return $is_candidate; |
@@ -291,29 +291,29 @@ discard block |
||
| 291 | 291 | * of thing you're probably better of building assets completely |
| 292 | 292 | * outside of WordPress anyway. |
| 293 | 293 | */ |
| 294 | - if ( null === $max_size ) { |
|
| 295 | - $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 ); |
|
| 294 | + if (null === $max_size) { |
|
| 295 | + $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | return $max_size; |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - private function check_datauri_exclude_list( $url ) |
|
| 301 | + private function check_datauri_exclude_list($url) |
|
| 302 | 302 | { |
| 303 | 303 | static $exclude_list = null; |
| 304 | 304 | $no_datauris = array(); |
| 305 | 305 | |
| 306 | 306 | // Again, skip doing certain stuff repeatedly when loop-called. |
| 307 | - if ( null === $exclude_list ) { |
|
| 308 | - $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' ); |
|
| 309 | - $no_datauris = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) ); |
|
| 307 | + if (null === $exclude_list) { |
|
| 308 | + $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', ''); |
|
| 309 | + $no_datauris = array_filter(array_map('trim', explode(',', $exclude_list))); |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | $matched = false; |
| 313 | 313 | |
| 314 | - if ( ! empty( $exclude_list ) ) { |
|
| 315 | - foreach ( $no_datauris as $no_datauri ) { |
|
| 316 | - if ( false !== strpos( $url, $no_datauri ) ) { |
|
| 314 | + if (!empty($exclude_list)) { |
|
| 315 | + foreach ($no_datauris as $no_datauri) { |
|
| 316 | + if (false !== strpos($url, $no_datauri)) { |
|
| 317 | 317 | $matched = true; |
| 318 | 318 | break; |
| 319 | 319 | } |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | return $matched; |
| 324 | 324 | } |
| 325 | 325 | |
| 326 | - private function build_or_get_datauri_image( $path ) |
|
| 326 | + private function build_or_get_datauri_image($path) |
|
| 327 | 327 | { |
| 328 | 328 | /** |
| 329 | 329 | * TODO/FIXME: document the required return array format, or better yet, |
@@ -332,27 +332,27 @@ discard block |
||
| 332 | 332 | */ |
| 333 | 333 | |
| 334 | 334 | // Allows short-circuiting datauri generation for an image. |
| 335 | - $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path ); |
|
| 336 | - if ( ! empty( $result ) ) { |
|
| 337 | - if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) { |
|
| 335 | + $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path); |
|
| 336 | + if (!empty($result)) { |
|
| 337 | + if (is_array($result) && isset($result['full']) && isset($result['base64data'])) { |
|
| 338 | 338 | return $result; |
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | - $hash = md5( $path ); |
|
| 343 | - $check = new autoptimizeCache( $hash, 'img' ); |
|
| 344 | - if ( $check->check() ) { |
|
| 342 | + $hash = md5($path); |
|
| 343 | + $check = new autoptimizeCache($hash, 'img'); |
|
| 344 | + if ($check->check()) { |
|
| 345 | 345 | // we have the base64 image in cache. |
| 346 | 346 | $headAndData = $check->retrieve(); |
| 347 | - $_base64data = explode( ';base64,', $headAndData ); |
|
| 347 | + $_base64data = explode(';base64,', $headAndData); |
|
| 348 | 348 | $base64data = $_base64data[1]; |
| 349 | - unset( $_base64data ); |
|
| 349 | + unset($_base64data); |
|
| 350 | 350 | } else { |
| 351 | 351 | // It's an image and we don't have it in cache, get the type by extension. |
| 352 | - $exploded_path = explode( '.', $path ); |
|
| 353 | - $type = end( $exploded_path ); |
|
| 352 | + $exploded_path = explode('.', $path); |
|
| 353 | + $type = end($exploded_path); |
|
| 354 | 354 | |
| 355 | - switch ( $type ) { |
|
| 355 | + switch ($type) { |
|
| 356 | 356 | case 'jpg': |
| 357 | 357 | case 'jpeg': |
| 358 | 358 | $dataurihead = 'data:image/jpeg;base64,'; |
@@ -374,15 +374,15 @@ discard block |
||
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | // Encode the data. |
| 377 | - $base64data = base64_encode( file_get_contents( $path ) ); |
|
| 378 | - $headAndData = $dataurihead . $base64data; |
|
| 377 | + $base64data = base64_encode(file_get_contents($path)); |
|
| 378 | + $headAndData = $dataurihead.$base64data; |
|
| 379 | 379 | |
| 380 | 380 | // Save in cache. |
| 381 | - $check->cache( $headAndData, 'text/plain' ); |
|
| 381 | + $check->cache($headAndData, 'text/plain'); |
|
| 382 | 382 | } |
| 383 | - unset( $check ); |
|
| 383 | + unset($check); |
|
| 384 | 384 | |
| 385 | - return array( 'full' => $headAndData, 'base64data' => $base64data ); |
|
| 385 | + return array('full' => $headAndData, 'base64data' => $base64data); |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
@@ -394,13 +394,13 @@ discard block |
||
| 394 | 394 | * |
| 395 | 395 | * @return string |
| 396 | 396 | */ |
| 397 | - protected static function replace_longest_matches_first( $string, $replacements = array() ) |
|
| 397 | + protected static function replace_longest_matches_first($string, $replacements = array()) |
|
| 398 | 398 | { |
| 399 | - if ( ! empty( $replacements ) ) { |
|
| 399 | + if (!empty($replacements)) { |
|
| 400 | 400 | // Sort the replacements array by key length in desc order (so that the longest strings are replaced first). |
| 401 | - $keys = array_map( 'strlen', array_keys( $replacements ) ); |
|
| 402 | - array_multisort( $keys, SORT_DESC, $replacements ); |
|
| 403 | - $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string ); |
|
| 401 | + $keys = array_map('strlen', array_keys($replacements)); |
|
| 402 | + array_multisort($keys, SORT_DESC, $replacements); |
|
| 403 | + $string = str_replace(array_keys($replacements), array_values($replacements), $string); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | return $string; |
@@ -416,15 +416,15 @@ discard block |
||
| 416 | 416 | * |
| 417 | 417 | * @return string |
| 418 | 418 | */ |
| 419 | - public function replace_urls( $code = '' ) |
|
| 419 | + public function replace_urls($code = '') |
|
| 420 | 420 | { |
| 421 | 421 | $replacements = array(); |
| 422 | 422 | |
| 423 | - preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches ); |
|
| 424 | - if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) { |
|
| 425 | - foreach ( $url_src_matches[1] as $count => $original_url ) { |
|
| 423 | + preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches); |
|
| 424 | + if (is_array($url_src_matches) && !empty($url_src_matches)) { |
|
| 425 | + foreach ($url_src_matches[1] as $count => $original_url) { |
|
| 426 | 426 | // Removes quotes and other cruft. |
| 427 | - $url = trim( $original_url, " \t\n\r\0\x0B\"'" ); |
|
| 427 | + $url = trim($original_url, " \t\n\r\0\x0B\"'"); |
|
| 428 | 428 | |
| 429 | 429 | /** |
| 430 | 430 | * TODO/FIXME: Add a way for other code / callable to be called here |
@@ -442,17 +442,17 @@ discard block |
||
| 442 | 442 | */ |
| 443 | 443 | |
| 444 | 444 | // Do CDN replacement if needed. |
| 445 | - if ( ! empty( $this->cdn_url ) ) { |
|
| 446 | - $replacement_url = $this->url_replace_cdn( $url ); |
|
| 445 | + if (!empty($this->cdn_url)) { |
|
| 446 | + $replacement_url = $this->url_replace_cdn($url); |
|
| 447 | 447 | // Prepare replacements array. |
| 448 | - $replacements[ $url_src_matches[1][ $count ] ] = str_replace( |
|
| 448 | + $replacements[$url_src_matches[1][$count]] = str_replace( |
|
| 449 | 449 | $original_url, $replacement_url, $url_src_matches[1][$count] |
| 450 | 450 | ); |
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - $code = self::replace_longest_matches_first( $code, $replacements ); |
|
| 455 | + $code = self::replace_longest_matches_first($code, $replacements); |
|
| 456 | 456 | |
| 457 | 457 | return $code; |
| 458 | 458 | } |
@@ -465,26 +465,26 @@ discard block |
||
| 465 | 465 | * @param string $code |
| 466 | 466 | * @return string |
| 467 | 467 | */ |
| 468 | - public function hide_fontface_and_maybe_cdn( $code ) |
|
| 468 | + public function hide_fontface_and_maybe_cdn($code) |
|
| 469 | 469 | { |
| 470 | 470 | // Proceed only if @font-face declarations exist within $code. |
| 471 | - preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces ); |
|
| 472 | - if ( isset( $fontfaces[0] ) ) { |
|
| 471 | + preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces); |
|
| 472 | + if (isset($fontfaces[0])) { |
|
| 473 | 473 | // Check if we need to cdn fonts or not. |
| 474 | - $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false ); |
|
| 474 | + $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false); |
|
| 475 | 475 | |
| 476 | - foreach ( $fontfaces[0] as $full_match ) { |
|
| 476 | + foreach ($fontfaces[0] as $full_match) { |
|
| 477 | 477 | // Keep original match so we can search/replace it. |
| 478 | 478 | $match_search = $full_match; |
| 479 | 479 | |
| 480 | 480 | // Do font cdn if needed. |
| 481 | - if ( $do_font_cdn ) { |
|
| 482 | - $full_match = $this->replace_urls( $full_match ); |
|
| 481 | + if ($do_font_cdn) { |
|
| 482 | + $full_match = $this->replace_urls($full_match); |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | // Replace declaration with its base64 encoded string. |
| 486 | - $replacement = self::build_marker( 'FONTFACE', $full_match ); |
|
| 487 | - $code = str_replace( $match_search, $replacement, $code ); |
|
| 486 | + $replacement = self::build_marker('FONTFACE', $full_match); |
|
| 487 | + $code = str_replace($match_search, $replacement, $code); |
|
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | |
@@ -498,16 +498,16 @@ discard block |
||
| 498 | 498 | * @param string $code |
| 499 | 499 | * @return string |
| 500 | 500 | */ |
| 501 | - public function restore_fontface( $code ) |
|
| 501 | + public function restore_fontface($code) |
|
| 502 | 502 | { |
| 503 | - return $this->restore_marked_content( 'FONTFACE', $code ); |
|
| 503 | + return $this->restore_marked_content('FONTFACE', $code); |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | // Re-write (and/or inline) referenced assets. |
| 507 | - public function rewrite_assets( $code ) |
|
| 507 | + public function rewrite_assets($code) |
|
| 508 | 508 | { |
| 509 | 509 | // Handle @font-face rules by hiding and processing them separately. |
| 510 | - $code = $this->hide_fontface_and_maybe_cdn( $code ); |
|
| 510 | + $code = $this->hide_fontface_and_maybe_cdn($code); |
|
| 511 | 511 | |
| 512 | 512 | /** |
| 513 | 513 | * TODO/FIXME: |
@@ -523,30 +523,30 @@ discard block |
||
| 523 | 523 | $url_src_matches = array(); |
| 524 | 524 | $imgreplace = array(); |
| 525 | 525 | // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs. |
| 526 | - preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches ); |
|
| 527 | - if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) { |
|
| 528 | - foreach ( $url_src_matches[1] as $count => $original_url ) { |
|
| 526 | + preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches); |
|
| 527 | + if (is_array($url_src_matches) && !empty($url_src_matches)) { |
|
| 528 | + foreach ($url_src_matches[1] as $count => $original_url) { |
|
| 529 | 529 | // Removes quotes and other cruft. |
| 530 | - $url = trim( $original_url, " \t\n\r\0\x0B\"'" ); |
|
| 530 | + $url = trim($original_url, " \t\n\r\0\x0B\"'"); |
|
| 531 | 531 | |
| 532 | 532 | // If datauri inlining is turned on, do it. |
| 533 | 533 | $inlined = false; |
| 534 | - if ( $this->datauris ) { |
|
| 534 | + if ($this->datauris) { |
|
| 535 | 535 | $iurl = $url; |
| 536 | - if ( false !== strpos( $iurl, '?' ) ) { |
|
| 537 | - $iurl = strtok( $iurl, '?' ); |
|
| 536 | + if (false !== strpos($iurl, '?')) { |
|
| 537 | + $iurl = strtok($iurl, '?'); |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | - $ipath = $this->getpath( $iurl ); |
|
| 540 | + $ipath = $this->getpath($iurl); |
|
| 541 | 541 | |
| 542 | - $excluded = $this->check_datauri_exclude_list( $ipath ); |
|
| 543 | - if ( ! $excluded ) { |
|
| 544 | - $is_datauri_candidate = $this->is_datauri_candidate( $ipath ); |
|
| 545 | - if ( $is_datauri_candidate ) { |
|
| 546 | - $datauri = $this->build_or_get_datauri_image( $ipath ); |
|
| 542 | + $excluded = $this->check_datauri_exclude_list($ipath); |
|
| 543 | + if (!$excluded) { |
|
| 544 | + $is_datauri_candidate = $this->is_datauri_candidate($ipath); |
|
| 545 | + if ($is_datauri_candidate) { |
|
| 546 | + $datauri = $this->build_or_get_datauri_image($ipath); |
|
| 547 | 547 | $base64data = $datauri['base64data']; |
| 548 | 548 | // Add it to the list for replacement. |
| 549 | - $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace( |
|
| 549 | + $imgreplace[$url_src_matches[1][$count]] = str_replace( |
|
| 550 | 550 | $original_url, |
| 551 | 551 | $datauri['full'], |
| 552 | 552 | $url_src_matches[1][$count] |
@@ -562,20 +562,20 @@ discard block |
||
| 562 | 562 | * inlining isn't turned on, or if a resource is skipped from |
| 563 | 563 | * being inlined for whatever reason above. |
| 564 | 564 | */ |
| 565 | - if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) { |
|
| 565 | + if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) { |
|
| 566 | 566 | // Just do the "simple" CDN replacement. |
| 567 | - $replacement_url = $this->url_replace_cdn( $url ); |
|
| 568 | - $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace( |
|
| 567 | + $replacement_url = $this->url_replace_cdn($url); |
|
| 568 | + $imgreplace[$url_src_matches[1][$count]] = str_replace( |
|
| 569 | 569 | $original_url, $replacement_url, $url_src_matches[1][$count] |
| 570 | 570 | ); |
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - $code = self::replace_longest_matches_first( $code, $imgreplace ); |
|
| 575 | + $code = self::replace_longest_matches_first($code, $imgreplace); |
|
| 576 | 576 | |
| 577 | 577 | // Replace back font-face markers with actual font-face declarations. |
| 578 | - $code = $this->restore_fontface( $code ); |
|
| 578 | + $code = $this->restore_fontface($code); |
|
| 579 | 579 | |
| 580 | 580 | return $code; |
| 581 | 581 | } |
@@ -583,29 +583,29 @@ discard block |
||
| 583 | 583 | // Joins and optimizes CSS. |
| 584 | 584 | public function minify() |
| 585 | 585 | { |
| 586 | - foreach ( $this->css as $group ) { |
|
| 587 | - list( $media, $css ) = $group; |
|
| 588 | - if ( preg_match( '#^INLINE;#', $css ) ) { |
|
| 586 | + foreach ($this->css as $group) { |
|
| 587 | + list($media, $css) = $group; |
|
| 588 | + if (preg_match('#^INLINE;#', $css)) { |
|
| 589 | 589 | // <style>. |
| 590 | - $css = preg_replace( '#^INLINE;#', '', $css ); |
|
| 591 | - $css = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash. |
|
| 592 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' ); |
|
| 593 | - if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) { |
|
| 590 | + $css = preg_replace('#^INLINE;#', '', $css); |
|
| 591 | + $css = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash. |
|
| 592 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, ''); |
|
| 593 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) { |
|
| 594 | 594 | $css = $tmpstyle; |
| 595 | 595 | $this->alreadyminified = true; |
| 596 | 596 | } |
| 597 | 597 | } else { |
| 598 | 598 | // <link> |
| 599 | - if ( false !== $css && file_exists( $css ) && is_readable( $css ) ) { |
|
| 599 | + if (false !== $css && file_exists($css) && is_readable($css)) { |
|
| 600 | 600 | $cssPath = $css; |
| 601 | - $css = self::fixurls( $cssPath, file_get_contents( $cssPath ) ); |
|
| 602 | - $css = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css ); |
|
| 603 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 604 | - if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) { |
|
| 601 | + $css = self::fixurls($cssPath, file_get_contents($cssPath)); |
|
| 602 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css); |
|
| 603 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath); |
|
| 604 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) { |
|
| 605 | 605 | $css = $tmpstyle; |
| 606 | 606 | $this->alreadyminified = true; |
| 607 | - } elseif ( $this->can_inject_late( $cssPath, $css ) ) { |
|
| 608 | - $css = self::build_injectlater_marker( $cssPath, md5( $css ) ); |
|
| 607 | + } elseif ($this->can_inject_late($cssPath, $css)) { |
|
| 608 | + $css = self::build_injectlater_marker($cssPath, md5($css)); |
|
| 609 | 609 | } |
| 610 | 610 | } else { |
| 611 | 611 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -613,12 +613,12 @@ discard block |
||
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | - foreach ( $media as $elem ) { |
|
| 617 | - if ( ! empty( $css ) ) { |
|
| 618 | - if ( ! isset( $this->csscode[$elem] ) ) { |
|
| 616 | + foreach ($media as $elem) { |
|
| 617 | + if (!empty($css)) { |
|
| 618 | + if (!isset($this->csscode[$elem])) { |
|
| 619 | 619 | $this->csscode[$elem] = ''; |
| 620 | 620 | } |
| 621 | - $this->csscode[$elem] .= "\n/*FILESTART*/" . $css; |
|
| 621 | + $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
|
| 622 | 622 | } |
| 623 | 623 | } |
| 624 | 624 | } |
@@ -626,133 +626,133 @@ discard block |
||
| 626 | 626 | // Check for duplicate code. |
| 627 | 627 | $md5list = array(); |
| 628 | 628 | $tmpcss = $this->csscode; |
| 629 | - foreach ( $tmpcss as $media => $code ) { |
|
| 630 | - $md5sum = md5( $code ); |
|
| 629 | + foreach ($tmpcss as $media => $code) { |
|
| 630 | + $md5sum = md5($code); |
|
| 631 | 631 | $medianame = $media; |
| 632 | - foreach ( $md5list as $med => $sum ) { |
|
| 632 | + foreach ($md5list as $med => $sum) { |
|
| 633 | 633 | // If same code. |
| 634 | - if ( $sum === $md5sum ) { |
|
| 634 | + if ($sum === $md5sum) { |
|
| 635 | 635 | // Add the merged code. |
| 636 | - $medianame = $med . ', ' . $media; |
|
| 636 | + $medianame = $med.', '.$media; |
|
| 637 | 637 | $this->csscode[$medianame] = $code; |
| 638 | 638 | $md5list[$medianame] = $md5list[$med]; |
| 639 | - unset( $this->csscode[$med], $this->csscode[$media], $md5list[$med] ); |
|
| 639 | + unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]); |
|
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | 642 | $md5list[$medianame] = $md5sum; |
| 643 | 643 | } |
| 644 | - unset( $tmpcss ); |
|
| 644 | + unset($tmpcss); |
|
| 645 | 645 | |
| 646 | 646 | // Manage @imports, while is for recursive import management. |
| 647 | - foreach ( $this->csscode as &$thiscss ) { |
|
| 647 | + foreach ($this->csscode as &$thiscss) { |
|
| 648 | 648 | // Flag to trigger import reconstitution and var to hold external imports. |
| 649 | 649 | $fiximports = false; |
| 650 | 650 | $external_imports = ''; |
| 651 | 651 | |
| 652 | 652 | // remove comments to avoid importing commented-out imports. |
| 653 | - $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss ); |
|
| 654 | - while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) { |
|
| 655 | - foreach ( $matches[0] as $import ) { |
|
| 656 | - if ( $this->isremovable( $import, $this->cssremovables ) ) { |
|
| 657 | - $thiscss = str_replace( $import, '', $thiscss ); |
|
| 653 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss); |
|
| 654 | + while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches)) { |
|
| 655 | + foreach ($matches[0] as $import) { |
|
| 656 | + if ($this->isremovable($import, $this->cssremovables)) { |
|
| 657 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 658 | 658 | $import_ok = true; |
| 659 | 659 | } else { |
| 660 | - $url = trim( preg_replace( '#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim( $import ) ), " \t\n\r\0\x0B\"'" ); |
|
| 661 | - $path = $this->getpath( $url ); |
|
| 660 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'"); |
|
| 661 | + $path = $this->getpath($url); |
|
| 662 | 662 | $import_ok = false; |
| 663 | - if ( file_exists( $path ) && is_readable( $path ) ) { |
|
| 664 | - $code = addcslashes( self::fixurls( $path, file_get_contents( $path ) ), "\\" ); |
|
| 665 | - $code = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $code ); |
|
| 666 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, '' ); |
|
| 667 | - if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) { |
|
| 663 | + if (file_exists($path) && is_readable($path)) { |
|
| 664 | + $code = addcslashes(self::fixurls($path, file_get_contents($path)), "\\"); |
|
| 665 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code); |
|
| 666 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, ''); |
|
| 667 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) { |
|
| 668 | 668 | $code = $tmpstyle; |
| 669 | 669 | $this->alreadyminified = true; |
| 670 | - } elseif ( $this->can_inject_late( $path, $code ) ) { |
|
| 671 | - $code = self::build_injectlater_marker( $path, md5( $code ) ); |
|
| 670 | + } elseif ($this->can_inject_late($path, $code)) { |
|
| 671 | + $code = self::build_injectlater_marker($path, md5($code)); |
|
| 672 | 672 | } |
| 673 | 673 | |
| 674 | - if ( ! empty( $code ) ) { |
|
| 675 | - $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss ); |
|
| 676 | - if ( ! empty( $tmp_thiscss ) ) { |
|
| 674 | + if (!empty($code)) { |
|
| 675 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss); |
|
| 676 | + if (!empty($tmp_thiscss)) { |
|
| 677 | 677 | $thiscss = $tmp_thiscss; |
| 678 | 678 | $import_ok = true; |
| 679 | - unset( $tmp_thiscss ); |
|
| 679 | + unset($tmp_thiscss); |
|
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - unset( $code ); |
|
| 682 | + unset($code); |
|
| 683 | 683 | } |
| 684 | 684 | } |
| 685 | - if ( ! $import_ok ) { |
|
| 685 | + if (!$import_ok) { |
|
| 686 | 686 | // External imports and general fall-back. |
| 687 | 687 | $external_imports .= $import; |
| 688 | 688 | |
| 689 | - $thiscss = str_replace( $import, '', $thiscss ); |
|
| 689 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 690 | 690 | $fiximports = true; |
| 691 | 691 | } |
| 692 | 692 | } |
| 693 | - $thiscss = preg_replace( '#/\*FILESTART\*/#', '', $thiscss ); |
|
| 694 | - $thiscss = preg_replace( '#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss ); |
|
| 693 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss); |
|
| 694 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss); |
|
| 695 | 695 | |
| 696 | 696 | // and update $thiscss_nocomments before going into next iteration in while loop. |
| 697 | - $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss ); |
|
| 697 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss); |
|
| 698 | 698 | } |
| 699 | - unset( $thiscss_nocomments ); |
|
| 699 | + unset($thiscss_nocomments); |
|
| 700 | 700 | |
| 701 | 701 | // Add external imports to top of aggregated CSS. |
| 702 | - if ( $fiximports ) { |
|
| 703 | - $thiscss = $external_imports . $thiscss; |
|
| 702 | + if ($fiximports) { |
|
| 703 | + $thiscss = $external_imports.$thiscss; |
|
| 704 | 704 | } |
| 705 | 705 | } |
| 706 | - unset( $thiscss ); |
|
| 706 | + unset($thiscss); |
|
| 707 | 707 | |
| 708 | 708 | // $this->csscode has all the uncompressed code now. |
| 709 | - foreach ( $this->csscode as &$code ) { |
|
| 709 | + foreach ($this->csscode as &$code) { |
|
| 710 | 710 | // Check for already-minified code. |
| 711 | - $hash = md5( $code ); |
|
| 712 | - do_action( 'autoptimize_action_css_hash', $hash ); |
|
| 713 | - $ccheck = new autoptimizeCache( $hash, 'css' ); |
|
| 714 | - if ( $ccheck->check() ) { |
|
| 711 | + $hash = md5($code); |
|
| 712 | + do_action('autoptimize_action_css_hash', $hash); |
|
| 713 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 714 | + if ($ccheck->check()) { |
|
| 715 | 715 | $code = $ccheck->retrieve(); |
| 716 | - $this->hashmap[md5( $code )] = $hash; |
|
| 716 | + $this->hashmap[md5($code)] = $hash; |
|
| 717 | 717 | continue; |
| 718 | 718 | } |
| 719 | - unset( $ccheck ); |
|
| 719 | + unset($ccheck); |
|
| 720 | 720 | |
| 721 | 721 | // Rewrite and/or inline referenced assets. |
| 722 | - $code = $this->rewrite_assets( $code ); |
|
| 722 | + $code = $this->rewrite_assets($code); |
|
| 723 | 723 | |
| 724 | 724 | // Minify. |
| 725 | - $code = $this->run_minifier_on( $code ); |
|
| 725 | + $code = $this->run_minifier_on($code); |
|
| 726 | 726 | |
| 727 | 727 | // Bring back INJECTLATER stuff. |
| 728 | - $code = $this->inject_minified( $code ); |
|
| 728 | + $code = $this->inject_minified($code); |
|
| 729 | 729 | |
| 730 | 730 | // Filter results. |
| 731 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code ); |
|
| 732 | - if ( ! empty( $tmp_code ) ) { |
|
| 731 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code); |
|
| 732 | + if (!empty($tmp_code)) { |
|
| 733 | 733 | $code = $tmp_code; |
| 734 | - unset( $tmp_code ); |
|
| 734 | + unset($tmp_code); |
|
| 735 | 735 | } |
| 736 | 736 | |
| 737 | - $this->hashmap[md5( $code )] = $hash; |
|
| 737 | + $this->hashmap[md5($code)] = $hash; |
|
| 738 | 738 | } |
| 739 | 739 | |
| 740 | - unset( $code ); |
|
| 740 | + unset($code); |
|
| 741 | 741 | return true; |
| 742 | 742 | } |
| 743 | 743 | |
| 744 | - public function run_minifier_on( $code ) |
|
| 744 | + public function run_minifier_on($code) |
|
| 745 | 745 | { |
| 746 | - if ( ! $this->alreadyminified ) { |
|
| 747 | - $do_minify = apply_filters( 'autoptimize_css_do_minify', true ); |
|
| 746 | + if (!$this->alreadyminified) { |
|
| 747 | + $do_minify = apply_filters('autoptimize_css_do_minify', true); |
|
| 748 | 748 | |
| 749 | - if ( $do_minify ) { |
|
| 749 | + if ($do_minify) { |
|
| 750 | 750 | $cssmin = new autoptimizeCSSmin(); |
| 751 | - $tmp_code = trim( $cssmin->run( $code ) ); |
|
| 751 | + $tmp_code = trim($cssmin->run($code)); |
|
| 752 | 752 | |
| 753 | - if ( ! empty( $tmp_code ) ) { |
|
| 753 | + if (!empty($tmp_code)) { |
|
| 754 | 754 | $code = $tmp_code; |
| 755 | - unset( $tmp_code ); |
|
| 755 | + unset($tmp_code); |
|
| 756 | 756 | } |
| 757 | 757 | } |
| 758 | 758 | } |
@@ -764,14 +764,14 @@ discard block |
||
| 764 | 764 | public function cache() |
| 765 | 765 | { |
| 766 | 766 | // CSS cache. |
| 767 | - foreach ( $this->csscode as $media => $code ) { |
|
| 768 | - $md5 = $this->hashmap[md5( $code )]; |
|
| 769 | - $cache = new autoptimizeCache( $md5, 'css' ); |
|
| 770 | - if ( ! $cache->check() ) { |
|
| 767 | + foreach ($this->csscode as $media => $code) { |
|
| 768 | + $md5 = $this->hashmap[md5($code)]; |
|
| 769 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 770 | + if (!$cache->check()) { |
|
| 771 | 771 | // Cache our code. |
| 772 | - $cache->cache( $code, 'text/css' ); |
|
| 772 | + $cache->cache($code, 'text/css'); |
|
| 773 | 773 | } |
| 774 | - $this->url[$media] = AUTOPTIMIZE_CACHE_URL . $cache->getname(); |
|
| 774 | + $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
|
| 775 | 775 | } |
| 776 | 776 | } |
| 777 | 777 | |
@@ -779,88 +779,88 @@ discard block |
||
| 779 | 779 | public function getcontent() |
| 780 | 780 | { |
| 781 | 781 | // restore comments. |
| 782 | - $this->content = $this->restore_comments( $this->content ); |
|
| 782 | + $this->content = $this->restore_comments($this->content); |
|
| 783 | 783 | |
| 784 | 784 | // restore IE hacks. |
| 785 | - $this->content = $this->restore_iehacks( $this->content ); |
|
| 785 | + $this->content = $this->restore_iehacks($this->content); |
|
| 786 | 786 | |
| 787 | 787 | // restore (no)script. |
| 788 | - $this->content = $this->restore_marked_content( 'SCRIPT', $this->content ); |
|
| 788 | + $this->content = $this->restore_marked_content('SCRIPT', $this->content); |
|
| 789 | 789 | |
| 790 | 790 | // Restore noptimize. |
| 791 | - $this->content = $this->restore_noptimize( $this->content ); |
|
| 791 | + $this->content = $this->restore_noptimize($this->content); |
|
| 792 | 792 | |
| 793 | 793 | // Restore the full content. |
| 794 | - if ( ! empty( $this->restofcontent ) ) { |
|
| 794 | + if (!empty($this->restofcontent)) { |
|
| 795 | 795 | $this->content .= $this->restofcontent; |
| 796 | 796 | $this->restofcontent = ''; |
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | // Inject the new stylesheets. |
| 800 | - $replaceTag = array( '<title', 'before' ); |
|
| 801 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content ); |
|
| 800 | + $replaceTag = array('<title', 'before'); |
|
| 801 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content); |
|
| 802 | 802 | |
| 803 | - if ( $this->inline ) { |
|
| 804 | - foreach ( $this->csscode as $media => $code ) { |
|
| 805 | - $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $code . '</style>', $replaceTag ); |
|
| 803 | + if ($this->inline) { |
|
| 804 | + foreach ($this->csscode as $media => $code) { |
|
| 805 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag); |
|
| 806 | 806 | } |
| 807 | 807 | } else { |
| 808 | - if ( $this->defer ) { |
|
| 808 | + if ($this->defer) { |
|
| 809 | 809 | $preloadCssBlock = ''; |
| 810 | 810 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 811 | 811 | |
| 812 | 812 | $defer_inline_code = $this->defer_inline; |
| 813 | - if ( ! empty( $defer_inline_code ) ) { |
|
| 814 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) { |
|
| 815 | - $iCssHash = md5( $defer_inline_code ); |
|
| 816 | - $iCssCache = new autoptimizeCache( $iCssHash, 'css' ); |
|
| 817 | - if ( $iCssCache->check() ) { |
|
| 813 | + if (!empty($defer_inline_code)) { |
|
| 814 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) { |
|
| 815 | + $iCssHash = md5($defer_inline_code); |
|
| 816 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 817 | + if ($iCssCache->check()) { |
|
| 818 | 818 | // we have the optimized inline CSS in cache. |
| 819 | 819 | $defer_inline_code = $iCssCache->retrieve(); |
| 820 | 820 | } else { |
| 821 | 821 | $cssmin = new autoptimizeCSSmin(); |
| 822 | - $tmp_code = trim( $cssmin->run( $defer_inline_code ) ); |
|
| 822 | + $tmp_code = trim($cssmin->run($defer_inline_code)); |
|
| 823 | 823 | |
| 824 | - if ( ! empty( $tmp_code ) ) { |
|
| 824 | + if (!empty($tmp_code)) { |
|
| 825 | 825 | $defer_inline_code = $tmp_code; |
| 826 | - $iCssCache->cache( $defer_inline_code, 'text/css' ); |
|
| 827 | - unset( $tmp_code ); |
|
| 826 | + $iCssCache->cache($defer_inline_code, 'text/css'); |
|
| 827 | + unset($tmp_code); |
|
| 828 | 828 | } |
| 829 | 829 | } |
| 830 | 830 | } |
| 831 | - $code_out = '<style type="text/css" id="aoatfcss" media="all">' . $defer_inline_code . '</style>'; |
|
| 832 | - $this->inject_in_html( $code_out, $replaceTag ); |
|
| 831 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 832 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 833 | 833 | } |
| 834 | 834 | } |
| 835 | 835 | |
| 836 | - foreach ( $this->url as $media => $url ) { |
|
| 837 | - $url = $this->url_replace_cdn( $url ); |
|
| 836 | + foreach ($this->url as $media => $url) { |
|
| 837 | + $url = $this->url_replace_cdn($url); |
|
| 838 | 838 | |
| 839 | 839 | // Add the stylesheet either deferred (import at bottom) or normal links in head. |
| 840 | - if ( $this->defer ) { |
|
| 840 | + if ($this->defer) { |
|
| 841 | 841 | $preloadOnLoad = autoptimizeConfig::get_ao_css_preload_onload(); |
| 842 | 842 | |
| 843 | - $preloadCssBlock .= '<link rel="preload" as="style" media="' . $media . '" href="' . $url . '" onload="' . $preloadOnLoad . '" />'; |
|
| 844 | - $noScriptCssBlock .= '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />'; |
|
| 843 | + $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="'.$preloadOnLoad.'" />'; |
|
| 844 | + $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />'; |
|
| 845 | 845 | } else { |
| 846 | 846 | // $this->inject_in_html('<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag); |
| 847 | - if ( strlen( $this->csscode[$media] ) > $this->cssinlinesize ) { |
|
| 848 | - $this->inject_in_html( '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag ); |
|
| 849 | - } elseif ( strlen( $this->csscode[$media] ) > 0 ) { |
|
| 850 | - $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $this->csscode[$media] . '</style>', $replaceTag ); |
|
| 847 | + if (strlen($this->csscode[$media]) > $this->cssinlinesize) { |
|
| 848 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag); |
|
| 849 | + } elseif (strlen($this->csscode[$media]) > 0) { |
|
| 850 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag); |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | } |
| 854 | 854 | |
| 855 | - if ( $this->defer ) { |
|
| 855 | + if ($this->defer) { |
|
| 856 | 856 | $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill(); |
| 857 | 857 | $noScriptCssBlock .= '</noscript>'; |
| 858 | - $this->inject_in_html( $preloadCssBlock . $noScriptCssBlock, $replaceTag ); |
|
| 858 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 859 | 859 | |
| 860 | 860 | // Adds preload polyfill at end of body tag. |
| 861 | 861 | $this->inject_in_html( |
| 862 | - apply_filters( 'autoptimize_css_preload_polyfill', $preload_polyfill ), |
|
| 863 | - array( '</body>', 'before' ) |
|
| 862 | + apply_filters('autoptimize_css_preload_polyfill', $preload_polyfill), |
|
| 863 | + array('</body>', 'before') |
|
| 864 | 864 | ); |
| 865 | 865 | } |
| 866 | 866 | } |
@@ -869,44 +869,44 @@ discard block |
||
| 869 | 869 | return $this->content; |
| 870 | 870 | } |
| 871 | 871 | |
| 872 | - static function fixurls( $file, $code ) |
|
| 872 | + static function fixurls($file, $code) |
|
| 873 | 873 | { |
| 874 | 874 | // Switch all imports to the url() syntax. |
| 875 | - $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code ); |
|
| 875 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code); |
|
| 876 | 876 | |
| 877 | - if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) { |
|
| 878 | - $file = str_replace( WP_ROOT_DIR, '/', $file ); |
|
| 877 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) { |
|
| 878 | + $file = str_replace(WP_ROOT_DIR, '/', $file); |
|
| 879 | 879 | /** |
| 880 | 880 | * rollback as per https://github.com/futtta/autoptimize/issues/94 |
| 881 | 881 | * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file ); |
| 882 | 882 | */ |
| 883 | - $dir = dirname( $file ); // Like /themes/expound/css. |
|
| 883 | + $dir = dirname($file); // Like /themes/expound/css. |
|
| 884 | 884 | |
| 885 | 885 | /** |
| 886 | 886 | * $dir should not contain backslashes, since it's used to replace |
| 887 | 887 | * urls, but it can contain them when running on Windows because |
| 888 | 888 | * fixurls() is sometimes called with `ABSPATH . 'index.php'` |
| 889 | 889 | */ |
| 890 | - $dir = str_replace( '\\', '/', $dir ); |
|
| 891 | - unset( $file ); // not used below at all. |
|
| 890 | + $dir = str_replace('\\', '/', $dir); |
|
| 891 | + unset($file); // not used below at all. |
|
| 892 | 892 | |
| 893 | 893 | $replace = array(); |
| 894 | - foreach ( $matches[1] as $k => $url ) { |
|
| 894 | + foreach ($matches[1] as $k => $url) { |
|
| 895 | 895 | // Remove quotes. |
| 896 | - $url = trim( $url, " \t\n\r\0\x0B\"'" ); |
|
| 897 | - $noQurl = trim( $url, "\"'" ); |
|
| 898 | - if ( $url !== $noQurl ) { |
|
| 896 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 897 | + $noQurl = trim($url, "\"'"); |
|
| 898 | + if ($url !== $noQurl) { |
|
| 899 | 899 | $removedQuotes = true; |
| 900 | 900 | } else { |
| 901 | 901 | $removedQuotes = false; |
| 902 | 902 | } |
| 903 | 903 | |
| 904 | - if ( '' === $noQurl ) { |
|
| 904 | + if ('' === $noQurl) { |
|
| 905 | 905 | continue; |
| 906 | 906 | } |
| 907 | 907 | |
| 908 | 908 | $url = $noQurl; |
| 909 | - if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) { |
|
| 909 | + if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) { |
|
| 910 | 910 | // URL is protocol-relative, host-relative or something we don't touch. |
| 911 | 911 | continue; |
| 912 | 912 | } else { |
@@ -915,49 +915,49 @@ discard block |
||
| 915 | 915 | * rollback as per https://github.com/futtta/autoptimize/issues/94 |
| 916 | 916 | * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
| 917 | 917 | */ |
| 918 | - $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
|
| 919 | - $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl ); |
|
| 918 | + $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url))); |
|
| 919 | + $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl); |
|
| 920 | 920 | |
| 921 | 921 | /** |
| 922 | 922 | * Hash the url + whatever was behind potentially for replacement |
| 923 | 923 | * We must do this, or different css classes referencing the same bg image (but |
| 924 | 924 | * different parts of it, say, in sprites and such) loose their stuff... |
| 925 | 925 | */ |
| 926 | - $hash = md5( $url . $matches[2][$k] ); |
|
| 927 | - $code = str_replace( $matches[0][$k], $hash, $code ); |
|
| 926 | + $hash = md5($url.$matches[2][$k]); |
|
| 927 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 928 | 928 | |
| 929 | - if ( $removedQuotes ) { |
|
| 930 | - $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k]; |
|
| 929 | + if ($removedQuotes) { |
|
| 930 | + $replace[$hash] = "url('".$newurl."')".$matches[2][$k]; |
|
| 931 | 931 | } else { |
| 932 | - $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k]; |
|
| 932 | + $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k]; |
|
| 933 | 933 | } |
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | 936 | |
| 937 | - $code = self::replace_longest_matches_first( $code, $replace ); |
|
| 937 | + $code = self::replace_longest_matches_first($code, $replace); |
|
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | return $code; |
| 941 | 941 | } |
| 942 | 942 | |
| 943 | - private function ismovable( $tag ) |
|
| 943 | + private function ismovable($tag) |
|
| 944 | 944 | { |
| 945 | - if ( ! $this->aggregate ) { |
|
| 945 | + if (!$this->aggregate) { |
|
| 946 | 946 | return false; |
| 947 | 947 | } |
| 948 | 948 | |
| 949 | - if ( ! empty( $this->whitelist ) ) { |
|
| 950 | - foreach ( $this->whitelist as $match ) { |
|
| 951 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 949 | + if (!empty($this->whitelist)) { |
|
| 950 | + foreach ($this->whitelist as $match) { |
|
| 951 | + if (false !== strpos($tag, $match)) { |
|
| 952 | 952 | return true; |
| 953 | 953 | } |
| 954 | 954 | } |
| 955 | 955 | // no match with whitelist. |
| 956 | 956 | return false; |
| 957 | 957 | } else { |
| 958 | - if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) { |
|
| 959 | - foreach ( $this->dontmove as $match ) { |
|
| 960 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 958 | + if (is_array($this->dontmove) && !empty($this->dontmove)) { |
|
| 959 | + foreach ($this->dontmove as $match) { |
|
| 960 | + if (false !== strpos($tag, $match)) { |
|
| 961 | 961 | // Matched something. |
| 962 | 962 | return false; |
| 963 | 963 | } |
@@ -969,22 +969,22 @@ discard block |
||
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | 971 | |
| 972 | - private function can_inject_late( $cssPath, $css ) |
|
| 972 | + private function can_inject_late($cssPath, $css) |
|
| 973 | 973 | { |
| 974 | - $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $cssPath ); |
|
| 975 | - if ( true !== $this->inject_min_late ) { |
|
| 974 | + $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath); |
|
| 975 | + if (true !== $this->inject_min_late) { |
|
| 976 | 976 | // late-inject turned off. |
| 977 | 977 | return false; |
| 978 | - } elseif ( ( false === strpos( $cssPath, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $cssPath ) === $cssPath ) ) { |
|
| 978 | + } elseif ((false === strpos($cssPath, 'min.css')) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) { |
|
| 979 | 979 | // file not minified based on filename & filter. |
| 980 | 980 | return false; |
| 981 | - } elseif ( false !== strpos( $css, '@import' ) ) { |
|
| 981 | + } elseif (false !== strpos($css, '@import')) { |
|
| 982 | 982 | // can't late-inject files with imports as those need to be aggregated. |
| 983 | 983 | return false; |
| 984 | - } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) { |
|
| 984 | + } elseif ((false !== strpos($css, '@font-face')) && (apply_filters('autoptimize_filter_css_fonts_cdn', false) === true) && (!empty($this->cdn_url))) { |
|
| 985 | 985 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed. |
| 986 | 986 | return false; |
| 987 | - } elseif ( ( ( $this->datauris == true ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) { |
|
| 987 | + } elseif ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) { |
|
| 988 | 988 | // don't late-inject CSS with images if CDN is set OR if image inlining is on. |
| 989 | 989 | return false; |
| 990 | 990 | } else { |
@@ -1002,32 +1002,32 @@ discard block |
||
| 1002 | 1002 | * |
| 1003 | 1003 | * @return bool|string Url pointing to the minified css file or false. |
| 1004 | 1004 | */ |
| 1005 | - public function minify_single( $filepath, $cache_miss = false ) |
|
| 1005 | + public function minify_single($filepath, $cache_miss = false) |
|
| 1006 | 1006 | { |
| 1007 | - $contents = $this->prepare_minify_single( $filepath ); |
|
| 1007 | + $contents = $this->prepare_minify_single($filepath); |
|
| 1008 | 1008 | |
| 1009 | - if ( empty( $contents ) ) { |
|
| 1009 | + if (empty($contents)) { |
|
| 1010 | 1010 | return false; |
| 1011 | 1011 | } |
| 1012 | 1012 | |
| 1013 | 1013 | // Check cache. |
| 1014 | - $hash = 'single_' . md5( $contents ); |
|
| 1015 | - $cache = new autoptimizeCache( $hash, 'css' ); |
|
| 1014 | + $hash = 'single_'.md5($contents); |
|
| 1015 | + $cache = new autoptimizeCache($hash, 'css'); |
|
| 1016 | 1016 | |
| 1017 | 1017 | // If not in cache already, minify... |
| 1018 | - if ( ! $cache->check() || $cache_miss ) { |
|
| 1018 | + if (!$cache->check() || $cache_miss) { |
|
| 1019 | 1019 | // Fixurls... |
| 1020 | - $contents = self::fixurls( $filepath, $contents ); |
|
| 1020 | + $contents = self::fixurls($filepath, $contents); |
|
| 1021 | 1021 | // CDN-replace any referenced assets if needed... |
| 1022 | - $contents = $this->replace_urls( $contents ); |
|
| 1022 | + $contents = $this->replace_urls($contents); |
|
| 1023 | 1023 | // Now minify... |
| 1024 | 1024 | $cssmin = new autoptimizeCSSmin(); |
| 1025 | - $contents = trim( $cssmin->run( $contents ) ); |
|
| 1025 | + $contents = trim($cssmin->run($contents)); |
|
| 1026 | 1026 | // Store in cache. |
| 1027 | - $cache->cache( $contents, 'text/css' ); |
|
| 1027 | + $cache->cache($contents, 'text/css'); |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | - $url = $this->build_minify_single_url( $cache ); |
|
| 1030 | + $url = $this->build_minify_single_url($cache); |
|
| 1031 | 1031 | |
| 1032 | 1032 | return $url; |
| 1033 | 1033 | } |
@@ -1047,18 +1047,18 @@ discard block |
||
| 1047 | 1047 | return $this->options; |
| 1048 | 1048 | } |
| 1049 | 1049 | |
| 1050 | - public function replaceOptions( $options ) |
|
| 1050 | + public function replaceOptions($options) |
|
| 1051 | 1051 | { |
| 1052 | 1052 | $this->options = $options; |
| 1053 | 1053 | } |
| 1054 | 1054 | |
| 1055 | - public function setOption( $name, $value ) |
|
| 1055 | + public function setOption($name, $value) |
|
| 1056 | 1056 | { |
| 1057 | 1057 | $this->options[$name] = $value; |
| 1058 | 1058 | $this->$name = $value; |
| 1059 | 1059 | } |
| 1060 | 1060 | |
| 1061 | - public function getOption( $name ) |
|
| 1061 | + public function getOption($name) |
|
| 1062 | 1062 | { |
| 1063 | 1063 | return $this->options[$name]; |
| 1064 | 1064 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | * |
| 15 | 15 | * @param bool|null $override Allows overriding the decision. |
| 16 | 16 | * |
| 17 | - * @return bool |
|
| 17 | + * @return boolean|null |
|
| 18 | 18 | */ |
| 19 | 19 | public static function mbstring_available( $override = null ) |
| 20 | 20 | { |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * |
| 131 | 131 | * @param bool $override Allows overriding the decision when needed. |
| 132 | 132 | * |
| 133 | - * @return bool |
|
| 133 | + * @return boolean|null |
|
| 134 | 134 | */ |
| 135 | 135 | public static function siteurl_not_root( $override = null ) |
| 136 | 136 | { |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * General helpers. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -16,15 +16,15 @@ discard block |
||
| 16 | 16 | * |
| 17 | 17 | * @return bool |
| 18 | 18 | */ |
| 19 | - public static function mbstring_available( $override = null ) |
|
| 19 | + public static function mbstring_available($override = null) |
|
| 20 | 20 | { |
| 21 | 21 | static $available = null; |
| 22 | 22 | |
| 23 | - if ( null === $available ) { |
|
| 24 | - $available = \extension_loaded( 'mbstring' ); |
|
| 23 | + if (null === $available) { |
|
| 24 | + $available = \extension_loaded('mbstring'); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - if ( null !== $override ) { |
|
| 27 | + if (null !== $override) { |
|
| 28 | 28 | $available = $override; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @return int|false |
| 44 | 44 | */ |
| 45 | - public static function strpos( $haystack, $needle, $offset = 0, $encoding = null ) |
|
| 45 | + public static function strpos($haystack, $needle, $offset = 0, $encoding = null) |
|
| 46 | 46 | { |
| 47 | - if ( self::mbstring_available() ) { |
|
| 48 | - return ( null === $encoding ) ? \mb_strpos( $haystack, $needle, $offset ) : \mb_strlen( $haystack, $needle, $offset, $encoding ); |
|
| 47 | + if (self::mbstring_available()) { |
|
| 48 | + return (null === $encoding) ? \mb_strpos($haystack, $needle, $offset) : \mb_strlen($haystack, $needle, $offset, $encoding); |
|
| 49 | 49 | } else { |
| 50 | - return \strpos( $haystack, $needle, $offset ); |
|
| 50 | + return \strpos($haystack, $needle, $offset); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
@@ -62,12 +62,12 @@ discard block |
||
| 62 | 62 | * @return int Number of charcters or bytes in given $string |
| 63 | 63 | * (characters if/when supported, bytes otherwise). |
| 64 | 64 | */ |
| 65 | - public static function strlen( $string, $encoding = null ) |
|
| 65 | + public static function strlen($string, $encoding = null) |
|
| 66 | 66 | { |
| 67 | - if ( self::mbstring_available() ) { |
|
| 68 | - return ( null === $encoding ) ? \mb_strlen( $string ) : \mb_strlen( $string, $encoding ); |
|
| 67 | + if (self::mbstring_available()) { |
|
| 68 | + return (null === $encoding) ? \mb_strlen($string) : \mb_strlen($string, $encoding); |
|
| 69 | 69 | } else { |
| 70 | - return \strlen( $string ); |
|
| 70 | + return \strlen($string); |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | |
@@ -85,44 +85,44 @@ discard block |
||
| 85 | 85 | * |
| 86 | 86 | * @return string |
| 87 | 87 | */ |
| 88 | - public static function substr_replace( $string, $replacement, $start, $length = null, $encoding = null ) |
|
| 88 | + public static function substr_replace($string, $replacement, $start, $length = null, $encoding = null) |
|
| 89 | 89 | { |
| 90 | - if ( self::mbstring_available() ) { |
|
| 91 | - $strlen = self::strlen( $string, $encoding ); |
|
| 90 | + if (self::mbstring_available()) { |
|
| 91 | + $strlen = self::strlen($string, $encoding); |
|
| 92 | 92 | |
| 93 | - if ( $start < 0 ) { |
|
| 93 | + if ($start < 0) { |
|
| 94 | 94 | if ( -$start < $strlen ) { |
| 95 | 95 | $start = $strlen + $start; |
| 96 | 96 | } else { |
| 97 | 97 | $start = 0; |
| 98 | 98 | } |
| 99 | - } elseif ( $start > $strlen ) { |
|
| 99 | + } elseif ($start > $strlen) { |
|
| 100 | 100 | $start = $strlen; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - if ( null === $length || '' === $length ) { |
|
| 103 | + if (null === $length || '' === $length) { |
|
| 104 | 104 | $start2 = $strlen; |
| 105 | - } elseif ( $length < 0 ) { |
|
| 105 | + } elseif ($length < 0) { |
|
| 106 | 106 | $start2 = $strlen + $length; |
| 107 | - if ( $start2 < $start ) { |
|
| 107 | + if ($start2 < $start) { |
|
| 108 | 108 | $start2 = $start; |
| 109 | 109 | } |
| 110 | 110 | } else { |
| 111 | 111 | $start2 = $start + $length; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - if ( null === $encoding ) { |
|
| 115 | - $leader = $start ? \mb_substr( $string, 0, $start ) : ''; |
|
| 116 | - $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null ) : ''; |
|
| 114 | + if (null === $encoding) { |
|
| 115 | + $leader = $start ? \mb_substr($string, 0, $start) : ''; |
|
| 116 | + $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null) : ''; |
|
| 117 | 117 | } else { |
| 118 | - $leader = $start ? \mb_substr( $string, 0, $start, $encoding ) : ''; |
|
| 119 | - $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null, $encoding ) : ''; |
|
| 118 | + $leader = $start ? \mb_substr($string, 0, $start, $encoding) : ''; |
|
| 119 | + $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null, $encoding) : ''; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | return "{$leader}{$replacement}{$trailer}"; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - return ( null === $length ) ? \substr_replace( $string, $replacement, $start ) : \substr_replace( $string, $replacement, $start, $length ); |
|
| 125 | + return (null === $length) ? \substr_replace($string, $replacement, $start) : \substr_replace($string, $replacement, $start, $length); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
@@ -132,16 +132,16 @@ discard block |
||
| 132 | 132 | * |
| 133 | 133 | * @return bool |
| 134 | 134 | */ |
| 135 | - public static function siteurl_not_root( $override = null ) |
|
| 135 | + public static function siteurl_not_root($override = null) |
|
| 136 | 136 | { |
| 137 | 137 | static $subdir = null; |
| 138 | 138 | |
| 139 | - if ( null === $subdir ) { |
|
| 139 | + if (null === $subdir) { |
|
| 140 | 140 | $parts = self::get_ao_wp_site_url_parts(); |
| 141 | - $subdir = ( isset( $parts['path'] ) && ( '/' !== $parts['path'] ) ); |
|
| 141 | + $subdir = (isset($parts['path']) && ('/' !== $parts['path'])); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - if ( null !== $override ) { |
|
| 144 | + if (null !== $override) { |
|
| 145 | 145 | $subdir = $override; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -158,8 +158,8 @@ discard block |
||
| 158 | 158 | { |
| 159 | 159 | static $parts = array(); |
| 160 | 160 | |
| 161 | - if ( empty( $parts ) ) { |
|
| 162 | - $parts = \parse_url( AUTOPTIMIZE_WP_SITE_URL ); |
|
| 161 | + if (empty($parts)) { |
|
| 162 | + $parts = \parse_url(AUTOPTIMIZE_WP_SITE_URL); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | return $parts; |
@@ -174,33 +174,33 @@ discard block |
||
| 174 | 174 | * |
| 175 | 175 | * @return string |
| 176 | 176 | */ |
| 177 | - public static function tweak_cdn_url_if_needed( $cdn_url, $force_cache_miss = false ) |
|
| 177 | + public static function tweak_cdn_url_if_needed($cdn_url, $force_cache_miss = false) |
|
| 178 | 178 | { |
| 179 | 179 | static $results = array(); |
| 180 | 180 | |
| 181 | - if ( ! isset( $results[ $cdn_url ] ) || $force_cache_miss ) { |
|
| 181 | + if (!isset($results[$cdn_url]) || $force_cache_miss) { |
|
| 182 | 182 | |
| 183 | 183 | // In order to return unmodified input when there's no need to tweak. |
| 184 | - $results[ $cdn_url ] = $cdn_url; |
|
| 184 | + $results[$cdn_url] = $cdn_url; |
|
| 185 | 185 | |
| 186 | 186 | // Behind a default true filter for backcompat, and only for sites |
| 187 | 187 | // in a subfolder/subdirectory, but still easily turned off if |
| 188 | 188 | // not wanted/needed... |
| 189 | - if ( autoptimizeUtils::siteurl_not_root() ) { |
|
| 190 | - $check = apply_filters( 'autoptimize_filter_cdn_magic_path_check', true, $cdn_url ); |
|
| 191 | - if ( $check ) { |
|
| 189 | + if (autoptimizeUtils::siteurl_not_root()) { |
|
| 190 | + $check = apply_filters('autoptimize_filter_cdn_magic_path_check', true, $cdn_url); |
|
| 191 | + if ($check) { |
|
| 192 | 192 | $site_url_parts = autoptimizeUtils::get_ao_wp_site_url_parts(); |
| 193 | - $cdn_url_parts = \parse_url( $cdn_url ); |
|
| 194 | - $schemeless = self::is_protocol_relative( $cdn_url ); |
|
| 195 | - $cdn_url_parts = self::maybe_replace_cdn_path( $site_url_parts, $cdn_url_parts ); |
|
| 196 | - if ( false !== $cdn_url_parts ) { |
|
| 197 | - $results[ $cdn_url ] = self::assemble_parsed_url( $cdn_url_parts, $schemeless ); |
|
| 193 | + $cdn_url_parts = \parse_url($cdn_url); |
|
| 194 | + $schemeless = self::is_protocol_relative($cdn_url); |
|
| 195 | + $cdn_url_parts = self::maybe_replace_cdn_path($site_url_parts, $cdn_url_parts); |
|
| 196 | + if (false !== $cdn_url_parts) { |
|
| 197 | + $results[$cdn_url] = self::assemble_parsed_url($cdn_url_parts, $schemeless); |
|
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - return $results[ $cdn_url ]; |
|
| 203 | + return $results[$cdn_url]; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -214,10 +214,10 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @return array|false |
| 216 | 216 | */ |
| 217 | - public static function maybe_replace_cdn_path( array $site_url_parts, array $cdn_url_parts ) |
|
| 217 | + public static function maybe_replace_cdn_path(array $site_url_parts, array $cdn_url_parts) |
|
| 218 | 218 | { |
| 219 | - if ( isset( $site_url_parts['path'] ) && '/' !== $site_url_parts['path'] ) { |
|
| 220 | - if ( ! isset( $cdn_url_parts['path'] ) || '/' === $cdn_url_parts['path'] ) { |
|
| 219 | + if (isset($site_url_parts['path']) && '/' !== $site_url_parts['path']) { |
|
| 220 | + if (!isset($cdn_url_parts['path']) || '/' === $cdn_url_parts['path']) { |
|
| 221 | 221 | $cdn_url_parts['path'] = $site_url_parts['path']; |
| 222 | 222 | return $cdn_url_parts; |
| 223 | 223 | } |
@@ -237,20 +237,20 @@ discard block |
||
| 237 | 237 | * |
| 238 | 238 | * @return string |
| 239 | 239 | */ |
| 240 | - public static function assemble_parsed_url( array $parsed_url, $schemeless = false ) |
|
| 240 | + public static function assemble_parsed_url(array $parsed_url, $schemeless = false) |
|
| 241 | 241 | { |
| 242 | - $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : ''; |
|
| 243 | - if ( $schemeless ) { |
|
| 242 | + $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : ''; |
|
| 243 | + if ($schemeless) { |
|
| 244 | 244 | $scheme = '//'; |
| 245 | 245 | } |
| 246 | - $host = isset( $parsed_url['host'] ) ? $parsed_url['host'] : ''; |
|
| 247 | - $port = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : ''; |
|
| 248 | - $user = isset( $parsed_url['user'] ) ? $parsed_url['user'] : ''; |
|
| 249 | - $pass = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : ''; |
|
| 250 | - $pass = ( $user || $pass ) ? "$pass@" : ''; |
|
| 251 | - $path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : ''; |
|
| 252 | - $query = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : ''; |
|
| 253 | - $fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : ''; |
|
| 246 | + $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; |
|
| 247 | + $port = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : ''; |
|
| 248 | + $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; |
|
| 249 | + $pass = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : ''; |
|
| 250 | + $pass = ($user || $pass) ? "$pass@" : ''; |
|
| 251 | + $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; |
|
| 252 | + $query = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : ''; |
|
| 253 | + $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : ''; |
|
| 254 | 254 | |
| 255 | 255 | return "$scheme$user$pass$host$port$path$query$fragment"; |
| 256 | 256 | } |
@@ -262,12 +262,12 @@ discard block |
||
| 262 | 262 | * |
| 263 | 263 | * @return bool |
| 264 | 264 | */ |
| 265 | - public static function is_protocol_relative( $url ) |
|
| 265 | + public static function is_protocol_relative($url) |
|
| 266 | 266 | { |
| 267 | 267 | $result = false; |
| 268 | 268 | |
| 269 | - if ( ! empty( $url ) ) { |
|
| 270 | - $result = ( '/' === $url{1} ); // second char is `/`. |
|
| 269 | + if (!empty($url)) { |
|
| 270 | + $result = ('/' === $url{1} ); // second char is `/`. |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | return $result; |
@@ -280,9 +280,9 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @return string |
| 282 | 282 | */ |
| 283 | - public static function path_canonicalize( $path ) |
|
| 283 | + public static function path_canonicalize($path) |
|
| 284 | 284 | { |
| 285 | - $patterns = array( |
|
| 285 | + $patterns = array( |
|
| 286 | 286 | '~/{2,}~', |
| 287 | 287 | '~/(\./)+~', |
| 288 | 288 | '~([^/\.]+/(?R)*\.{2,}/)~', |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | '', |
| 296 | 296 | ); |
| 297 | 297 | |
| 298 | - return preg_replace( $patterns, $replacements, $path ); |
|
| 298 | + return preg_replace($patterns, $replacements, $path); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | /** |
@@ -305,15 +305,15 @@ discard block |
||
| 305 | 305 | * |
| 306 | 306 | * @return none if $return_result is false (default), array if $return_result is true. |
| 307 | 307 | */ |
| 308 | - public static function check_service_availability( $return_result = false ) |
|
| 308 | + public static function check_service_availability($return_result = false) |
|
| 309 | 309 | { |
| 310 | - $service_availability_resp = wp_remote_get( 'https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver=' . AUTOPTIMIZE_PLUGIN_VERSION ); |
|
| 311 | - if ( ! is_wp_error( $service_availability_resp ) ) { |
|
| 312 | - if ( '200' == wp_remote_retrieve_response_code( $service_availability_resp ) ) { |
|
| 313 | - $availabilities = json_decode( wp_remote_retrieve_body( $service_availability_resp ), true ); |
|
| 314 | - if ( is_array( $availabilities ) ) { |
|
| 315 | - update_option( 'autoptimize_service_availablity', $availabilities ); |
|
| 316 | - if ( $return_result ) { |
|
| 310 | + $service_availability_resp = wp_remote_get('https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver='.AUTOPTIMIZE_PLUGIN_VERSION); |
|
| 311 | + if (!is_wp_error($service_availability_resp)) { |
|
| 312 | + if ('200' == wp_remote_retrieve_response_code($service_availability_resp)) { |
|
| 313 | + $availabilities = json_decode(wp_remote_retrieve_body($service_availability_resp), true); |
|
| 314 | + if (is_array($availabilities)) { |
|
| 315 | + update_option('autoptimize_service_availablity', $availabilities); |
|
| 316 | + if ($return_result) { |
|
| 317 | 317 | return $availabilities; |
| 318 | 318 | } |
| 319 | 319 | } |
@@ -328,10 +328,10 @@ discard block |
||
| 328 | 328 | * |
| 329 | 329 | * @return bool |
| 330 | 330 | */ |
| 331 | - public static function str_is_valid_regex( $string ) |
|
| 331 | + public static function str_is_valid_regex($string) |
|
| 332 | 332 | { |
| 333 | - set_error_handler( function() {}, E_WARNING ); |
|
| 334 | - $is_regex = ( false !== preg_match( $string, '' ) ); |
|
| 333 | + set_error_handler(function() {}, E_WARNING); |
|
| 334 | + $is_regex = (false !== preg_match($string, '')); |
|
| 335 | 335 | restore_error_handler(); |
| 336 | 336 | |
| 337 | 337 | return $is_regex; |
