Completed
Push — master ( 0a18aa...1b5efc )
by frank
02:30
created
autoptimize.php 2 patches
Braces   +13 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,7 +12,10 @@  discard block
 block discarded – undo
12 12
 http://www.gnu.org/licenses/gpl.txt
13 13
 */
14 14
 
15
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
15
+if ( ! defined( 'ABSPATH' ) ) {
16
+    exit;
17
+}
18
+// Exit if accessed directly
16 19
 
17 20
 define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
18 21
 
@@ -224,12 +227,15 @@  discard block
 block discarded – undo
224 227
 
225 228
     // Choose the classes
226 229
     $classes = array();
227
-    if($conf->get('autoptimize_js'))
228
-        $classes[] = 'autoptimizeScripts';
229
-    if($conf->get('autoptimize_css'))
230
-        $classes[] = 'autoptimizeStyles';
231
-    if($conf->get('autoptimize_html'))
232
-        $classes[] = 'autoptimizeHTML';
230
+    if($conf->get('autoptimize_js')) {
231
+            $classes[] = 'autoptimizeScripts';
232
+    }
233
+    if($conf->get('autoptimize_css')) {
234
+            $classes[] = 'autoptimizeStyles';
235
+    }
236
+    if($conf->get('autoptimize_html')) {
237
+            $classes[] = 'autoptimizeHTML';
238
+    }
233 239
 
234 240
     // Set some options
235 241
     $classoptions = array(
Please login to merge, or discard this patch.
Spacing   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@  discard block
 block discarded – undo
12 12
 http://www.gnu.org/licenses/gpl.txt
13 13
 */
14 14
 
15
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
15
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
16 16
 
17
-define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
17
+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
18 18
 
19 19
 // Load config class
20 20
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php');
21 21
 
22 22
 // Load toolbar class
23
-include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' );
23
+include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php');
24 24
 
25 25
 // Load partners tab if admin
26 26
 if (is_admin()) {
@@ -28,25 +28,25 @@  discard block
 block discarded – undo
28 28
 }
29 29
 
30 30
 // Do we gzip when caching (needed early to load autoptimizeCache.php)
31
-define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip'));
31
+define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip'));
32 32
 
33 33
 // Load cache class
34 34
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php');
35 35
 
36 36
 // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php
37
-if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); }
38
-if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); }
37
+if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); }
38
+if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); }
39 39
 if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); }
40 40
 
41 41
 // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites)
42
-if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) {
42
+if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
43 43
     $blog_id = get_current_blog_id();
44
-    define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
44
+    define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
45 45
 } else {
46 46
     define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR);
47 47
 }
