futtta /
autoptimize
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | "empty" : |
| 21 | 21 | aoCssQueue; |
| 22 | 22 | <?php |
| 23 | - if ( $ao_ccss_debug ) { |
|
| 23 | + if ($ao_ccss_debug) { |
|
| 24 | 24 | echo "console.log( 'Queue Object:', aoCssQueueLog );\n"; |
| 25 | 25 | } |
| 26 | 26 | ?> |
@@ -62,34 +62,34 @@ discard block |
||
| 62 | 62 | // Status: NEW (N, sort order 1) |
| 63 | 63 | status = '<span class="hidden">1</span>N'; |
| 64 | 64 | statusClass = 'new'; |
| 65 | - title = '<?php _e( 'New', 'autoptimize' ); ?> (' + ljid + ')'; |
|
| 66 | - buttons = '<?php _e( 'None', 'autoptimize' ); ?>'; |
|
| 65 | + title = '<?php _e('New', 'autoptimize'); ?> (' + ljid + ')'; |
|
| 66 | + buttons = '<?php _e('None', 'autoptimize'); ?>'; |
|
| 67 | 67 | } else if (keys.jqstat === 'JOB_QUEUED' || keys.jqstat === 'JOB_ONGOING') { |
| 68 | 68 | // Status: PENDING (P, sort order 2) |
| 69 | 69 | status = '<span class="hidden">2</span>P'; |
| 70 | 70 | statusClass = 'pending'; |
| 71 | - title = '<?php _e( 'PENDING', 'autoptimize' ); ?> (' + ljid + ')'; |
|
| 72 | - buttons = '<?php _e( 'None', 'autoptimize' ); ?>'; |
|
| 71 | + title = '<?php _e('PENDING', 'autoptimize'); ?> (' + ljid + ')'; |
|
| 72 | + buttons = '<?php _e('None', 'autoptimize'); ?>'; |
|
| 73 | 73 | } else if (keys.jqstat === 'JOB_DONE' && keys.jrstat === 'GOOD' && (keys.jvstat === 'WARN' || keys.jvstat === 'BAD')) { |
| 74 | 74 | // Status: REVIEW (R, sort order 5) |
| 75 | 75 | status = '<span class="hidden">5</span>R'; |
| 76 | 76 | statusClass = 'review'; |
| 77 | - title = "<?php _e( 'REVIEW', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat; |
|
| 78 | - buttons = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>'; |
|
| 77 | + title = "<?php _e('REVIEW', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat; |
|
| 78 | + buttons = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>'; |
|
| 79 | 79 | dbtn = true; |
| 80 | 80 | } else if (keys.jqstat === 'JOB_DONE') { |
| 81 | 81 | // Status: DONE (D, sort order 6) |
| 82 | 82 | status = '<span class="hidden">6</span>D'; |
| 83 | 83 | statusClass = 'done'; |
| 84 | - title = '<?php _e( 'DONE', 'autoptimize' ); ?> (' + ljid + ')'; |
|
| 85 | - buttons = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>'; |
|
| 84 | + title = '<?php _e('DONE', 'autoptimize'); ?> (' + ljid + ')'; |
|
| 85 | + buttons = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>'; |
|
| 86 | 86 | dbtn = true; |
| 87 | 87 | } else if (keys.jqstat === 'JOB_FAILED' || keys.jqstat === 'STATUS_JOB_BAD' || keys.jqstat === 'INVALID_JWT_TOKEN' || keys.jqstat === 'NO_CSS' || keys.jqstat === 'NO_RESPONSE') { |
| 88 | 88 | // Status: ERROR (E, sort order 4) |
| 89 | 89 | status = '<span class="hidden">4</span>E'; |
| 90 | 90 | statusClass = 'error'; |
| 91 | - title = "<?php _e( 'ERROR', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat; |
|
| 92 | - buttons = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>'; |
|
| 91 | + title = "<?php _e('ERROR', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat; |
|
| 92 | + buttons = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e('Retry Job', 'autoptimize'); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>'; |
|
| 93 | 93 | rbtn = true; |
| 94 | 94 | dbtn = true; |
| 95 | 95 | hbtn = true; |
@@ -97,21 +97,21 @@ discard block |
||
| 97 | 97 | // Status: UNKNOWN (U, sort order 5) |
| 98 | 98 | status = '<span class="hidden">5</span>U'; |
| 99 | 99 | statusClass = 'unknown'; |
| 100 | - title = "<?php _e( 'UNKNOWN', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat; |
|
| 101 | - buttons = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>'; |
|
| 100 | + title = "<?php _e('UNKNOWN', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat; |
|
| 101 | + buttons = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>'; |
|
| 102 | 102 | dbtn = true; |
| 103 | 103 | hbtn = true; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // Prepare job finish time |
| 107 | 107 | if (keys.jftime === null) { |
| 108 | - ftime = '<?php _e( 'N/A', 'autoptimize' ); ?>'; |
|
| 108 | + ftime = '<?php _e('N/A', 'autoptimize'); ?>'; |
|
| 109 | 109 | } else { |
| 110 | 110 | ftime = EpochToDate(keys.jftime); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | // Append job entry |
| 114 | - jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e( 'Job status is ', 'autoptimize' ); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>"); |
|
| 114 | + jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e('Job status is ', 'autoptimize'); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>"); |
|
| 115 | 115 | |
| 116 | 116 | // Attach button actions |
| 117 | 117 | if (rbtn) { |
@@ -134,12 +134,12 @@ discard block |
||
| 134 | 134 | height: 180, |
| 135 | 135 | modal: true, |
| 136 | 136 | buttons: { |
| 137 | - <?php _e( 'Delete', 'autoptimize' ); ?>: function() { |
|
| 137 | + <?php _e('Delete', 'autoptimize'); ?>: function() { |
|
| 138 | 138 | delete queue[jpath]; |
| 139 | 139 | updateQueue(queue); |
| 140 | 140 | jQuery(this).dialog('close' ); |
| 141 | 141 | }, |
| 142 | - <?php _e( 'Cancel', 'autoptimize' ); ?>: function() { |
|
| 142 | + <?php _e('Cancel', 'autoptimize'); ?>: function() { |
|
| 143 | 143 | jQuery(this).dialog('close' ); |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -152,12 +152,12 @@ discard block |
||
| 152 | 152 | height:235, |
| 153 | 153 | modal: true, |
| 154 | 154 | buttons: { |
| 155 | - "<?php _e( 'Delete all jobs?', 'autoptimize' ); ?>": function() { |
|
| 155 | + "<?php _e('Delete all jobs?', 'autoptimize'); ?>": function() { |
|
| 156 | 156 | queue=[]; |
| 157 | 157 | updateQueue(queue); |
| 158 | 158 | jQuery( this ).dialog( "close" ); |
| 159 | 159 | }, |
| 160 | - "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() { |
|
| 160 | + "<?php _e('Cancel', 'autoptimize'); ?>": function() { |
|
| 161 | 161 | jQuery( this ).dialog( "close" ); |
| 162 | 162 | } |
| 163 | 163 | } |
@@ -172,9 +172,9 @@ discard block |
||
| 172 | 172 | height: 180, |
| 173 | 173 | modal: true, |
| 174 | 174 | buttons: { |
| 175 | - <?php _e( 'Retry', 'autoptimize' ); ?>: function() { |
|
| 175 | + <?php _e('Retry', 'autoptimize'); ?>: function() { |
|
| 176 | 176 | <?php |
| 177 | - if ( $ao_ccss_debug ) { |
|
| 177 | + if ($ao_ccss_debug) { |
|
| 178 | 178 | echo "console.log( 'SHOULD retry job:', jid[0], jpath );\n"; |
| 179 | 179 | } |
| 180 | 180 | ?> |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | updateQueue(queue); |
| 188 | 188 | jQuery(this).dialog('close' ); |
| 189 | 189 | }, |
| 190 | - <?php _e( 'Cancel', 'autoptimize' ); ?>: function() { |
|
| 190 | + <?php _e('Cancel', 'autoptimize'); ?>: function() { |
|
| 191 | 191 | jQuery(this).dialog('close' ); |
| 192 | 192 | } |
| 193 | 193 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | jQuery('#unSavedWarning').show(); |
| 202 | 202 | document.getElementById('ao_title_and_button').scrollIntoView(); |
| 203 | 203 | <?php |
| 204 | - if ( $ao_ccss_debug ) { |
|
| 204 | + if ($ao_ccss_debug) { |
|
| 205 | 205 | echo "console.log('Updated Queue Object:', queue);\n"; |
| 206 | 206 | } |
| 207 | 207 | ?> |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | global $ao_ccss_domain; |
| 19 | 19 | |
| 20 | 20 | // In case domain is not set yet (done in cron.php). |
| 21 | - if ( empty( $ao_ccss_domain ) ) { |
|
| 21 | + if (empty($ao_ccss_domain)) { |
|
| 22 | 22 | $ao_ccss_domain = get_site_url(); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | ?> |
| 28 | 28 | <ul id="adv-panel"> |
| 29 | 29 | <li class="itemDetail"> |
| 30 | - <h2 class="itemTitle fleft"><?php _e( 'Advanced Settings', 'autoptimize' ); ?></h2> |
|
| 30 | + <h2 class="itemTitle fleft"><?php _e('Advanced Settings', 'autoptimize'); ?></h2> |
|
| 31 | 31 | <button type="button" class="toggle-btn"> |
| 32 | 32 | <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span> |
| 33 | 33 | </button> |
@@ -35,103 +35,103 @@ discard block |
||
| 35 | 35 | <table id="key" class="form-table"> |
| 36 | 36 | <tr> |
| 37 | 37 | <th scope="row"> |
| 38 | - <?php _e( 'Viewport Size', 'autoptimize' ); ?> |
|
| 38 | + <?php _e('Viewport Size', 'autoptimize'); ?> |
|
| 39 | 39 | </th> |
| 40 | 40 | <td> |
| 41 | - <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']; ?>" /> |
|
| 42 | - <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']; ?>" /> |
|
| 41 | + <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']; ?>" /> |
|
| 42 | + <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']; ?>" /> |
|
| 43 | 43 | <p class="notes"> |
| 44 | - <?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' ); ?> |
|
| 44 | + <?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'); ?> |
|
| 45 | 45 | </p> |
| 46 | 46 | </td> |
| 47 | 47 | </tr> |
| 48 | 48 | <tr> |
| 49 | 49 | <th scope="row"> |
| 50 | - <?php _e( 'Force Include CSS selectors', 'autoptimize' ); ?> |
|
| 50 | + <?php _e('Force Include CSS selectors', 'autoptimize'); ?> |
|
| 51 | 51 | </th> |
| 52 | 52 | <td> |
| 53 | - <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> |
|
| 53 | + <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> |
|
| 54 | 54 | <p class="notes"> |
| 55 | - <?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' ); ?> |
|
| 55 | + <?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'); ?> |
|
| 56 | 56 | </p> |
| 57 | 57 | </td> |
| 58 | 58 | </tr> |
| 59 | 59 | <tr> |
| 60 | 60 | <th scope="row"> |
| 61 | - <?php _e( 'Request Limit', 'autoptimize' ); ?> |
|
| 61 | + <?php _e('Request Limit', 'autoptimize'); ?> |
|
| 62 | 62 | </th> |
| 63 | 63 | <td> |
| 64 | 64 | <input type="number" id="autoptimize_ccss_rlimit" name="autoptimize_ccss_rlimit" min="1" max="240" placeholder="0" value="<?php echo $ao_ccss_rlimit; ?>" /> |
| 65 | 65 | <p class="notes"> |
| 66 | - <?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' ); ?> |
|
| 66 | + <?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'); ?> |
|
| 67 | 67 | </p> |
| 68 | 68 | </td> |
| 69 | 69 | </tr> |
| 70 | 70 | <tr> |
| 71 | 71 | <th scope="row"> |
| 72 | - <?php _e( 'Fetch Original CSS', 'autoptimize' ); ?> |
|
| 72 | + <?php _e('Fetch Original CSS', 'autoptimize'); ?> |
|
| 73 | 73 | </th> |
| 74 | 74 | <td> |
| 75 | - <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked( 1 == $ao_ccss_noptimize ); ?>> |
|
| 75 | + <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked(1 == $ao_ccss_noptimize); ?>> |
|
| 76 | 76 | <p class="notes"> |
| 77 | - <?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' ); ?> |
|
| 77 | + <?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'); ?> |
|
| 78 | 78 | </p> |
| 79 | 79 | </td> |
| 80 | 80 | </tr> |
| 81 | 81 | <tr> |
| 82 | 82 | <th scope="row"> |
| 83 | - <?php _e( 'Add CCSS for logged in users?', 'autoptimize' ); ?> |
|
| 83 | + <?php _e('Add CCSS for logged in users?', 'autoptimize'); ?> |
|
| 84 | 84 | </th> |
| 85 | 85 | <td> |
| 86 | - <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked( 1 == $ao_ccss_loggedin ); ?>> |
|
| 86 | + <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked(1 == $ao_ccss_loggedin); ?>> |
|
| 87 | 87 | <p class="notes"> |
| 88 | - <?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' ); ?> |
|
| 88 | + <?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'); ?> |
|
| 89 | 89 | </p> |
| 90 | 90 | </td> |
| 91 | 91 | </tr> |
| 92 | 92 | <tr> |
| 93 | 93 | <th scope="row"> |
| 94 | - <?php _e( 'Force path-based rules to be generated for pages?', 'autoptimize' ); ?> |
|
| 94 | + <?php _e('Force path-based rules to be generated for pages?', 'autoptimize'); ?> |
|
| 95 | 95 | </th> |
| 96 | 96 | <td> |
| 97 | - <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked( 1 == $ao_ccss_forcepath ); ?>> |
|
| 97 | + <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked(1 == $ao_ccss_forcepath); ?>> |
|
| 98 | 98 | <p class="notes"> |
| 99 | - <?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' ); ?> |
|
| 99 | + <?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'); ?> |
|
| 100 | 100 | </p> |
| 101 | 101 | </td> |
| 102 | 102 | </tr> |
| 103 | 103 | <tr> |
| 104 | 104 | <th scope="row"> |
| 105 | - <?php _e( 'Defer jQuery and other non-aggregated JS-files?', 'autoptimize' ); ?> |
|
| 105 | + <?php _e('Defer jQuery and other non-aggregated JS-files?', 'autoptimize'); ?> |
|
| 106 | 106 | </th> |
| 107 | 107 | <td> |
| 108 | - <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked( 1 == $ao_ccss_deferjquery ); ?>> |
|
| 108 | + <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked(1 == $ao_ccss_deferjquery); ?>> |
|
| 109 | 109 | <p class="notes"> |
| 110 | - <?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' ); ?> |
|
| 110 | + <?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'); ?> |
|
| 111 | 111 | </p> |
| 112 | 112 | </td> |
| 113 | 113 | </tr> |
| 114 | 114 | <tr> |
| 115 | 115 | <th scope="row"> |
| 116 | - <?php _e( 'Bound domain', 'autoptimize' ); ?> |
|
| 116 | + <?php _e('Bound domain', 'autoptimize'); ?> |
|
| 117 | 117 | </th> |
| 118 | 118 | <td> |
| 119 | - <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 ); ?>"> |
|
| 119 | + <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); ?>"> |
|
| 120 | 120 | <p class="notes"> |
| 121 | - <?php _e( 'Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize' ); ?> |
|
| 121 | + <?php _e('Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize'); ?> |
|
| 122 | 122 | </p> |
| 123 | 123 | </td> |
| 124 | 124 | </tr> |
| 125 | 125 | <tr> |
| 126 | 126 | <th scope="row"> |
| 127 | - <?php _e( 'Debug Mode', 'autoptimize' ); ?> |
|
| 127 | + <?php _e('Debug Mode', 'autoptimize'); ?> |
|
| 128 | 128 | </th> |
| 129 | 129 | <td> |
| 130 | - <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked( 1 == $ao_ccss_debug ); ?>> |
|
| 130 | + <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked(1 == $ao_ccss_debug); ?>> |
|
| 131 | 131 | <p class="notes"> |
| 132 | 132 | <?php |
| 133 | - _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' ); |
|
| 134 | - echo '<code>' . AO_CCSS_LOG . '</code>'; |
|
| 133 | + _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'); |
|
| 134 | + echo '<code>'.AO_CCSS_LOG.'</code>'; |
|
| 135 | 135 | ?> |
| 136 | 136 | </p> |
| 137 | 137 | </td> |
@@ -9,15 +9,15 @@ discard block |
||
| 9 | 9 | console.log('Exporting...'); |
| 10 | 10 | var data = { |
| 11 | 11 | 'action': 'ao_ccss_export', |
| 12 | - 'ao_ccss_export_nonce': '<?php echo wp_create_nonce( 'ao_ccss_export_nonce' ); ?>', |
|
| 12 | + 'ao_ccss_export_nonce': '<?php echo wp_create_nonce('ao_ccss_export_nonce'); ?>', |
|
| 13 | 13 | }; |
| 14 | 14 | |
| 15 | 15 | jQuery.post(ajaxurl, data, function(response) { |
| 16 | 16 | response_array=JSON.parse(response); |
| 17 | 17 | if (response_array['code'] == 200) { |
| 18 | 18 | <?php |
| 19 | - if ( is_multisite() ) { |
|
| 20 | - $blog_id = '/' . get_current_blog_id() . '/'; |
|
| 19 | + if (is_multisite()) { |
|
| 20 | + $blog_id = '/'.get_current_blog_id().'/'; |
|
| 21 | 21 | } else { |
| 22 | 22 | $blog_id = '/'; |
| 23 | 23 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | autoOpen: true, |
| 33 | 33 | height: 210, |
| 34 | 34 | width: 700, |
| 35 | - title: "<?php _e( 'Export settings result', 'autoptimize' ); ?>", |
|
| 35 | + title: "<?php _e('Export settings result', 'autoptimize'); ?>", |
|
| 36 | 36 | modal: true, |
| 37 | 37 | buttons: { |
| 38 | 38 | OK: function() { |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | var settings_file = file[0].files[0]; |
| 51 | 51 | fd.append('file', settings_file); |
| 52 | 52 | fd.append('action', 'ao_ccss_import'); |
| 53 | - fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce( 'ao_ccss_import_nonce' ); ?>'); |
|
| 53 | + fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce('ao_ccss_import_nonce'); ?>'); |
|
| 54 | 54 | |
| 55 | 55 | jQuery.ajax({ |
| 56 | 56 | url: ajaxurl, |
@@ -12,27 +12,27 @@ discard block |
||
| 12 | 12 | * @param string $message Message. |
| 13 | 13 | * @param string $color Color to highlight message in. |
| 14 | 14 | */ |
| 15 | -function ao_ccss_render_key( $key, $status, $status_msg, $message, $color ) { |
|
| 16 | - if ( defined( 'AUTOPTIMIZE_CRITICALCSS_API_KEY' ) ) { |
|
| 17 | - $key = __( 'API key provided by your host/ WordPress administrator, no need to enter anything here. In case of problems with the API key, contact your host/ WordPress administrator.', 'autoptimize' ); |
|
| 15 | +function ao_ccss_render_key($key, $status, $status_msg, $message, $color) { |
|
| 16 | + if (defined('AUTOPTIMIZE_CRITICALCSS_API_KEY')) { |
|
| 17 | + $key = __('API key provided by your host/ WordPress administrator, no need to enter anything here. In case of problems with the API key, contact your host/ WordPress administrator.', 'autoptimize'); |
|
| 18 | 18 | } |
| 19 | 19 | ?> |
| 20 | 20 | <ul id="key-panel"> |
| 21 | 21 | <li class="itemDetail"> |
| 22 | - <h2 class="itemTitle fleft"><?php _e( 'API Key', 'autoptimize' ); ?>: <span style="color:<?php echo $color; ?>;"><?php echo $status_msg; ?></span></h2> |
|
| 22 | + <h2 class="itemTitle fleft"><?php _e('API Key', 'autoptimize'); ?>: <span style="color:<?php echo $color; ?>;"><?php echo $status_msg; ?></span></h2> |
|
| 23 | 23 | <button type="button" class="toggle-btn"> |
| 24 | - <?php if ( 'valid' != $status ) { ?> |
|
| 24 | + <?php if ('valid' != $status) { ?> |
|
| 25 | 25 | <span class="toggle-indicator dashicons dashicons-arrow-up"></span> |
| 26 | 26 | <?php } else { ?> |
| 27 | 27 | <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span> |
| 28 | 28 | <?php } ?> |
| 29 | 29 | </button> |
| 30 | - <?php if ( 'valid' != $status ) { ?> |
|
| 30 | + <?php if ('valid' != $status) { ?> |
|
| 31 | 31 | <div class="collapsible"> |
| 32 | 32 | <?php } else { ?> |
| 33 | 33 | <div class="collapsible hidden"> |
| 34 | 34 | <?php } ?> |
| 35 | - <?php if ( 'valid' != $status ) { ?> |
|
| 35 | + <?php if ('valid' != $status) { ?> |
|
| 36 | 36 | <div style="clear:both;padding:2px 10px;border-left:solid;border-left-width:5px;border-left-color:<?php echo $color; ?>;background-color:white;"> |
| 37 | 37 | <p><?php echo $message; ?></p> |
| 38 | 38 | </div> |
@@ -40,12 +40,12 @@ discard block |
||
| 40 | 40 | <table id="key" class="form-table"> |
| 41 | 41 | <tr> |
| 42 | 42 | <th scope="row"> |
| 43 | - <?php _e( 'Your API Key', 'autoptimize' ); ?> |
|
| 43 | + <?php _e('Your API Key', 'autoptimize'); ?> |
|
| 44 | 44 | </th> |
| 45 | 45 | <td> |
| 46 | - <textarea id="autoptimize_ccss_key" name="autoptimize_ccss_key" rows='3' style="width:100%;" placeholder="<?php _e( 'Please enter your criticalcss.com API key here.', 'autoptimize' ); ?>"><?php echo trim( $key ); ?></textarea> |
|
| 46 | + <textarea id="autoptimize_ccss_key" name="autoptimize_ccss_key" rows='3' style="width:100%;" placeholder="<?php _e('Please enter your criticalcss.com API key here.', 'autoptimize'); ?>"><?php echo trim($key); ?></textarea> |
|
| 47 | 47 | <p class="notes"> |
| 48 | - <?php _e( 'Enter your <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> API key above. The key is revalidated every time a new job is sent to it.<br />To obtain your API key, go to <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> > Account > API Keys.<br />Requests to generate a critical CSS via the API are priced at £5 per domain per month.<br /><strong>Not sure yet? With the <a href="https://criticalcss.com/faq/?aff=1#trial" target="_blank">30 day free trial</a>, you have nothing to lose!</strong>', 'autoptimize' ); ?> |
|
| 48 | + <?php _e('Enter your <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> API key above. The key is revalidated every time a new job is sent to it.<br />To obtain your API key, go to <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> > Account > API Keys.<br />Requests to generate a critical CSS via the API are priced at £5 per domain per month.<br /><strong>Not sure yet? With the <a href="https://criticalcss.com/faq/?aff=1#trial" target="_blank">30 day free trial</a>, you have nothing to lose!</strong>', 'autoptimize'); ?> |
|
| 49 | 49 | </p> |
| 50 | 50 | </td> |
| 51 | 51 | </tr> |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Outputs JS code for the rules panel. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( $ao_ccss_debug ) { |
|
| 6 | +if ($ao_ccss_debug) { |
|
| 7 | 7 | echo "console.log('[WARN] Autoptimize CriticalCSS Power-Up is in DEBUG MODE!');\n"; |
| 8 | 8 | echo "console.log('[WARN] Avoid using debug mode on production/live environments unless for ad-hoc troubleshooting purposes and make sure to disable it after!');\n"; |
| 9 | 9 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | jQuery(document).ready(function() { |
| 24 | 24 | critCssArray=JSON.parse(document.getElementById("critCssOrigin").value); |
| 25 | 25 | <?php |
| 26 | - if ( $ao_ccss_debug ) { |
|
| 26 | + if ($ao_ccss_debug) { |
|
| 27 | 27 | echo "console.log('Rules Object:', critCssArray);\n"; |
| 28 | 28 | } |
| 29 | 29 | ?> |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | jQuery("#rules-list").empty(); |
| 40 | 40 | jQuery.each(critCssArray,function(k,v) { |
| 41 | 41 | if (k=="paths") { |
| 42 | - kstring="<?php _e( 'Path Based Rules', 'autoptimize' ); ?>"; |
|
| 42 | + kstring="<?php _e('Path Based Rules', 'autoptimize'); ?>"; |
|
| 43 | 43 | } else { |
| 44 | - kstring="<?php _e( 'Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize' ); ?>"; |
|
| 44 | + kstring="<?php _e('Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize'); ?>"; |
|
| 45 | 45 | } |
| 46 | 46 | if (!(jQuery.isEmptyObject(v))) { |
| 47 | 47 | jQuery("#rules-list").append("<tr><td colspan='5'><h4>" + kstring + "</h4></td></tr>"); |
| 48 | - jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e( 'Type', 'autoptimize' ); ?></th><th><?php _e( 'Target', 'autoptimize' ); ?></th><th><?php _e( 'Critical CSS File', 'autoptimize' ); ?></th><th colspan='2'><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>"); |
|
| 48 | + jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e('Type', 'autoptimize'); ?></th><th><?php _e('Target', 'autoptimize'); ?></th><th><?php _e('Critical CSS File', 'autoptimize'); ?></th><th colspan='2'><?php _e('Actions', 'autoptimize'); ?></th></tr>"); |
|
| 49 | 49 | } |
| 50 | 50 | nodeNumber=0; |
| 51 | 51 | jQuery.each(v,function(i,nv){ |
@@ -55,13 +55,13 @@ discard block |
||
| 55 | 55 | file=nv.file; |
| 56 | 56 | filest=nv.file; |
| 57 | 57 | if (file == 0) { |
| 58 | - file='<?php _e( 'To be fetched from criticalcss.com in the next queue run...', 'autoptimize' ); ?>'; |
|
| 58 | + file='<?php _e('To be fetched from criticalcss.com in the next queue run...', 'autoptimize'); ?>'; |
|
| 59 | 59 | } |
| 60 | 60 | if (nv.hash === 0 && filest != 0) { |
| 61 | - type='<?php _e( 'MANUAL', 'autoptimize' ); ?>'; |
|
| 61 | + type='<?php _e('MANUAL', 'autoptimize'); ?>'; |
|
| 62 | 62 | typeClass = 'manual'; |
| 63 | 63 | } else { |
| 64 | - type='<?php _e( 'AUTO', 'autoptimize' ); ?>'; |
|
| 64 | + type='<?php _e('AUTO', 'autoptimize'); ?>'; |
|
| 65 | 65 | typeClass = 'auto'; |
| 66 | 66 | } |
| 67 | 67 | if (file && typeof file == 'string') { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | rmark = ''; |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | - jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + i.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e( 'Edit', 'autoptimize' ); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e( 'Remove', 'autoptimize' ); ?></span></td></tr>"); |
|
| 75 | + jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + i.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e('Edit', 'autoptimize'); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e('Remove', 'autoptimize'); ?></span></td></tr>"); |
|
| 76 | 76 | jQuery("#" + nodeId + "_edit").click(function(){addEditRow(this.id);}); |
| 77 | 77 | jQuery("#" + nodeId + "_remove").click(function(){confirmRemove(this.id);}); |
| 78 | 78 | }) |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | height:235, |
| 86 | 86 | modal: true, |
| 87 | 87 | buttons: { |
| 88 | - "<?php _e( 'Delete', 'autoptimize' ); ?>": function() { |
|
| 88 | + "<?php _e('Delete', 'autoptimize'); ?>": function() { |
|
| 89 | 89 | removeRow(idToRemove); |
| 90 | 90 | updateAfterChange(); |
| 91 | 91 | jQuery( this ).dialog( "close" ); |
| 92 | 92 | }, |
| 93 | - "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() { |
|
| 93 | + "<?php _e('Cancel', 'autoptimize'); ?>": function() { |
|
| 94 | 94 | jQuery( this ).dialog( "close" ); |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -103,14 +103,14 @@ discard block |
||
| 103 | 103 | height:235, |
| 104 | 104 | modal: true, |
| 105 | 105 | buttons: { |
| 106 | - "<?php _e( 'Delete All', 'autoptimize' ); ?>": function() { |
|
| 106 | + "<?php _e('Delete All', 'autoptimize'); ?>": function() { |
|
| 107 | 107 | critCssArray={'paths':[],'types':[]}; |
| 108 | 108 | drawTable(critCssArray); |
| 109 | 109 | updateAfterChange(); |
| 110 | 110 | removeAllCcssFilesOnServer(); |
| 111 | 111 | jQuery( this ).dialog( "close" ); |
| 112 | 112 | }, |
| 113 | - "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() { |
|
| 113 | + "<?php _e('Cancel', 'autoptimize'); ?>": function() { |
|
| 114 | 114 | jQuery( this ).dialog( "close" ); |
| 115 | 115 | } |
| 116 | 116 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | var data = { |
| 129 | 129 | 'action': 'rm_critcss', |
| 130 | - 'critcss_rm_nonce': '<?php echo wp_create_nonce( 'rm_critcss_nonce' ); ?>', |
|
| 130 | + 'critcss_rm_nonce': '<?php echo wp_create_nonce('rm_critcss_nonce'); ?>', |
|
| 131 | 131 | 'cachebustingtimestamp': new Date().getTime(), |
| 132 | 132 | 'critcssfile': crit_file |
| 133 | 133 | }; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | function removeAllCcssFilesOnServer() { |
| 149 | 149 | var data = { |
| 150 | 150 | 'action': 'rm_critcss_all', |
| 151 | - 'critcss_rm_all_nonce': '<?php echo wp_create_nonce( 'rm_critcss_all_nonce' ); ?>', |
|
| 151 | + 'critcss_rm_all_nonce': '<?php echo wp_create_nonce('rm_critcss_all_nonce'); ?>', |
|
| 152 | 152 | 'cachebustingtimestamp': new Date().getTime() |
| 153 | 153 | }; |
| 154 | 154 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | function addEditRow(idToEdit) { |
| 169 | 169 | resetForm(); |
| 170 | 170 | if (idToEdit) { |
| 171 | - dialogTitle="<?php _e( 'Edit Critical CSS Rule', 'autoptimize' ); ?>"; |
|
| 171 | + dialogTitle="<?php _e('Edit Critical CSS Rule', 'autoptimize'); ?>"; |
|
| 172 | 172 | |
| 173 | 173 | splits=idToEdit.split(/_/); |
| 174 | 174 | crit_type=splits[0]; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | jQuery("#critcss_addedit_id").val(idToEdit); |
| 180 | 180 | jQuery("#critcss_addedit_type").val(crit_type); |
| 181 | 181 | jQuery("#critcss_addedit_file").val(crit_file); |
| 182 | - jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'Loading critical CSS...', 'autoptimize' ); ?>"); |
|
| 182 | + jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('Loading critical CSS...', 'autoptimize'); ?>"); |
|
| 183 | 183 | jQuery("#critcss_addedit_type").attr("disabled",true); |
| 184 | 184 | |
| 185 | 185 | if (crit_type==="paths") { |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | |
| 195 | 195 | var data = { |
| 196 | 196 | 'action': 'fetch_critcss', |
| 197 | - 'critcss_fetch_nonce': '<?php echo wp_create_nonce( 'fetch_critcss_nonce' ); ?>', |
|
| 197 | + 'critcss_fetch_nonce': '<?php echo wp_create_nonce('fetch_critcss_nonce'); ?>', |
|
| 198 | 198 | 'cachebustingtimestamp': new Date().getTime(), |
| 199 | 199 | 'critcssfile': crit_file |
| 200 | 200 | }; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | }); |
| 210 | 210 | } else { |
| 211 | - dialogTitle="<?php _e( 'Add Critical CSS Rule', 'autotimize' ); ?>"; |
|
| 211 | + dialogTitle="<?php _e('Add Critical CSS Rule', 'autotimize'); ?>"; |
|
| 212 | 212 | |
| 213 | 213 | // default: paths, hide content type field |
| 214 | 214 | jQuery("#critcss_addedit_type").val("paths"); |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | if(this.value==="types") { |
| 220 | 220 | jQuery("#critcss_addedit_pagetype_wrapper").show(); |
| 221 | 221 | jQuery("#critcss_addedit_path_wrapper").hide(); |
| 222 | - jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize' ); ?>"); |
|
| 222 | + jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize'); ?>"); |
|
| 223 | 223 | } else { |
| 224 | 224 | jQuery("#critcss_addedit_path_wrapper").show(); |
| 225 | 225 | jQuery("#critcss_addedit_pagetype_wrapper").hide(); |
| 226 | - jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>"); |
|
| 226 | + jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>"); |
|
| 227 | 227 | } |
| 228 | 228 | }); |
| 229 | 229 | } |
@@ -235,21 +235,21 @@ discard block |
||
| 235 | 235 | title: dialogTitle, |
| 236 | 236 | modal: true, |
| 237 | 237 | buttons: { |
| 238 | - "<?php _e( 'Submit', 'autoptimize' ); ?>": function() { |
|
| 238 | + "<?php _e('Submit', 'autoptimize'); ?>": function() { |
|
| 239 | 239 | rpath = jQuery("#critcss_addedit_path").val(); |
| 240 | 240 | rtype = jQuery("#critcss_addedit_pagetype option:selected").val(); |
| 241 | 241 | rccss = jQuery("#critcss_addedit_css").val(); |
| 242 | 242 | console.log('rpath: ' + rpath, 'rtype: ' + rtype, 'rccss: ' + rccss); |
| 243 | 243 | if (rpath === '' && rtype === '') { |
| 244 | - alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize' ); ?>'); |
|
| 244 | + alert('<?php _e("RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize'); ?>'); |
|
| 245 | 245 | } else if (rtype !== '' && rccss == '') { |
| 246 | - alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize' ); ?>'); |
|
| 246 | + alert('<?php _e("RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize'); ?>'); |
|
| 247 | 247 | } else { |
| 248 | 248 | saveEditCritCss(); |
| 249 | 249 | jQuery(this).dialog('close'); |
| 250 | 250 | } |
| 251 | 251 | }, |
| 252 | - "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() { |
|
| 252 | + "<?php _e('Cancel', 'autoptimize'); ?>": function() { |
|
| 253 | 253 | resetForm(); |
| 254 | 254 | jQuery(this).dialog("close"); |
| 255 | 255 | } |
@@ -263,15 +263,15 @@ discard block |
||
| 263 | 263 | autoOpen: true, |
| 264 | 264 | height: 505, |
| 265 | 265 | width: 700, |
| 266 | - title: "<?php _e( 'Default Critical CSS', 'autoptimize' ); ?>", |
|
| 266 | + title: "<?php _e('Default Critical CSS', 'autoptimize'); ?>", |
|
| 267 | 267 | modal: true, |
| 268 | 268 | buttons: { |
| 269 | - "<?php _e( 'Submit', 'autoptimize' ); ?>": function() { |
|
| 269 | + "<?php _e('Submit', 'autoptimize'); ?>": function() { |
|
| 270 | 270 | document.getElementById("autoptimize_css_defer_inline").value=document.getElementById("dummyDefault").value; |
| 271 | 271 | jQuery("#unSavedWarning").show(); |
| 272 | 272 | jQuery("#default_critcss_wrapper").dialog( "close" ); |
| 273 | 273 | }, |
| 274 | - "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() { |
|
| 274 | + "<?php _e('Cancel', 'autoptimize'); ?>": function() { |
|
| 275 | 275 | jQuery("#default_critcss_wrapper").dialog( "close" ); |
| 276 | 276 | } |
| 277 | 277 | } |
@@ -284,15 +284,15 @@ discard block |
||
| 284 | 284 | autoOpen: true, |
| 285 | 285 | height: 505, |
| 286 | 286 | width: 700, |
| 287 | - title: "<?php _e( 'Additional Critical CSS', 'autoptimize' ); ?>", |
|
| 287 | + title: "<?php _e('Additional Critical CSS', 'autoptimize'); ?>", |
|
| 288 | 288 | modal: true, |
| 289 | 289 | buttons: { |
| 290 | - "<?php _e( 'Submit', 'autoptimize' ); ?>": function() { |
|
| 290 | + "<?php _e('Submit', 'autoptimize'); ?>": function() { |
|
| 291 | 291 | document.getElementById("autoptimize_ccss_additional").value=document.getElementById("dummyAdditional").value; |
| 292 | 292 | jQuery("#unSavedWarning").show(); |
| 293 | 293 | jQuery("#additional_critcss_wrapper").dialog( "close" ); |
| 294 | 294 | }, |
| 295 | - "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() { |
|
| 295 | + "<?php _e('Cancel', 'autoptimize'); ?>": function() { |
|
| 296 | 296 | jQuery("#additional_critcss_wrapper").dialog( "close" ); |
| 297 | 297 | } |
| 298 | 298 | } |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | critCssArray[critcsstype][critcsstarget].file=critcssfile; |
| 329 | 329 | |
| 330 | 330 | <?php |
| 331 | - if ( $ao_ccss_debug ) { |
|
| 331 | + if ($ao_ccss_debug) { |
|
| 332 | 332 | echo "console.log('[RULE PROPERTIES] Type:', critcsstype, ', Target:', critcsstarget, ', Hash:', 0, ', File:', critcssfile);"; |
| 333 | 333 | } |
| 334 | 334 | ?> |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | |
| 338 | 338 | var data = { |
| 339 | 339 | 'action': 'save_critcss', |
| 340 | - 'critcss_save_nonce': '<?php echo wp_create_nonce( 'save_critcss_nonce' ); ?>', |
|
| 340 | + 'critcss_save_nonce': '<?php echo wp_create_nonce('save_critcss_nonce'); ?>', |
|
| 341 | 341 | 'critcssfile': critcssfile, |
| 342 | 342 | 'critcsscontents': critcsscontents |
| 343 | 343 | }; |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | function resetForm() { |
| 365 | - jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>"); |
|
| 365 | + jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>"); |
|
| 366 | 366 | jQuery("#critcss_addedit_type").attr("disabled",false); |
| 367 | 367 | jQuery("#critcss_addedit_path_wrapper").show(); |
| 368 | 368 | jQuery("#critcss_addedit_id").val(""); |
@@ -13,12 +13,12 @@ discard block |
||
| 13 | 13 | ?> |
| 14 | 14 | <ul id="rules-panel"> |
| 15 | 15 | <li class="itemDetail"> |
| 16 | - <h2 class="itemTitle"><?php _e( 'Rules', 'autoptimize' ); ?></h2> |
|
| 16 | + <h2 class="itemTitle"><?php _e('Rules', 'autoptimize'); ?></h2> |
|
| 17 | 17 | |
| 18 | 18 | <!-- BEGIN Rule dialogs --> |
| 19 | 19 | <!-- Unsaved dialog --> |
| 20 | 20 | <div id="unSavedWarning" class="hidden updated settings-error notice notice-warning is-dismissible"> |
| 21 | - <p><?php _e( "<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize' ); ?></p> |
|
| 21 | + <p><?php _e("<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize'); ?></p> |
|
| 22 | 22 | </div> |
| 23 | 23 | |
| 24 | 24 | <!-- Create/edit rule dialog --> |
@@ -26,97 +26,97 @@ discard block |
||
| 26 | 26 | <table class="form-table rules"> |
| 27 | 27 | <tr id="critcss_addedit_type_wrapper"> |
| 28 | 28 | <th scope="row"> |
| 29 | - <?php _e( 'Rule Type', 'autoptimize' ); ?> |
|
| 29 | + <?php _e('Rule Type', 'autoptimize'); ?> |
|
| 30 | 30 | </th> |
| 31 | 31 | <td> |
| 32 | 32 | <select id="critcss_addedit_type" style="width:100%;"> |
| 33 | - <option value="paths"><?php _e( 'Path', 'autoptimize' ); ?></option> |
|
| 34 | - <option value="types"><?php _e( 'Conditional Tag', 'autoptimize' ); ?></option> |
|
| 33 | + <option value="paths"><?php _e('Path', 'autoptimize'); ?></option> |
|
| 34 | + <option value="types"><?php _e('Conditional Tag', 'autoptimize'); ?></option> |
|
| 35 | 35 | </select> |
| 36 | 36 | </td> |
| 37 | 37 | </tr> |
| 38 | 38 | <tr id="critcss_addedit_path_wrapper"> |
| 39 | 39 | <th scope="row"> |
| 40 | - <?php _e( 'String in Path', 'autoptimize' ); ?> |
|
| 40 | + <?php _e('String in Path', 'autoptimize'); ?> |
|
| 41 | 41 | </th> |
| 42 | 42 | <td> |
| 43 | - <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=""> |
|
| 43 | + <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=""> |
|
| 44 | 44 | </td> |
| 45 | 45 | </tr> |
| 46 | 46 | <tr id="critcss_addedit_pagetype_wrapper"> |
| 47 | 47 | <th scope="row"> |
| 48 | - <?php _e( 'Conditional Tag, Custom Post Type or Page Template', 'autoptimize' ); ?> |
|
| 48 | + <?php _e('Conditional Tag, Custom Post Type or Page Template', 'autoptimize'); ?> |
|
| 49 | 49 | </th> |
| 50 | 50 | <td> |
| 51 | 51 | <select id="critcss_addedit_pagetype" style="width:100%;"> |
| 52 | - <option value="" disabled selected><?php _e( 'Select from the list below...', 'autoptimize' ); ?></option> |
|
| 53 | - <optgroup label="<?php _e( 'Standard Conditional Tags', 'autoptimize' ); ?>"> |
|
| 52 | + <option value="" disabled selected><?php _e('Select from the list below...', 'autoptimize'); ?></option> |
|
| 53 | + <optgroup label="<?php _e('Standard Conditional Tags', 'autoptimize'); ?>"> |
|
| 54 | 54 | <?php |
| 55 | 55 | // Render grouped simple conditional tags. |
| 56 | - foreach ( $ao_ccss_types as $ctag ) { |
|
| 57 | - $optgrp = substr( $ctag, 0, 3 ); |
|
| 58 | - if ( substr( $ctag, 0, 3 ) === 'is_' ) { |
|
| 59 | - echo '<option value="' . $ctag . '">' . $ctag . '</option>'; |
|
| 56 | + foreach ($ao_ccss_types as $ctag) { |
|
| 57 | + $optgrp = substr($ctag, 0, 3); |
|
| 58 | + if (substr($ctag, 0, 3) === 'is_') { |
|
| 59 | + echo '<option value="'.$ctag.'">'.$ctag.'</option>'; |
|
| 60 | 60 | } |
| 61 | - $prevgrp = substr( $ctag, 0, 3 ); |
|
| 61 | + $prevgrp = substr($ctag, 0, 3); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // Render grouped custom post types, templates and specific conditional tags. |
| 65 | - foreach ( $ao_ccss_types as $type ) { |
|
| 66 | - $optgrp = substr( $type, 0, 3 ); |
|
| 65 | + foreach ($ao_ccss_types as $type) { |
|
| 66 | + $optgrp = substr($type, 0, 3); |
|
| 67 | 67 | |
| 68 | 68 | // Option groups labels. |
| 69 | - if ( $optgrp !== $prevgrp && 'is_' !== $optgrp ) { |
|
| 69 | + if ($optgrp !== $prevgrp && 'is_' !== $optgrp) { |
|
| 70 | 70 | ?> |
| 71 | 71 | </optgroup> |
| 72 | 72 | <?php |
| 73 | - if ( substr( $type, 0, 12 ) === 'custom_post_' ) { |
|
| 73 | + if (substr($type, 0, 12) === 'custom_post_') { |
|
| 74 | 74 | ?> |
| 75 | - <optgroup label="<?php _e( 'Custom Post Types', 'autoptimize' ); ?>"> |
|
| 75 | + <optgroup label="<?php _e('Custom Post Types', 'autoptimize'); ?>"> |
|
| 76 | 76 | <?php |
| 77 | - } elseif ( substr( $type, 0, 9 ) === 'template_' ) { |
|
| 77 | + } elseif (substr($type, 0, 9) === 'template_') { |
|
| 78 | 78 | ?> |
| 79 | - <optgroup label="<?php _e( 'Page Templates', 'autoptimize' ); ?>"> |
|
| 79 | + <optgroup label="<?php _e('Page Templates', 'autoptimize'); ?>"> |
|
| 80 | 80 | <?php |
| 81 | - } elseif ( substr( $type, 0, 4 ) === 'bbp_' ) { |
|
| 81 | + } elseif (substr($type, 0, 4) === 'bbp_') { |
|
| 82 | 82 | ?> |
| 83 | - <optgroup label="<?php _e( 'BBPress Conditional Tags', 'autoptimize' ); ?>"> |
|
| 83 | + <optgroup label="<?php _e('BBPress Conditional Tags', 'autoptimize'); ?>"> |
|
| 84 | 84 | <?php |
| 85 | - } elseif ( substr( $type, 0, 3 ) === 'bp_' ) { |
|
| 85 | + } elseif (substr($type, 0, 3) === 'bp_') { |
|
| 86 | 86 | ?> |
| 87 | - <optgroup label="<?php _e( 'BuddyPress Conditional Tags', 'autoptimize' ); ?>"> |
|
| 87 | + <optgroup label="<?php _e('BuddyPress Conditional Tags', 'autoptimize'); ?>"> |
|
| 88 | 88 | <?php |
| 89 | - } elseif ( substr( $type, 0, 4 ) === 'edd_' ) { |
|
| 89 | + } elseif (substr($type, 0, 4) === 'edd_') { |
|
| 90 | 90 | ?> |
| 91 | - <optgroup label="<?php _e( 'Easy Digital Downloads Conditional Tags', 'autoptimize' ); ?>"> |
|
| 91 | + <optgroup label="<?php _e('Easy Digital Downloads Conditional Tags', 'autoptimize'); ?>"> |
|
| 92 | 92 | <?php |
| 93 | - } elseif ( substr( $type, 0, 4 ) === 'woo_' ) { |
|
| 93 | + } elseif (substr($type, 0, 4) === 'woo_') { |
|
| 94 | 94 | ?> |
| 95 | - <optgroup label="<?php _e( 'WooCommerce Conditional Tags', 'autoptimize' ); ?>"> |
|
| 95 | + <optgroup label="<?php _e('WooCommerce Conditional Tags', 'autoptimize'); ?>"> |
|
| 96 | 96 | <?php |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | // Options. |
| 101 | - if ( 'is_' !== $optgrp ) { |
|
| 101 | + if ('is_' !== $optgrp) { |
|
| 102 | 102 | // Remove prefix from custom post types, templates and some specific conditional tags. |
| 103 | - if ( substr( $type, 0, 12 ) === 'custom_post_' ) { |
|
| 104 | - $_type = str_replace( 'custom_post_', '', $type ); |
|
| 105 | - } elseif ( substr( $type, 0, 9 ) === 'template_' ) { |
|
| 106 | - $_type = str_replace( 'template_', '', $type ); |
|
| 107 | - } elseif ( 'bbp_is_bbpress' == $type ) { |
|
| 108 | - $_type = str_replace( 'bbp_', '', $type ); |
|
| 109 | - } elseif ( 'bp_is_buddypress' == $type ) { |
|
| 110 | - $_type = str_replace( 'bp_', '', $type ); |
|
| 111 | - } elseif ( substr( $type, 0, 4 ) === 'woo_' ) { |
|
| 112 | - $_type = str_replace( 'woo_', '', $type ); |
|
| 113 | - } elseif ( substr( $type, 0, 4 ) === 'edd_' ) { |
|
| 114 | - $_type = str_replace( 'edd_', '', $type ); |
|
| 103 | + if (substr($type, 0, 12) === 'custom_post_') { |
|
| 104 | + $_type = str_replace('custom_post_', '', $type); |
|
| 105 | + } elseif (substr($type, 0, 9) === 'template_') { |
|
| 106 | + $_type = str_replace('template_', '', $type); |
|
| 107 | + } elseif ('bbp_is_bbpress' == $type) { |
|
| 108 | + $_type = str_replace('bbp_', '', $type); |
|
| 109 | + } elseif ('bp_is_buddypress' == $type) { |
|
| 110 | + $_type = str_replace('bp_', '', $type); |
|
| 111 | + } elseif (substr($type, 0, 4) === 'woo_') { |
|
| 112 | + $_type = str_replace('woo_', '', $type); |
|
| 113 | + } elseif (substr($type, 0, 4) === 'edd_') { |
|
| 114 | + $_type = str_replace('edd_', '', $type); |
|
| 115 | 115 | } else { |
| 116 | 116 | $_type = $type; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - echo '<option value="' . $type . '">' . $_type . '</option>'; |
|
| 119 | + echo '<option value="'.$type.'">'.$_type.'</option>'; |
|
| 120 | 120 | $prevgrp = $optgrp; |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -127,10 +127,10 @@ discard block |
||
| 127 | 127 | </tr> |
| 128 | 128 | <tr> |
| 129 | 129 | <th scope="row"> |
| 130 | - <?php _e( 'Custom Critical CSS', 'autoptimize' ); ?> |
|
| 130 | + <?php _e('Custom Critical CSS', 'autoptimize'); ?> |
|
| 131 | 131 | </th> |
| 132 | 132 | <td> |
| 133 | - <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> |
|
| 133 | + <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> |
|
| 134 | 134 | <input type="hidden" id="critcss_addedit_file"> |
| 135 | 135 | <input type="hidden" id="critcss_addedit_id"> |
| 136 | 136 | </td> |
@@ -139,23 +139,23 @@ discard block |
||
| 139 | 139 | </div> |
| 140 | 140 | |
| 141 | 141 | <!-- Remove dialog --> |
| 142 | - <div id="confirm-rm" title="<?php _e( 'Delete Rule', 'autoptimize' ); ?>" class="hidden"> |
|
| 143 | - <p><?php _e( 'This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p> |
|
| 142 | + <div id="confirm-rm" title="<?php _e('Delete Rule', 'autoptimize'); ?>" class="hidden"> |
|
| 143 | + <p><?php _e('This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p> |
|
| 144 | 144 | </div> |
| 145 | 145 | |
| 146 | 146 | <!-- Remove All dialog --> |
| 147 | - <div id="confirm-rm-all" title="<?php _e( 'Delete all Rules and Jobs', 'autoptimize' ); ?>" class="hidden"> |
|
| 148 | - <p><?php _e( 'All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p> |
|
| 147 | + <div id="confirm-rm-all" title="<?php _e('Delete all Rules and Jobs', 'autoptimize'); ?>" class="hidden"> |
|
| 148 | + <p><?php _e('All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p> |
|
| 149 | 149 | </div> |
| 150 | 150 | |
| 151 | 151 | <!-- Add/edit default critical CSS dialog --> |
| 152 | 152 | <div id="default_critcss_wrapper" class="hidden"> |
| 153 | - <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> |
|
| 153 | + <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> |
|
| 154 | 154 | </div> |
| 155 | 155 | |
| 156 | 156 | <!-- Add/edit additional critical CSS dialog --> |
| 157 | 157 | <div id="additional_critcss_wrapper" class="hidden"> |
| 158 | - <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> |
|
| 158 | + <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> |
|
| 159 | 159 | </div> |
| 160 | 160 | |
| 161 | 161 | <!-- Wrapper for in screen notices --> |
@@ -165,38 +165,38 @@ discard block |
||
| 165 | 165 | <!-- BEGIN Rules UI --> |
| 166 | 166 | <div class="howto"> |
| 167 | 167 | <div class="title-wrap"> |
| 168 | - <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize' ); ?></h4> |
|
| 169 | - <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p> |
|
| 168 | + <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize'); ?></h4> |
|
| 169 | + <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p> |
|
| 170 | 170 | </div> |
| 171 | 171 | <button type="button" class="toggle-btn"> |
| 172 | 172 | <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span> |
| 173 | 173 | </button> |
| 174 | 174 | <div class="howto-wrap hidden"> |
| 175 | - <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> |
|
| 175 | + <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> |
|
| 176 | 176 | <ol> |
| 177 | - <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> |
|
| 178 | - <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> |
|
| 179 | - <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> |
|
| 180 | - <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> |
|
| 181 | - <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> |
|
| 182 | - <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> |
|
| 183 | - <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> |
|
| 184 | - <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> |
|
| 177 | + <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> |
|
| 178 | + <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> |
|
| 179 | + <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> |
|
| 180 | + <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> |
|
| 181 | + <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> |
|
| 182 | + <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> |
|
| 183 | + <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> |
|
| 184 | + <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> |
|
| 185 | 185 | </ol> |
| 186 | 186 | </div> |
| 187 | 187 | </div> |
| 188 | - <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> |
|
| 189 | - <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_ccss_additional', '' ); ?></textarea> |
|
| 188 | + <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> |
|
| 189 | + <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_ccss_additional', ''); ?></textarea> |
|
| 190 | 190 | <table class="rules-list" cellspacing="0"><tbody id="rules-list"></tbody></table> |
| 191 | - <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo ( json_encode( $ao_ccss_rules, JSON_FORCE_OBJECT ) ); ?>'> |
|
| 191 | + <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo (json_encode($ao_ccss_rules, JSON_FORCE_OBJECT)); ?>'> |
|
| 192 | 192 | <div class="submit rules-btn"> |
| 193 | 193 | <div class="alignleft"> |
| 194 | - <span id="addCritCssButton" class="button-secondary"><?php _e( 'Add New Rule', 'autoptimize' ); ?></span> |
|
| 195 | - <span id="editDefaultButton" class="button-secondary"><?php _e( 'Edit Default Rule CSS', 'autoptimize' ); ?></span> |
|
| 196 | - <span id="editAdditionalButton" class="button-secondary"><?php _e( 'Add CSS To All Rules', 'autoptimize' ); ?></span> |
|
| 194 | + <span id="addCritCssButton" class="button-secondary"><?php _e('Add New Rule', 'autoptimize'); ?></span> |
|
| 195 | + <span id="editDefaultButton" class="button-secondary"><?php _e('Edit Default Rule CSS', 'autoptimize'); ?></span> |
|
| 196 | + <span id="editAdditionalButton" class="button-secondary"><?php _e('Add CSS To All Rules', 'autoptimize'); ?></span> |
|
| 197 | 197 | </div> |
| 198 | 198 | <div class="alignright"> |
| 199 | - <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e( 'Remove all rules', 'autoptimize' ); ?></span> |
|
| 199 | + <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e('Remove all rules', 'autoptimize'); ?></span> |
|
| 200 | 200 | </div> |
| 201 | 201 | </div> |
| 202 | 202 | <!-- END Rules UI --> |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | $ao_options = $wpdb->get_results(' |
| 11 | 11 | SELECT option_name AS name, |
| 12 | 12 | option_value AS value |
| 13 | - FROM ' . $wpdb->options . ' |
|
| 13 | + FROM ' . $wpdb->options.' |
|
| 14 | 14 | WHERE option_name LIKE "autoptimize_%%" |
| 15 | 15 | ORDER BY name |
| 16 | 16 | ', ARRAY_A); |
@@ -19,27 +19,27 @@ discard block |
||
| 19 | 19 | $ao_trans = $wpdb->get_results(' |
| 20 | 20 | SELECT option_name AS name, |
| 21 | 21 | option_value AS value |
| 22 | - FROM ' . $wpdb->options . ' |
|
| 22 | + FROM ' . $wpdb->options.' |
|
| 23 | 23 | WHERE option_name LIKE "_transient_autoptimize_%%" |
| 24 | 24 | OR option_name LIKE "_transient_timeout_autoptimize_%%" |
| 25 | 25 | ', ARRAY_A); |
| 26 | 26 | |
| 27 | 27 | // Render debug panel if there's something to show. |
| 28 | -if ( $ao_options || $ao_trans ) { |
|
| 28 | +if ($ao_options || $ao_trans) { |
|
| 29 | 29 | ?> |
| 30 | 30 | <!-- BEGIN: Settings Debug --> |
| 31 | 31 | <ul> |
| 32 | 32 | <li class="itemDetail"> |
| 33 | - <h2 class="itemTitle"><?php _e( 'Debug Information', 'autoptimize' ); ?></h2> |
|
| 33 | + <h2 class="itemTitle"><?php _e('Debug Information', 'autoptimize'); ?></h2> |
|
| 34 | 34 | |
| 35 | 35 | <?php |
| 36 | 36 | // Render options. |
| 37 | - if ( $ao_options ) { |
|
| 37 | + if ($ao_options) { |
|
| 38 | 38 | ?> |
| 39 | - <h4><?php _e( 'Options', 'autoptimize' ); ?>:</h4> |
|
| 39 | + <h4><?php _e('Options', 'autoptimize'); ?>:</h4> |
|
| 40 | 40 | <table class="form-table debug"> |
| 41 | 41 | <?php |
| 42 | - foreach ( $ao_options as $option ) { |
|
| 42 | + foreach ($ao_options as $option) { |
|
| 43 | 43 | ?> |
| 44 | 44 | <tr> |
| 45 | 45 | <th scope="row"> |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | </th> |
| 48 | 48 | <td> |
| 49 | 49 | <?php |
| 50 | - if ( 'autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name'] ) { |
|
| 51 | - $value = print_r( json_decode( $option['value'], true ), true ); |
|
| 52 | - if ( $value ) { |
|
| 53 | - echo "Raw JSON:\n<pre>" . $option['value'] . "</pre>\n\nDecoded JSON:\n<pre>" . $value . '</pre>'; |
|
| 50 | + if ('autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name']) { |
|
| 51 | + $value = print_r(json_decode($option['value'], true), true); |
|
| 52 | + if ($value) { |
|
| 53 | + echo "Raw JSON:\n<pre>".$option['value']."</pre>\n\nDecoded JSON:\n<pre>".$value.'</pre>'; |
|
| 54 | 54 | } else { |
| 55 | 55 | echo 'Empty'; |
| 56 | 56 | } |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | // Render WP-Cron intervals and scheduled events. |
| 71 | 71 | ?> |
| 72 | - <h4><?php _e( 'WP-Cron Intervals', 'autoptimize' ); ?>:</h4> |
|
| 73 | - <pre><?php print_r( wp_get_schedules() ); ?></pre> |
|
| 72 | + <h4><?php _e('WP-Cron Intervals', 'autoptimize'); ?>:</h4> |
|
| 73 | + <pre><?php print_r(wp_get_schedules()); ?></pre> |
|
| 74 | 74 | <hr /> |
| 75 | - <h4><?php _e( 'WP-Cron Scheduled Events', 'autoptimize' ); ?>:</h4> |
|
| 76 | - <pre><?php print_r( _get_cron_array() ); ?></pre> |
|
| 75 | + <h4><?php _e('WP-Cron Scheduled Events', 'autoptimize'); ?>:</h4> |
|
| 76 | + <pre><?php print_r(_get_cron_array()); ?></pre> |
|
| 77 | 77 | </li> |
| 78 | 78 | </ul> |
| 79 | 79 | <!-- END: Settings Debug --> |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Critical CSS Options page. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -17,34 +17,34 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function __construct() |
| 19 | 19 | { |
| 20 | - $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http ); |
|
| 20 | + $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http); |
|
| 21 | 21 | $this->run(); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | protected function enabled() |
| 25 | 25 | { |
| 26 | - return apply_filters( 'autoptimize_filter_show_criticalcss_tabs', true ); |
|
| 26 | + return apply_filters('autoptimize_filter_show_criticalcss_tabs', true); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public function run() |
| 30 | 30 | { |
| 31 | - if ( $this->enabled() ) { |
|
| 32 | - add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_critcss_tabs' ), 10, 1 ); |
|
| 33 | - add_action( 'admin_enqueue_scripts', array( $this, 'admin_assets' ) ); |
|
| 31 | + if ($this->enabled()) { |
|
| 32 | + add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_critcss_tabs'), 10, 1); |
|
| 33 | + add_action('admin_enqueue_scripts', array($this, 'admin_assets')); |
|
| 34 | 34 | |
| 35 | - if ( $this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
| 36 | - add_action( 'network_admin_menu', array( $this, 'add_critcss_admin_menu' ) ); |
|
| 35 | + if ($this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
| 36 | + add_action('network_admin_menu', array($this, 'add_critcss_admin_menu')); |
|
| 37 | 37 | } else { |
| 38 | - add_action( 'admin_menu', array( $this, 'add_critcss_admin_menu' ) ); |
|
| 38 | + add_action('admin_menu', array($this, 'add_critcss_admin_menu')); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $criticalcss_ajax = new autoptimizeCriticalCSSSettingsAjax(); |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function add_critcss_tabs( $in ) |
|
| 45 | + public function add_critcss_tabs($in) |
|
| 46 | 46 | { |
| 47 | - $in = array_merge( $in, array( 'ao_critcss' => '⚡ ' . __( 'Critical CSS', 'autoptimize' ) ) ); |
|
| 47 | + $in = array_merge($in, array('ao_critcss' => '⚡ '.__('Critical CSS', 'autoptimize'))); |
|
| 48 | 48 | |
| 49 | 49 | return $in; |
| 50 | 50 | } |
@@ -52,56 +52,56 @@ discard block |
||
| 52 | 52 | public function add_critcss_admin_menu() |
| 53 | 53 | { |
| 54 | 54 | // Register settings. |
| 55 | - register_setting( 'ao_ccss_options_group', 'autoptimize_css_defer_inline' ); |
|
| 56 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rules' ); |
|
| 57 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_additional' ); |
|
| 58 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_queue' ); |
|
| 59 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_viewport' ); |
|
| 60 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_finclude' ); |
|
| 61 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rlimit' ); |
|
| 62 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_noptimize' ); |
|
| 63 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_debug' ); |
|
| 64 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_key' ); |
|
| 65 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_keyst' ); |
|
| 66 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_loggedin' ); |
|
| 67 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_forcepath' ); |
|
| 68 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_deferjquery' ); |
|
| 69 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_domain' ); |
|
| 55 | + register_setting('ao_ccss_options_group', 'autoptimize_css_defer_inline'); |
|
| 56 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_rules'); |
|
| 57 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_additional'); |
|
| 58 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_queue'); |
|
| 59 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_viewport'); |
|
| 60 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_finclude'); |
|
| 61 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_rlimit'); |
|
| 62 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_noptimize'); |
|
| 63 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_debug'); |
|
| 64 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_key'); |
|
| 65 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_keyst'); |
|
| 66 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_loggedin'); |
|
| 67 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_forcepath'); |
|
| 68 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_deferjquery'); |
|
| 69 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_domain'); |
|
| 70 | 70 | |
| 71 | 71 | // And add submenu-page. |
| 72 | - add_submenu_page( null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array( $this, 'ao_criticalcsssettings_page' ) ); |
|
| 72 | + add_submenu_page(null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array($this, 'ao_criticalcsssettings_page')); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - public function admin_assets( $hook ) { |
|
| 75 | + public function admin_assets($hook) { |
|
| 76 | 76 | // Return if plugin is not hooked. |
| 77 | - if ( 'settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook ) { |
|
| 77 | + if ('settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook) { |
|
| 78 | 78 | return; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // Stylesheets to add. |
| 82 | - wp_enqueue_style( 'wp-jquery-ui-dialog' ); |
|
| 83 | - wp_enqueue_style( 'ao-tablesorter', plugins_url( 'critcss-inc/css/ao-tablesorter/style.css', __FILE__ ) ); |
|
| 84 | - wp_enqueue_style( 'ao-ccss-admin-css', plugins_url( 'critcss-inc/css/admin_styles.css', __FILE__ ) ); |
|
| 82 | + wp_enqueue_style('wp-jquery-ui-dialog'); |
|
| 83 | + wp_enqueue_style('ao-tablesorter', plugins_url('critcss-inc/css/ao-tablesorter/style.css', __FILE__)); |
|
| 84 | + wp_enqueue_style('ao-ccss-admin-css', plugins_url('critcss-inc/css/admin_styles.css', __FILE__)); |
|
| 85 | 85 | |
| 86 | 86 | // Scripts to add. |
| 87 | - wp_enqueue_script( 'jquery-ui-dialog', array( 'jquery' ) ); |
|
| 88 | - wp_enqueue_script( 'md5', plugins_url( 'critcss-inc/js/md5.min.js', __FILE__ ), null, null, true ); |
|
| 89 | - wp_enqueue_script( 'tablesorter', plugins_url( 'critcss-inc/js/jquery.tablesorter.min.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
| 90 | - wp_enqueue_script( 'ao-ccss-admin-license', plugins_url( 'critcss-inc/js/admin_settings.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
| 87 | + wp_enqueue_script('jquery-ui-dialog', array('jquery')); |
|
| 88 | + wp_enqueue_script('md5', plugins_url('critcss-inc/js/md5.min.js', __FILE__), null, null, true); |
|
| 89 | + wp_enqueue_script('tablesorter', plugins_url('critcss-inc/js/jquery.tablesorter.min.js', __FILE__), array('jquery'), null, true); |
|
| 90 | + wp_enqueue_script('ao-ccss-admin-license', plugins_url('critcss-inc/js/admin_settings.js', __FILE__), array('jquery'), null, true); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | public function ao_criticalcsssettings_page() |
| 94 | 94 | { |
| 95 | 95 | // these are not OO yet, simply require for now. |
| 96 | - require_once( 'critcss-inc/admin_settings_rules.php' ); |
|
| 97 | - require_once( 'critcss-inc/admin_settings_queue.php' ); |
|
| 98 | - require_once( 'critcss-inc/admin_settings_key.php' ); |
|
| 99 | - require_once( 'critcss-inc/admin_settings_adv.php' ); |
|
| 100 | - require_once( 'critcss-inc/admin_settings_explain.php' ); |
|
| 96 | + require_once('critcss-inc/admin_settings_rules.php'); |
|
| 97 | + require_once('critcss-inc/admin_settings_queue.php'); |
|
| 98 | + require_once('critcss-inc/admin_settings_key.php'); |
|
| 99 | + require_once('critcss-inc/admin_settings_adv.php'); |
|
| 100 | + require_once('critcss-inc/admin_settings_explain.php'); |
|
| 101 | 101 | |
| 102 | 102 | // fetch all options at once and populate them individually explicitely as globals. |
| 103 | 103 | $all_options = autoptimizeCriticalCSSBase::fetch_options(); |
| 104 | - foreach ( $all_options as $_option => $_value ) { |
|
| 104 | + foreach ($all_options as $_option => $_value) { |
|
| 105 | 105 | global ${$_option}; |
| 106 | 106 | ${$_option} = $_value; |
| 107 | 107 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | <div class="wrap"> |
| 110 | 110 | <div id="autoptimize_main"> |
| 111 | 111 | <div id="ao_title_and_button"> |
| 112 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
| 112 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
| 113 | 113 | </div> |
| 114 | 114 | |
| 115 | 115 | <?php |
@@ -117,14 +117,14 @@ discard block |
||
| 117 | 117 | echo autoptimizeConfig::ao_admin_tabs(); |
| 118 | 118 | |
| 119 | 119 | // Make sure dir to write ao_ccss exists and is writable. |
| 120 | - if ( ! is_dir( AO_CCSS_DIR ) ) { |
|
| 121 | - $mkdirresp = @mkdir( AO_CCSS_DIR, 0775, true ); // @codingStandardsIgnoreLine |
|
| 122 | - $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>' ); |
|
| 123 | - if ( ( ! $mkdirresp ) || ( ! $fileresp ) ) { |
|
| 120 | + if (!is_dir(AO_CCSS_DIR)) { |
|
| 121 | + $mkdirresp = @mkdir(AO_CCSS_DIR, 0775, true); // @codingStandardsIgnoreLine |
|
| 122 | + $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>'); |
|
| 123 | + if ((!$mkdirresp) || (!$fileresp)) { |
|
| 124 | 124 | ?> |
| 125 | 125 | <div class="notice-error notice"><p> |
| 126 | 126 | <?php |
| 127 | - _e( 'Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize' ); |
|
| 127 | + _e('Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize'); |
|
| 128 | 128 | ?> |
| 129 | 129 | </p></div> |
| 130 | 130 | <?php |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | // Check for Autoptimize. |
| 135 | - if ( ! empty( $ao_ccss_key ) && ! $ao_css_defer ) { |
|
| 135 | + if (!empty($ao_ccss_key) && !$ao_css_defer) { |
|
| 136 | 136 | ?> |
| 137 | 137 | <div class="notice-error notice"><p> |
| 138 | 138 | <?php |
| 139 | - _e( "Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize' ); |
|
| 139 | + _e("Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize'); |
|
| 140 | 140 | ?> |
| 141 | 141 | </p></div> |
| 142 | 142 | <?php |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | // check if WordPress cron is disabled and warn if so. |
| 147 | - if ( ! empty( $ao_ccss_key ) && defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && PAnD::is_admin_notice_active( 'i-know-about-disable-cron-forever' ) ) { |
|
| 147 | + if (!empty($ao_ccss_key) && defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && PAnD::is_admin_notice_active('i-know-about-disable-cron-forever')) { |
|
| 148 | 148 | ?> |
| 149 | 149 | <div data-dismissible="i-know-about-disable-cron-forever" class="notice-warning notice is-dismissible"><p> |
| 150 | 150 | <?php |
| 151 | - _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' ); |
|
| 151 | + _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'); |
|
| 152 | 152 | ?> |
| 153 | 153 | </p></div> |
| 154 | 154 | <?php |
@@ -156,24 +156,24 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | // warn if it looks as though the queue processing job looks isn't running |
| 158 | 158 | // but store result in transient as to not to have to go through 2 arrays each and every time. |
| 159 | - $_warn_cron = get_transient( 'ao_ccss_cronwarning' ); |
|
| 160 | - if ( ! empty( $ao_ccss_key ) && false === $_warn_cron ) { |
|
| 159 | + $_warn_cron = get_transient('ao_ccss_cronwarning'); |
|
| 160 | + if (!empty($ao_ccss_key) && false === $_warn_cron) { |
|
| 161 | 161 | $_jobs_all_new = true; |
| 162 | - $_oldest_job_timestamp = microtime( true ); // now. |
|
| 162 | + $_oldest_job_timestamp = microtime(true); // now. |
|
| 163 | 163 | $_jobs_too_old = true; |
| 164 | 164 | |
| 165 | 165 | // go over queue array. |
| 166 | - if ( empty( $ao_ccss_queue ) ) { |
|
| 166 | + if (empty($ao_ccss_queue)) { |
|
| 167 | 167 | // no jobs, then no warning. |
| 168 | 168 | $_jobs_all_new = false; |
| 169 | 169 | } else { |
| 170 | - foreach ( $ao_ccss_queue as $job ) { |
|
| 171 | - if ( $job['jctime'] < $_oldest_job_timestamp ) { |
|
| 170 | + foreach ($ao_ccss_queue as $job) { |
|
| 171 | + if ($job['jctime'] < $_oldest_job_timestamp) { |
|
| 172 | 172 | // we need to catch the oldest job's timestamp. |
| 173 | 173 | $_oldest_job_timestamp = $job['jctime']; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if ( 'NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid'] ) { |
|
| 176 | + if ('NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid']) { |
|
| 177 | 177 | // we have a non-"NEW" job which is not our pending firstrun job either, break the loop. |
| 178 | 178 | $_jobs_all_new = false; |
| 179 | 179 | break; |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | // is the oldest job too old (4h)? |
| 185 | - if ( $_oldest_job_timestamp > microtime( true ) - 60 * 60 * 4 ) { |
|
| 185 | + if ($_oldest_job_timestamp > microtime(true) - 60*60*4) { |
|
| 186 | 186 | $_jobs_too_old = false; |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - if ( $_jobs_all_new && ! $this->ao_ccss_has_autorules() && $_jobs_too_old ) { |
|
| 189 | + if ($_jobs_all_new && !$this->ao_ccss_has_autorules() && $_jobs_too_old) { |
|
| 190 | 190 | $_warn_cron = 'on'; |
| 191 | 191 | $_transient_multiplier = 1; // store for 1 hour. |
| 192 | 192 | } else { |
@@ -194,33 +194,33 @@ discard block |
||
| 194 | 194 | $_transient_multiplier = 4; // store for 4 hours. |
| 195 | 195 | } |
| 196 | 196 | // and set transient. |
| 197 | - set_transient( 'ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier * HOUR_IN_SECONDS ); |
|
| 197 | + set_transient('ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier*HOUR_IN_SECONDS); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - if ( ! empty( $ao_ccss_key ) && 'on' == $_warn_cron && PAnD::is_admin_notice_active( 'i-know-about-cron-1' ) ) { |
|
| 200 | + if (!empty($ao_ccss_key) && 'on' == $_warn_cron && PAnD::is_admin_notice_active('i-know-about-cron-1')) { |
|
| 201 | 201 | ?> |
| 202 | 202 | <div data-dismissible="i-know-about-cron-1" class="notice-warning notice is-dismissible"><p> |
| 203 | 203 | <?php |
| 204 | - _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' ); |
|
| 204 | + _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'); |
|
| 205 | 205 | ?> |
| 206 | 206 | </p></div> |
| 207 | 207 | <?php |
| 208 | - } elseif ( ! empty( $ao_ccss_key ) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && ! $this->ao_ccss_has_autorules() ) { |
|
| 208 | + } elseif (!empty($ao_ccss_key) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && !$this->ao_ccss_has_autorules()) { |
|
| 209 | 209 | ?> |
| 210 | 210 | <div class="notice-success notice"><p> |
| 211 | 211 | <?php |
| 212 | - _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' ); |
|
| 212 | + _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'); |
|
| 213 | 213 | ?> |
| 214 | 214 | </p></div> |
| 215 | 215 | <?php |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | // warn if service is down. |
| 219 | - if ( ! empty( $ao_ccss_key ) && ! empty( $ao_ccss_servicestatus ) && is_array( $ao_ccss_servicestatus ) && 'down' === $ao_ccss_servicestatus['critcss']['status'] ) { |
|
| 219 | + if (!empty($ao_ccss_key) && !empty($ao_ccss_servicestatus) && is_array($ao_ccss_servicestatus) && 'down' === $ao_ccss_servicestatus['critcss']['status']) { |
|
| 220 | 220 | ?> |
| 221 | 221 | <div class="notice-warning notice"><p> |
| 222 | 222 | <?php |
| 223 | - _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' ); |
|
| 223 | + _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'); |
|
| 224 | 224 | ?> |
| 225 | 225 | </p></div> |
| 226 | 226 | <?php |
@@ -230,24 +230,24 @@ discard block |
||
| 230 | 230 | ?> |
| 231 | 231 | <form id="settings" method="post" action="options.php"> |
| 232 | 232 | <?php |
| 233 | - settings_fields( 'ao_ccss_options_group' ); |
|
| 233 | + settings_fields('ao_ccss_options_group'); |
|
| 234 | 234 | |
| 235 | 235 | // Get API key status. |
| 236 | - $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( true ); |
|
| 236 | + $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(true); |
|
| 237 | 237 | |
| 238 | - if ( $this->is_multisite_network_admin() ) { |
|
| 238 | + if ($this->is_multisite_network_admin()) { |
|
| 239 | 239 | ?> |
| 240 | 240 | <ul id="key-panel"> |
| 241 | 241 | <li class="itemDetail"> |
| 242 | 242 | <?php |
| 243 | 243 | // translators: the placesholder is for a line of code in wp-config.php. |
| 244 | - 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>' ); |
|
| 244 | + 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>'); |
|
| 245 | 245 | ?> |
| 246 | 246 | </li> |
| 247 | 247 | </ul> |
| 248 | 248 | <?php |
| 249 | 249 | } else { |
| 250 | - if ( 'valid' == $key['status'] ) { |
|
| 250 | + if ('valid' == $key['status']) { |
|
| 251 | 251 | // If key status is valid, render other panels. |
| 252 | 252 | // Render rules section. |
| 253 | 253 | ao_ccss_render_rules(); |
@@ -264,23 +264,23 @@ discard block |
||
| 264 | 264 | $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport(); |
| 265 | 265 | |
| 266 | 266 | // Add hidden fields. |
| 267 | - echo "<input class='hidden' name='autoptimize_ccss_rules' value='" . $ao_ccss_rules_raw . "'>"; |
|
| 268 | - echo "<input class='hidden' name='autoptimize_ccss_queue' value='" . $ao_ccss_queue_raw . "'>"; |
|
| 269 | - echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="' . $viewport['w'] . '">'; |
|
| 270 | - echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="' . $viewport['h'] . '">'; |
|
| 271 | - echo '<input class="hidden" name="autoptimize_ccss_finclude" value="' . $ao_ccss_finclude . '">'; |
|
| 272 | - echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="' . $ao_ccss_rlimit . '">'; |
|
| 273 | - echo '<input class="hidden" name="autoptimize_ccss_debug" value="' . $ao_ccss_debug . '">'; |
|
| 274 | - echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="' . $ao_ccss_noptimize . '">'; |
|
| 275 | - echo '<input class="hidden" name="autoptimize_css_defer_inline" value="' . esc_attr( $ao_css_defer_inline ) . '">'; |
|
| 276 | - echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="' . $ao_ccss_loggedin . '">'; |
|
| 277 | - echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="' . $ao_ccss_forcepath . '">'; |
|
| 267 | + echo "<input class='hidden' name='autoptimize_ccss_rules' value='".$ao_ccss_rules_raw."'>"; |
|
| 268 | + echo "<input class='hidden' name='autoptimize_ccss_queue' value='".$ao_ccss_queue_raw."'>"; |
|
| 269 | + echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="'.$viewport['w'].'">'; |
|
| 270 | + echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="'.$viewport['h'].'">'; |
|
| 271 | + echo '<input class="hidden" name="autoptimize_ccss_finclude" value="'.$ao_ccss_finclude.'">'; |
|
| 272 | + echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="'.$ao_ccss_rlimit.'">'; |
|
| 273 | + echo '<input class="hidden" name="autoptimize_ccss_debug" value="'.$ao_ccss_debug.'">'; |
|
| 274 | + echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="'.$ao_ccss_noptimize.'">'; |
|
| 275 | + echo '<input class="hidden" name="autoptimize_css_defer_inline" value="'.esc_attr($ao_css_defer_inline).'">'; |
|
| 276 | + echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="'.$ao_ccss_loggedin.'">'; |
|
| 277 | + echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="'.$ao_ccss_forcepath.'">'; |
|
| 278 | 278 | } |
| 279 | 279 | // Render key panel unconditionally. |
| 280 | - ao_ccss_render_key( $ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color'] ); |
|
| 280 | + ao_ccss_render_key($ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color']); |
|
| 281 | 281 | ?> |
| 282 | 282 | <p class="submit left"> |
| 283 | - <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /> |
|
| 283 | + <input type="submit" class="button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /> |
|
| 284 | 284 | </p> |
| 285 | 285 | <?php |
| 286 | 286 | } |
@@ -298,31 +298,31 @@ discard block |
||
| 298 | 298 | }); |
| 299 | 299 | } |
| 300 | 300 | </script> |
| 301 | - <form id="importSettingsForm"<?php if ( $this->is_multisite_network_admin() ) { echo ' class="hidden"'; } ?>> |
|
| 302 | - <span id="exportSettings" class="button-secondary"><?php _e( 'Export Settings', 'autoptimize' ); ?></span> |
|
| 303 | - <input class="button-secondary" id="importSettings" type="button" value="<?php _e( 'Import Settings', 'autoptimize' ); ?>" onclick="upload();return false;" /> |
|
| 301 | + <form id="importSettingsForm"<?php if ($this->is_multisite_network_admin()) { echo ' class="hidden"'; } ?>> |
|
| 302 | + <span id="exportSettings" class="button-secondary"><?php _e('Export Settings', 'autoptimize'); ?></span> |
|
| 303 | + <input class="button-secondary" id="importSettings" type="button" value="<?php _e('Import Settings', 'autoptimize'); ?>" onclick="upload();return false;" /> |
|
| 304 | 304 | <input class="button-secondary" id="settingsfile" name="settingsfile" type="file" /> |
| 305 | 305 | </form> |
| 306 | 306 | <div id="importdialog"></div> |
| 307 | 307 | </div><!-- /#autoptimize_main --> |
| 308 | 308 | </div><!-- /#wrap --> |
| 309 | 309 | <?php |
| 310 | - if ( ! $this->is_multisite_network_admin() ) { |
|
| 310 | + if (!$this->is_multisite_network_admin()) { |
|
| 311 | 311 | // Include debug panel if debug mode is enable. |
| 312 | - if ( $ao_ccss_debug ) { |
|
| 312 | + if ($ao_ccss_debug) { |
|
| 313 | 313 | ?> |
| 314 | 314 | <div id="debug"> |
| 315 | 315 | <?php |
| 316 | 316 | // Include debug panel. |
| 317 | - include( 'critcss-inc/admin_settings_debug.php' ); |
|
| 317 | + include('critcss-inc/admin_settings_debug.php'); |
|
| 318 | 318 | ?> |
| 319 | 319 | </div><!-- /#debug --> |
| 320 | 320 | <?php |
| 321 | 321 | } |
| 322 | 322 | echo '<script>'; |
| 323 | - include( 'critcss-inc/admin_settings_rules.js.php' ); |
|
| 324 | - include( 'critcss-inc/admin_settings_queue.js.php' ); |
|
| 325 | - include( 'critcss-inc/admin_settings_impexp.js.php' ); |
|
| 323 | + include('critcss-inc/admin_settings_rules.js.php'); |
|
| 324 | + include('critcss-inc/admin_settings_queue.js.php'); |
|
| 325 | + include('critcss-inc/admin_settings_impexp.js.php'); |
|
| 326 | 326 | echo '</script>'; |
| 327 | 327 | } |
| 328 | 328 | } |
@@ -330,19 +330,19 @@ discard block |
||
| 330 | 330 | public static function ao_ccss_has_autorules() { |
| 331 | 331 | static $_has_auto_rules = null; |
| 332 | 332 | |
| 333 | - if ( null === $_has_auto_rules ) { |
|
| 333 | + if (null === $_has_auto_rules) { |
|
| 334 | 334 | global $ao_ccss_rules; |
| 335 | 335 | $_has_auto_rules = false; |
| 336 | - if ( ! empty( $ao_ccss_rules ) ) { |
|
| 337 | - foreach ( array( 'types', 'paths' ) as $_typat ) { |
|
| 338 | - foreach ( $ao_ccss_rules[ $_typat ] as $rule ) { |
|
| 339 | - if ( ! empty( $rule['hash'] ) ) { |
|
| 336 | + if (!empty($ao_ccss_rules)) { |
|
| 337 | + foreach (array('types', 'paths') as $_typat) { |
|
| 338 | + foreach ($ao_ccss_rules[$_typat] as $rule) { |
|
| 339 | + if (!empty($rule['hash'])) { |
|
| 340 | 340 | // we have at least one AUTO job, so all is fine. |
| 341 | 341 | $_has_auto_rules = true; |
| 342 | 342 | break; |
| 343 | 343 | } |
| 344 | 344 | } |
| 345 | - if ( $_has_auto_rules ) { |
|
| 345 | + if ($_has_auto_rules) { |
|
| 346 | 346 | break; |
| 347 | 347 | } |
| 348 | 348 | } |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | public function is_multisite_network_admin() { |
| 356 | 356 | static $_multisite_network_admin = null; |
| 357 | 357 | |
| 358 | - if ( null === $_multisite_network_admin ) { |
|
| 359 | - if ( is_multisite() && is_network_admin() ) { |
|
| 358 | + if (null === $_multisite_network_admin) { |
|
| 359 | + if (is_multisite() && is_network_admin()) { |
|
| 360 | 360 | $_multisite_network_admin = true; |
| 361 | 361 | } else { |
| 362 | 362 | $_multisite_network_admin = false; |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Main configuration logic. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -35,32 +35,32 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | private function __construct() |
| 37 | 37 | { |
| 38 | - if ( is_admin() ) { |
|
| 38 | + if (is_admin()) { |
|
| 39 | 39 | // Add the admin page and settings. |
| 40 | - if ( autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
| 41 | - add_action( 'network_admin_menu', array( $this, 'addmenu' ) ); |
|
| 40 | + if (autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
| 41 | + add_action('network_admin_menu', array($this, 'addmenu')); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - add_action( 'admin_menu', array( $this, 'addmenu' ) ); |
|
| 45 | - add_action( 'admin_init', array( $this, 'registersettings' ) ); |
|
| 44 | + add_action('admin_menu', array($this, 'addmenu')); |
|
| 45 | + add_action('admin_init', array($this, 'registersettings')); |
|
| 46 | 46 | |
| 47 | 47 | // Set meta info. |
| 48 | - if ( function_exists( 'plugin_row_meta' ) ) { |
|
| 48 | + if (function_exists('plugin_row_meta')) { |
|
| 49 | 49 | // 2.8 and higher. |
| 50 | - add_filter( 'plugin_row_meta', array( $this, 'setmeta' ), 10, 2 ); |
|
| 51 | - } elseif ( function_exists( 'post_class' ) ) { |
|
| 50 | + add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2); |
|
| 51 | + } elseif (function_exists('post_class')) { |
|
| 52 | 52 | // 2.7 and lower. |
| 53 | - $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' ); |
|
| 54 | - add_filter( 'plugin_action_links_' . $plugin, array( $this, 'setmeta' ) ); |
|
| 53 | + $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
|
| 54 | + add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta')); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // Clean cache? |
| 58 | - if ( autoptimizeOptionWrapper::get_option( 'autoptimize_cache_clean' ) ) { |
|
| 58 | + if (autoptimizeOptionWrapper::get_option('autoptimize_cache_clean')) { |
|
| 59 | 59 | autoptimizeCache::clearall(); |
| 60 | - autoptimizeOptionWrapper::update_option( 'autoptimize_cache_clean', 0 ); |
|
| 60 | + autoptimizeOptionWrapper::update_option('autoptimize_cache_clean', 0); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http ); |
|
| 63 | + $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | // Adds the Autoptimize Toolbar to the Admin bar. |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | static public function instance() |
| 77 | 77 | { |
| 78 | 78 | // Only one instance. |
| 79 | - if ( null === self::$instance ) { |
|
| 79 | + if (null === self::$instance) { |
|
| 80 | 80 | self::$instance = new autoptimizeConfig(); |
| 81 | 81 | } |
| 82 | 82 | |
@@ -86,9 +86,9 @@ discard block |
||
| 86 | 86 | public function show_network_message() { |
| 87 | 87 | ?> |
| 88 | 88 | <div class="wrap"> |
| 89 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
| 89 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
| 90 | 90 | <?php echo $this->ao_admin_tabs(); ?> |
| 91 | - <p style="font-size:120%;"><?php echo apply_filters( 'autoptimize_filter_settingsscreen_multisite_network_message', __( 'Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize' ) ); ?></p> |
|
| 91 | + <p style="font-size:120%;"><?php echo apply_filters('autoptimize_filter_settingsscreen_multisite_network_message', __('Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize')); ?></p> |
|
| 92 | 92 | </div> |
| 93 | 93 | <?php |
| 94 | 94 | } |
@@ -181,32 +181,32 @@ discard block |
||
| 181 | 181 | <div class="wrap"> |
| 182 | 182 | |
| 183 | 183 | <!-- Temporary nudge to disable aoccss power-up. --> |
| 184 | -<?php if ( autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) { ?> |
|
| 184 | +<?php if (autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) { ?> |
|
| 185 | 185 | <div class="notice-info notice"><p> |
| 186 | - <?php _e( 'Autoptimize now includes the criticalcss.com integration that was previously part of the separate power-up. If you want you can simply disable the power-up and Autoptimize will take over immediately.', 'autoptimize' ); ?> |
|
| 186 | + <?php _e('Autoptimize now includes the criticalcss.com integration that was previously part of the separate power-up. If you want you can simply disable the power-up and Autoptimize will take over immediately.', 'autoptimize'); ?> |
|
| 187 | 187 | </p></div> |
| 188 | 188 | <?php } ?> |
| 189 | 189 | |
| 190 | 190 | <div id="autoptimize_main"> |
| 191 | - <h1 id="ao_title"><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
| 191 | + <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
| 192 | 192 | <?php echo $this->ao_admin_tabs(); ?> |
| 193 | 193 | |
| 194 | -<form method="post" action="<?php echo admin_url( 'options.php' ); ?>"> |
|
| 195 | -<?php settings_fields( 'autoptimize' ); ?> |
|
| 194 | +<form method="post" action="<?php echo admin_url('options.php'); ?>"> |
|
| 195 | +<?php settings_fields('autoptimize'); ?> |
|
| 196 | 196 | |
| 197 | 197 | <ul> |
| 198 | 198 | |
| 199 | 199 | <?php |
| 200 | 200 | // Only show enable site configuration in network site option. |
| 201 | -if ( is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
| 201 | +if (is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
| 202 | 202 | ?> |
| 203 | 203 | <li class="itemDetail multiSite"> |
| 204 | - <h2 class="itemTitle"><?php _e( 'Multisite Options', 'autoptimize' ); ?></h2> |
|
| 204 | + <h2 class="itemTitle"><?php _e('Multisite Options', 'autoptimize'); ?></h2> |
|
| 205 | 205 | <table class="form-table"> |
| 206 | 206 | <tr valign="top"> |
| 207 | - <th scope="row"><?php _e( 'Enable site configuration?', 'autoptimize' ); ?></th> |
|
| 208 | - <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 209 | - <?php _e( 'Enable Autoptimize configuration per site.', 'autoptimize' ); ?></label></td> |
|
| 207 | + <th scope="row"><?php _e('Enable site configuration?', 'autoptimize'); ?></th> |
|
| 208 | + <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config') ? 'checked="checked" ' : ''; ?>/> |
|
| 209 | + <?php _e('Enable Autoptimize configuration per site.', 'autoptimize'); ?></label></td> |
|
| 210 | 210 | </tr> |
| 211 | 211 | </table> |
| 212 | 212 | </li> |
@@ -215,115 +215,115 @@ discard block |
||
| 215 | 215 | <?php } ?> |
| 216 | 216 | |
| 217 | 217 | <li class="itemDetail"> |
| 218 | -<h2 class="itemTitle"><?php _e( 'JavaScript Options', 'autoptimize' ); ?></h2> |
|
| 218 | +<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2> |
|
| 219 | 219 | <table class="form-table"> |
| 220 | 220 | <tr valign="top"> |
| 221 | -<th scope="row"><?php _e( 'Optimize JavaScript Code?', 'autoptimize' ); ?></th> |
|
| 222 | -<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js' ) ? 'checked="checked" ' : ''; ?>/></td> |
|
| 221 | +<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th> |
|
| 222 | +<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 223 | 223 | </tr> |
| 224 | 224 | <tr valign="top" class="js_sub"> |
| 225 | -<th scope="row"><?php _e( 'Aggregate JS-files?', 'autoptimize' ); ?></th> |
|
| 226 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 227 | -<?php _e( 'Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td> |
|
| 225 | +<th scope="row"><?php _e('Aggregate JS-files?', 'autoptimize'); ?></th> |
|
| 226 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get('autoptimize_js_aggregate') ? 'checked="checked" ' : ''; ?>/> |
|
| 227 | +<?php _e('Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td> |
|
| 228 | 228 | </tr> |
| 229 | 229 | <tr valign="top" class="js_sub js_aggregate"> |
| 230 | -<th scope="row"><?php _e( 'Also aggregate inline JS?', 'autoptimize' ); ?></th> |
|
| 231 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_include_inline' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 232 | -<?php _e( 'Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize' ); ?></label></td> |
|
| 230 | +<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th> |
|
| 231 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 232 | +<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td> |
|
| 233 | 233 | </tr> |
| 234 | 234 | <tr valign="top" class="js_sub js_aggregate"> |
| 235 | -<th scope="row"><?php _e( 'Force JavaScript in <head>?', 'autoptimize' ); ?></th> |
|
| 236 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_forcehead' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 237 | -<?php _e( 'Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize' ); ?></label></td> |
|
| 235 | +<th scope="row"><?php _e('Force JavaScript in <head>?', 'autoptimize'); ?></th> |
|
| 236 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/> |
|
| 237 | +<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td> |
|
| 238 | 238 | </tr> |
| 239 | -<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ) { ?> |
|
| 239 | +<?php if (autoptimizeOptionWrapper::get_option('autoptimize_js_justhead')) { ?> |
|
| 240 | 240 | <tr valign="top" class="js_sub js_aggregate"> |
| 241 | 241 | <th scope="row"> |
| 242 | 242 | <?php |
| 243 | - _e( 'Look for scripts only in <head>?', 'autoptimize' ); |
|
| 244 | - echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>'; |
|
| 243 | + _e('Look for scripts only in <head>?', 'autoptimize'); |
|
| 244 | + echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; |
|
| 245 | 245 | ?> |
| 246 | 246 | </th> |
| 247 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 248 | -<?php _e( 'Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize' ); ?></label></td> |
|
| 247 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 248 | +<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td> |
|
| 249 | 249 | </tr> |
| 250 | 250 | <?php } ?> |
| 251 | 251 | <tr valign="top" class="js_sub"> |
| 252 | -<th scope="row"><?php _e( 'Exclude scripts from Autoptimize:', 'autoptimize' ); ?></th> |
|
| 253 | -<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js' ); ?>"/><br /> |
|
| 252 | +<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th> |
|
| 253 | +<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js'); ?>"/><br /> |
|
| 254 | 254 | <?php |
| 255 | -echo __( 'A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' ); |
|
| 255 | +echo __('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize'); |
|
| 256 | 256 | ?> |
| 257 | 257 | </label></td> |
| 258 | 258 | </tr> |
| 259 | 259 | <tr valign="top" class="js_sub js_aggregate"> |
| 260 | -<th scope="row"><?php _e( 'Add try-catch wrapping?', 'autoptimize' ); ?></th> |
|
| 261 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_trycatch' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 262 | -<?php _e( 'If your scripts break because of a JS-error, you might want to try this.', 'autoptimize' ); ?></label></td> |
|
| 260 | +<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th> |
|
| 261 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/> |
|
| 262 | +<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td> |
|
| 263 | 263 | </tr> |
| 264 | 264 | </table> |
| 265 | 265 | </li> |
| 266 | 266 | |
| 267 | 267 | <li class="itemDetail"> |
| 268 | -<h2 class="itemTitle"><?php _e( 'CSS Options', 'autoptimize' ); ?></h2> |
|
| 268 | +<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2> |
|
| 269 | 269 | <table class="form-table"> |
| 270 | 270 | <tr valign="top"> |
| 271 | -<th scope="row"><?php _e( 'Optimize CSS Code?', 'autoptimize' ); ?></th> |
|
| 272 | -<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css' ) ? 'checked="checked" ' : ''; ?>/></td> |
|
| 271 | +<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th> |
|
| 272 | +<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 273 | 273 | </tr> |
| 274 | 274 | <tr class="css_sub" valign="top"> |
| 275 | -<th scope="row"><?php _e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th> |
|
| 276 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get( 'autoptimize_css_aggregate' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 277 | -<?php _e( 'Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td> |
|
| 275 | +<th scope="row"><?php _e('Aggregate CSS-files?', 'autoptimize'); ?></th> |
|
| 276 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get('autoptimize_css_aggregate') ? 'checked="checked" ' : ''; ?>/> |
|
| 277 | +<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td> |
|
| 278 | 278 | </tr> |
| 279 | 279 | <tr valign="top" class="css_sub css_aggregate"> |
| 280 | -<th scope="row"><?php _e( 'Also aggregate inline CSS?', 'autoptimize' ); ?></th> |
|
| 281 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_include_inline', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 282 | -<?php _e( 'Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize' ); ?></label></td> |
|
| 280 | +<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th> |
|
| 281 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 282 | +<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td> |
|
| 283 | 283 | </tr> |
| 284 | 284 | <tr class="css_sub css_aggregate" valign="top"> |
| 285 | -<th scope="row"><?php _e( 'Generate data: URIs for images?', 'autoptimize' ); ?></th> |
|
| 286 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_datauris' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 287 | -<?php _e( 'Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize' ); ?></label></td> |
|
| 285 | +<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th> |
|
| 286 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/> |
|
| 287 | +<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td> |
|
| 288 | 288 | </tr> |
| 289 | -<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ) { ?> |
|
| 289 | +<?php if (autoptimizeOptionWrapper::get_option('autoptimize_css_justhead')) { ?> |
|
| 290 | 290 | <tr valign="top" class="css_sub css_aggregate"> |
| 291 | 291 | <th scope="row"> |
| 292 | 292 | <?php |
| 293 | -_e( 'Look for styles only in <head>?', 'autoptimize' ); |
|
| 294 | -echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>'; |
|
| 293 | +_e('Look for styles only in <head>?', 'autoptimize'); |
|
| 294 | +echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; |
|
| 295 | 295 | ?> |
| 296 | 296 | </th> |
| 297 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 298 | -<?php _e( 'Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize' ); ?></label></td> |
|
| 297 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 298 | +<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td> |
|
| 299 | 299 | </tr> |
| 300 | 300 | <?php } ?> |
| 301 | 301 | <tr valign="top" class="css_sub"> |
| 302 | -<th scope="row"><?php _e( 'Inline and Defer CSS?', 'autoptimize' ); ?></th> |
|
| 303 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 302 | +<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th> |
|
| 303 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/> |
|
| 304 | 304 | <?php |
| 305 | -_e( 'Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize' ); |
|
| 305 | +_e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize'); |
|
| 306 | 306 | echo ' '; |
| 307 | -$critcss_settings_url = get_admin_url( null, 'options-general.php?page=ao_critcss' ); |
|
| 307 | +$critcss_settings_url = get_admin_url(null, 'options-general.php?page=ao_critcss'); |
|
| 308 | 308 | // translators: links "autoptimize critical CSS" tab. |
| 309 | -echo sprintf( __( 'This can be fully automated for different types of pages on the %s tab.', 'autoptimize' ), '<a href="' . $critcss_settings_url . '">CriticalCSS</a>' ); |
|
| 309 | +echo sprintf(__('This can be fully automated for different types of pages on the %s tab.', 'autoptimize'), '<a href="'.$critcss_settings_url.'">CriticalCSS</a>'); |
|
| 310 | 310 | ?> |
| 311 | 311 | </label></td> |
| 312 | 312 | </tr> |
| 313 | 313 | <tr valign="top" class="css_sub" id="autoptimize_css_defer_inline"> |
| 314 | 314 | <th scope="row"></th> |
| 315 | -<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ); ?></textarea></label></td> |
|
| 315 | +<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 316 | 316 | </tr> |
| 317 | 317 | <tr valign="top" class="css_sub css_aggregate"> |
| 318 | -<th scope="row"><?php _e( 'Inline all CSS?', 'autoptimize' ); ?></th> |
|
| 319 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_inline' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 320 | -<?php _e( 'Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them any more, breaking thumbnails when sharing.', 'autoptimize' ); ?></label></td> |
|
| 318 | +<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th> |
|
| 319 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 320 | +<?php _e('Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them any more, breaking thumbnails when sharing.', 'autoptimize'); ?></label></td> |
|
| 321 | 321 | </tr> |
| 322 | 322 | <tr valign="top" class="css_sub"> |
| 323 | -<th scope="row"><?php _e( 'Exclude CSS from Autoptimize:', 'autoptimize' ); ?></th> |
|
| 324 | -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css' ); ?>"/><br /> |
|
| 323 | +<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th> |
|
| 324 | +<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 325 | 325 | <?php |
| 326 | -echo __( 'A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' ); |
|
| 326 | +echo __('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize'); |
|
| 327 | 327 | ?> |
| 328 | 328 | </label></td> |
| 329 | 329 | </tr> |
@@ -331,55 +331,55 @@ discard block |
||
| 331 | 331 | </li> |
| 332 | 332 | |
| 333 | 333 | <li class="itemDetail"> |
| 334 | -<h2 class="itemTitle"><?php _e( 'HTML Options', 'autoptimize' ); ?></h2> |
|
| 334 | +<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2> |
|
| 335 | 335 | <table class="form-table"> |
| 336 | 336 | <tr valign="top"> |
| 337 | -<th scope="row"><?php _e( 'Optimize HTML Code?', 'autoptimize' ); ?></th> |
|
| 338 | -<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html' ) ? 'checked="checked" ' : ''; ?>/></td> |
|
| 337 | +<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th> |
|
| 338 | +<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 339 | 339 | </tr> |
| 340 | 340 | <tr class="html_sub" valign="top"> |
| 341 | -<th scope="row"><?php _e( 'Keep HTML comments?', 'autoptimize' ); ?></th> |
|
| 342 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html_keepcomments' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 343 | -<?php _e( 'Enable this if you want HTML comments to remain in the page.', 'autoptimize' ); ?></label></td> |
|
| 341 | +<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th> |
|
| 342 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/> |
|
| 343 | +<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td> |
|
| 344 | 344 | </tr> |
| 345 | 345 | </table> |
| 346 | 346 | </li> |
| 347 | 347 | |
| 348 | 348 | <li class="itemDetail"> |
| 349 | -<h2 class="itemTitle"><?php _e( 'CDN Options', 'autoptimize' ); ?></h2> |
|
| 349 | +<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2> |
|
| 350 | 350 | <table class="form-table"> |
| 351 | 351 | <tr valign="top"> |
| 352 | -<th scope="row"><?php _e( 'CDN Base URL', 'autoptimize' ); ?></th> |
|
| 353 | -<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url( autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' ), array( 'http', 'https' ) ); ?>" /><br /> |
|
| 354 | -<?php _e( 'Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize' ); ?></label></td> |
|
| 352 | +<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th> |
|
| 353 | +<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(autoptimizeOptionWrapper::get_option('autoptimize_cdn_url', ''), array('http', 'https')); ?>" /><br /> |
|
| 354 | +<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td> |
|
| 355 | 355 | </tr> |
| 356 | 356 | </table> |
| 357 | 357 | </li> |
| 358 | 358 | |
| 359 | 359 | <li class="itemDetail"> |
| 360 | -<h2 class="itemTitle"><?php _e( 'Cache Info', 'autoptimize' ); ?></h2> |
|
| 360 | +<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2> |
|
| 361 | 361 | <table class="form-table" > |
| 362 | 362 | <tr valign="top" > |
| 363 | -<th scope="row"><?php _e( 'Cache folder', 'autoptimize' ); ?></th> |
|
| 364 | -<td><?php echo htmlentities( AUTOPTIMIZE_CACHE_DIR ); ?></td> |
|
| 363 | +<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th> |
|
| 364 | +<td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td> |
|
| 365 | 365 | </tr> |
| 366 | 366 | <tr valign="top" > |
| 367 | -<th scope="row"><?php _e( 'Can we write?', 'autoptimize' ); ?></th> |
|
| 368 | -<td><?php echo ( autoptimizeCache::cacheavail() ? __( 'Yes', 'autoptimize' ) : __( 'No', 'autoptimize' ) ); ?></td> |
|
| 367 | +<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th> |
|
| 368 | +<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td> |
|
| 369 | 369 | </tr> |
| 370 | 370 | <tr valign="top" > |
| 371 | -<th scope="row"><?php _e( 'Cached styles and scripts', 'autoptimize' ); ?></th> |
|
| 371 | +<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th> |
|
| 372 | 372 | <td> |
| 373 | 373 | <?php |
| 374 | 374 | $ao_stat_arr = autoptimizeCache::stats(); |
| 375 | - if ( ! empty( $ao_stat_arr ) && is_array( $ao_stat_arr ) ) { |
|
| 376 | - $ao_cache_size = size_format( $ao_stat_arr[1], 2 ); |
|
| 375 | + if (!empty($ao_stat_arr) && is_array($ao_stat_arr)) { |
|
| 376 | + $ao_cache_size = size_format($ao_stat_arr[1], 2); |
|
| 377 | 377 | $details = ''; |
| 378 | - if ( $ao_cache_size > 0 ) { |
|
| 379 | - $details = ', ~' . $ao_cache_size . ' total'; |
|
| 378 | + if ($ao_cache_size > 0) { |
|
| 379 | + $details = ', ~'.$ao_cache_size.' total'; |
|
| 380 | 380 | } |
| 381 | 381 | // translators: Kilobytes + timestamp shown. |
| 382 | - printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize' ), $ao_stat_arr[0], $ao_cache_size, date( 'H:i e', $ao_stat_arr[2] ) ); |
|
| 382 | + printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $ao_stat_arr[0], $ao_cache_size, date('H:i e', $ao_stat_arr[2])); |
|
| 383 | 383 | } |
| 384 | 384 | ?> |
| 385 | 385 | </td> |
@@ -388,41 +388,41 @@ discard block |
||
| 388 | 388 | </li> |
| 389 | 389 | |
| 390 | 390 | <li class="itemDetail"> |
| 391 | -<h2 class="itemTitle"><?php _e( 'Misc Options', 'autoptimize' ); ?></h2> |
|
| 391 | +<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2> |
|
| 392 | 392 | <table class="form-table"> |
| 393 | 393 | <tr valign="top" > |
| 394 | - <th scope="row"><?php _e( 'Save aggregated script/css as static files?', 'autoptimize' ); ?></th> |
|
| 395 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 396 | - <?php _e( 'By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize' ); ?></label></td> |
|
| 394 | + <th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th> |
|
| 395 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 396 | + <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td> |
|
| 397 | 397 | </tr> |
| 398 | 398 | <?php |
| 399 | 399 | $_min_excl_class = ''; |
| 400 | - if ( ! $conf->get( 'autoptimize_css_aggregate' ) && ! $conf->get( 'autoptimize_js_aggregate' ) ) { |
|
| 400 | + if (!$conf->get('autoptimize_css_aggregate') && !$conf->get('autoptimize_js_aggregate')) { |
|
| 401 | 401 | $_min_excl_class = 'hidden'; |
| 402 | 402 | } |
| 403 | 403 | ?> |
| 404 | 404 | <tr valign="top" id="min_excl_row" class="<?php echo $_min_excl_class; ?>"> |
| 405 | - <th scope="row"><?php _e( 'Minify excluded CSS and JS files?', 'autoptimize' ); ?></th> |
|
| 406 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_minify_excluded', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 407 | - <?php _e( 'When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize' ); ?></label></td> |
|
| 405 | + <th scope="row"><?php _e('Minify excluded CSS and JS files?', 'autoptimize'); ?></th> |
|
| 406 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_minify_excluded', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 407 | + <?php _e('When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize'); ?></label></td> |
|
| 408 | 408 | </tr> |
| 409 | 409 | <tr valign="top"> |
| 410 | - <th scope="row"><?php _e( 'Experimental: enable 404 fallbacks.', 'autoptimize' ); ?></th> |
|
| 411 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_fallback', '' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 412 | - <?php _e( 'Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. This experimental feature tries to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases this will require extra web-server level configuration to ensure <code>wp-content/autoptimize_404_handler.php</code> is set to handle 404\'s in <code>wp-content/cache/autoptimize</code>.', 'autoptimize' ); ?></label></td> |
|
| 410 | + <th scope="row"><?php _e('Experimental: enable 404 fallbacks.', 'autoptimize'); ?></th> |
|
| 411 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_fallback', '') ? 'checked="checked" ' : ''; ?>/> |
|
| 412 | + <?php _e('Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. This experimental feature tries to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases this will require extra web-server level configuration to ensure <code>wp-content/autoptimize_404_handler.php</code> is set to handle 404\'s in <code>wp-content/cache/autoptimize</code>.', 'autoptimize'); ?></label></td> |
|
| 413 | 413 | </tr> |
| 414 | 414 | <tr valign="top"> |
| 415 | - <th scope="row"><?php _e( 'Also optimize for logged in editors/ administrators?', 'autoptimize' ); ?></th> |
|
| 416 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_logged', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 417 | - <?php _e( 'By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize' ); ?></label></td> |
|
| 415 | + <th scope="row"><?php _e('Also optimize for logged in editors/ administrators?', 'autoptimize'); ?></th> |
|
| 416 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 417 | + <?php _e('By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label></td> |
|
| 418 | 418 | </tr> |
| 419 | 419 | <?php |
| 420 | - if ( function_exists( 'is_checkout' ) || function_exists( 'is_cart' ) || function_exists( 'edd_is_checkout' ) || function_exists( 'wpsc_is_cart' ) || function_exists( 'wpsc_is_checkout' ) ) { |
|
| 420 | + if (function_exists('is_checkout') || function_exists('is_cart') || function_exists('edd_is_checkout') || function_exists('wpsc_is_cart') || function_exists('wpsc_is_checkout')) { |
|
| 421 | 421 | ?> |
| 422 | 422 | <tr valign="top" > |
| 423 | - <th scope="row"><?php _e( 'Also optimize shop cart/ checkout?', 'autoptimize' ); ?></th> |
|
| 424 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', '0' ) ? 'checked="checked" ' : ''; ?>/> |
|
| 425 | - <?php _e( 'By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize' ); ?></label> |
|
| 423 | + <th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th> |
|
| 424 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', '0') ? 'checked="checked" ' : ''; ?>/> |
|
| 425 | + <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label> |
|
| 426 | 426 | </td> |
| 427 | 427 | </tr> |
| 428 | 428 | <?php } ?> |
@@ -432,8 +432,8 @@ discard block |
||
| 432 | 432 | </ul> |
| 433 | 433 | |
| 434 | 434 | <p class="submit"> |
| 435 | -<input type="submit" class="button-secondary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /> |
|
| 436 | -<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e( 'Save Changes and Empty Cache', 'autoptimize' ); ?>" /> |
|
| 435 | +<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /> |
|
| 436 | +<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize'); ?>" /> |
|
| 437 | 437 | </p> |
| 438 | 438 | |
| 439 | 439 | </form> |
@@ -442,46 +442,46 @@ discard block |
||
| 442 | 442 | <div class="autoptimize_banner hidden"> |
| 443 | 443 | <ul> |
| 444 | 444 | <?php |
| 445 | - if ( $this->settings_screen_do_remote_http ) { |
|
| 446 | - $ao_banner = get_transient( 'autoptimize_banner' ); |
|
| 447 | - if ( empty( $ao_banner ) ) { |
|
| 448 | - $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION ); |
|
| 449 | - if ( ! is_wp_error( $banner_resp ) ) { |
|
| 450 | - if ( '200' == wp_remote_retrieve_response_code( $banner_resp ) ) { |
|
| 451 | - $ao_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) ); |
|
| 452 | - set_transient( 'autoptimize_banner', $ao_banner, WEEK_IN_SECONDS ); |
|
| 445 | + if ($this->settings_screen_do_remote_http) { |
|
| 446 | + $ao_banner = get_transient('autoptimize_banner'); |
|
| 447 | + if (empty($ao_banner)) { |
|
| 448 | + $banner_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION); |
|
| 449 | + if (!is_wp_error($banner_resp)) { |
|
| 450 | + if ('200' == wp_remote_retrieve_response_code($banner_resp)) { |
|
| 451 | + $ao_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp)); |
|
| 452 | + set_transient('autoptimize_banner', $ao_banner, WEEK_IN_SECONDS); |
|
| 453 | 453 | } |
| 454 | 454 | } |
| 455 | 455 | } |
| 456 | 456 | echo $ao_banner; |
| 457 | 457 | } |
| 458 | 458 | ?> |
| 459 | - <li><?php _e( "Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize' ); ?></li> |
|
| 460 | - <li><?php _e( 'Happy with Autoptimize?', 'autoptimize' ); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e( 'Try my other plugins!', 'autoptimize' ); ?></a></li> |
|
| 459 | + <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize'); ?></li> |
|
| 460 | + <li><?php _e('Happy with Autoptimize?', 'autoptimize'); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e('Try my other plugins!', 'autoptimize'); ?></a></li> |
|
| 461 | 461 | </ul> |
| 462 | 462 | </div> |
| 463 | 463 | <div style="margin-left:10px;margin-top:-5px;"> |
| 464 | 464 | <h2> |
| 465 | - <?php _e( 'futtta about', 'autoptimize' ); ?> |
|
| 465 | + <?php _e('futtta about', 'autoptimize'); ?> |
|
| 466 | 466 | <select id="feed_dropdown" > |
| 467 | - <option value="1"><?php _e( 'Autoptimize', 'autoptimize' ); ?></option> |
|
| 468 | - <option value="2"><?php _e( 'WordPress', 'autoptimize' ); ?></option> |
|
| 469 | - <option value="3"><?php _e( 'Web Technology', 'autoptimize' ); ?></option> |
|
| 467 | + <option value="1"><?php _e('Autoptimize', 'autoptimize'); ?></option> |
|
| 468 | + <option value="2"><?php _e('WordPress', 'autoptimize'); ?></option> |
|
| 469 | + <option value="3"><?php _e('Web Technology', 'autoptimize'); ?></option> |
|
| 470 | 470 | </select> |
| 471 | 471 | </h2> |
| 472 | 472 | <div id="futtta_feed"> |
| 473 | 473 | <div id="autoptimizefeed"> |
| 474 | - <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_autoptimize' ); ?> |
|
| 474 | + <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_autoptimize'); ?> |
|
| 475 | 475 | </div> |
| 476 | 476 | <div id="wordpressfeed"> |
| 477 | - <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_wordpress' ); ?> |
|
| 477 | + <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_wordpress'); ?> |
|
| 478 | 478 | </div> |
| 479 | 479 | <div id="webtechfeed"> |
| 480 | - <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_webtech' ); ?> |
|
| 480 | + <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_webtech'); ?> |
|
| 481 | 481 | </div> |
| 482 | 482 | </div> |
| 483 | 483 | </div> |
| 484 | - <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url() . '/' . plugin_basename( dirname( __FILE__ ) ) . '/external/do_not_donate_smallest.png'; ?>" title="<?php _e( 'Do not donate for this plugin!', 'autoptimize' ); ?>"></a></div> |
|
| 484 | + <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e('Do not donate for this plugin!', 'autoptimize'); ?>"></a></div> |
|
| 485 | 485 | </div> |
| 486 | 486 | |
| 487 | 487 | <script type="text/javascript"> |
@@ -630,81 +630,81 @@ discard block |
||
| 630 | 630 | |
| 631 | 631 | public function addmenu() |
| 632 | 632 | { |
| 633 | - if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
| 633 | + if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
| 634 | 634 | // multisite, network admin, ao network activated: add normal settings page at network level. |
| 635 | - $hook = add_submenu_page( 'settings.php', __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show_config' ) ); |
|
| 636 | - } elseif ( is_multisite() && ! is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) { |
|
| 635 | + $hook = add_submenu_page('settings.php', __('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_network_options', 'autoptimize', array($this, 'show_config')); |
|
| 636 | + } elseif (is_multisite() && !is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) { |
|
| 637 | 637 | // multisite, ao network activated, not network admin so site specific settings, but "autoptimize_enable_site_config" is off: show "sorry, ask network admin" message iso options. |
| 638 | - $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_network_message' ) ); |
|
| 638 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_network_message')); |
|
| 639 | 639 | } else { |
| 640 | 640 | // default: show normal options page if not multisite, if multisite but not network activated, if multisite and network activated and "autoptimize_enable_site_config" is on. |
| 641 | - $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_config' ) ); |
|
| 641 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_config')); |
|
| 642 | 642 | } |
| 643 | 643 | |
| 644 | - add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) ); |
|
| 645 | - add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) ); |
|
| 644 | + add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts')); |
|
| 645 | + add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles')); |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | public function autoptimize_admin_scripts() |
| 649 | 649 | { |
| 650 | - wp_enqueue_script( 'jqcookie', plugins_url( '/external/js/jquery.cookie.min.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
| 651 | - wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider-min.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
| 650 | + wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true); |
|
| 651 | + wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true); |
|
| 652 | 652 | } |
| 653 | 653 | |
| 654 | 654 | public function autoptimize_admin_styles() |
| 655 | 655 | { |
| 656 | - wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ) ); |
|
| 657 | - wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ) ); |
|
| 656 | + wp_enqueue_style('unslider', plugins_url('/external/js/unslider.css', __FILE__)); |
|
| 657 | + wp_enqueue_style('unslider-dots', plugins_url('/external/js/unslider-dots.css', __FILE__)); |
|
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | public function registersettings() { |
| 661 | - register_setting( 'autoptimize', 'autoptimize_html' ); |
|
| 662 | - register_setting( 'autoptimize', 'autoptimize_html_keepcomments' ); |
|
| 663 | - register_setting( 'autoptimize', 'autoptimize_enable_site_config' ); |
|
| 664 | - register_setting( 'autoptimize', 'autoptimize_js' ); |
|
| 665 | - register_setting( 'autoptimize', 'autoptimize_js_aggregate' ); |
|
| 666 | - register_setting( 'autoptimize', 'autoptimize_js_exclude' ); |
|
| 667 | - register_setting( 'autoptimize', 'autoptimize_js_trycatch' ); |
|
| 668 | - register_setting( 'autoptimize', 'autoptimize_js_justhead' ); |
|
| 669 | - register_setting( 'autoptimize', 'autoptimize_js_forcehead' ); |
|
| 670 | - register_setting( 'autoptimize', 'autoptimize_js_include_inline' ); |
|
| 671 | - register_setting( 'autoptimize', 'autoptimize_css' ); |
|
| 672 | - register_setting( 'autoptimize', 'autoptimize_css_aggregate' ); |
|
| 673 | - register_setting( 'autoptimize', 'autoptimize_css_exclude' ); |
|
| 674 | - register_setting( 'autoptimize', 'autoptimize_css_justhead' ); |
|
| 675 | - register_setting( 'autoptimize', 'autoptimize_css_datauris' ); |
|
| 676 | - register_setting( 'autoptimize', 'autoptimize_css_defer' ); |
|
| 677 | - register_setting( 'autoptimize', 'autoptimize_css_defer_inline' ); |
|
| 678 | - register_setting( 'autoptimize', 'autoptimize_css_inline' ); |
|
| 679 | - register_setting( 'autoptimize', 'autoptimize_css_include_inline' ); |
|
| 680 | - register_setting( 'autoptimize', 'autoptimize_cdn_url' ); |
|
| 681 | - register_setting( 'autoptimize', 'autoptimize_cache_clean' ); |
|
| 682 | - register_setting( 'autoptimize', 'autoptimize_cache_nogzip' ); |
|
| 683 | - register_setting( 'autoptimize', 'autoptimize_optimize_logged' ); |
|
| 684 | - register_setting( 'autoptimize', 'autoptimize_optimize_checkout' ); |
|
| 685 | - register_setting( 'autoptimize', 'autoptimize_minify_excluded' ); |
|
| 686 | - register_setting( 'autoptimize', 'autoptimize_cache_fallback' ); |
|
| 661 | + register_setting('autoptimize', 'autoptimize_html'); |
|
| 662 | + register_setting('autoptimize', 'autoptimize_html_keepcomments'); |
|
| 663 | + register_setting('autoptimize', 'autoptimize_enable_site_config'); |
|
| 664 | + register_setting('autoptimize', 'autoptimize_js'); |
|
| 665 | + register_setting('autoptimize', 'autoptimize_js_aggregate'); |
|
| 666 | + register_setting('autoptimize', 'autoptimize_js_exclude'); |
|
| 667 | + register_setting('autoptimize', 'autoptimize_js_trycatch'); |
|
| 668 | + register_setting('autoptimize', 'autoptimize_js_justhead'); |
|
| 669 | + register_setting('autoptimize', 'autoptimize_js_forcehead'); |
|
| 670 | + register_setting('autoptimize', 'autoptimize_js_include_inline'); |
|
| 671 | + register_setting('autoptimize', 'autoptimize_css'); |
|
| 672 | + register_setting('autoptimize', 'autoptimize_css_aggregate'); |
|
| 673 | + register_setting('autoptimize', 'autoptimize_css_exclude'); |
|
| 674 | + register_setting('autoptimize', 'autoptimize_css_justhead'); |
|
| 675 | + register_setting('autoptimize', 'autoptimize_css_datauris'); |
|
| 676 | + register_setting('autoptimize', 'autoptimize_css_defer'); |
|
| 677 | + register_setting('autoptimize', 'autoptimize_css_defer_inline'); |
|
| 678 | + register_setting('autoptimize', 'autoptimize_css_inline'); |
|
| 679 | + register_setting('autoptimize', 'autoptimize_css_include_inline'); |
|
| 680 | + register_setting('autoptimize', 'autoptimize_cdn_url'); |
|
| 681 | + register_setting('autoptimize', 'autoptimize_cache_clean'); |
|
| 682 | + register_setting('autoptimize', 'autoptimize_cache_nogzip'); |
|
| 683 | + register_setting('autoptimize', 'autoptimize_optimize_logged'); |
|
| 684 | + register_setting('autoptimize', 'autoptimize_optimize_checkout'); |
|
| 685 | + register_setting('autoptimize', 'autoptimize_minify_excluded'); |
|
| 686 | + register_setting('autoptimize', 'autoptimize_cache_fallback'); |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | - public function setmeta( $links, $file = null ) |
|
| 689 | + public function setmeta($links, $file = null) |
|
| 690 | 690 | { |
| 691 | 691 | // Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/. |
| 692 | 692 | // Do it only once - saves time. |
| 693 | 693 | static $plugin; |
| 694 | - if ( empty( $plugin ) ) { |
|
| 695 | - $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' ); |
|
| 694 | + if (empty($plugin)) { |
|
| 695 | + $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | - if ( null === $file ) { |
|
| 698 | + if (null === $file) { |
|
| 699 | 699 | // 2.7 and lower. |
| 700 | - $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ); |
|
| 701 | - array_unshift( $links, $settings_link ); |
|
| 700 | + $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')); |
|
| 701 | + array_unshift($links, $settings_link); |
|
| 702 | 702 | } else { |
| 703 | 703 | // 2.8 and higher. |
| 704 | 704 | // If it's us, add the link. |
| 705 | - if ( $file === $plugin ) { |
|
| 706 | - $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ) ); |
|
| 707 | - $links = array_merge( $links, $newlink ); |
|
| 705 | + if ($file === $plugin) { |
|
| 706 | + $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'))); |
|
| 707 | + $links = array_merge($links, $newlink); |
|
| 708 | 708 | } |
| 709 | 709 | } |
| 710 | 710 | |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | 'autoptimize_imgopt_select_field_2' => '2', // quality glossy. |
| 781 | 781 | 'autoptimize_imgopt_checkbox_field_3' => '0', // lazy load off. |
| 782 | 782 | 'autoptimize_imgopt_checkbox_field_4' => '0', // webp off (might be removed). |
| 783 | - 'autoptimize_imgopt_text_field_5' => '', // lazy load exclusions empty. |
|
| 783 | + 'autoptimize_imgopt_text_field_5' => '', // lazy load exclusions empty. |
|
| 784 | 784 | ); |
| 785 | 785 | return $defaults; |
| 786 | 786 | } |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | */ |
| 793 | 793 | public static function get_ao_css_preload_polyfill() |
| 794 | 794 | { |
| 795 | - $preload_poly = apply_filters( 'autoptimize_css_preload_polyfill', '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>' ); |
|
| 795 | + $preload_poly = apply_filters('autoptimize_css_preload_polyfill', '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>'); |
|
| 796 | 796 | return $preload_poly; |
| 797 | 797 | } |
| 798 | 798 | |
@@ -803,56 +803,56 @@ discard block |
||
| 803 | 803 | */ |
| 804 | 804 | public static function get_ao_css_preload_onload() |
| 805 | 805 | { |
| 806 | - $preload_onload = apply_filters( 'autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'" ); |
|
| 806 | + $preload_onload = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'"); |
|
| 807 | 807 | return $preload_onload; |
| 808 | 808 | } |
| 809 | 809 | |
| 810 | - public function get( $key ) |
|
| 810 | + public function get($key) |
|
| 811 | 811 | { |
| 812 | - if ( ! is_array( $this->config ) ) { |
|
| 812 | + if (!is_array($this->config)) { |
|
| 813 | 813 | // Default config. |
| 814 | 814 | $config = self::get_defaults(); |
| 815 | 815 | |
| 816 | 816 | // Override with user settings. |
| 817 | - foreach ( array_keys( $config ) as $name ) { |
|
| 818 | - $conf = autoptimizeOptionWrapper::get_option( $name ); |
|
| 819 | - if ( false !== $conf ) { |
|
| 817 | + foreach (array_keys($config) as $name) { |
|
| 818 | + $conf = autoptimizeOptionWrapper::get_option($name); |
|
| 819 | + if (false !== $conf) { |
|
| 820 | 820 | // It was set before! |
| 821 | - $config[ $name ] = $conf; |
|
| 821 | + $config[$name] = $conf; |
|
| 822 | 822 | } |
| 823 | 823 | } |
| 824 | 824 | |
| 825 | 825 | // Save for next call. |
| 826 | - $this->config = apply_filters( 'autoptimize_filter_get_config', $config ); |
|
| 826 | + $this->config = apply_filters('autoptimize_filter_get_config', $config); |
|
| 827 | 827 | } |
| 828 | 828 | |
| 829 | - if ( isset( $this->config[ $key ] ) ) { |
|
| 830 | - return $this->config[ $key ]; |
|
| 829 | + if (isset($this->config[$key])) { |
|
| 830 | + return $this->config[$key]; |
|
| 831 | 831 | } |
| 832 | 832 | |
| 833 | 833 | return false; |
| 834 | 834 | } |
| 835 | 835 | |
| 836 | - private function get_futtta_feeds( $url ) { |
|
| 837 | - if ( $this->settings_screen_do_remote_http ) { |
|
| 838 | - $rss = fetch_feed( $url ); |
|
| 836 | + private function get_futtta_feeds($url) { |
|
| 837 | + if ($this->settings_screen_do_remote_http) { |
|
| 838 | + $rss = fetch_feed($url); |
|
| 839 | 839 | $maxitems = 0; |
| 840 | 840 | |
| 841 | - if ( ! is_wp_error( $rss ) ) { |
|
| 842 | - $maxitems = $rss->get_item_quantity( 7 ); |
|
| 843 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
| 841 | + if (!is_wp_error($rss)) { |
|
| 842 | + $maxitems = $rss->get_item_quantity(7); |
|
| 843 | + $rss_items = $rss->get_items(0, $maxitems); |
|
| 844 | 844 | } |
| 845 | 845 | ?> |
| 846 | 846 | <ul> |
| 847 | - <?php if ( 0 == $maxitems ) : ?> |
|
| 848 | - <li><?php _e( 'No items', 'autoptimize' ); ?></li> |
|
| 847 | + <?php if (0 == $maxitems) : ?> |
|
| 848 | + <li><?php _e('No items', 'autoptimize'); ?></li> |
|
| 849 | 849 | <?php else : ?> |
| 850 | - <?php foreach ( $rss_items as $item ) : ?> |
|
| 850 | + <?php foreach ($rss_items as $item) : ?> |
|
| 851 | 851 | <li> |
| 852 | - <a href="<?php echo esc_url( $item->get_permalink() ); ?>" |
|
| 852 | + <a href="<?php echo esc_url($item->get_permalink()); ?>" |
|
| 853 | 853 | <?php // translators: the variable contains a date. ?> |
| 854 | - title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>"> |
|
| 855 | - <?php echo esc_html( $item->get_title() ); ?> |
|
| 854 | + title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>"> |
|
| 855 | + <?php echo esc_html($item->get_title()); ?> |
|
| 856 | 856 | </a> |
| 857 | 857 | </li> |
| 858 | 858 | <?php endforeach; ?> |
@@ -865,23 +865,23 @@ discard block |
||
| 865 | 865 | static function ao_admin_tabs() |
| 866 | 866 | { |
| 867 | 867 | // based on http://wordpress.stackexchange.com/a/58826 . |
| 868 | - $tabs = apply_filters( 'autoptimize_filter_settingsscreen_tabs', array( 'autoptimize' => __( 'JS, CSS & HTML', 'autoptimize' ) ) ); |
|
| 868 | + $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('JS, CSS & HTML', 'autoptimize'))); |
|
| 869 | 869 | $tab_content = ''; |
| 870 | - $tabs_count = count( $tabs ); |
|
| 871 | - if ( $tabs_count > 1 ) { |
|
| 872 | - if ( isset( $_GET['page'] ) ) { |
|
| 870 | + $tabs_count = count($tabs); |
|
| 871 | + if ($tabs_count > 1) { |
|
| 872 | + if (isset($_GET['page'])) { |
|
| 873 | 873 | $current_id = $_GET['page']; |
| 874 | 874 | } else { |
| 875 | 875 | $current_id = 'autoptimize'; |
| 876 | 876 | } |
| 877 | 877 | $tab_content .= '<h2 class="nav-tab-wrapper">'; |
| 878 | - foreach ( $tabs as $tab_id => $tab_name ) { |
|
| 879 | - if ( $current_id == $tab_id ) { |
|
| 878 | + foreach ($tabs as $tab_id => $tab_name) { |
|
| 879 | + if ($current_id == $tab_id) { |
|
| 880 | 880 | $class = ' nav-tab-active'; |
| 881 | 881 | } else { |
| 882 | 882 | $class = ''; |
| 883 | 883 | } |
| 884 | - $tab_content .= '<a class="nav-tab' . $class . '" href="?page=' . $tab_id . '">' . $tab_name . '</a>'; |
|
| 884 | + $tab_content .= '<a class="nav-tab'.$class.'" href="?page='.$tab_id.'">'.$tab_name.'</a>'; |
|
| 885 | 885 | } |
| 886 | 886 | $tab_content .= '</h2>'; |
| 887 | 887 | } else { |
@@ -898,7 +898,7 @@ discard block |
||
| 898 | 898 | */ |
| 899 | 899 | public static function is_admin_and_not_ajax() |
| 900 | 900 | { |
| 901 | - return ( is_admin() && ! self::doing_ajax() ); |
|
| 901 | + return (is_admin() && !self::doing_ajax()); |
|
| 902 | 902 | } |
| 903 | 903 | |
| 904 | 904 | /** |
@@ -908,10 +908,10 @@ discard block |
||
| 908 | 908 | */ |
| 909 | 909 | protected static function doing_ajax() |
| 910 | 910 | { |
| 911 | - if ( function_exists( 'wp_doing_ajax' ) ) { |
|
| 911 | + if (function_exists('wp_doing_ajax')) { |
|
| 912 | 912 | return wp_doing_ajax(); |
| 913 | 913 | } |
| 914 | - return ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
| 914 | + return (defined('DOING_AJAX') && DOING_AJAX); |
|
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | /** |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | * @return bool |
| 921 | 921 | */ |
| 922 | 922 | public static function should_show_menu_tabs() { |
| 923 | - if ( ! is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) { |
|
| 923 | + if (!is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) { |
|
| 924 | 924 | return true; |
| 925 | 925 | } else { |
| 926 | 926 | return false; |
