futtta / autoptimize

classes/critcss-inc/admin_settings_explain.php

Spacing +10 added lines, -10 removed lines

@@ -12,28 +12,28 @@
         .ao_settings_div {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;}
         .ao_settings_div .form-table th {font-weight: normal;}
     </style>
-    <script>document.title = "Autoptimize: <?php _e( 'Critical CSS', 'autoptimize' ); ?> " + document.title;</script>
+    <script>document.title = "Autoptimize: <?php _e('Critical CSS', 'autoptimize'); ?> " + document.title;</script>
     <ul id="explain-panel">
         <div class="ao_settings_div">
             <?php
             $ccss_explanation = '';
 
             // get the HTML with the explanation of what critical CSS is.
-            if ( apply_filters( 'autoptimize_settingsscreen_remotehttp', true ) ) {
-                $ccss_explanation = get_transient( 'ao_ccss_explain' );
-                if ( empty( $ccss_explanation ) ) {
-                    $ccss_expl_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_ccss_explain.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
-                    if ( ! is_wp_error( $ccss_expl_resp ) ) {
-                        if ( '200' == wp_remote_retrieve_response_code( $ccss_expl_resp ) ) {
-                            $ccss_explanation = wp_kses_post( wp_remote_retrieve_body( $ccss_expl_resp ) );
-                            set_transient( 'ao_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS );
+            if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+                $ccss_explanation = get_transient('ao_ccss_explain');
+                if (empty($ccss_explanation)) {
+                    $ccss_expl_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_ccss_explain.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+                    if (!is_wp_error($ccss_expl_resp)) {
+                        if ('200' == wp_remote_retrieve_response_code($ccss_expl_resp)) {
+                            $ccss_explanation = wp_kses_post(wp_remote_retrieve_body($ccss_expl_resp));
+                            set_transient('ao_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS);
                         }
                     }
                 }
             }
 
             // placeholder text in case HTML is empty.
-            if ( empty( $ccss_explanation ) ) {
+            if (empty($ccss_explanation)) {
                 $ccss_explanation = '<h2>Fix render-blocking CSS!</h2><p>Significantly improve your first-paint times by making CSS non-render-blocking.</p><p>The next step is to sign up at <a href="https://criticalcss.com/?aff=1" target="_blank">https://criticalcss.com</a> (this is a premium service, priced 2 GBP/month for membership and 5 GBP/month per domain) <strong>and get the API key, which you can copy from <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">the API-keys page</a></strong> and paste below.</p><p>If you have any questions or need support, head on over to <a href="https://wordpress.org/support/plugin/autoptimize" target="_blank">our support forum</a> and we\'ll help you get up and running in no time!</p>';
             }
 

classes/critcss-inc/admin_settings_queue.php

Spacing +24 added lines, -24 removed lines

@@ -11,21 +11,21 @@ 
     global $ao_ccss_queue;
 
     // Prepare the queue object.
-    if ( empty( $ao_ccss_queue ) ) {
+    if (empty($ao_ccss_queue)) {
         $ao_ccss_queue = '';
     } else {
-        $ao_ccss_queue = json_encode( $ao_ccss_queue );
+        $ao_ccss_queue = json_encode($ao_ccss_queue);
     }
 ?>
 
     <ul id="queue-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle fleft"><?php _e( 'Job Queue', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle fleft"><?php _e('Job Queue', 'autoptimize'); ?></h2>
             <button type="button" class="toggle-btn">
                 <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
             </button>
             <?php
-            if ( autoptimizeCriticalCSSSettings::ao_ccss_has_autorules() ) {
+            if (autoptimizeCriticalCSSSettings::ao_ccss_has_autorules()) {
                 $_queue_visibility = 'hidden';
             } else {
                 $_queue_visibility = 'visible';
@@ -34,54 +34,54 @@ 
             <div class="collapsible <?php echo $_queue_visibility; ?>">
                 <!-- BEGIN Queue dialogs -->
                 <!-- Retry dialog -->
-                <div id="queue-confirm-retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>" class="hidden">
-                    <p><?php _e( 'Are you sure you want to retry this job?', 'autoptimize' ); ?></p>
+                <div id="queue-confirm-retry" title="<?php _e('Retry Job', 'autoptimize'); ?>" class="hidden">
+                    <p><?php _e('Are you sure you want to retry this job?', 'autoptimize'); ?></p>
                 </div>
 
                 <!-- Remove dialog -->
-                <div id="queue-confirm-rm" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>" class="hidden">
-                    <p><?php _e( 'Are you sure you want to delete this job?', 'autoptimize' ); ?></p>
+                <div id="queue-confirm-rm" title="<?php _e('Delete Job', 'autoptimize'); ?>" class="hidden">
+                    <p><?php _e('Are you sure you want to delete this job?', 'autoptimize'); ?></p>
                 </div>
 
                 <!-- Remove all dialog -->
-                <div id="queue-confirm-rm-all" title="<?php _e( 'Delete all jobs', 'autoptimize' ); ?>" class="hidden">
-                    <p><?php _e( 'This will delete all jobs, are you sure?', 'autoptimize' ); ?></p>
+                <div id="queue-confirm-rm-all" title="<?php _e('Delete all jobs', 'autoptimize'); ?>" class="hidden">
+                    <p><?php _e('This will delete all jobs, are you sure?', 'autoptimize'); ?></p>
                 </div>
                 <!-- END Queue dialogs -->
 
                 <!-- BEGIN Queue UI -->
                 <div class="howto">
                     <div class="title-wrap">
-                        <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Queue', 'autoptimize' ); ?></h4>
-                        <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p>
+                        <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Queue', 'autoptimize'); ?></h4>
+                        <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p>
                     </div>
                     <button type="button" class="toggle-btn">
                         <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
                     </button>
                     <div class="howto-wrap hidden">
-                        <p><?php _e( 'TL;DR:<br /><strong>Queue runs every 10 minutes.</strong> Job statuses are <span class="badge new">N</span> for NEW, <span class="badge pending">P</span> for PENDING, <span class="badge error">E</span> for ERROR and <span class="badge unknown">U</span> for UNKOWN.', 'autoptimize' ); ?></p>
+                        <p><?php _e('TL;DR:<br /><strong>Queue runs every 10 minutes.</strong> Job statuses are <span class="badge new">N</span> for NEW, <span class="badge pending">P</span> for PENDING, <span class="badge error">E</span> for ERROR and <span class="badge unknown">U</span> for UNKOWN.', 'autoptimize'); ?></p>
                         <ol>
-                            <li><?php _e( 'The queue operates <strong>automatically, asynchronously and on regular intervals of 10 minutes.</strong> To view updated queue status, refresh this page.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'When the conditions to create a job are met (i.e. user not logged in, no matching <span class="badge manual">MANUAL</span> rule or CSS files has changed for an <span class="badge auto">AUTO</span> rule), a <span class="badge new">N</span> job is created in the queue.', 'autoptimize' ); ?></li>
-                            <li><?php _e( "Autoptimize CriticalCSS Power-Up constantly query the queue for <span class='badge new'>N</span> jobs. When it finds one, gears spins and jobs becomes <span class='badge pending'>P</span> while they are running and <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> doesn't return a result.", 'autoptimize' ); ?></li>
-                            <li><?php _e( 'As soon as <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> returns a valid critical CSS file, the job is then finished and removed from the queue.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'When things go wrong, a job is marked as <span class="badge error">E</span>. You can retry faulty jobs, delete them or get in touch with <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'Sometimes an unknown condition can happen. In this case, the job status becomes <span class="badge unknown">U</span> and you may want to ask <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for help or just delete it.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'To get more information about jobs statuses, specially the ones with <span class="badge error">E</span> and <span class="badge unknown">U</span> status, hover your mouse in the status badge of that job. This information might be crucial when contacting <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize' ); ?></li>
-                            <li><?php _e( '<strong>A word about WordPress cron:</strong> Autoptimize CriticalCSS Power-Up watch the queue by using WordPress Cron (or WP-Cron for short.) It <a href="https://www.smashingmagazine.com/2013/10/schedule-events-using-wordpress-cron/#limitations-of-wordpress-cron-and-solutions-to-fix-em" target="_blank">could be faulty</a> on very light or very heavy loads. If your site receives just a few or thousands visits a day, it might be a good idea to <a href="https://developer.wordpress.org/plugins/cron/hooking-into-the-system-task-scheduler/" target="_blank">turn WP-Cron off and use your system task scheduler</a> to fire it instead.', 'autoptimize' ); ?></li>
+                            <li><?php _e('The queue operates <strong>automatically, asynchronously and on regular intervals of 10 minutes.</strong> To view updated queue status, refresh this page.', 'autoptimize'); ?></li>
+                            <li><?php _e('When the conditions to create a job are met (i.e. user not logged in, no matching <span class="badge manual">MANUAL</span> rule or CSS files has changed for an <span class="badge auto">AUTO</span> rule), a <span class="badge new">N</span> job is created in the queue.', 'autoptimize'); ?></li>
+                            <li><?php _e("Autoptimize CriticalCSS Power-Up constantly query the queue for <span class='badge new'>N</span> jobs. When it finds one, gears spins and jobs becomes <span class='badge pending'>P</span> while they are running and <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> doesn't return a result.", 'autoptimize'); ?></li>
+                            <li><?php _e('As soon as <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> returns a valid critical CSS file, the job is then finished and removed from the queue.', 'autoptimize'); ?></li>
+                            <li><?php _e('When things go wrong, a job is marked as <span class="badge error">E</span>. You can retry faulty jobs, delete them or get in touch with <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize'); ?></li>
+                            <li><?php _e('Sometimes an unknown condition can happen. In this case, the job status becomes <span class="badge unknown">U</span> and you may want to ask <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for help or just delete it.', 'autoptimize'); ?></li>
+                            <li><?php _e('To get more information about jobs statuses, specially the ones with <span class="badge error">E</span> and <span class="badge unknown">U</span> status, hover your mouse in the status badge of that job. This information might be crucial when contacting <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize'); ?></li>
+                            <li><?php _e('<strong>A word about WordPress cron:</strong> Autoptimize CriticalCSS Power-Up watch the queue by using WordPress Cron (or WP-Cron for short.) It <a href="https://www.smashingmagazine.com/2013/10/schedule-events-using-wordpress-cron/#limitations-of-wordpress-cron-and-solutions-to-fix-em" target="_blank">could be faulty</a> on very light or very heavy loads. If your site receives just a few or thousands visits a day, it might be a good idea to <a href="https://developer.wordpress.org/plugins/cron/hooking-into-the-system-task-scheduler/" target="_blank">turn WP-Cron off and use your system task scheduler</a> to fire it instead.', 'autoptimize'); ?></li>
                         </ol>
                     </div>
                 </div>
                 <table id="queue-tbl" class="queue tablesorter" cellspacing="0">
                     <thead>
-                        <tr><th class="status"><?php _e( 'Status', 'autoptimize' ); ?></th><th><?php _e( 'Target Rule', 'autoptimize' ); ?></th><th><?php _e( 'Page Path', 'autoptimize' ); ?></th><th><?php _e( 'Page Type', 'autoptimize' ); ?></th><th><?php _e( 'Creation Date', 'autoptimize' ); ?></th><th><?php _e( 'Finish Date', 'autoptimize' ); ?></th><th class="btn"><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>
+                        <tr><th class="status"><?php _e('Status', 'autoptimize'); ?></th><th><?php _e('Target Rule', 'autoptimize'); ?></th><th><?php _e('Page Path', 'autoptimize'); ?></th><th><?php _e('Page Type', 'autoptimize'); ?></th><th><?php _e('Creation Date', 'autoptimize'); ?></th><th><?php _e('Finish Date', 'autoptimize'); ?></th><th class="btn"><?php _e('Actions', 'autoptimize'); ?></th></tr>
                     </thead>
                     <tbody id="queue"></tbody>
                 </table>
-                <input class="hidden" type="text" id="ao-ccss-queue" name="autoptimize_ccss_queue" value='<?php echo( $ao_ccss_queue ); ?>'>
+                <input class="hidden" type="text" id="ao-ccss-queue" name="autoptimize_ccss_queue" value='<?php echo($ao_ccss_queue); ?>'>
                 <div class="submit jobs-btn">
                     <div class="alignright">
-                        <span id="removeAllJobs" class="button-secondary" style="color:red;"><?php _e( 'Remove all jobs', 'autoptimize' ); ?></span>
+                        <span id="removeAllJobs" class="button-secondary" style="color:red;"><?php _e('Remove all jobs', 'autoptimize'); ?></span>
                     </div>
                 </div>
             </div>

classes/critcss-inc/admin_settings_adv.php

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
     global $ao_ccss_domain;
 
     // In case domain is not set yet (done in cron.php).
-    if ( empty( $ao_ccss_domain ) ) {
+    if (empty($ao_ccss_domain)) {
         $ao_ccss_domain = get_site_url();
     }
 
@@ -27,7 +27,7 @@ 
 ?>
     <ul id="adv-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle fleft"><?php _e( 'Advanced Settings', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle fleft"><?php _e('Advanced Settings', 'autoptimize'); ?></h2>
             <button type="button" class="toggle-btn">
                 <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
             </button>
@@ -35,103 +35,103 @@ 
                 <table id="key" class="form-table">
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Viewport Size', 'autoptimize' ); ?>
+                            <?php _e('Viewport Size', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <label for="autoptimize_ccss_vw"><?php _e( 'Width', 'autoptimize' ); ?>:</label> <input type="number" id="autoptimize_ccss_vw" name="autoptimize_ccss_viewport[w]" min="800" max="4096" placeholder="1400" value="<?php echo $viewport['w']; ?>" />&nbsp;&nbsp;
-                            <label for="autoptimize_ccss_vh"><?php _e( 'Height', 'autoptimize' ); ?>:</label> <input type="number" id="autoptimize_ccss_vh" name="autoptimize_ccss_viewport[h]" min="600" max="2160" placeholder="1080" value="<?php echo $viewport['h']; ?>" />
+                            <label for="autoptimize_ccss_vw"><?php _e('Width', 'autoptimize'); ?>:</label> <input type="number" id="autoptimize_ccss_vw" name="autoptimize_ccss_viewport[w]" min="800" max="4096" placeholder="1400" value="<?php echo $viewport['w']; ?>" />&nbsp;&nbsp;
+                            <label for="autoptimize_ccss_vh"><?php _e('Height', 'autoptimize'); ?>:</label> <input type="number" id="autoptimize_ccss_vh" name="autoptimize_ccss_viewport[h]" min="600" max="2160" placeholder="1080" value="<?php echo $viewport['h']; ?>" />
                             <p class="notes">
-                                <?php _e( '<a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> default viewport size is 1400x1080 pixels (width x height). You can change this size by typing a desired width and height values above. Allowed value ranges are from 800 to 4096 for width and from 600 to 2160 for height.', 'autoptimize' ); ?>
+                                <?php _e('<a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> default viewport size is 1400x1080 pixels (width x height). You can change this size by typing a desired width and height values above. Allowed value ranges are from 800 to 4096 for width and from 600 to 2160 for height.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Force Include CSS selectors', 'autoptimize' ); ?>
+                            <?php _e('Force Include CSS selectors', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="autoptimize_ccss_finclude" name="autoptimize_ccss_finclude" rows='3' maxlenght='500' style="width:100%;" placeholder="<?php _e( '.button-special,//#footer', 'autoptimize' ); ?>"><?php echo trim( $ao_ccss_finclude ); ?></textarea>
+                            <textarea id="autoptimize_ccss_finclude" name="autoptimize_ccss_finclude" rows='3' maxlenght='500' style="width:100%;" placeholder="<?php _e('.button-special,//#footer', 'autoptimize'); ?>"><?php echo trim($ao_ccss_finclude); ?></textarea>
                             <p class="notes">
-                                <?php _e( 'Force include CSS selectors can be used to style dynamic content that is not part of the HTML that is seen during the Critical CSS generation. To use this feature, add comma separated values with both simple strings and/or regular expressions to match the desired selectors. Regular expressions must be preceeded by two forward slashes. For instance: <code>.button-special,//#footer</code>. In this example <code>.button-special</code> will match <code>.button-special</code> selector only, while <code>//#footer</code> will match <code>#footer</code>, <code>#footer-address</code> and <code>#footer-phone</code> selectors in case they exist.<br />Do take into account that changing this setting will only affect new/ updated rules, so you might want to remove old rules and clear your page cache to expedite the forceIncludes becoming used.', 'autoptimize' ); ?>
+                                <?php _e('Force include CSS selectors can be used to style dynamic content that is not part of the HTML that is seen during the Critical CSS generation. To use this feature, add comma separated values with both simple strings and/or regular expressions to match the desired selectors. Regular expressions must be preceeded by two forward slashes. For instance: <code>.button-special,//#footer</code>. In this example <code>.button-special</code> will match <code>.button-special</code> selector only, while <code>//#footer</code> will match <code>#footer</code>, <code>#footer-address</code> and <code>#footer-phone</code> selectors in case they exist.<br />Do take into account that changing this setting will only affect new/ updated rules, so you might want to remove old rules and clear your page cache to expedite the forceIncludes becoming used.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Request Limit', 'autoptimize' ); ?>
+                            <?php _e('Request Limit', 'autoptimize'); ?>
                         </th>
                         <td>
                             <input type="number" id="autoptimize_ccss_rlimit" name="autoptimize_ccss_rlimit" min="1" max="240" placeholder="0" value="<?php echo $ao_ccss_rlimit; ?>" />
                             <p class="notes">
-                                <?php _e( 'Certain hosting services impose hard limitations to background processes on either execution time, requests made from your server to any third party services, or both. This could lead to a faulty operation of the queue background process triggered by WP-Cron. If automated rules are not being created, you may be facing this limitation from your hosting provider. In that case, set the request limit to a reasonable number between 1 and 240. The queue fire a request to <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> on every 15 seconds (due to service limitations). If your hosting provider allows a 60 seconds time span to background processes runtime, set this value to 3 or 4 so the queue can operate within the boundaries. The maximum value of 240 allows enough requests for one hour long. To disable this limit and to let requests be made at will, just delete any values in this setting (a grey 0 will show).', 'autoptimize' ); ?>
+                                <?php _e('Certain hosting services impose hard limitations to background processes on either execution time, requests made from your server to any third party services, or both. This could lead to a faulty operation of the queue background process triggered by WP-Cron. If automated rules are not being created, you may be facing this limitation from your hosting provider. In that case, set the request limit to a reasonable number between 1 and 240. The queue fire a request to <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> on every 15 seconds (due to service limitations). If your hosting provider allows a 60 seconds time span to background processes runtime, set this value to 3 or 4 so the queue can operate within the boundaries. The maximum value of 240 allows enough requests for one hour long. To disable this limit and to let requests be made at will, just delete any values in this setting (a grey 0 will show).', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Fetch Original CSS', 'autoptimize' ); ?>
+                            <?php _e('Fetch Original CSS', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked( 1 == $ao_ccss_noptimize ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked(1 == $ao_ccss_noptimize); ?>>
                             <p class="notes">
-                                <?php _e( 'In some (rare) cases the generation of critical CSS works better with the original CSS instead of the Autoptimized one, this option enables that behavior.', 'autoptimize' ); ?>
+                                <?php _e('In some (rare) cases the generation of critical CSS works better with the original CSS instead of the Autoptimized one, this option enables that behavior.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Add CCSS for logged in users?', 'autoptimize' ); ?>
+                            <?php _e('Add CCSS for logged in users?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked( 1 == $ao_ccss_loggedin ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked(1 == $ao_ccss_loggedin); ?>>
                             <p class="notes">
-                                <?php _e( 'Critical CSS is generated by criticalcss.com from your pages as seen be "anonymous visitor", disable this option if you don\'t want the "visitor" critical CSS to be used for logged on users.', 'autoptimize' ); ?>
+                                <?php _e('Critical CSS is generated by criticalcss.com from your pages as seen be "anonymous visitor", disable this option if you don\'t want the "visitor" critical CSS to be used for logged on users.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Force path-based rules to be generated for pages?', 'autoptimize' ); ?>
+                            <?php _e('Force path-based rules to be generated for pages?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked( 1 == $ao_ccss_forcepath ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked(1 == $ao_ccss_forcepath); ?>>
                             <p class="notes">
-                                <?php _e( 'By default for each page a separate rule is generated. If your pages have (semi-)identical above the fold look and feel and you want to keep the rules lean, you can disable that so one rule is created to all pages.', 'autoptimize' ); ?>
+                                <?php _e('By default for each page a separate rule is generated. If your pages have (semi-)identical above the fold look and feel and you want to keep the rules lean, you can disable that so one rule is created to all pages.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Defer jQuery and other non-aggregated JS-files?', 'autoptimize' ); ?>
+                            <?php _e('Defer jQuery and other non-aggregated JS-files?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked( 1 == $ao_ccss_deferjquery ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked(1 == $ao_ccss_deferjquery); ?>>
                             <p class="notes">
-                                <?php _e( 'Defer all non-aggregated JS, including jQuery and inline JS to fix remaining render-blocking issues. Make sure to test your site thoroughly when activating this option!', 'autoptimize' ); ?>
+                                <?php _e('Defer all non-aggregated JS, including jQuery and inline JS to fix remaining render-blocking issues. Make sure to test your site thoroughly when activating this option!', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Bound domain', 'autoptimize' ); ?>
+                            <?php _e('Bound domain', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="text" id="autoptimize_ccss_domain" name="autoptimize_ccss_domain" style="width:100%;" placeholder="<?php _e( 'Don\'t leave this empty, put e.g. https://example.net/ or simply \'none\' to disable domain binding.', 'autoptimize' ); ?>" value="<?php echo trim( $ao_ccss_domain ); ?>">
+                            <input type="text" id="autoptimize_ccss_domain" name="autoptimize_ccss_domain" style="width:100%;" placeholder="<?php _e('Don\'t leave this empty, put e.g. https://example.net/ or simply \'none\' to disable domain binding.', 'autoptimize'); ?>" value="<?php echo trim($ao_ccss_domain); ?>">
                             <p class="notes">
-                                <?php _e( 'Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize' ); ?>
+                                <?php _e('Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Debug Mode', 'autoptimize' ); ?>
+                            <?php _e('Debug Mode', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked( 1 == $ao_ccss_debug ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked(1 == $ao_ccss_debug); ?>>
                             <p class="notes">
                                 <?php
-                                _e( '<strong>CAUTION! Only use debug mode on production/live environments for ad-hoc troubleshooting and remember to turn it back off after</strong>, as this generates a lot of log-data.<br />Check the box above to enable Autoptimize CriticalCSS Power-Up debug mode. It provides debug facilities in this screen, to the browser console and to this file: ', 'autoptimize' );
-                                echo '<code>' . AO_CCSS_LOG . '</code>';
+                                _e('<strong>CAUTION! Only use debug mode on production/live environments for ad-hoc troubleshooting and remember to turn it back off after</strong>, as this generates a lot of log-data.<br />Check the box above to enable Autoptimize CriticalCSS Power-Up debug mode. It provides debug facilities in this screen, to the browser console and to this file: ', 'autoptimize');
+                                echo '<code>'.AO_CCSS_LOG.'</code>';
                                 ?>
                             </p>
                         </td>

classes/critcss-inc/admin_settings_impexp.js.php

Spacing +5 added lines, -5 removed lines

@@ -9,15 +9,15 @@ 
     console.log('Exporting...');
     var data = {
         'action': 'ao_ccss_export',
-        'ao_ccss_export_nonce': '<?php echo wp_create_nonce( 'ao_ccss_export_nonce' ); ?>',
+        'ao_ccss_export_nonce': '<?php echo wp_create_nonce('ao_ccss_export_nonce'); ?>',
     };
 
     jQuery.post(ajaxurl, data, function(response) {
         response_array=JSON.parse(response);
         if (response_array['code'] == 200) {
             <?php
-            if ( is_multisite() ) {
-                $blog_id = '/' . get_current_blog_id() . '/';
+            if (is_multisite()) {
+                $blog_id = '/'.get_current_blog_id().'/';
             } else {
                 $blog_id = '/';
             }
@@ -32,7 +32,7 @@ 
             autoOpen: true,
             height: 210,
             width: 700,
-            title: "<?php _e( 'Export settings result', 'autoptimize' ); ?>",
+            title: "<?php _e('Export settings result', 'autoptimize'); ?>",
             modal: true,
             buttons: {
                 OK: function() {
@@ -50,7 +50,7 @@ 
     var settings_file = file[0].files[0];
     fd.append('file', settings_file);
     fd.append('action', 'ao_ccss_import');
-    fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce( 'ao_ccss_import_nonce' ); ?>');
+    fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce('ao_ccss_import_nonce'); ?>');
 
     jQuery.ajax({
         url: ajaxurl,

classes/critcss-inc/admin_settings_rules.php

Spacing +70 added lines, -70 removed lines

@@ -13,12 +13,12 @@ 
 ?>
     <ul id="rules-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle"><?php _e( 'Rules', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle"><?php _e('Rules', 'autoptimize'); ?></h2>
 
             <!-- BEGIN Rule dialogs -->
             <!-- Unsaved dialog -->
             <div id="unSavedWarning" class="hidden updated settings-error notice notice-warning is-dismissible">
-                <p><?php _e( "<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize' ); ?></p>
+                <p><?php _e("<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize'); ?></p>
             </div>
 
             <!-- Create/edit rule dialog -->
@@ -26,97 +26,97 @@ 
                 <table class="form-table rules">
                     <tr id="critcss_addedit_type_wrapper">
                         <th scope="row">
-                            <?php _e( 'Rule Type', 'autoptimize' ); ?>
+                            <?php _e('Rule Type', 'autoptimize'); ?>
                         </th>
                         <td>
                             <select id="critcss_addedit_type" style="width:100%;">
-                                <option value="paths"><?php _e( 'Path', 'autoptimize' ); ?></option>
-                                <option value="types"><?php _e( 'Conditional Tag', 'autoptimize' ); ?></option>
+                                <option value="paths"><?php _e('Path', 'autoptimize'); ?></option>
+                                <option value="types"><?php _e('Conditional Tag', 'autoptimize'); ?></option>
                             </select>
                         </td>
                     </tr>
                     <tr id="critcss_addedit_path_wrapper">
                         <th scope="row">
-                            <?php _e( 'String in Path', 'autoptimize' ); ?>
+                            <?php _e('String in Path', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="text" id="critcss_addedit_path" placeholder="<?php _e( "Enter a part of the URL that identifies the page(s) you're targetting.", 'autoptimize' ); ?>" style="width:100%;" value="">
+                            <input type="text" id="critcss_addedit_path" placeholder="<?php _e("Enter a part of the URL that identifies the page(s) you're targetting.", 'autoptimize'); ?>" style="width:100%;" value="">
                         </td>
                     </tr>
                     <tr id="critcss_addedit_pagetype_wrapper">
                         <th scope="row">
-                            <?php _e( 'Conditional Tag, Custom Post Type or Page Template', 'autoptimize' ); ?>
+                            <?php _e('Conditional Tag, Custom Post Type or Page Template', 'autoptimize'); ?>
                         </th>
                         <td>
                             <select id="critcss_addedit_pagetype" style="width:100%;">
-                                <option value="" disabled selected><?php _e( 'Select from the list below...', 'autoptimize' ); ?></option>
-                                <optgroup label="<?php _e( 'Standard Conditional Tags', 'autoptimize' ); ?>">
+                                <option value="" disabled selected><?php _e('Select from the list below...', 'autoptimize'); ?></option>
+                                <optgroup label="<?php _e('Standard Conditional Tags', 'autoptimize'); ?>">
                                     <?php
                                     // Render grouped simple conditional tags.
-                                    foreach ( $ao_ccss_types as $ctag ) {
-                                        $optgrp = substr( $ctag, 0, 3 );
-                                        if ( substr( $ctag, 0, 3 ) === 'is_' ) {
-                                            echo '<option value="' . $ctag . '">' . $ctag . '</option>';
+                                    foreach ($ao_ccss_types as $ctag) {
+                                        $optgrp = substr($ctag, 0, 3);
+                                        if (substr($ctag, 0, 3) === 'is_') {
+                                            echo '<option value="'.$ctag.'">'.$ctag.'</option>';
                                         }
-                                        $prevgrp = substr( $ctag, 0, 3 );
+                                        $prevgrp = substr($ctag, 0, 3);
                                     }
 
                                     // Render grouped custom post types, templates and specific conditional tags.
-                                    foreach ( $ao_ccss_types as $type ) {
-                                        $optgrp = substr( $type, 0, 3 );
+                                    foreach ($ao_ccss_types as $type) {
+                                        $optgrp = substr($type, 0, 3);
 
                                         // Option groups labels.
-                                        if ( $optgrp !== $prevgrp && 'is_' !== $optgrp ) {
+                                        if ($optgrp !== $prevgrp && 'is_' !== $optgrp) {
                                             ?>
                                             </optgroup>
                                             <?php
-                                            if ( substr( $type, 0, 12 ) === 'custom_post_' ) {
+                                            if (substr($type, 0, 12) === 'custom_post_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Custom Post Types', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Custom Post Types', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 9 ) === 'template_' ) {
+                                            } elseif (substr($type, 0, 9) === 'template_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Page Templates', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Page Templates', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'bbp_' ) {
+                                            } elseif (substr($type, 0, 4) === 'bbp_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'BBPress Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('BBPress Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 3 ) === 'bp_' ) {
+                                            } elseif (substr($type, 0, 3) === 'bp_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'BuddyPress Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('BuddyPress Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'edd_' ) {
+                                            } elseif (substr($type, 0, 4) === 'edd_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Easy Digital Downloads Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Easy Digital Downloads Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'woo_' ) {
+                                            } elseif (substr($type, 0, 4) === 'woo_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'WooCommerce Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('WooCommerce Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
                                             }
                                         }
 
                                         // Options.
-                                        if ( 'is_' !== $optgrp ) {
+                                        if ('is_' !== $optgrp) {
                                             // Remove prefix from custom post types, templates and some specific conditional tags.
-                                            if ( substr( $type, 0, 12 ) === 'custom_post_' ) {
-                                                $_type = str_replace( 'custom_post_', '', $type );
-                                            } elseif ( substr( $type, 0, 9 ) === 'template_' ) {
-                                                $_type = str_replace( 'template_', '', $type );
-                                            } elseif ( 'bbp_is_bbpress' == $type ) {
-                                                $_type = str_replace( 'bbp_', '', $type );
-                                            } elseif ( 'bp_is_buddypress' == $type ) {
-                                                $_type = str_replace( 'bp_', '', $type );
-                                            } elseif ( substr( $type, 0, 4 ) === 'woo_' ) {
-                                                $_type = str_replace( 'woo_', '', $type );
-                                            } elseif ( substr( $type, 0, 4 ) === 'edd_' ) {
-                                                $_type = str_replace( 'edd_', '', $type );
+                                            if (substr($type, 0, 12) === 'custom_post_') {
+                                                $_type = str_replace('custom_post_', '', $type);
+                                            } elseif (substr($type, 0, 9) === 'template_') {
+                                                $_type = str_replace('template_', '', $type);
+                                            } elseif ('bbp_is_bbpress' == $type) {
+                                                $_type = str_replace('bbp_', '', $type);
+                                            } elseif ('bp_is_buddypress' == $type) {
+                                                $_type = str_replace('bp_', '', $type);
+                                            } elseif (substr($type, 0, 4) === 'woo_') {
+                                                $_type = str_replace('woo_', '', $type);
+                                            } elseif (substr($type, 0, 4) === 'edd_') {
+                                                $_type = str_replace('edd_', '', $type);
                                             } else {
                                                 $_type = $type;
                                             }
 
-                                            echo '<option value="' . $type . '">' . $_type . '</option>';
+                                            echo '<option value="'.$type.'">'.$_type.'</option>';
                                             $prevgrp = $optgrp;
                                         }
                                     }
@@ -127,10 +127,10 @@ 
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Custom Critical CSS', 'autoptimize' ); ?>
+                            <?php _e('Custom Critical CSS', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="critcss_addedit_css" rows="13" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your specific critical CSS here and hit submit to save.', 'autoptimize' ); ?>"></textarea>
+                            <textarea id="critcss_addedit_css" rows="13" cols="10" style="width:100%;" placeholder="<?php _e('Paste your specific critical CSS here and hit submit to save.', 'autoptimize'); ?>"></textarea>
                             <input type="hidden" id="critcss_addedit_file">
                             <input type="hidden" id="critcss_addedit_id">
                         </td>
@@ -139,23 +139,23 @@ 
             </div>
 
             <!-- Remove dialog -->
-            <div id="confirm-rm" title="<?php _e( 'Delete Rule', 'autoptimize' ); ?>" class="hidden">
-                <p><?php _e( 'This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p>
+            <div id="confirm-rm" title="<?php _e('Delete Rule', 'autoptimize'); ?>" class="hidden">
+                <p><?php _e('This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p>
             </div>
 
             <!-- Remove All dialog -->
-            <div id="confirm-rm-all" title="<?php _e( 'Delete all Rules and Jobs', 'autoptimize' ); ?>" class="hidden">
-                <p><?php _e( 'All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p>
+            <div id="confirm-rm-all" title="<?php _e('Delete all Rules and Jobs', 'autoptimize'); ?>" class="hidden">
+                <p><?php _e('All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p>
             </div>
 
             <!-- Add/edit default critical CSS dialog -->
             <div id="default_critcss_wrapper" class="hidden">
-                <textarea id="dummyDefault" rows="19" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your MINIFIED default critical CSS here and hit submit to save. This is the critical CSS to be used for every page NOT MATCHING any rule.', 'autoptimize' ); ?>"></textarea>
+                <textarea id="dummyDefault" rows="19" cols="10" style="width:100%;" placeholder="<?php _e('Paste your MINIFIED default critical CSS here and hit submit to save. This is the critical CSS to be used for every page NOT MATCHING any rule.', 'autoptimize'); ?>"></textarea>
             </div>
 
             <!-- Add/edit additional critical CSS dialog -->
             <div id="additional_critcss_wrapper" class="hidden">
-                <textarea id="dummyAdditional" rows="19" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your MINIFIED additional critical CSS here and hit submit to save. This is the CSS to be added AT THE END of every critical CSS provided by a matching rule, or the default one.', 'autoptimize' ); ?>"></textarea>
+                <textarea id="dummyAdditional" rows="19" cols="10" style="width:100%;" placeholder="<?php _e('Paste your MINIFIED additional critical CSS here and hit submit to save. This is the CSS to be added AT THE END of every critical CSS provided by a matching rule, or the default one.', 'autoptimize'); ?>"></textarea>
             </div>
 
             <!-- Wrapper for in screen notices -->
@@ -165,38 +165,38 @@ 
             <!-- BEGIN Rules UI -->
             <div class="howto">
                 <div class="title-wrap">
-                    <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize' ); ?></h4>
-                    <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p>
+                    <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize'); ?></h4>
+                    <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p>
                 </div>
                 <button type="button" class="toggle-btn">
                     <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
                 </button>
                 <div class="howto-wrap hidden">
-                <p><?php _e( "TL;DR:<br />Critical CSS files from <span class='badge auto'>AUTO</span> <strong>rules are updated automatically</strong> while from <span class='badge manual'>MANUAL</span> <strong>rules are not.</strong>", 'autoptimize' ); ?></p>
+                <p><?php _e("TL;DR:<br />Critical CSS files from <span class='badge auto'>AUTO</span> <strong>rules are updated automatically</strong> while from <span class='badge manual'>MANUAL</span> <strong>rules are not.</strong>", 'autoptimize'); ?></p>
                     <ol>
-                        <li><?php _e( 'When a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key is in place, Autoptimize CriticalCSS Power-Up starts to operate <strong>automatically</strong>.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'Upon a request to any of the frontend pages made by a <strong>not logged in user</strong>, it will <strong>asynchronously</strong> fetch and update the critical CSS from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for conditional tags you have on your site (e.g. is_page, is_single, is_archive etc.)', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'These requests also creates an <span class="badge auto">AUTO</span> rule for you. The critical CSS files from <span class="badge auto">AUTO</span> <strong>rules are updated automatically</strong> when a CSS file in your theme or frontend plugins changes.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'If you want to make any fine tunning in the critical CSS file of an <span class="badge auto">AUTO</span> rule, click on "Edit" button of that rule, change what you need, submit and save it. The rule you\'ve just edited becomes a <span class="badge manual">MANUAL</span> rule then.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'You can create <span class="badge manual">MANUAL</span> rules for specific page paths (URL). Longer, more specific paths have higher priority over shorter ones, which in turn have higher priority over <span class="badge auto">AUTO</span> rules. Also, critical CSS files from <span class="badge manual">MANUAL</span> <strong>rules are NEVER updated automatically.</strong>', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'You can also create an <span class="badge auto">AUTO</span> rule for a path by leaving its critical CSS content empty. The critical CSS for that path will be automatically fetched from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for you and updated whenever it changes.', 'autoptimize' ); ?></li>
-                        <li><?php _e( "If you see an <span class='badge auto'>AUTO</span> rule with a <span class='badge review'>R</span> besides it (R is after REVIEW), it means that the fetched critical CSS for that rule is not 100% garanteed to work according to <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> analysis. It's advised that you edit and review that rule to make any required adjustments.", 'autoptimize' ); ?></li>
-                        <li><?php _e( 'At any time you can delete an <span class="badge auto">AUTO</span> or <span class="badge manual">MANUAL</span> rule by cliking on "Remove" button of the desired rule and saving your changes.', 'autoptimize' ); ?></li>
+                        <li><?php _e('When a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key is in place, Autoptimize CriticalCSS Power-Up starts to operate <strong>automatically</strong>.', 'autoptimize'); ?></li>
+                        <li><?php _e('Upon a request to any of the frontend pages made by a <strong>not logged in user</strong>, it will <strong>asynchronously</strong> fetch and update the critical CSS from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for conditional tags you have on your site (e.g. is_page, is_single, is_archive etc.)', 'autoptimize'); ?></li>
+                        <li><?php _e('These requests also creates an <span class="badge auto">AUTO</span> rule for you. The critical CSS files from <span class="badge auto">AUTO</span> <strong>rules are updated automatically</strong> when a CSS file in your theme or frontend plugins changes.', 'autoptimize'); ?></li>
+                        <li><?php _e('If you want to make any fine tunning in the critical CSS file of an <span class="badge auto">AUTO</span> rule, click on "Edit" button of that rule, change what you need, submit and save it. The rule you\'ve just edited becomes a <span class="badge manual">MANUAL</span> rule then.', 'autoptimize'); ?></li>
+                        <li><?php _e('You can create <span class="badge manual">MANUAL</span> rules for specific page paths (URL). Longer, more specific paths have higher priority over shorter ones, which in turn have higher priority over <span class="badge auto">AUTO</span> rules. Also, critical CSS files from <span class="badge manual">MANUAL</span> <strong>rules are NEVER updated automatically.</strong>', 'autoptimize'); ?></li>
+                        <li><?php _e('You can also create an <span class="badge auto">AUTO</span> rule for a path by leaving its critical CSS content empty. The critical CSS for that path will be automatically fetched from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for you and updated whenever it changes.', 'autoptimize'); ?></li>
+                        <li><?php _e("If you see an <span class='badge auto'>AUTO</span> rule with a <span class='badge review'>R</span> besides it (R is after REVIEW), it means that the fetched critical CSS for that rule is not 100% garanteed to work according to <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> analysis. It's advised that you edit and review that rule to make any required adjustments.", 'autoptimize'); ?></li>
+                        <li><?php _e('At any time you can delete an <span class="badge auto">AUTO</span> or <span class="badge manual">MANUAL</span> rule by cliking on "Remove" button of the desired rule and saving your changes.', 'autoptimize'); ?></li>
                     </ol>
                 </div>
             </div>
-            <textarea id="autoptimize_css_defer_inline" name="autoptimize_css_defer_inline" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_css_defer_inline', '' ); ?></textarea>
-            <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_ccss_additional', '' ); ?></textarea>
+            <textarea id="autoptimize_css_defer_inline" name="autoptimize_css_defer_inline" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_css_defer_inline', ''); ?></textarea>
+            <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_ccss_additional', ''); ?></textarea>
             <table class="rules-list" cellspacing="0"><tbody id="rules-list"></tbody></table>
-            <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo ( json_encode( $ao_ccss_rules, JSON_FORCE_OBJECT ) ); ?>'>
+            <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo (json_encode($ao_ccss_rules, JSON_FORCE_OBJECT)); ?>'>
             <div class="submit rules-btn">
                 <div class="alignleft">
-                    <span id="addCritCssButton" class="button-secondary"><?php _e( 'Add New Rule', 'autoptimize' ); ?></span>
-                    <span id="editDefaultButton" class="button-secondary"><?php _e( 'Edit Default Rule CSS', 'autoptimize' ); ?></span>
-                    <span id="editAdditionalButton" class="button-secondary"><?php _e( 'Add CSS To All Rules', 'autoptimize' ); ?></span>
+                    <span id="addCritCssButton" class="button-secondary"><?php _e('Add New Rule', 'autoptimize'); ?></span>
+                    <span id="editDefaultButton" class="button-secondary"><?php _e('Edit Default Rule CSS', 'autoptimize'); ?></span>
+                    <span id="editAdditionalButton" class="button-secondary"><?php _e('Add CSS To All Rules', 'autoptimize'); ?></span>
                 </div>
                 <div class="alignright">
-                    <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e( 'Remove all rules', 'autoptimize' ); ?></span>
+                    <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e('Remove all rules', 'autoptimize'); ?></span>
                 </div>
             </div>
             <!-- END Rules UI -->

classes/critcss-inc/admin_settings_debug.php

Spacing +15 added lines, -15 removed lines

@@ -10,7 +10,7 @@ 
 $ao_options = $wpdb->get_results('
   SELECT option_name  AS name,
          option_value AS value
-  FROM ' . $wpdb->options . '
+  FROM ' . $wpdb->options.'
   WHERE option_name LIKE "autoptimize_%%"
   ORDER BY name
 ', ARRAY_A);
@@ -19,27 +19,27 @@ 
 $ao_trans = $wpdb->get_results('
   SELECT option_name  AS name,
          option_value AS value
-  FROM ' . $wpdb->options . '
+  FROM ' . $wpdb->options.'
   WHERE option_name LIKE "_transient_autoptimize_%%"
      OR option_name LIKE "_transient_timeout_autoptimize_%%"
 ', ARRAY_A);
 
 // Render debug panel if there's something to show.
-if ( $ao_options || $ao_trans ) {
+if ($ao_options || $ao_trans) {
 ?>
 <!-- BEGIN: Settings Debug -->
 <ul>
     <li class="itemDetail">
-        <h2 class="itemTitle"><?php _e( 'Debug Information', 'autoptimize' ); ?></h2>
+        <h2 class="itemTitle"><?php _e('Debug Information', 'autoptimize'); ?></h2>
 
         <?php
         // Render options.
-        if ( $ao_options ) {
+        if ($ao_options) {
         ?>
-            <h4><?php _e( 'Options', 'autoptimize' ); ?>:</h4>
+            <h4><?php _e('Options', 'autoptimize'); ?>:</h4>
             <table class="form-table debug">
             <?php
-            foreach ( $ao_options as $option ) {
+            foreach ($ao_options as $option) {
             ?>
                 <tr>
                     <th scope="row">
@@ -47,10 +47,10 @@ 
                     </th>
                     <td>
                         <?php
-                        if ( 'autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name'] ) {
-                            $value = print_r( json_decode( $option['value'], true ), true );
-                            if ( $value ) {
-                                echo "Raw JSON:\n<pre>" . $option['value'] . "</pre>\n\nDecoded JSON:\n<pre>" . $value . '</pre>';
+                        if ('autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name']) {
+                            $value = print_r(json_decode($option['value'], true), true);
+                            if ($value) {
+                                echo "Raw JSON:\n<pre>".$option['value']."</pre>\n\nDecoded JSON:\n<pre>".$value.'</pre>';
                             } else {
                                 echo 'Empty';
                             }
@@ -69,11 +69,11 @@ 
         }
         // Render WP-Cron intervals and scheduled events.
         ?>
-        <h4><?php _e( 'WP-Cron Intervals', 'autoptimize' ); ?>:</h4>
-        <pre><?php print_r( wp_get_schedules() ); ?></pre>
+        <h4><?php _e('WP-Cron Intervals', 'autoptimize'); ?>:</h4>
+        <pre><?php print_r(wp_get_schedules()); ?></pre>
         <hr />
-        <h4><?php _e( 'WP-Cron Scheduled Events', 'autoptimize' ); ?>:</h4>
-        <pre><?php print_r( _get_cron_array() ); ?></pre>
+        <h4><?php _e('WP-Cron Scheduled Events', 'autoptimize'); ?>:</h4>
+        <pre><?php print_r(_get_cron_array()); ?></pre>
     </li>
 </ul>
 <!-- END: Settings Debug -->

classes/autoptimizeCriticalCSSSettings.php

Spacing +103 added lines, -103 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS Options page.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,34 +17,34 @@ 
 
     public function __construct()
     {
-        $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http );
+        $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http);
         $this->run();
     }
 
     protected function enabled()
     {
-        return apply_filters( 'autoptimize_filter_show_criticalcss_tabs', true );
+        return apply_filters('autoptimize_filter_show_criticalcss_tabs', true);
     }
 
     public function run()
     {
-        if ( $this->enabled() ) {
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_critcss_tabs' ), 10, 1 );
-            add_action( 'admin_enqueue_scripts', array( $this, 'admin_assets' ) );
+        if ($this->enabled()) {
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_critcss_tabs'), 10, 1);
+            add_action('admin_enqueue_scripts', array($this, 'admin_assets'));
 
-            if ( $this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'add_critcss_admin_menu' ) );
+            if ($this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'add_critcss_admin_menu'));
             } else {
-                add_action( 'admin_menu', array( $this, 'add_critcss_admin_menu' ) );
+                add_action('admin_menu', array($this, 'add_critcss_admin_menu'));
             }
 
             $criticalcss_ajax = new autoptimizeCriticalCSSSettingsAjax();
         }
     }
 
-    public function add_critcss_tabs( $in )
+    public function add_critcss_tabs($in)
     {
-        $in = array_merge( $in, array( 'ao_critcss' => '⚡ ' . __( 'Critical CSS', 'autoptimize' ) ) );
+        $in = array_merge($in, array('ao_critcss' => '⚡ '.__('Critical CSS', 'autoptimize')));
 
         return $in;
     }
@@ -52,56 +52,56 @@ 
     public function add_critcss_admin_menu()
     {
         // Register settings.
-        register_setting( 'ao_ccss_options_group', 'autoptimize_css_defer_inline' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rules' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_additional' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_queue' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_viewport' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_finclude' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rlimit' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_noptimize' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_debug' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_key' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_keyst' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_loggedin' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_forcepath' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_deferjquery' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_domain' );
+        register_setting('ao_ccss_options_group', 'autoptimize_css_defer_inline');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_rules');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_additional');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_queue');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_viewport');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_finclude');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_rlimit');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_noptimize');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_debug');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_key');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_keyst');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_loggedin');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_forcepath');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_deferjquery');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_domain');
 
         // And add submenu-page.
-        add_submenu_page( null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array( $this, 'ao_criticalcsssettings_page' ) );
+        add_submenu_page(null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array($this, 'ao_criticalcsssettings_page'));
     }
 
-    public function admin_assets( $hook ) {
+    public function admin_assets($hook) {
         // Return if plugin is not hooked.
-        if ( 'settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook ) {
+        if ('settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook) {
             return;
         }
 
         // Stylesheets to add.
-        wp_enqueue_style( 'wp-jquery-ui-dialog' );
-        wp_enqueue_style( 'ao-tablesorter', plugins_url( 'critcss-inc/css/ao-tablesorter/style.css', __FILE__ ) );
-        wp_enqueue_style( 'ao-ccss-admin-css', plugins_url( 'critcss-inc/css/admin_styles.css', __FILE__ ) );
+        wp_enqueue_style('wp-jquery-ui-dialog');
+        wp_enqueue_style('ao-tablesorter', plugins_url('critcss-inc/css/ao-tablesorter/style.css', __FILE__));
+        wp_enqueue_style('ao-ccss-admin-css', plugins_url('critcss-inc/css/admin_styles.css', __FILE__));
 
         // Scripts to add.
-        wp_enqueue_script( 'jquery-ui-dialog', array( 'jquery' ) );
-        wp_enqueue_script( 'md5', plugins_url( 'critcss-inc/js/md5.min.js', __FILE__ ), null, null, true );
-        wp_enqueue_script( 'tablesorter', plugins_url( 'critcss-inc/js/jquery.tablesorter.min.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_enqueue_script( 'ao-ccss-admin-license', plugins_url( 'critcss-inc/js/admin_settings.js', __FILE__ ), array( 'jquery' ), null, true );
+        wp_enqueue_script('jquery-ui-dialog', array('jquery'));
+        wp_enqueue_script('md5', plugins_url('critcss-inc/js/md5.min.js', __FILE__), null, null, true);
+        wp_enqueue_script('tablesorter', plugins_url('critcss-inc/js/jquery.tablesorter.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('ao-ccss-admin-license', plugins_url('critcss-inc/js/admin_settings.js', __FILE__), array('jquery'), null, true);
     }
 
     public function ao_criticalcsssettings_page()
     {
         // these are not OO yet, simply require for now.
-        require_once( 'critcss-inc/admin_settings_rules.php' );
-        require_once( 'critcss-inc/admin_settings_queue.php' );
-        require_once( 'critcss-inc/admin_settings_key.php' );
-        require_once( 'critcss-inc/admin_settings_adv.php' );
-        require_once( 'critcss-inc/admin_settings_explain.php' );
+        require_once('critcss-inc/admin_settings_rules.php');
+        require_once('critcss-inc/admin_settings_queue.php');
+        require_once('critcss-inc/admin_settings_key.php');
+        require_once('critcss-inc/admin_settings_adv.php');
+        require_once('critcss-inc/admin_settings_explain.php');
 
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
@@ -109,7 +109,7 @@ 
         <div class="wrap">
             <div id="autoptimize_main">
                 <div id="ao_title_and_button">
-                    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+                    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
                 </div>
 
                 <?php
@@ -117,14 +117,14 @@ 
                 echo autoptimizeConfig::ao_admin_tabs();
 
                 // Make sure dir to write ao_ccss exists and is writable.
-                if ( ! is_dir( AO_CCSS_DIR ) ) {
-                    $mkdirresp = @mkdir( AO_CCSS_DIR, 0775, true ); // @codingStandardsIgnoreLine
-                    $fileresp  = file_put_contents( AO_CCSS_DIR . 'index.html', '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' );
-                    if ( ( ! $mkdirresp ) || ( ! $fileresp ) ) {
+                if (!is_dir(AO_CCSS_DIR)) {
+                    $mkdirresp = @mkdir(AO_CCSS_DIR, 0775, true); // @codingStandardsIgnoreLine
+                    $fileresp  = file_put_contents(AO_CCSS_DIR.'index.html', '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+                    if ((!$mkdirresp) || (!$fileresp)) {
                         ?>
                         <div class="notice-error notice"><p>
                         <?php
-                        _e( 'Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize' );
+                        _e('Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize');
                         ?>
                         </p></div>
                         <?php
@@ -132,11 +132,11 @@ 
                 }
 
                 // Check for Autoptimize.
-                if ( ! empty( $ao_ccss_key ) && ! $ao_css_defer ) {
+                if (!empty($ao_ccss_key) && !$ao_css_defer) {
                     ?>
                     <div class="notice-error notice"><p>
                     <?php
-                    _e( "Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize' );
+                    _e("Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -144,11 +144,11 @@ 
                 }
 
                 // check if WordPress cron is disabled and warn if so.
-                if ( ! empty( $ao_ccss_key ) && defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && PAnD::is_admin_notice_active( 'i-know-about-disable-cron-forever' ) ) {
+                if (!empty($ao_ccss_key) && defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && PAnD::is_admin_notice_active('i-know-about-disable-cron-forever')) {
                     ?>
                     <div data-dismissible="i-know-about-disable-cron-forever" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e('WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -156,24 +156,24 @@ 
 
                 // warn if it looks as though the queue processing job looks isn't running
                 // but store result in transient as to not to have to go through 2 arrays each and every time.
-                $_warn_cron = get_transient( 'ao_ccss_cronwarning' );
-                if ( ! empty( $ao_ccss_key ) && false === $_warn_cron ) {
+                $_warn_cron = get_transient('ao_ccss_cronwarning');
+                if (!empty($ao_ccss_key) && false === $_warn_cron) {
                     $_jobs_all_new         = true;
-                    $_oldest_job_timestamp = microtime( true ); // now.
+                    $_oldest_job_timestamp = microtime(true); // now.
                     $_jobs_too_old         = true;
 
                     // go over queue array.
-                    if ( empty( $ao_ccss_queue ) ) {
+                    if (empty($ao_ccss_queue)) {
                         // no jobs, then no warning.
                         $_jobs_all_new = false;
                     } else {
-                        foreach ( $ao_ccss_queue as $job ) {
-                            if ( $job['jctime'] < $_oldest_job_timestamp ) {
+                        foreach ($ao_ccss_queue as $job) {
+                            if ($job['jctime'] < $_oldest_job_timestamp) {
                                 // we need to catch the oldest job's timestamp.
                                 $_oldest_job_timestamp = $job['jctime'];
                             }
 
-                            if ( 'NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid'] ) {
+                            if ('NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid']) {
                                 // we have a non-"NEW" job which is not our pending firstrun job either, break the loop.
                                 $_jobs_all_new = false;
                                 break;
@@ -182,11 +182,11 @@ 
                     }
 
                     // is the oldest job too old (4h)?
-                    if ( $_oldest_job_timestamp > microtime( true ) - 60 * 60 * 4 ) {
+                    if ($_oldest_job_timestamp > microtime(true) - 60*60*4) {
                         $_jobs_too_old = false;
                     }
 
-                    if ( $_jobs_all_new && ! $this->ao_ccss_has_autorules() && $_jobs_too_old ) {
+                    if ($_jobs_all_new && !$this->ao_ccss_has_autorules() && $_jobs_too_old) {
                         $_warn_cron            = 'on';
                         $_transient_multiplier = 1; // store for 1 hour.
                     } else {
@@ -194,33 +194,33 @@ 
                         $_transient_multiplier = 4; // store for 4 hours.
                     }
                     // and set transient.
-                    set_transient( 'ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier * HOUR_IN_SECONDS );
+                    set_transient('ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier*HOUR_IN_SECONDS);
                 }
 
-                if ( ! empty( $ao_ccss_key ) && 'on' == $_warn_cron && PAnD::is_admin_notice_active( 'i-know-about-cron-1' ) ) {
+                if (!empty($ao_ccss_key) && 'on' == $_warn_cron && PAnD::is_admin_notice_active('i-know-about-cron-1')) {
                     ?>
                     <div data-dismissible="i-know-about-cron-1" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e('It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
-                } elseif ( ! empty( $ao_ccss_key ) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && ! $this->ao_ccss_has_autorules() ) {
+                } elseif (!empty($ao_ccss_key) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && !$this->ao_ccss_has_autorules()) {
                     ?>
                     <div class="notice-success notice"><p>
                     <?php
-                    _e( 'Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize' );
+                    _e('Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
                 }
 
                 // warn if service is down.
-                if ( ! empty( $ao_ccss_key ) && ! empty( $ao_ccss_servicestatus ) && is_array( $ao_ccss_servicestatus ) && 'down' === $ao_ccss_servicestatus['critcss']['status'] ) {
+                if (!empty($ao_ccss_key) && !empty($ao_ccss_servicestatus) && is_array($ao_ccss_servicestatus) && 'down' === $ao_ccss_servicestatus['critcss']['status']) {
                     ?>
                     <div class="notice-warning notice"><p>
                     <?php
-                    _e( 'The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize' );
+                    _e('The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -230,24 +230,24 @@ 
                 ?>
                 <form id="settings" method="post" action="options.php">
                     <?php
-                    settings_fields( 'ao_ccss_options_group' );
+                    settings_fields('ao_ccss_options_group');
 
                     // Get API key status.
-                    $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( true );
+                    $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(true);
 
-                    if ( $this->is_multisite_network_admin() ) {
+                    if ($this->is_multisite_network_admin()) {
                         ?>
                         <ul id="key-panel">
                             <li class="itemDetail">
                             <?php
                                 // translators: the placesholder is for a line of code in wp-config.php.
-                                echo sprintf( __( '<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize' ), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>' );
+                                echo sprintf(__('<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize'), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>');
                             ?>
                             </li>
                         </ul>
                         <?php
                     } else {
-                        if ( 'valid' == $key['status'] ) {
+                        if ('valid' == $key['status']) {
                             // If key status is valid, render other panels.
                             // Render rules section.
                             ao_ccss_render_rules();
@@ -264,23 +264,23 @@ 
                             $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport();
 
                             // Add hidden fields.
-                            echo "<input class='hidden' name='autoptimize_ccss_rules' value='" . $ao_ccss_rules_raw . "'>";
-                            echo "<input class='hidden' name='autoptimize_ccss_queue' value='" . $ao_ccss_queue_raw . "'>";
-                            echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="' . $viewport['w'] . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="' . $viewport['h'] . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_finclude" value="' . $ao_ccss_finclude . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="' . $ao_ccss_rlimit . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_debug" value="' . $ao_ccss_debug . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="' . $ao_ccss_noptimize . '">';
-                            echo '<input class="hidden" name="autoptimize_css_defer_inline" value="' . esc_attr( $ao_css_defer_inline ) . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="' . $ao_ccss_loggedin . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="' . $ao_ccss_forcepath . '">';
+                            echo "<input class='hidden' name='autoptimize_ccss_rules' value='".$ao_ccss_rules_raw."'>";
+                            echo "<input class='hidden' name='autoptimize_ccss_queue' value='".$ao_ccss_queue_raw."'>";
+                            echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="'.$viewport['w'].'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="'.$viewport['h'].'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_finclude" value="'.$ao_ccss_finclude.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="'.$ao_ccss_rlimit.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_debug" value="'.$ao_ccss_debug.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="'.$ao_ccss_noptimize.'">';
+                            echo '<input class="hidden" name="autoptimize_css_defer_inline" value="'.esc_attr($ao_css_defer_inline).'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="'.$ao_ccss_loggedin.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="'.$ao_ccss_forcepath.'">';
                         }
                         // Render key panel unconditionally.
-                        ao_ccss_render_key( $ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color'] );
+                        ao_ccss_render_key($ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color']);
                         ?>
                         <p class="submit left">
-                            <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" />
+                            <input type="submit" class="button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" />
                         </p>
                         <?php
                     }
@@ -298,31 +298,31 @@ 
                     });
                 }
                 </script>
-                <form id="importSettingsForm"<?php if ( $this->is_multisite_network_admin() ) { echo ' class="hidden"'; } ?>>
-                    <span id="exportSettings" class="button-secondary"><?php _e( 'Export Settings', 'autoptimize' ); ?></span>
-                    <input class="button-secondary" id="importSettings" type="button" value="<?php _e( 'Import Settings', 'autoptimize' ); ?>" onclick="upload();return false;" />
+                <form id="importSettingsForm"<?php if ($this->is_multisite_network_admin()) { echo ' class="hidden"'; } ?>>
+                    <span id="exportSettings" class="button-secondary"><?php _e('Export Settings', 'autoptimize'); ?></span>
+                    <input class="button-secondary" id="importSettings" type="button" value="<?php _e('Import Settings', 'autoptimize'); ?>" onclick="upload();return false;" />
                     <input class="button-secondary" id="settingsfile" name="settingsfile" type="file" />
                 </form>
                 <div id="importdialog"></div>
             </div><!-- /#autoptimize_main -->
         </div><!-- /#wrap -->
         <?php
-        if ( ! $this->is_multisite_network_admin() ) {
+        if (!$this->is_multisite_network_admin()) {
             // Include debug panel if debug mode is enable.
-            if ( $ao_ccss_debug ) {
+            if ($ao_ccss_debug) {
             ?>
                 <div id="debug">
                     <?php
                     // Include debug panel.
-                    include( 'critcss-inc/admin_settings_debug.php' );
+                    include('critcss-inc/admin_settings_debug.php');
                     ?>
                 </div><!-- /#debug -->
             <?php
             }
             echo '<script>';
-            include( 'critcss-inc/admin_settings_rules.js.php' );
-            include( 'critcss-inc/admin_settings_queue.js.php' );
-            include( 'critcss-inc/admin_settings_impexp.js.php' );
+            include('critcss-inc/admin_settings_rules.js.php');
+            include('critcss-inc/admin_settings_queue.js.php');
+            include('critcss-inc/admin_settings_impexp.js.php');
             echo '</script>';
         }
     }
@@ -330,19 +330,19 @@ 
     public static function ao_ccss_has_autorules() {
         static $_has_auto_rules = null;
 
-        if ( null === $_has_auto_rules ) {
+        if (null === $_has_auto_rules) {
             global $ao_ccss_rules;
             $_has_auto_rules = false;
-            if ( ! empty( $ao_ccss_rules ) ) {
-                foreach ( array( 'types', 'paths' ) as $_typat ) {
-                    foreach ( $ao_ccss_rules[ $_typat ] as $rule ) {
-                        if ( ! empty( $rule['hash'] ) ) {
+            if (!empty($ao_ccss_rules)) {
+                foreach (array('types', 'paths') as $_typat) {
+                    foreach ($ao_ccss_rules[$_typat] as $rule) {
+                        if (!empty($rule['hash'])) {
                             // we have at least one AUTO job, so all is fine.
                             $_has_auto_rules = true;
                             break;
                         }
                     }
-                    if ( $_has_auto_rules ) {
+                    if ($_has_auto_rules) {
                         break;
                     }
                 }
@@ -355,8 +355,8 @@ 
     public function is_multisite_network_admin() {
         static $_multisite_network_admin = null;
 
-        if ( null === $_multisite_network_admin ) {
-            if ( is_multisite() && is_network_admin() ) {
+        if (null === $_multisite_network_admin) {
+            if (is_multisite() && is_network_admin()) {
                 $_multisite_network_admin = true;
             } else {
                 $_multisite_network_admin = false;

classes/autoptimizeCriticalCSSSettingsAjax.php

Spacing +99 added lines, -99 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS settings AJAX logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,7 +12,7 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
@@ -21,47 +21,47 @@ 
 
     public function run() {
         // add filters.
-        add_action( 'wp_ajax_fetch_critcss', array( $this, 'critcss_fetch_callback' ) );
-        add_action( 'wp_ajax_save_critcss', array( $this, 'critcss_save_callback' ) );
-        add_action( 'wp_ajax_rm_critcss', array( $this, 'critcss_rm_callback' ) );
-        add_action( 'wp_ajax_rm_critcss_all', array( $this, 'critcss_rm_all_callback' ) );
-        add_action( 'wp_ajax_ao_ccss_export', array( $this, 'ao_ccss_export_callback' ) );
-        add_action( 'wp_ajax_ao_ccss_import', array( $this, 'ao_ccss_import_callback' ) );
+        add_action('wp_ajax_fetch_critcss', array($this, 'critcss_fetch_callback'));
+        add_action('wp_ajax_save_critcss', array($this, 'critcss_save_callback'));
+        add_action('wp_ajax_rm_critcss', array($this, 'critcss_rm_callback'));
+        add_action('wp_ajax_rm_critcss_all', array($this, 'critcss_rm_all_callback'));
+        add_action('wp_ajax_ao_ccss_export', array($this, 'ao_ccss_export_callback'));
+        add_action('wp_ajax_ao_ccss_import', array($this, 'ao_ccss_import_callback'));
     }
 
     public function critcss_fetch_callback() {
         // Ajax handler to obtain a critical CSS file from the filesystem.
         // Check referer.
-        check_ajax_referer( 'fetch_critcss_nonce', 'critcss_fetch_nonce' );
+        check_ajax_referer('fetch_critcss_nonce', 'critcss_fetch_nonce');
 
         // Initialize error flag.
         $error = true;
 
         // Allow no content for MANUAL rules (as they may not exist just yet).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $content = '';
             $error   = false;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename.
             // Set file path and obtain its content.
-            $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-            if ( file_exists( $critcssfile ) ) {
-                $content = file_get_contents( $critcssfile );
+            $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+            if (file_exists($critcssfile)) {
+                $content = file_get_contents($critcssfile);
                 $error   = false;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
-            $response['string'] = 'Error reading file ' . $critcssfile . '.';
+            $response['string'] = 'Error reading file '.$critcssfile.'.';
         } else {
             $response['code']   = '200';
             $response['string'] = $content;
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -74,22 +74,22 @@ 
 
         // Ajax handler to write a critical CSS to the filesystem
         // Check referer.
-        check_ajax_referer( 'save_critcss_nonce', 'critcss_save_nonce' );
+        check_ajax_referer('save_critcss_nonce', 'critcss_save_nonce');
 
         // Allow empty contents for MANUAL rules (as they are fetched later).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $critcssfile = false;
             $status      = true;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename
             // Set critical CSS content.
-            $critcsscontents = stripslashes( $_POST['critcsscontents'] );
+            $critcsscontents = stripslashes($_POST['critcsscontents']);
 
             // If there is content and it's valid, write the file.
-            if ( $critcsscontents && autoptimizeCriticalCSSCore::ao_ccss_check_contents( $critcsscontents ) ) {
+            if ($critcsscontents && autoptimizeCriticalCSSCore::ao_ccss_check_contents($critcsscontents)) {
                 // Set file path and status.
-                $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-                $status      = file_put_contents( $critcssfile, $critcsscontents, LOCK_EX );
+                $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+                $status      = file_put_contents($critcssfile, $critcsscontents, LOCK_EX);
                 // Or set as error.
             } else {
                 $error = true;
@@ -100,20 +100,20 @@ 
         }
 
         // Prepare response.
-        if ( ! $status || $error ) {
+        if (!$status || $error) {
             $response['code']   = '500';
-            $response['string'] = 'Error saving file ' . $critcssfile . '.';
+            $response['string'] = 'Error saving file '.$critcssfile.'.';
         } else {
             $response['code'] = '200';
-            if ( $critcssfile ) {
-                $response['string'] = 'File ' . $critcssfile . ' saved.';
+            if ($critcssfile) {
+                $response['string'] = 'File '.$critcssfile.' saved.';
             } else {
                 $response['string'] = 'Empty content do not need to be saved.';
             }
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -123,40 +123,40 @@ 
     public function critcss_rm_callback() {
         // Ajax handler to delete a critical CSS from the filesystem
         // Check referer.
-        check_ajax_referer( 'rm_critcss_nonce', 'critcss_rm_nonce' );
+        check_ajax_referer('rm_critcss_nonce', 'critcss_rm_nonce');
 
         // Initialize error and status flags.
         $error  = true;
         $status = false;
 
         // Allow no file for MANUAL rules (as they may not exist just yet).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $error = false;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename
             // Set file path and delete it.
-            $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-            if ( file_exists( $critcssfile ) ) {
-                $status = unlink( $critcssfile );
+            $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+            if (file_exists($critcssfile)) {
+                $status = unlink($critcssfile);
                 $error  = false;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
-            $response['string'] = 'Error removing file ' . $critcssfile . '.';
+            $response['string'] = 'Error removing file '.$critcssfile.'.';
         } else {
             $response['code'] = '200';
-            if ( $status ) {
-                $response['string'] = 'File ' . $critcssfile . ' removed.';
+            if ($status) {
+                $response['string'] = 'File '.$critcssfile.' removed.';
             } else {
                 $response['string'] = 'No file to be removed.';
             }
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -165,28 +165,28 @@ 
     public function critcss_rm_all_callback() {
         // Ajax handler to delete a critical CSS from the filesystem
         // Check referer.
-        check_ajax_referer( 'rm_critcss_all_nonce', 'critcss_rm_all_nonce' );
+        check_ajax_referer('rm_critcss_all_nonce', 'critcss_rm_all_nonce');
 
         // Initialize error and status flags.
         $error  = true;
         $status = false;
 
         // Remove all ccss files on filesystem.
-        if ( current_user_can( 'manage_options' ) ) {
-            if ( file_exists( AO_CCSS_DIR ) && is_dir( AO_CCSS_DIR ) ) {
-                array_map( 'unlink', glob( AO_CCSS_DIR . 'ccss_*.css', GLOB_BRACE ) );
+        if (current_user_can('manage_options')) {
+            if (file_exists(AO_CCSS_DIR) && is_dir(AO_CCSS_DIR)) {
+                array_map('unlink', glob(AO_CCSS_DIR.'ccss_*.css', GLOB_BRACE));
                 $error  = false;
                 $status = true;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
             $response['string'] = 'Error removing all critical CSS files.';
         } else {
             $response['code'] = '200';
-            if ( $status ) {
+            if ($status) {
                 $response['string'] = 'Critical CSS Files removed.';
             } else {
                 $response['string'] = 'No file removed.';
@@ -194,7 +194,7 @@ 
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -203,70 +203,70 @@ 
     public function ao_ccss_export_callback() {
         // Ajax handler export settings
         // Check referer.
-        check_ajax_referer( 'ao_ccss_export_nonce', 'ao_ccss_export_nonce' );
+        check_ajax_referer('ao_ccss_export_nonce', 'ao_ccss_export_nonce');
 
-        if ( ! class_exists( 'ZipArchive' ) ) {
+        if (!class_exists('ZipArchive')) {
             $response['code'] = '500';
             $response['msg']  = 'PHP ZipArchive not present, cannot create zipfile';
-            echo json_encode( $response );
+            echo json_encode($response);
             wp_die();
         }
 
         // Init array, get options and prepare the raw object.
         $settings               = array();
-        $settings['rules']      = get_option( 'autoptimize_ccss_rules' );
-        $settings['additional'] = get_option( 'autoptimize_ccss_additional' );
-        $settings['viewport']   = get_option( 'autoptimize_ccss_viewport' );
-        $settings['finclude']   = get_option( 'autoptimize_ccss_finclude' );
-        $settings['rlimit']     = get_option( 'autoptimize_ccss_rlimit' );
-        $settings['noptimize']  = get_option( 'autoptimize_ccss_noptimize' );
-        $settings['debug']      = get_option( 'autoptimize_ccss_debug' );
-        $settings['key']        = get_option( 'autoptimize_ccss_key' );
+        $settings['rules']      = get_option('autoptimize_ccss_rules');
+        $settings['additional'] = get_option('autoptimize_ccss_additional');
+        $settings['viewport']   = get_option('autoptimize_ccss_viewport');
+        $settings['finclude']   = get_option('autoptimize_ccss_finclude');
+        $settings['rlimit']     = get_option('autoptimize_ccss_rlimit');
+        $settings['noptimize']  = get_option('autoptimize_ccss_noptimize');
+        $settings['debug']      = get_option('autoptimize_ccss_debug');
+        $settings['key']        = get_option('autoptimize_ccss_key');
 
         // Initialize error flag.
         $error = true;
 
         // Check user permissions.
-        if ( current_user_can( 'manage_options' ) ) {
+        if (current_user_can('manage_options')) {
             // Prepare settings file path and content.
-            $exportfile = AO_CCSS_DIR . 'settings.json';
-            $contents   = json_encode( $settings );
-            $status     = file_put_contents( $exportfile, $contents, LOCK_EX );
+            $exportfile = AO_CCSS_DIR.'settings.json';
+            $contents   = json_encode($settings);
+            $status     = file_put_contents($exportfile, $contents, LOCK_EX);
             $error      = false;
         }
 
         // Prepare archive.
-        $zipfile = AO_CCSS_DIR . date( 'Ymd-H\hi' ) . '_ao_ccss_settings.zip';
-        $file    = pathinfo( $zipfile, PATHINFO_BASENAME );
+        $zipfile = AO_CCSS_DIR.date('Ymd-H\hi').'_ao_ccss_settings.zip';
+        $file    = pathinfo($zipfile, PATHINFO_BASENAME);
         $zip     = new ZipArchive();
-        $ret     = $zip->open( $zipfile, ZipArchive::CREATE );
-        if ( true !== $ret ) {
+        $ret     = $zip->open($zipfile, ZipArchive::CREATE);
+        if (true !== $ret) {
             $error = true;
         } else {
-            $zip->addFile( AO_CCSS_DIR . 'settings.json', 'settings.json' );
-            if ( file_exists( AO_CCSS_DIR . 'queue.json' ) ) {
-                $zip->addFile( AO_CCSS_DIR . 'queue.json', 'queue.json' );
+            $zip->addFile(AO_CCSS_DIR.'settings.json', 'settings.json');
+            if (file_exists(AO_CCSS_DIR.'queue.json')) {
+                $zip->addFile(AO_CCSS_DIR.'queue.json', 'queue.json');
             }
             $options = array(
                 'add_path'        => './',
                 'remove_all_path' => true,
             );
-            $zip->addGlob( AO_CCSS_DIR . '*.css', 0, $options );
+            $zip->addGlob(AO_CCSS_DIR.'*.css', 0, $options);
             $zip->close();
         }
 
         // Prepare response.
-        if ( ! $status || $error ) {
+        if (!$status || $error) {
             $response['code'] = '500';
-            $response['msg']  = 'Error saving file ' . $file . ', code: ' . $ret;
+            $response['msg']  = 'Error saving file '.$file.', code: '.$ret;
         } else {
             $response['code'] = '200';
-            $response['msg']  = 'File ' . $file . ' saved.';
+            $response['msg']  = 'File '.$file.' saved.';
             $response['file'] = $file;
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -275,44 +275,44 @@ 
     public function ao_ccss_import_callback() {
         // Ajax handler import settings
         // Check referer.
-        check_ajax_referer( 'ao_ccss_import_nonce', 'ao_ccss_import_nonce' );
+        check_ajax_referer('ao_ccss_import_nonce', 'ao_ccss_import_nonce');
 
         // Initialize error flag.
         $error = false;
 
         // Process an uploaded file with no errors.
-        if ( ! $_FILES['file']['error'] ) {
+        if (!$_FILES['file']['error']) {
             // Save file to the cache directory.
-            $zipfile = AO_CCSS_DIR . $_FILES['file']['name'];
-            move_uploaded_file( $_FILES['file']['tmp_name'], $zipfile );
+            $zipfile = AO_CCSS_DIR.$_FILES['file']['name'];
+            move_uploaded_file($_FILES['file']['tmp_name'], $zipfile);
 
             // Extract archive.
             $zip = new ZipArchive;
-            if ( $zip->open( $zipfile ) === true ) {
-                $zip->extractTo( AO_CCSS_DIR );
+            if ($zip->open($zipfile) === true) {
+                $zip->extractTo(AO_CCSS_DIR);
                 $zip->close();
             } else {
                 $error = 'extracting';
             }
 
-            if ( ! $error ) {
+            if (!$error) {
                 // Archive extraction ok, continue settings importing
                 // Settings file.
-                $importfile = AO_CCSS_DIR . 'settings.json';
+                $importfile = AO_CCSS_DIR.'settings.json';
 
-                if ( file_exists( $importfile ) ) {
+                if (file_exists($importfile)) {
                     // Get settings and turn them into an object.
-                    $settings = json_decode( file_get_contents( $importfile ), true );
+                    $settings = json_decode(file_get_contents($importfile), true);
 
                     // Update options.
-                    update_option( 'autoptimize_ccss_rules', $settings['rules'] );
-                    update_option( 'autoptimize_ccss_additional', $settings['additional'] );
-                    update_option( 'autoptimize_ccss_viewport', $settings['viewport'] );
-                    update_option( 'autoptimize_ccss_finclude', $settings['finclude'] );
-                    update_option( 'autoptimize_ccss_rlimit', $settings['rlimit'] );
-                    update_option( 'autoptimize_ccss_noptimize', $settings['noptimize'] );
-                    update_option( 'autoptimize_ccss_debug', $settings['debug'] );
-                    update_option( 'autoptimize_ccss_key', $settings['key'] );
+                    update_option('autoptimize_ccss_rules', $settings['rules']);
+                    update_option('autoptimize_ccss_additional', $settings['additional']);
+                    update_option('autoptimize_ccss_viewport', $settings['viewport']);
+                    update_option('autoptimize_ccss_finclude', $settings['finclude']);
+                    update_option('autoptimize_ccss_rlimit', $settings['rlimit']);
+                    update_option('autoptimize_ccss_noptimize', $settings['noptimize']);
+                    update_option('autoptimize_ccss_debug', $settings['debug']);
+                    update_option('autoptimize_ccss_key', $settings['key']);
                 } else {
                     // Settings file doesn't exist, update error flag.
                     $error = 'settings file does not exist';
@@ -321,28 +321,28 @@ 
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code'] = '500';
-            $response['msg']  = 'Error importing settings: ' . $error;
+            $response['msg']  = 'Error importing settings: '.$error;
         } else {
             $response['code'] = '200';
             $response['msg']  = 'Settings imported successfully';
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
     }
 
-    public function critcss_check_filename( $filename ) {
+    public function critcss_check_filename($filename) {
         // Try to avoid directory traversal when reading/writing/deleting critical CSS files.
-        if ( strpos( $filename, 'ccss_' ) !== 0 ) {
+        if (strpos($filename, 'ccss_') !== 0) {
             return false;
-        } elseif ( substr( $filename, -4, 4 ) !== '.css' ) {
+        } elseif (substr($filename, -4, 4) !== '.css') {
             return false;
-        } elseif ( sanitize_file_name( $filename ) !== $filename ) {
+        } elseif (sanitize_file_name($filename) !== $filename) {
             // Use WordPress core's sanitize_file_name to see if anything fishy is going on.
             return false;
         } else {

classes/autoptimizeCriticalCSSBase.php

Spacing +60 added lines, -60 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS base file (initializes all ccss files).
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -19,27 +19,27 @@ 
     public function __construct()
     {
         // define constant, but only once.
-        if ( ! defined( 'AO_CCSS_DIR' ) ) {
+        if (!defined('AO_CCSS_DIR')) {
             // Define plugin version.
-            define( 'AO_CCSS_VER', 'AO_' . AUTOPTIMIZE_PLUGIN_VERSION );
+            define('AO_CCSS_VER', 'AO_'.AUTOPTIMIZE_PLUGIN_VERSION);
 
             // Define a constant with the directory to store critical CSS in.
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' . $blog_id . '/' );
+                define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/'.$blog_id.'/');
             } else {
-                define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' );
+                define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/');
             }
 
             // Define support files locations.
-            define( 'AO_CCSS_LOCK', AO_CCSS_DIR . 'queue.lock' );
-            define( 'AO_CCSS_LOG', AO_CCSS_DIR . 'queuelog.html' );
-            define( 'AO_CCSS_DEBUG', AO_CCSS_DIR . 'queue.json' );
+            define('AO_CCSS_LOCK', AO_CCSS_DIR.'queue.lock');
+            define('AO_CCSS_LOG', AO_CCSS_DIR.'queuelog.html');
+            define('AO_CCSS_DEBUG', AO_CCSS_DIR.'queue.json');
 
             // Define constants for criticalcss.com base path and API endpoints.
             // fixme: AO_CCSS_URL should be read from the autoptimize availability json stored as option.
-            define( 'AO_CCSS_URL', 'https://criticalcss.com' );
-            define( 'AO_CCSS_API', AO_CCSS_URL . '/api/premium/' );
+            define('AO_CCSS_URL', 'https://criticalcss.com');
+            define('AO_CCSS_API', AO_CCSS_URL.'/api/premium/');
         }
 
         $this->filepath = __FILE__;
@@ -52,19 +52,19 @@ 
     {
         // get all options.
         $all_options = $this->fetch_options();
-        foreach ( $all_options as $option => $value ) {
+        foreach ($all_options as $option => $value) {
             ${$option} = $value;
         }
 
         // make sure the 10 minutes cron schedule is added.
-        add_filter( 'cron_schedules', array( $this, 'ao_ccss_interval' ) );
+        add_filter('cron_schedules', array($this, 'ao_ccss_interval'));
 
         // check if we need to upgrade.
         $this->check_upgrade();
 
         // make sure ao_ccss_queue is scheduled OK if an API key is set.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
     }
 
@@ -72,12 +72,12 @@ 
         // Required libs, core is always needed.
         $criticalcss_core = new autoptimizeCriticalCSSCore();
 
-        if ( defined( 'DOING_CRON' ) || is_admin() ) {
+        if (defined('DOING_CRON') || is_admin()) {
             // TODO: also include if overridden somehow to force queue processing to be executed?
             $criticalcss_cron = new autoptimizeCriticalCSSCron();
         }
 
-        if ( is_admin() ) {
+        if (is_admin()) {
             $criticalcss_settings = new autoptimizeCriticalCSSSettings();
         } else {
             // enqueuing only done when not wp-admin.
@@ -87,48 +87,48 @@ 
 
     public static function fetch_options() {
         // Get options.
-        $autoptimize_ccss_options['ao_css_defer']          = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' );
-        $autoptimize_ccss_options['ao_css_defer_inline']   = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' );
-        $autoptimize_ccss_options['ao_ccss_rules_raw']     = get_option( 'autoptimize_ccss_rules', false );
-        $autoptimize_ccss_options['ao_ccss_additional']    = get_option( 'autoptimize_ccss_additional' );
-        $autoptimize_ccss_options['ao_ccss_queue_raw']     = get_option( 'autoptimize_ccss_queue', false );
-        $autoptimize_ccss_options['ao_ccss_viewport']      = get_option( 'autoptimize_ccss_viewport', false );
-        $autoptimize_ccss_options['ao_ccss_finclude']      = get_option( 'autoptimize_ccss_finclude', false );
-        $autoptimize_ccss_options['ao_ccss_rlimit']        = get_option( 'autoptimize_ccss_rlimit', '5' );
-        $autoptimize_ccss_options['ao_ccss_noptimize']     = get_option( 'autoptimize_ccss_noptimize', false );
-        $autoptimize_ccss_options['ao_ccss_debug']         = get_option( 'autoptimize_ccss_debug', false );
-        $autoptimize_ccss_options['ao_ccss_key']           = get_option( 'autoptimize_ccss_key' );
-        $autoptimize_ccss_options['ao_ccss_keyst']         = get_option( 'autoptimize_ccss_keyst' );
-        $autoptimize_ccss_options['ao_ccss_loggedin']      = get_option( 'autoptimize_ccss_loggedin', '1' );
-        $autoptimize_ccss_options['ao_ccss_forcepath']     = get_option( 'autoptimize_ccss_forcepath', '1' );
-        $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option( 'autoptimize_service_availablity' );
-        $autoptimize_ccss_options['ao_ccss_deferjquery']   = get_option( 'autoptimize_ccss_deferjquery', false );
-        $autoptimize_ccss_options['ao_ccss_domain']        = get_option( 'autoptimize_ccss_domain' );
-
-        if ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) === false && strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'uggc' ) === 0 ) {
-            $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] );
-        } elseif ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) !== false ) {
+        $autoptimize_ccss_options['ao_css_defer']          = autoptimizeOptionWrapper::get_option('autoptimize_css_defer');
+        $autoptimize_ccss_options['ao_css_defer_inline']   = autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline');
+        $autoptimize_ccss_options['ao_ccss_rules_raw']     = get_option('autoptimize_ccss_rules', false);
+        $autoptimize_ccss_options['ao_ccss_additional']    = get_option('autoptimize_ccss_additional');
+        $autoptimize_ccss_options['ao_ccss_queue_raw']     = get_option('autoptimize_ccss_queue', false);
+        $autoptimize_ccss_options['ao_ccss_viewport']      = get_option('autoptimize_ccss_viewport', false);
+        $autoptimize_ccss_options['ao_ccss_finclude']      = get_option('autoptimize_ccss_finclude', false);
+        $autoptimize_ccss_options['ao_ccss_rlimit']        = get_option('autoptimize_ccss_rlimit', '5');
+        $autoptimize_ccss_options['ao_ccss_noptimize']     = get_option('autoptimize_ccss_noptimize', false);
+        $autoptimize_ccss_options['ao_ccss_debug']         = get_option('autoptimize_ccss_debug', false);
+        $autoptimize_ccss_options['ao_ccss_key']           = get_option('autoptimize_ccss_key');
+        $autoptimize_ccss_options['ao_ccss_keyst']         = get_option('autoptimize_ccss_keyst');
+        $autoptimize_ccss_options['ao_ccss_loggedin']      = get_option('autoptimize_ccss_loggedin', '1');
+        $autoptimize_ccss_options['ao_ccss_forcepath']     = get_option('autoptimize_ccss_forcepath', '1');
+        $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option('autoptimize_service_availablity');
+        $autoptimize_ccss_options['ao_ccss_deferjquery']   = get_option('autoptimize_ccss_deferjquery', false);
+        $autoptimize_ccss_options['ao_ccss_domain']        = get_option('autoptimize_ccss_domain');
+
+        if (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') === false && strpos($autoptimize_ccss_options['ao_ccss_domain'], 'uggc') === 0) {
+            $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13($autoptimize_ccss_options['ao_ccss_domain']);
+        } elseif (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') !== false) {
             // not rot13'ed yet, do so now (goal; avoid migration plugins change the bound domain).
-            update_option( 'autoptimize_ccss_domain', str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] ) );
+            update_option('autoptimize_ccss_domain', str_rot13($autoptimize_ccss_options['ao_ccss_domain']));
         }
 
         // Setup the rules array.
-        if ( empty( $autoptimize_ccss_options['ao_ccss_rules_raw'] ) ) {
+        if (empty($autoptimize_ccss_options['ao_ccss_rules_raw'])) {
             $autoptimize_ccss_options['ao_ccss_rules']['paths'] = array();
             $autoptimize_ccss_options['ao_ccss_rules']['types'] = array();
         } else {
-            $autoptimize_ccss_options['ao_ccss_rules'] = json_decode( $autoptimize_ccss_options['ao_ccss_rules_raw'], true );
+            $autoptimize_ccss_options['ao_ccss_rules'] = json_decode($autoptimize_ccss_options['ao_ccss_rules_raw'], true);
         }
 
         // Setup the queue array.
-        if ( empty( $autoptimize_ccss_options['ao_ccss_queue_raw'] ) ) {
+        if (empty($autoptimize_ccss_options['ao_ccss_queue_raw'])) {
             $autoptimize_ccss_options['ao_ccss_queue'] = array();
         } else {
-            $autoptimize_ccss_options['ao_ccss_queue'] = json_decode( $autoptimize_ccss_options['ao_ccss_queue_raw'], true );
+            $autoptimize_ccss_options['ao_ccss_queue'] = json_decode($autoptimize_ccss_options['ao_ccss_queue_raw'], true);
         }
 
         // Override API key if constant is defined.
-        if ( defined( 'AUTOPTIMIZE_CRITICALCSS_API_KEY' ) ) {
+        if (defined('AUTOPTIMIZE_CRITICALCSS_API_KEY')) {
             $autoptimize_ccss_options['ao_ccss_key'] = AUTOPTIMIZE_CRITICALCSS_API_KEY;
         }
 
@@ -139,49 +139,49 @@ 
         global $ao_ccss_key;
 
         // Create the cache directory if it doesn't exist already.
-        if ( ! file_exists( AO_CCSS_DIR ) ) {
-            mkdir( AO_CCSS_DIR, 0755, true );
+        if (!file_exists(AO_CCSS_DIR)) {
+            mkdir(AO_CCSS_DIR, 0755, true);
         }
 
         // Create a scheduled event for the queue.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
 
         // Create a scheduled event for log maintenance.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_maintenance' ) ) {
-            wp_schedule_event( time(), 'twicedaily', 'ao_ccss_maintenance' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_maintenance')) {
+            wp_schedule_event(time(), 'twicedaily', 'ao_ccss_maintenance');
         }
     }
 
     public function check_upgrade() {
-        $db_version = get_option( 'autoptimize_ccss_version', '' );
-        if ( AO_CCSS_VER !== $db_version ) {
+        $db_version = get_option('autoptimize_ccss_version', '');
+        if (AO_CCSS_VER !== $db_version) {
             // check schedules & re-schedule if needed.
             $this->on_upgrade();
             // and update db_version.
-            update_option( 'autoptimize_ccss_version', AO_CCSS_VER );
+            update_option('autoptimize_ccss_version', AO_CCSS_VER);
         }
     }
 
-    public function ao_ccss_interval( $schedules ) {
+    public function ao_ccss_interval($schedules) {
         // Let interval be configurable.
-        if ( ! defined( 'AO_CCSS_DEBUG_INTERVAL' ) ) {
+        if (!defined('AO_CCSS_DEBUG_INTERVAL')) {
             $intsec = 600;
         } else {
             $intsec = AO_CCSS_DEBUG_INTERVAL;
-            if ( $intsec >= 120 ) {
-                $inttxt = $intsec / 60 . ' minutes';
+            if ($intsec >= 120) {
+                $inttxt = $intsec/60.' minutes';
             } else {
-                $inttxt = $intsec . ' second(s)';
+                $inttxt = $intsec.' second(s)';
             }
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Using custom WP-Cron interval of ' . $inttxt, 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Using custom WP-Cron interval of '.$inttxt, 3);
         }
 
         // Attach interval to schedule.
         $schedules['ao_ccss'] = array(
             'interval' => $intsec,
-            'display'  => __( 'Autoptimize CriticalCSS' ),
+            'display'  => __('Autoptimize CriticalCSS'),
         );
         return $schedules;
     }