48
-define('AUTOPTIMIZE_CACHE_DELAY',true);
49
-define('WP_ROOT_DIR',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',WP_CONTENT_DIR));
48
+define('AUTOPTIMIZE_CACHE_DELAY', true);
49
+define('WP_ROOT_DIR', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', WP_CONTENT_DIR));
50 50
 
51 51
 // Initialize the cache at least once
52 52
 $conf = autoptimizeConfig::instance();
@@ -54,65 +54,65 @@  discard block
 block discarded – undo
54 54
 /* Check if we're updating, in which case we might need to do stuff and flush the cache
55 55
 to avoid old versions of aggregated files lingering around */
56 56
 
57
-$autoptimize_version="2.1.0";
58
-$autoptimize_db_version=get_option('autoptimize_version','none');
57
+$autoptimize_version = "2.1.0";
58
+$autoptimize_db_version = get_option('autoptimize_version', 'none');
59 59
 
60 60
 if ($autoptimize_db_version !== $autoptimize_version) {
61
-    if ($autoptimize_db_version==="none") {
61
+    if ($autoptimize_db_version === "none") {
62 62
         add_action('admin_notices', 'autoptimize_install_config_notice');
63 63
     } else {
64 64
         // updating, include the update-code
65 65
         include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php');
66 66
     }
67 67
 
68
-    update_option('autoptimize_version',$autoptimize_version);
69
-    $autoptimize_db_version=$autoptimize_version;
68
+    update_option('autoptimize_version', $autoptimize_version);
69
+    $autoptimize_db_version = $autoptimize_version;
70 70
 }
71 71
 
72 72
 // Load translations
73 73
 function autoptimize_load_plugin_textdomain() {
74
-    load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization');
74
+    load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization');
75 75
 }
76
-add_action( 'init', 'autoptimize_load_plugin_textdomain' );
76
+add_action('init', 'autoptimize_load_plugin_textdomain');
77 77
 
78
-function autoptimize_uninstall(){
78
+function autoptimize_uninstall() {
79 79
     autoptimizeCache::clearall();
80 80
 
81
-    $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_css_nogooglefont");
81
+    $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_css_nogooglefont");
82 82
 
83
-    if ( !is_multisite() ) {
84
-        foreach ($delete_options as $del_opt) {    delete_option( $del_opt ); }
83
+    if (!is_multisite()) {
84
+        foreach ($delete_options as $del_opt) {    delete_option($del_opt); }
85 85
     } else {
86 86
         global $wpdb;
87
-        $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
87
+        $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
88 88
         $original_blog_id = get_current_blog_id();
89
-        foreach ( $blog_ids as $blog_id ) {
90
-            switch_to_blog( $blog_id );
91
-            foreach ($delete_options as $del_opt) {    delete_option( $del_opt ); }
89
+        foreach ($blog_ids as $blog_id) {
90
+            switch_to_blog($blog_id);
91
+            foreach ($delete_options as $del_opt) {    delete_option($del_opt); }
92 92
         }
93
-        switch_to_blog( $original_blog_id );
93
+        switch_to_blog($original_blog_id);
94 94
     }
95 95
 
96
-    if ( wp_get_schedule( 'ao_cachechecker' ) ) {
97
-        wp_clear_scheduled_hook( 'ao_cachechecker' );
96
+    if (wp_get_schedule('ao_cachechecker')) {
97
+        wp_clear_scheduled_hook('ao_cachechecker');
98 98
     }
99 99
 }
100 100
 
101 101
 function autoptimize_install_config_notice() {
102 102
     echo '<div class="updated"><p>';
103
-    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
103
+    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
104 104
     echo '</p></div>';
105 105
 }
106 106
 
107 107
 function autoptimize_update_config_notice() {
108 108
     echo '<div class="updated"><p>';
109
-    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
109
+    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
110 110
     echo '</p></div>';
111 111
 }
112 112
 
113 113
 function autoptimize_cache_unavailable_notice() {
114 114
     echo '<div class="error"><p>';
115
-    printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
115
+    printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
116 116
     echo '</p></div>';
117 117
 }
118 118
 
@@ -121,21 +121,21 @@  discard block
 block discarded – undo
121 121
     $ao_noptimize = false;
122 122
 
123 123
     // noptimize in qs to get non-optimized page for debugging
124
-    if (array_key_exists("ao_noptimize",$_GET)) {
125
-        if ( ($_GET["ao_noptimize"]==="1") && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
124
+    if (array_key_exists("ao_noptimize", $_GET)) {
125
+        if (($_GET["ao_noptimize"] === "1") && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) {
126 126
             $ao_noptimize = true;
127 127
         }
128 128
     }
129 129
 
130 130
     // check for DONOTMINIFY constant as used by e.g. WooCommerce POS
131
-    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) {
131
+    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) {
132 132
         $ao_noptimize = true;
133 133
     }
134 134
 
135 135
     // filter you can use to block autoptimization on your own terms
136
-    $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
136
+    $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
137 137
 
138
-    if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) {
138
+    if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) {
139 139
         // Config element
140 140
         $conf = autoptimizeConfig::instance();
141 141
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
         include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php');
144 144
 
145 145
         // Load extra classes and set some vars
146
-        if($conf->get('autoptimize_html')) {
146
+        if ($conf->get('autoptimize_html')) {
147 147
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php');
148 148
             // BUG: new minify-html does not support keeping HTML comments, skipping for now
149 149
             // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
             // }
154 154
         }
155 155
 
156
-        if($conf->get('autoptimize_js')) {
156
+        if ($conf->get('autoptimize_js')) {
157 157
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php');
158 158
             if (!class_exists('JSMin')) {
159 159
                 if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -162,15 +162,15 @@  discard block
 block discarded – undo
162 162
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php');
163 163
                 }
164 164
             }
165
-            if ( ! defined( 'CONCATENATE_SCRIPTS' )) {
166
-                define('CONCATENATE_SCRIPTS',false);
165
+            if (!defined('CONCATENATE_SCRIPTS')) {
166
+                define('CONCATENATE_SCRIPTS', false);
167 167
             }
168
-            if ( ! defined( 'COMPRESS_SCRIPTS' )) {
169
-                define('COMPRESS_SCRIPTS',false);
168
+            if (!defined('COMPRESS_SCRIPTS')) {
169
+                define('COMPRESS_SCRIPTS', false);
170 170
             }
171 171
         }
172 172
 
173
-        if($conf->get('autoptimize_css')) {
173
+        if ($conf->get('autoptimize_css')) {
174 174
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php');
175 175
             if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
176 176
                 if (!class_exists('Minify_CSS_Compressor')) {
@@ -181,13 +181,13 @@  discard block
 block discarded – undo
181 181
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php');
182 182
                 }
183 183
             }
184
-            if ( ! defined( 'COMPRESS_CSS' )) {
185
-                define('COMPRESS_CSS',false);
184
+            if (!defined('COMPRESS_CSS')) {
185
+                define('COMPRESS_CSS', false);
186 186
             }
187 187
         }
188 188
 
189 189
         // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned!
190
-        if (apply_filters('autoptimize_filter_obkiller',false)) {
190
+        if (apply_filters('autoptimize_filter_obkiller', false)) {
191 191
             while (ob_get_level() > 0) {
192 192
                 ob_end_clean();
193 193
             }
@@ -200,35 +200,35 @@  discard block
 block discarded – undo
200 200
 
201 201
 // Action on end, this is where the magic happens
202 202
 function autoptimize_end_buffering($content) {
203
-    if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; }
203
+    if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; }
204 204
     
205 205
     // load URL constants as late as possible to allow domain mapper to kick in
206 206
     if (function_exists("domain_mapping_siteurl")) {
207
-        define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id()));
208
-        define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url()));
207
+        define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
208
+        define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
209 209
     } else {
210
-        define('AUTOPTIMIZE_WP_SITE_URL',site_url());
211
-        define('AUTOPTIMIZE_WP_CONTENT_URL',content_url());
210
+        define('AUTOPTIMIZE_WP_SITE_URL', site_url());
211
+        define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
212 212
     }
213 213
 
214
-    if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) {
214
+    if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
215 215
         $blog_id = get_current_blog_id();
216
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
216
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
217 217
     } else {
218
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
218
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
219 219
     }
220
-    define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL));
220
+    define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
221 221
 
222 222
     // Config element
223 223
     $conf = autoptimizeConfig::instance();
224 224
 
225 225
     // Choose the classes
226 226
     $classes = array();
227
-    if($conf->get('autoptimize_js'))
227
+    if ($conf->get('autoptimize_js'))
228 228
         $classes[] = 'autoptimizeScripts';
229
-    if($conf->get('autoptimize_css'))
229
+    if ($conf->get('autoptimize_css'))
230 230
         $classes[] = 'autoptimizeStyles';
231
-    if($conf->get('autoptimize_html'))
231
+    if ($conf->get('autoptimize_html'))
232 232
         $classes[] = 'autoptimizeHTML';
233 233
 
234 234
     // Set some options
@@ -257,12 +257,12 @@  discard block
 block discarded – undo
257 257
         )
258 258
     );
259 259
 
260
-    $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
260
+    $content = apply_filters('autoptimize_filter_html_before_minify', $content);
261 261
 
262 262
     // Run the classes
263
-    foreach($classes as $name) {
263
+    foreach ($classes as $name) {
264 264
         $instance = new $name($content);
265
-        if($instance->read($classoptions[$name])) {
265
+        if ($instance->read($classoptions[$name])) {
266 266
             $instance->minify();
267 267
             $instance->cache();
268 268
             $content = $instance->getcontent();
@@ -270,19 +270,19 @@  discard block
 block discarded – undo
270 270
         unset($instance);
271 271
     }
272 272
     
273
-    $content = apply_filters( 'autoptimize_html_after_minify', $content );
273
+    $content = apply_filters('autoptimize_html_after_minify', $content);
274 274
     return $content;
275 275
 }
276 276
 
277
-if ( autoptimizeCache::cacheavail() ) {
277
+if (autoptimizeCache::cacheavail()) {
278 278
     $conf = autoptimizeConfig::instance();
279
-    if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) {
279
+    if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) {
280 280
         // Hook to wordpress
281 281
         if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
282
-            add_action('init','autoptimize_start_buffering',-1);
282
+            add_action('init', 'autoptimize_start_buffering', -1);
283 283
         } else {
284 284
             if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); }
285
-            add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2);
285
+            add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2);
286 286
         }
287 287
     }
288 288
 } else {
@@ -290,9 +290,9 @@  discard block
 block discarded – undo
290 290
 }
291 291
 
292 292
 function autoptimize_activate() {
293
-    register_uninstall_hook( __FILE__, 'autoptimize_uninstall' );
293
+    register_uninstall_hook(__FILE__, 'autoptimize_uninstall');
294 294
 }
295
-register_activation_hook( __FILE__, 'autoptimize_activate' );
295
+register_activation_hook(__FILE__, 'autoptimize_activate');
296 296
 
297 297
 include_once('classlesses/autoptimizeCacheChecker.php');
298 298
 
Please login to merge, or discard this patch.
classlesses/autoptimizePartners.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@  discard block
 block discarded – undo
5 5
 
6 6
 add_action('admin_init', 'ao_partner_tabs_preinit');
7 7
 function ao_partner_tabs_preinit() {
8
-    if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
9
-        add_filter('autoptimize_filter_settingsscreen_tabs','ao_add_partner_tabs');
8
+    if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
9
+        add_filter('autoptimize_filter_settingsscreen_tabs', 'ao_add_partner_tabs');
10 10
     }
11 11
 }
