| @@ -1,7 +1,6 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__) . '/admin-ui.php'); |
| 3 | -require_once(dirname(__FILE__) . '/magpiemocklink.class.php'); | |
| 4 | 3 | |
| 5 | 4 | class FeedWordPressDiagnosticsPage extends FeedWordPressAdminPage { |
| 6 | 5 | public function __construct() { |
| 7 | 6 | // Set meta-box context name |
| @@ -15,8 +14,11 @@ | ||
| 15 | 14 | |
| 16 | 15 | function has_link () { return false; } |
| 17 | 16 | |
| 18 | 17 | function display () { |
| 18 | + global $wpdb, $wp_db_version, $fwp_path; | |
| 19 | + global $fwp_post; | |
| 20 | + | |
| 19 | 21 | if (FeedWordPress::needs_upgrade()) : |
| 20 | 22 | fwp_upgrade_page(); |
| 21 | 23 | return; |
| 22 | 24 | endif; |
| @@ -24,10 +26,10 @@ | ||
| 24 | 26 | // If this is a POST, validate source and user credentials |
| 25 | 27 | FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_diagnostics', /*capability=*/ 'manage_options'); |
| 26 | 28 | |
| 27 | 29 | if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') : |
| 28 | - $this->accept_POST(); | |
| 29 | - do_action('feedwordpress_admin_page_diagnostics_save', null, $this); | |
| 30 | + $this->accept_POST($fwp_post); | |
| 31 | + do_action('feedwordpress_admin_page_diagnostics_save', $fwp_post, $this); | |
| 30 | 32 | endif; |
| 31 | 33 | |
| 32 | 34 | //////////////////////////////////////////////// |
| 33 | 35 | // Prepare settings page /////////////////////// |
| @@ -41,9 +43,9 @@ | ||
| 41 | 43 | <?php |
| 42 | 44 | $boxes_by_methods = array( |
| 43 | 45 | 'info_box' => __('Diagnostic Information'), |
| 44 | 46 | 'diagnostics_box' => __('Display Diagnostics'), |
| 45 | - 'updates_box' => __('Diagnostic Messages'), | |
| 47 | + 'updates_box' => __('Updates'), | |
| 46 | 48 | 'tests_box' => __('Diagnostic Tests'), |
| 47 | 49 | ); |
| 48 | 50 | |
| 49 | 51 | foreach ($boxes_by_methods as $method => $title) : |
| @@ -58,9 +60,9 @@ | ||
| 58 | 60 | do_action('feedwordpress_admin_page_diagnostics_meta_boxes', $this); |
| 59 | 61 | ?> |
| 60 | 62 | <div class="metabox-holder"> |
| 61 | 63 | <?php |
| 62 | - do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this); | |
| 64 | + fwp_do_meta_boxes($this->meta_box_context(), $this->meta_box_context(), $this); | |
| 63 | 65 | ?> |
| 64 | 66 | </div> <!-- class="metabox-holder" --> |
| 65 | 67 | </div> <!-- id="post-body" --> |
| 66 | 68 | |
| @@ -67,46 +69,48 @@ | ||
| 67 | 69 | <?php |
| 68 | 70 | $this->close_sheet(); |
| 69 | 71 | } /* FeedWordPressDiagnosticsPage::display () */ |
| 70 | 72 | |
| 71 | - public function do_requested () { | |
| 72 | - return ( ! is_null( self::what_requested() ) ); | |
| 73 | - } | |
| 73 | + function accept_POST ($post) { | |
| 74 | + if (isset($post['submit']) | |
| 75 | + or isset($post['save']) | |
| 76 | + or isset($post['feedwordpress_diagnostics_do'])) : | |
| 77 | + update_option('feedwordpress_debug', $post['feedwordpress_debug']); | |
| 78 | + update_option('feedwordpress_secret_key', $post['feedwordpress_secret_key']); | |
| 74 | 79 | |
| 75 | - public function what_requested () { | |
| 76 | - return FeedWordPress::post( 'feedwordpress_diagnostics_do' ); | |
| 77 | - } | |
| 80 | + if (!isset($post['diagnostics_output']) | |
| 81 | + or !is_array($post['diagnostics_output'])) : | |
| 82 | + $post['diagnostics_output'] = array(); | |
| 83 | + endif; | |
| 84 | + update_option('feedwordpress_diagnostics_output', $post['diagnostics_output']); | |
| 78 | 85 | |
| 79 | - function accept_POST () { | |
| 80 | - if ( self::save_requested() || self::do_requested() ) : | |
| 86 | + if (!isset($post['diagnostics_show']) | |
| 87 | + or !is_array($post['diagnostics_show'])) : | |
| 88 | + $post['diagnostics_show'] = array(); | |
| 89 | + endif; | |
| 90 | + update_option('feedwordpress_diagnostics_show', $post['diagnostics_show']); | |
| 81 | 91 | |
| 82 | - update_option( 'feedwordpress_debug', FeedWordPress::post( 'feedwordpress_debug' ) ); | |
| 83 | - update_option( 'feedwordpress_secret_key', FeedWordPress::post( 'feedwordpress_secret_key' ) ); | |
| 84 | - | |
| 85 | - update_option( 'feedwordpress_diagnostics_output', FeedWordPress::post( 'diagnostics_output' ) ); | |
| 86 | - update_option( 'feedwordpress_diagnostics_show', FeedWordPress::post( 'diagnostics_show' ) ); | |
| 87 | - | |
| 88 | - if ( FeedWordPress::post( 'diagnostics_show' ) | |
| 89 | - and in_array( 'updated_feeds:errors:persistent', FeedWordPress::post( 'diagnostics_show' ) ) ) : | |
| 90 | - update_option('feedwordpress_diagnostics_persistent_errors_hours', (int) FeedWordPress::post( 'diagnostics_persistent_error_hours' ) ); | |
| 92 | + if ($post['diagnostics_show'] | |
| 93 | + and in_array('updated_feeds:errors:persistent', $post['diagnostics_show'])) : | |
| 94 | + update_option('feedwordpress_diagnostics_persistent_errors_hours', (int) $post['diagnostics_persistent_error_hours']); | |
| 91 | 95 | else : |
| 92 | - delete_option( 'feedwordpress_diagnostics_persistent_errors_hours' ); | |
| 96 | + delete_option('feedwordpress_diagnostics_persistent_errors_hours'); | |
| 93 | 97 | endif; |
| 94 | 98 | |
| 95 | - if ( in_array( 'email', FeedWordPress::post( 'diagnostics_output' ) ) ) : | |
| 96 | - $ded = FeedWordPress::post('diagnostics_email_destination' ); | |
| 97 | - if ( 'mailto' == $ded ) : | |
| 98 | - $ded .= ':' . FeedWordPress::post('diagnostics_email_destination_address' ); | |
| 99 | + if (in_array('email', $post['diagnostics_output'])) : | |
| 100 | + $ded = $post['diagnostics_email_destination']; | |
| 101 | + if ('mailto'==$ded) : | |
| 102 | + $ded .= ':'.$post['diagnostics_email_destination_address']; | |
| 99 | 103 | endif; |
| 100 | 104 | |
| 101 | - update_option( 'feedwordpress_diagnostics_email_destination', $ded ); | |
| 105 | + update_option('feedwordpress_diagnostics_email_destination', $ded); | |
| 102 | 106 | else : |
| 103 | - delete_option( 'feedwordpress_diagnostics_email_destination' ); | |
| 107 | + delete_option('feedwordpress_diagnostics_email_destination'); | |
| 104 | 108 | endif; |
| 105 | 109 | |
| 106 | - if ( self::do_requested() ) : | |
| 107 | - foreach ( self::what_requested() as $do => $value) : | |
| 108 | - do_action( 'feedwordpress_diagnostics_do_'.$do ); | |
| 110 | + if (isset($post['feedwordpress_diagnostics_do'])) : | |
| 111 | + foreach ($post['feedwordpress_diagnostics_do'] as $do => $value) : | |
| 112 | + do_action('feedwordpress_diagnostics_do_'.$do, $post); | |
| 109 | 113 | endforeach; |
| 110 | 114 | endif; |
| 111 | 115 | |
| 112 | 116 | $this->updated = true; // Default update message |
| @@ -125,49 +129,47 @@ | ||
| 125 | 129 | </thead> |
| 126 | 130 | |
| 127 | 131 | <tbody> |
| 128 | 132 | <tr> |
| 129 | - <th scope="row"><?php esc_html_e( 'Version:' ); ?></th> | |
| 130 | - <td><?php esc_html_e( 'You are using FeedWordPress version' ); ?> <strong><?php print esc_html( FEEDWORDPRESS_VERSION ); ?></strong>.</td> | |
| 133 | + <th scope="row">Version:</th> | |
| 134 | + <td>You are using FeedWordPress version <strong><?php print FEEDWORDPRESS_VERSION; ?></strong>.</td> | |
| 131 | 135 | </tr> |
| 132 | 136 | |
| 133 | 137 | <tr> |
| 134 | - <th scope="row"><?php esc_html_e( 'Hosting Environment:' ); ?></th> | |
| 138 | + <th scope="row">Hosting Environment:</th> | |
| 135 | 139 | <td><ul style="margin-top: 0; padding-top: 0;"> |
| 136 | - <li><em>WordPress:</em> <?php esc_html_e( 'version' ); ?> <?php print esc_html( $wp_version ); ?></li> | |
| 137 | - <li><em>SimplePie:</em> <?php esc_html_e( 'version' ); ?> <?php print esc_html( SIMPLEPIE_VERSION ); ?></li> | |
| 138 | - <?php if ( function_exists( 'phpversion' ) ) : ?> | |
| 139 | - <li><em><?php esc_html_e( 'PHP:' ); ?></em> <?php esc_html_e( 'version' ); ?> <?php print esc_html( phpversion() ); ?></li> | |
| 140 | + <li><em>WordPress:</em> version <?php print $wp_version; ?></li> | |
| 141 | + <?php if (function_exists('phpversion')) : ?> | |
| 142 | + <li><em>PHP:</em> version <?php print phpversion(); ?></li> | |
| 140 | 143 | <?php endif; ?> |
| 141 | - <?php if ( function_exists( 'apache_get_version' ) ) : ?> | |
| 142 | - <li><em><?php esc_html_e( 'Web Server:' ); ?></em> <?php print esc_html( apache_get_version() ); ?></li> | |
| 144 | + <?php if (function_exists('apache_get_version')) : ?> | |
| 145 | + <li><sem>Web Server:</em> <?php print apache_get_version(); ?></li> | |
| 143 | 146 | <?php endif; ?> |
| 144 | - <?php if ( ! empty( $_SERVER['SERVER_SIGNATURE'] ) ) : ?> | |
| 145 | - <li><em><?php esc_html_e( 'Web Server signature:' ); ?></em> <?php print esc_html( $_SERVER['SERVER_SIGNATURE'] ); ?></li> | |
| 146 | - <?php endif; ?> | |
| 147 | - <li><em><?php esc_html_e( 'Hosted on:' ); ?></em> <?php print esc_html( php_uname( 'a' ) ); ?></li> | |
| 148 | 147 | </ul> |
| 149 | 148 | </td> |
| 150 | 149 | </tr> |
| 151 | 150 | |
| 152 | 151 | <tr> |
| 153 | - <th scope="row"><?php esc_html_e( 'Link Category:' ); ?></th> | |
| 154 | - <td><?php if ( ! is_wp_error( $link_category_id ) ) : | |
| 155 | - $term = get_term( $link_category_id, 'link_category' ); | |
| 156 | - ?><p><?php esc_html_e( 'Syndicated feeds are kept in link category' ); ?> #<?php print esc_html( $term->term_id ); ?>, <strong><?php print esc_html( $term->name ); ?></strong>.</p> | |
| 152 | + <th scope="row">Link Category:</th> | |
| 153 | + <td><?php if (!is_wp_error($link_category_id)) : | |
| 154 | + $term = get_term($link_category_id, 'link_category'); | |
| 155 | + ?><p>Syndicated feeds are | |
| 156 | + kept in link category #<?php print $term->term_id; ?>, <strong><?php print $term->name; ?></strong>.</p> | |
| 157 | 157 | <?php else : ?> |
| 158 | - <p><strong><?php esc_html_e( 'FeedWordPress has been unable to set up a valid Link Category for syndicated feeds.' ); ?></strong> <?php esc_html_e( 'Attempting to set one up returned an' ); ?> | |
| 159 | - <code><?php $link_category_id->get_error_code(); ?></code> <?php esc_html_e( 'error with this additional data:' ); ?></p> | |
| 158 | + <p><strong>FeedWordPress has been unable to set up a valid Link Category | |
| 159 | + for syndicated feeds.</strong> Attempting to set one up returned an | |
| 160 | + <code><?php $link_category_id->get_error_code(); ?></code> error with this | |
| 161 | + additional data:</p> | |
| 160 | 162 | <table> |
| 161 | 163 | <tbody> |
| 162 | 164 | <tr> |
| 163 | - <th scope="row"><?php esc_html_e( 'Message:' ); ?></th> | |
| 164 | - <td><?php print esc_html( $link_category_id->get_error_message() ); ?></td> | |
| 165 | + <th scope="row">Message:</th> | |
| 166 | + <td><?php print $link_category_id->get_error_message(); ?></td> | |
| 165 | 167 | </tr> |
| 166 | - <?php $data = $link_category_id->get_error_data(); if ( ! empty( $data ) ) : ?> | |
| 168 | + <?php $data = $link_category_id->get_error_data(); if (!empty($data)) : ?> | |
| 167 | 169 | <tr> |
| 168 | - <th scope="row"><?php esc_html_e( 'Auxiliary Data:' ); ?></th> | |
| 169 | - <td><pre><?php print esc_html( MyPHP::val( $link_category_id->get_error_data() ) ); ?></pre></td> | |
| 170 | + <th scope="row">Auxiliary Data:</th> | |
| 171 | + <td><pre><?php print esc_html(MyPHP::val($link_category_id->get_error_data())); ?></pre></td> | |
| 170 | 172 | </tr> |
| 171 | 173 | <?php endif; ?> |
| 172 | 174 | </table> |
| 173 | 175 | <?php endif; ?></td> |
| @@ -173,11 +175,13 @@ | ||
| 173 | 175 | <?php endif; ?></td> |
| 174 | 176 | </tr> |
| 175 | 177 | |
| 176 | 178 | <tr> |
| 177 | - <th scope="row"><?php esc_html_e('Secret Key:'); ?></th> | |
| 178 | - <td><input type="text" name="feedwordpress_secret_key" value="<?php print esc_attr( $feedwordpress->secret_key() ); ?>" /> | |
| 179 | - <p class="setting-description"><?php esc_html_e( 'This is used to control access to some diagnostic testing functions. You can change it to any string you want, but only tell it to people you trust to help you troubleshoot your FeedWordPress installation. Keep it secret—keep it safe.' ); ?></p></td> | |
| 179 | + <th scope="row"><?php _e('Secret Key:'); ?></th> | |
| 180 | + <td><input type="text" name="feedwordpress_secret_key" value="<?php print esc_attr($feedwordpress->secret_key()); ?>" /> | |
| 181 | + <p class="setting-description">This is used to control access to some diagnostic testing functions. You can change it to any string you want, | |
| 182 | + but only tell it to people you trust to help you troubleshoot your | |
| 183 | + FeedWordPress installation. Keep it secret—keep it safe.</p></td> | |
| 180 | 184 | </tr> |
| 181 | 185 | </table> |
| 182 | 186 | |
| 183 | 187 | <?php |
| @@ -182,22 +186,19 @@ | ||
| 182 | 186 | |
| 183 | 187 | <?php |
| 184 | 188 | } /* FeedWordPressDiagnosticsPage::info_box () */ |
| 185 | 189 | |
| 186 | - static function diagnostics_box( $page, $box = NULL ) { | |
| 190 | + static function diagnostics_box ($page, $box = NULL) { | |
| 187 | 191 | $settings = array(); |
| 188 | - $settings['debug'] = ( get_option( 'feedwordpress_debug' ) == 'yes' ); | |
| 192 | + $settings['debug'] = (get_option('feedwordpress_debug')=='yes'); | |
| 189 | 193 | |
| 190 | - $diagnostics_output = get_option( 'feedwordpress_diagnostics_output', array() ); | |
| 191 | - if ( ! is_array( $diagnostics_output ) ) { | |
| 192 | - $diagnostics_output = array( $diagnostics_output ); | |
| 193 | - } | |
| 194 | - | |
| 194 | + $diagnostics_output = get_option('feedwordpress_diagnostics_output', array()); | |
| 195 | + | |
| 195 | 196 | $users = fwp_author_list(); |
| 196 | 197 | |
| 197 | - $ded = get_option( 'feedwordpress_diagnostics_email_destination', 'admins' ); | |
| 198 | + $ded = get_option('feedwordpress_diagnostics_email_destination', 'admins'); | |
| 198 | 199 | |
| 199 | - if (preg_match( '/^mailto:(.*)$/', $ded, $ref ) ) : | |
| 200 | + if (preg_match('/^mailto:(.*)$/', $ded, $ref)) : | |
| 200 | 201 | $ded_addy = $ref[1]; |
| 201 | 202 | else : |
| 202 | 203 | $ded_addy = NULL; |
| 203 | 204 | endif; |
| @@ -205,18 +206,18 @@ | ||
| 205 | 206 | // Hey ho, let's go... |
| 206 | 207 | ?> |
| 207 | 208 | <table class="edit-form"> |
| 208 | 209 | <tr style="vertical-align: top"> |
| 209 | -<th scope="row"><?php esc_html_e( 'Debugging mode:' ); ?></th> | |
| 210 | +<th scope="row">Debugging mode:</th> | |
| 210 | 211 | <td><select name="feedwordpress_debug" size="1"> |
| 211 | -<option value="yes"<?php echo ( $settings['debug'] ? ' selected="selected"' : '' ); ?>><?php esc_html_e( 'on' ); ?></option> | |
| 212 | -<option value="no"<?php echo ( $settings['debug'] ? '' : ' selected="selected"' ); ?>><?php esc_html_e( 'off' ); ?></option> | |
| 212 | +<option value="yes"<?php echo ($settings['debug'] ? ' selected="selected"' : ''); ?>>on</option> | |
| 213 | +<option value="no"<?php echo ($settings['debug'] ? '' : ' selected="selected"'); ?>>off</option> | |
| 213 | 214 | </select> |
| 214 | 215 | |
| 215 | -<p><?php esc_html_e( 'When debugging mode is <strong>ON</strong>, FeedWordPress displays many | |
| 216 | +<p>When debugging mode is <strong>ON</strong>, FeedWordPress displays many | |
| 216 | 217 | diagnostic error messages, warnings, and notices that are ordinarily suppressed, |
| 217 | 218 | and turns off all caching of feeds. Use with caution: this setting is useful for |
| 218 | -testing but absolutely inappropriate for a production server.' ); ?></p> | |
| 219 | +testing but absolutely inappropriate for a production server.</p> | |
| 219 | 220 | |
| 220 | 221 | </td> |
| 221 | 222 | </tr> |
| 222 | 223 | <tr> |
| @@ -221,20 +222,20 @@ | ||
| 221 | 222 | </tr> |
| 222 | 223 | <tr> |
| 223 | 224 | <th scope="row">Diagnostics output:</th> |
| 224 | 225 | <td><ul class="options"> |
| 225 | -<li><input type="checkbox" name="diagnostics_output[]" value="error_log" <?php print ( in_array( 'error_log', $diagnostics_output ) ? ' checked="checked"' : ''); ?> /> Log in PHP error logs</label></li> | |
| 226 | +<li><input type="checkbox" name="diagnostics_output[]" value="error_log" <?php print (in_array('error_log', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Log in PHP error logs</label></li> | |
| 226 | 227 | <li><input type="checkbox" name="diagnostics_output[]" value="admin_footer" <?php print (in_array('admin_footer', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Display in WordPress admin footer</label></li> |
| 227 | 228 | <li><input type="checkbox" name="diagnostics_output[]" value="echo" <?php print (in_array('echo', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Echo in web browser as they are issued</label></li> |
| 228 | 229 | <li><input type="checkbox" name="diagnostics_output[]" value="echo_in_cronjob" <?php print (in_array('echo_in_cronjob', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Echo to output when they are issued during an update cron job</label></li> |
| 229 | 230 | <li><input type="checkbox" name="diagnostics_output[]" value="email" <?php print (in_array('email', $diagnostics_output) ? ' checked="checked"' : ''); ?> /> Send a daily email digest to:</label> <select name="diagnostics_email_destination" id="diagnostics-email-destination" size="1"> |
| 230 | -<option value="admins"<?php if ( 'admins' == $ded ) : ?> selected="selected"<?php endif; ?>>the site administrators</option> | |
| 231 | +<option value="admins"<?php if ('admins'==$ded) : ?> selected="selected"<?php endif; ?>>the site administrators</option> | |
| 231 | 232 | <?php foreach ($users as $id => $name) : ?> |
| 232 | 233 | <option value="user:<?php print (int) $id; ?>"<?php if (sprintf('user:%d', (int) $id)==$ded) : ?> selected="selected"<?php endif; ?>><?php print esc_html($name); ?></option> |
| 233 | 234 | <?php endforeach; ?> |
| 234 | -<option value="mailto"<?php if ( !is_null($ded_addy)) : ?> selected="selected"<?php endif; ?>>another e-mail address...</option> | |
| 235 | +<option value="mailto"<?php if (!is_null($ded_addy)) : ?> selected="selected"<?php endif; ?>>another e-mail address...</option> | |
| 235 | 236 | </select> |
| 236 | -<input type="email" id="diagnostics-email-destination-address" name="diagnostics_email_destination_address" value="<?php print esc_attr( $ded_addy ); ?>" placeholder="email address" /></li> | |
| 237 | +<input type="email" id="diagnostics-email-destination-address" name="diagnostics_email_destination_address" value="<?php print $ded_addy; ?>" placeholder="email address" /></li> | |
| 237 | 238 | </ul></td> |
| 238 | 239 | </tr> |
| 239 | 240 | </table> |
| 240 | 241 | |
| @@ -245,9 +246,9 @@ | ||
| 245 | 246 | 'diagnostics-email-destination-default', |
| 246 | 247 | 'mailto', |
| 247 | 248 | 'inline' |
| 248 | 249 | ); |
| 249 | - jQuery( '#diagnostics-email-destination' ).change ( function () { | |
| 250 | + jQuery('#diagnostics-email-destination').change ( function () { | |
| 250 | 251 | contextual_appearance( |
| 251 | 252 | 'diagnostics-email-destination', |
| 252 | 253 | 'diagnostics-email-destination-address', |
| 253 | 254 | 'diagnostics-email-destination-default', |
| @@ -258,38 +259,26 @@ | ||
| 258 | 259 | </script> |
| 259 | 260 | <?php |
| 260 | 261 | } /* FeedWordPressDiagnosticsPage::diagnostics_box () */ |
| 261 | 262 | |
| 262 | - /** | |
| 263 | - * Shows the box for the many possible update options. | |
| 264 | - * | |
| 265 | - * @param type $page description | |
| 266 | - * @param type $box description | |
| 267 | - * | |
| 268 | - * @return void description | |
| 269 | - */ | |
| 270 | 263 | static function updates_box ($page, $box = NULL) { |
| 271 | - $hours = get_option( 'feedwordpress_diagnostics_persistent_errors_hours', 2 ); | |
| 272 | - $fields = apply_filters( 'feedwordpress_diagnostics', array( | |
| 264 | + $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2); | |
| 265 | + $fields = apply_filters('feedwordpress_diagnostics', array( | |
| 273 | 266 | 'Update Diagnostics' => array( |
| 274 | 267 | 'update_schedule:check' => 'whenever a FeedWordPress checks in on the update schedule', |
| 275 | 268 | 'updated_feeds' => 'as each feed is checked for updates', |
| 269 | + 'updated_feeds:errors:persistent' => 'when attempts to update a feed have resulted in errors</label> <label>for at least <input type="number" min="1" max="360" step="1" name="diagnostics_persistent_error_hours" value="'.$hours.'" /> hours', | |
| 270 | + 'updated_feeds:errors' => 'any time FeedWordPress encounters any errors while checking a feed for updates', | |
| 271 | + 'updated_feeds:http' => "displaying the raw HTTP data passed to and from the feed being checked for updates", | |
| 276 | 272 | 'syndicated_posts' => 'as each syndicated post is added to the database', |
| 277 | 273 | 'feed_items' => 'as each syndicated item is considered on the feed', |
| 278 | 274 | 'memory_usage' => 'indicating how much memory was used', |
| 279 | 275 | ), |
| 280 | - // Note: the embedded HTML gets filtered out, so this might require some refactoring. (gwyneth 20230917) | |
| 281 | - 'Feed Retrieval' => array( | |
| 282 | - 'updated_feeds:errors:persistent' => 'when attempts to update a feed have resulted in errors</label> <label>for at least <input type="number" min="1" max="360" step="1" name="diagnostics_persistent_error_hours" value="'.$hours.'" /> hours', | |
| 283 | - 'updated_feeds:errors' => 'any time FeedWordPress encounters any errors while checking a feed for updates', | |
| 284 | - 'updated_feeds:http' => "displaying the raw HTTP data passed to and from the feed being checked for updates", | |
| 285 | - ), | |
| 286 | 276 | 'Syndicated Post Details' => array( |
| 287 | 277 | 'feed_items:freshness' => 'as FeedWordPress decides whether to treat an item as a new post, an update, or a duplicate of an existing post', |
| 288 | 278 | 'feed_items:rejected' => 'when FeedWordPress rejects a post without syndicating it', |
| 289 | 279 | 'syndicated_posts:categories' => 'as categories, tags, and other terms are added on the post', |
| 290 | 280 | 'syndicated_posts:meta_data' => 'as syndication meta-data is added on the post', |
| 291 | - 'syndicated_posts:do_pings' => 'when FeedWordPress holds or releases the pings WordPress sends out when new posts are created', | |
| 292 | 281 | ), |
| 293 | 282 | 'Advanced Diagnostics' => array( |
| 294 | 283 | 'feed_items:freshness:reasons' => 'explaining the reason that a post was treated as an update to an existing post', |
| 295 | 284 | 'feed_items:freshness:sql' => 'when FeedWordPress issues the SQL query it uses to decide whether to treat items as new, updates, or duplicates', |
| @@ -295,18 +284,18 @@ | ||
| 295 | 284 | 'feed_items:freshness:sql' => 'when FeedWordPress issues the SQL query it uses to decide whether to treat items as new, updates, or duplicates', |
| 296 | 285 | 'syndicated_posts:categories:test' => 'as FeedWordPress checks for the familiarity of feed categories and tags', |
| 297 | 286 | 'syndicated_posts:static_meta_data' => 'providing meta-data about syndicated posts in the Edit Posts interface', |
| 298 | 287 | ), |
| 299 | - ), $page ); | |
| 288 | + ), $page); | |
| 300 | 289 | |
| 301 | - foreach ( $fields as $section => $items ) : | |
| 302 | - foreach ( $items as $key => $label ) : | |
| 290 | + foreach ($fields as $section => $items) : | |
| 291 | + foreach ($items as $key => $label) : | |
| 303 | 292 | $checked[$key] = ''; |
| 304 | 293 | endforeach; |
| 305 | 294 | endforeach; |
| 306 | 295 | |
| 307 | - $diagnostics_show = get_option( 'feedwordpress_diagnostics_show', array() ); | |
| 308 | - if ( is_array( $diagnostics_show ) ) : foreach ( $diagnostics_show as $thingy ) : | |
| 296 | + $diagnostics_show = get_option('feedwordpress_diagnostics_show', array()); | |
| 297 | + if (is_array($diagnostics_show)) : foreach ($diagnostics_show as $thingy) : | |
| 309 | 298 | $checked[$thingy] = ' checked="checked"'; |
| 310 | 299 | endforeach; endif; |
| 311 | 300 | |
| 312 | 301 | // Hey ho, let's go... |
| @@ -314,16 +303,16 @@ | ||
| 314 | 303 | <table class="edit-form"> |
| 315 | 304 | <?php foreach ($fields as $section => $ul) : ?> |
| 316 | 305 | <tr> |
| 317 | 306 | <th scope="row"><?php print esc_html($section); ?>:</th> |
| 318 | - <td><p><?php esc_html_e( 'Show a diagnostic message...' ); ?></p> | |
| 307 | + <td><p>Show a diagnostic message...</p> | |
| 319 | 308 | <ul class="options"> |
| 320 | 309 | <?php foreach ($ul as $key => $label) : ?> |
| 321 | 310 | <li><label><input |
| 322 | 311 | type="checkbox" name="diagnostics_show[]" |
| 323 | - value="<?php print esc_html( $key ); ?>" | |
| 324 | - <?php fwp_selected_flag( $checked, $key, "checked" ); ?> /> | |
| 325 | - <?php print esc_html( $label ); ?></label></li> | |
| 312 | + value="<?php print esc_html($key); ?>" | |
| 313 | + <?php print $checked[$key]; ?> /> | |
| 314 | + <?php print $label; ?></label></li> | |
| 326 | 315 | <?php endforeach; ?> |
| 327 | 316 | </ul></td> |
| 328 | 317 | </tr> |
| 329 | 318 | <?php endforeach; ?> |
| @@ -331,17 +320,8 @@ | ||
| 331 | 320 | <?php |
| 332 | 321 | } /* FeedWordPressDiagnosticsPage::updates_box () */ |
| 333 | 322 | |
| 334 | 323 | static function tests_box ($page, $box = NULL) { |
| 335 | - $url = FeedWordPress::param( 'http_test_url' ); | |
| 336 | - $method = FeedWordPress::param( 'http_test_method' ); | |
| 337 | - $xpath = FeedWordPress::param( 'http_test_xpath' ); | |
| 338 | - | |
| 339 | - $aMethods = array( | |
| 340 | - 'wp_remote_request', | |
| 341 | - 'FeedWordPie_File', | |
| 342 | - 'FeedWordPress::fetch', | |
| 343 | - ); | |
| 344 | 324 | ?> |
| 345 | 325 | <script type="text/javascript"> |
| 346 | 326 | function clone_http_test_args_keyvalue_prototype () { |
| 347 | 327 | var next = jQuery('#http-test-args').find('.http-test-args-keyvalue').length; |
| @@ -356,34 +336,25 @@ | ||
| 356 | 336 | |
| 357 | 337 | <table class="edit-form"> |
| 358 | 338 | <tr> |
| 359 | 339 | <th scope="row">HTTP:</th> |
| 360 | - <td><div><input type="url" name="http_test_url" value="<?php print esc_attr($url);?>" placeholder="http://www.example.com/" size="127" style="width: 80%; max-width: 80.0em;" /> | |
| 340 | + <td><div><input type="url" name="http_test_url" value="" placeholder="http://www.example.com/" size="127" style="width: 80%; max-width: 80.0em;" /> | |
| 361 | 341 | <input type="submit" name="feedwordpress_diagnostics_do[http_test]" value="Test »" /></div> |
| 362 | 342 | <div><select name="http_test_method" size="1"> |
| 363 | - <?php foreach ($aMethods as $sMethod) :?> | |
| 364 | - <option value="<?php | |
| 365 | - print esc_attr($sMethod); | |
| 366 | - ?>"<?php | |
| 367 | - if ($method==$sMethod) : | |
| 368 | - print ' selected="selected"'; | |
| 369 | - endif; | |
| 370 | - ?>><?php | |
| 371 | - print esc_html( $sMethod ); | |
| 372 | - ?></option> | |
| 373 | - <?php endforeach; ?> | |
| 343 | + <option value="wp_remote_request">wp_remote_request</option> | |
| 344 | + <option value="FeedWordPress_File">FeedWordPress_File</option> | |
| 374 | 345 | </select></div> |
| 375 | 346 | <table> |
| 376 | 347 | <tr> |
| 377 | 348 | <td> |
| 378 | 349 | <div id="http-test-args"> |
| 379 | - <div id="http-test-args-keyvalue-prototype" class="http-test-args-keyvalue"><label><?php esc_html_e( 'Args' ); ?>: | |
| 350 | + <div id="http-test-args-keyvalue-prototype" class="http-test-args-keyvalue"><label>Args: | |
| 380 | 351 | <input type="text" class='http_test_args_key' name="http_test_args_key[0]" value="" placeholder="key" /></label> |
| 381 | 352 | <label>= <input type="text" class='http_test_args_value' name="http_test_args_value[0]" value="" placeholder="value" /></label> |
| 382 | 353 | </div> |
| 383 | 354 | </div> |
| 384 | 355 | </td> |
| 385 | - <td><a href="#http-test-args" onclick="return clone_http_test_args_keyvalue_prototype();"><span class="dashicons dashicons-plus fwp-no-underline"></span> <?php esc_html_e( 'Add' ); ?></a></td> | |
| 356 | + <td><a href="#http-test-args" onclick="return clone_http_test_args_keyvalue_prototype();">+ Add</a></td> | |
| 386 | 357 | </tr> |
| 387 | 358 | </table> |
| 388 | 359 | </td> |
| 389 | 360 | </tr> |
| @@ -389,21 +360,21 @@ | ||
| 389 | 360 | </tr> |
| 390 | 361 | |
| 391 | 362 | <tr> |
| 392 | 363 | <th>XPath:</th> |
| 393 | - <td><div><input type="text" name="http_test_xpath" value="<?php print esc_attr($xpath); ?>" placeholder="xpath-like query" /></div> | |
| 394 | - <div><p><?php esc_html_e( 'Leave blank to test HTTP, fill in to test a query.' ); ?></p></div> | |
| 364 | + <td><div><input type="text" name="http_test_xpath" value="" placeholder="xpath-like query" /></div> | |
| 365 | + <div><p>Leave blank to test HTTP, fill in to test a query.</p></div> | |
| 395 | 366 | </td> |
| 396 | 367 | </tr> |
| 397 | - | |
| 368 | + | |
| 398 | 369 | <?php if (isset($page->test_html['http_test'])) : ?> |
| 399 | 370 | <tr> |
| 400 | - <th scope="row"><?php esc_html_e( 'RESULTS:' ); ?></th> | |
| 371 | + <th scope="row">RESULTS:</th> | |
| 401 | 372 | <td> |
| 402 | 373 | <div>URL: <code><?php print esc_html($page->test_html['url']); ?></code></div> |
| 403 | 374 | <div style="position: relative"> |
| 404 | 375 | <div style="width: 100%; overflow: scroll; background-color: #eed"> |
| 405 | - <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -o-pre-wrap;"><?php print esc_html($page->test_html['http_test']); ?></pre> | |
| 376 | + <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -o-pre-wrap;"><?php print $page->test_html['http_test']; ?></pre> | |
| 406 | 377 | </div> |
| 407 | 378 | </div> |
| 408 | 379 | </td> |
| 409 | 380 | </tr> |
| @@ -413,80 +384,48 @@ | ||
| 413 | 384 | <?php |
| 414 | 385 | } /* FeedWordPressDiagnosticsPage::tests_box () */ |
| 415 | 386 | |
| 416 | 387 | private $test_html; |
| 417 | - public function do_http_test () { | |
| 418 | - $url = FeedWordPress::post( 'http_test_url' ); | |
| 419 | - $method = FeedWordPress::post( 'http_test_method' ); | |
| 420 | - if ( ! ( is_null( $url ) || is_null( $method ) ) ) : | |
| 388 | + public function do_http_test ($post) { | |
| 389 | + if (isset($post['http_test_url']) and isset($post['http_test_method'])) : | |
| 390 | + $url = $post['http_test_url']; | |
| 421 | 391 | |
| 422 | 392 | $args = array(); |
| 423 | - $keys = FeedWordPress::post( 'http_test_args_key' ); | |
| 424 | - if ( ! is_null( $keys ) ) : | |
| 425 | - foreach ( $keys as $idx => $name ) : | |
| 393 | + if (isset($post['http_test_args_key'])) : | |
| 394 | + foreach ($post['http_test_args_key'] as $idx => $name) : | |
| 426 | 395 | $name = trim($name); |
| 427 | 396 | if (strlen($name) > 0) : |
| 428 | - $values = FeedWordPress::post('http_test_args_value', array() ); | |
| 429 | - | |
| 430 | - $value = null; | |
| 431 | - if ( isset( $values[ $idx ] ) ) : | |
| 432 | - $value = $values[$idx]; | |
| 397 | + $value = NULL; | |
| 398 | + if (isset($post['http_test_args_value']) | |
| 399 | + and isset($post['http_test_args_value'][$idx])) : | |
| 400 | + $value = $post['http_test_args_value'][$idx]; | |
| 433 | 401 | endif; |
| 434 | 402 | |
| 435 | - if ( preg_match('/^javascript:(.*)$/i', $value, $refs) ) : | |
| 436 | - if ( function_exists('json_decode') ) : | |
| 437 | - $json_value = json_decode( $refs[1] ); | |
| 438 | - if ( ! is_null($json_value) ) : | |
| 403 | + if (preg_match('/^javascript:(.*)$/i', $value, $refs)) : | |
| 404 | + if (function_exists('json_decode')) : | |
| 405 | + $json_value = json_decode($refs[1]); | |
| 406 | + if (!is_null($json_value)) : | |
| 439 | 407 | $value = $json_value; |
| 440 | 408 | endif; |
| 441 | 409 | endif; |
| 442 | 410 | endif; |
| 443 | 411 | |
| 444 | - $args[ $name ] = $value; | |
| 412 | + $args[$name] = $value; | |
| 445 | 413 | endif; |
| 446 | 414 | endforeach; |
| 447 | 415 | endif; |
| 448 | 416 | |
| 449 | - switch ( $method ) : | |
| 417 | + switch ($post['http_test_method']) : | |
| 450 | 418 | case 'wp_remote_request' : |
| 451 | 419 | $out = wp_remote_request($url, $args); |
| 452 | - unset( $out[ 'http_response' ] ); | |
| 453 | 420 | break; |
| 454 | - case 'FeedWordPie_File' : | |
| 455 | - $out = new FeedWordPie_File($url); | |
| 421 | + case 'FeedWordPress_File' : | |
| 422 | + $out = new FeedWordPress_File($url); | |
| 456 | 423 | break; |
| 457 | - case 'FeedWordPress::fetch' : | |
| 458 | - $out = FeedWordPress::fetch($url); | |
| 459 | - | |
| 460 | - $s_xpath = FeedWordPress::post( 'http_test_xpath', '' ); | |
| 461 | - if ( strlen( $s_xpath ) > 0 ) : | |
| 462 | - | |
| 463 | - $xpath = FeedWordPress::post( 'http_test_xpath' ); | |
| 464 | - | |
| 465 | - if ( !is_wp_error($out) ) : | |
| 466 | - $expr = new FeedWordPressParsedPostMeta($xpath); | |
| 467 | - | |
| 468 | - $feed = new MagpieMockLink( $out, $url ); | |
| 469 | - $posts = $feed->live_posts(); | |
| 470 | - | |
| 471 | - $post = new SyndicatedPost($posts[0], $feed); | |
| 472 | - $meta = $expr->do_substitutions($post); | |
| 473 | - | |
| 474 | - $out = array( | |
| 475 | - "post_title" => $post->entry->get_title(), | |
| 476 | - "post_link" => $post->permalink(), | |
| 477 | - "guid" => $post->guid(), | |
| 478 | - "expression" => $xpath, | |
| 479 | - "results" => $meta, | |
| 480 | - "pie" => $out, | |
| 481 | - ); | |
| 482 | - endif; | |
| 483 | - endif; | |
| 484 | - break; | |
| 485 | 424 | endswitch; |
| 486 | - | |
| 487 | - $this->test_html['url'] = $url; | |
| 488 | - $this->test_html['http_test'] = esc_html( MyPHP::val($out) ); | |
| 425 | + | |
| 426 | + $this->test_html['url'] = $url; | |
| 427 | + $this->test_html['http_test'] = esc_html(MyPHP::val($out)); | |
| 489 | 428 | endif; |
| 490 | 429 | } /* FeedWordPressDiagnosticsPage::do_http_test () */ |
| 491 | 430 | |
| 492 | 431 | } /* class FeedWordPressDiagnosticsPage */ |