12 12
 
13 13
 function ao_add_partner_tabs($in) {
14
-    $in=array_merge($in,array('ao_partners' => __('Optimize More!','autoptimize')));
14
+    $in = array_merge($in, array('ao_partners' => __('Optimize More!', 'autoptimize')));
15 15
     return $in;
16 16
 }
17 17
 
18
-add_action('admin_menu','ao_partners_init');
18
+add_action('admin_menu', 'ao_partners_init');
19 19
 function ao_partners_init() {
20
-    if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
21
-        $hook=add_submenu_page(NULL,'AO partner','AO partner','manage_options','ao_partners','ao_partners');
20
+    if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
21
+        $hook = add_submenu_page(NULL, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', 'ao_partners');
22 22
         // register_settings here as well if needed
23 23
     }
24 24
 }
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
     }    
70 70
     </style>
71 71
     <div class="wrap">
72
-        <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
72
+        <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
73 73
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
74 74
         <?php
75
-            echo '<h2>'. __("These Autoptimize power-ups and related services will improve your site's performance even more!",'autoptimize') . '</h2>';
75
+            echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>';
76 76
         ?>
77 77
         <div>
78 78
             <?php getAOPartnerFeed(); ?>
@@ -82,32 +82,32 @@  discard block
 block discarded – undo
82 82
 }
83 83
 
84 84
 function getAOPartnerFeed() {
85
-    $noFeedText=__( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
85
+    $noFeedText = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
86 86
 
87
-    if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
88
-        $rss = fetch_feed( "http://feeds.feedburner.com/OptimizingMattersDownloads" );
87
+    if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
88
+        $rss = fetch_feed("http://feeds.feedburner.com/OptimizingMattersDownloads");
89 89
         $maxitems = 0;
90 90
 
91
-        if ( ! is_wp_error( $rss ) ) {
92
-            $maxitems = $rss->get_item_quantity( 20 ); 
93
-            $rss_items = $rss->get_items( 0, $maxitems );
91
+        if (!is_wp_error($rss)) {
92
+            $maxitems = $rss->get_item_quantity(20); 
93
+            $rss_items = $rss->get_items(0, $maxitems);
94 94
         } ?>
95 95
         <ul>
96 96
             <?php
97
-            if ( $maxitems == 0 ) {
97
+            if ($maxitems == 0) {
98 98
                 echo $noFeedText;
99 99
             } else {
100
-                foreach ( $rss_items as $item ) : 
101
-                    $itemURL = esc_url( $item->get_permalink() ); ?>
100
+                foreach ($rss_items as $item) : 
101
+                    $itemURL = esc_url($item->get_permalink()); ?>
102 102
                     <li class="itemDetail">
103
-                        <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html( $item->get_title() ); ?></a></h3>
103
+                        <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html($item->get_title()); ?></a></h3>
104 104
                         <?php
105
-                        if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(),"image")!==false) ) {
106
-                            $itemImgURL=esc_url($enclosure->get_link());
105
+                        if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(), "image") !== false)) {
106
+                            $itemImgURL = esc_url($enclosure->get_link());
107 107
                             echo "<div class=\"itemImage\"><a href=\"".$itemURL."\" target=\"_blank\"><img src=\"".$itemImgURL."\"/></a></div>";
108 108
                         }
109 109
                         ?>
110
-                        <div class="itemDescription"><?php echo wp_kses_post($item -> get_description() ); ?></div>
110
+                        <div class="itemDescription"><?php echo wp_kses_post($item -> get_description()); ?></div>
111 111
                         <div class="itemButtonRow"><div class="itemButton button-secondary"><a href="<?php echo $itemURL; ?>" target="_blank">More info</a></div></div>
112 112
                     </li>
113 113
                 <?php endforeach; ?>
Please login to merge, or discard this patch.