| @@ -1,85 +1,50 @@ | ||
| 1 | 1 | <?php |
| 2 | -require_once dirname(__FILE__) . '/admin-ui.php'; | |
| 2 | +require_once(dirname(__FILE__) . '/admin-ui.php'); | |
| 3 | 3 | |
| 4 | 4 | class FeedWordPressAuthorsPage extends FeedWordPressAdminPage { |
| 5 | 5 | var $authorlist = NULL; |
| 6 | 6 | var $rule_count = 0; |
| 7 | - | |
| 8 | - /** | |
| 9 | - * Class constructor | |
| 10 | - * | |
| 11 | - * @param int $link ID of the feed in the Links. | |
| 12 | - */ | |
| 13 | - public function __construct( $link = -1 ) { | |
| 14 | - if ( is_numeric( $link ) and -1 == $link ) : | |
| 15 | - $link = $this->submitted_link(); | |
| 16 | - endif; | |
| 17 | - | |
| 18 | - parent::__construct( 'feedwordpressauthors', $link ); | |
| 19 | - $this->refresh_author_list(); | |
| 7 | + | |
| 8 | + function FeedWordPressAuthorsPage ($link) { | |
| 9 | + FeedWordPressAdminPage::FeedWordPressAdminPage('feedwordpressauthors', $link); | |
| 10 | + $this->authorlist = fwp_author_list(); | |
| 20 | 11 | $this->dispatch = 'feedwordpress_author_settings'; |
| 21 | 12 | $this->filename = __FILE__; |
| 13 | + } | |
| 14 | + | |
| 15 | + /*static*/ function syndicated_authors_box ($page, $box = NULL) { | |
| 16 | + $link = $page->link; | |
| 17 | + $unfamiliar = array ('create' => '','default' => '','filter' => ''); | |
| 22 | 18 | |
| 23 | - $this->pagenames = array( | |
| 24 | - 'default' => 'Authors', | |
| 25 | - 'settings-update' => 'Syndicated Authors', | |
| 26 | - 'open-sheet' => 'Syndicated Author', | |
| 27 | - ); | |
| 28 | - } /* construct() */ | |
| 29 | - | |
| 30 | - /** | |
| 31 | - * Refreshes the author list and optionally sort it with the natural | |
| 32 | - * alphanumeric sort algorithm. | |
| 33 | - */ | |
| 34 | - function refresh_author_list() { | |
| 35 | - $this->authorlist = fwp_author_list(); | |
| 36 | - | |
| 37 | - // Case-insensitive "natural" alphanumeric sort. Preserves key/value associations. | |
| 38 | - if ( function_exists( 'natcasesort' ) ) : | |
| 39 | - natcasesort( $this->authorlist ); | |
| 40 | - endif; | |
| 41 | - } /* FeedWordPressAuthorsPage::refresh_author_list) */ | |
| 42 | - | |
| 43 | - /** | |
| 44 | - * Displays the page box for the syndicated authors. | |
| 45 | - * | |
| 46 | - * @param FeedWordPressAuthorsPage $page FWP dashboard page. | |
| 47 | - * @param string|null $box Page box (unused). | |
| 48 | - */ | |
| 49 | - /*static*/ function syndicated_authors_box( $page, $box = NULL ) { | |
| 50 | - /** @var SyndicatedLink|null An object of class {@link SyndicatedLink} if created for one feed's settings, NULL if created for global default settings. */ | |
| 51 | - $link = $page->link; // unused? (gwyneth 20230920) | |
| 52 | - $unfamiliar = array( 'create' => '','default' => '','filter' => '' ); | |
| 53 | - | |
| 54 | - if ( $page->for_feed_settings() ) : | |
| 55 | - $key = $this->link->setting( 'unfamiliar author', NULL, 'site-default' ); | |
| 19 | + if ($page->for_feed_settings()) : | |
| 20 | + $key = $link->setting('unfamiliar author', NULL, 'site-default'); | |
| 56 | 21 | $unfamiliar['site-default'] = ''; |
| 57 | 22 | else : |
| 58 | 23 | $key = FeedWordPress::on_unfamiliar('author'); |
| 59 | 24 | endif; |
| 60 | - $unfamiliar[$key] = true; | |
| 25 | + $unfamiliar[$key] = ' selected="selected"'; | |
| 61 | 26 | |
| 62 | - $match_author_by_email = ! ( 'yes' == get_option( "feedwordpress_do_not_match_author_by_email" ) ); | |
| 27 | + $match_author_by_email = !('yes' == get_option("feedwordpress_do_not_match_author_by_email")); | |
| 63 | 28 | $null_emails = FeedWordPress::null_email_set(); |
| 64 | 29 | |
| 65 | 30 | // Hey ho, let's go... |
| 66 | 31 | ?> |
| 67 | 32 | <table class="form-table"> |
| 68 | -<?php | |
| 69 | -if ( $page->for_default_settings() ) : | |
| 70 | -?> | |
| 71 | -<tr><th>Unmatched authors</th> | |
| 72 | -<td><span>Authors who haven’t been syndicated before</span> | |
| 33 | +<tbody> | |
| 34 | +<tr> | |
| 35 | + <th>New authors</th> | |
| 36 | + <td><span>Authors who haven't been syndicated before</span> | |
| 73 | 37 | <select style="max-width: 27.0em" id="unfamiliar-author" name="unfamiliar_author" onchange="contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline');"> |
| 74 | - <option value="create"<?php fwp_selected_flag($unfamiliar, 'create'); ?>>will have a new author account created for them</option> | |
| 75 | - <?php foreach ($page->authorlist as $author_id => $author_name) : | |
| 76 | - if ( !isset($unfamiliar[$author_id])) : $unfamiliar[$author_id] = false; endif; | |
| 77 | - ?> | |
| 78 | - <option value="<?php echo esc_attr($author_id); ?>"<?php fwp_selected_flag($unfamiliar, $author_id); ?>>will have their posts attributed to <?php echo esc_html($author_name); ?></option> | |
| 38 | +<?php if ($page->for_feed_settings()) : ?> | |
| 39 | + <option value="site-default"<?php print $unfamiliar['site-default']; ?>>are handled according to the default for all feeds</option> | |
| 40 | +<?php endif; ?> | |
| 41 | + <option value="create"<?php print $unfamiliar['create']; ?>>will have a new author account created for them</option> | |
| 42 | + <?php foreach ($page->authorlist as $author_id => $author_name) : ?> | |
| 43 | + <option value="<?php echo $author_id; ?>"<?php print (isset($unfamiliar[$author_id]) ? $unfamiliar[$author_id] : ''); ?>>will have their posts attributed to <?php echo $author_name; ?></option> | |
| 79 | 44 | <?php endforeach; ?> |
| 80 | 45 | <option value="newuser">will have their posts attributed to a new user...</option> |
| 81 | - <option value="filter"<?php fwp_selected_flag($unfamiliar, 'filter'); ?>>get filtered out</option> | |
| 46 | + <option value="filter"<?php print $unfamiliar['filter'] ?>>get filtered out</option> | |
| 82 | 47 | </select> |
| 83 | 48 | |
| 84 | 49 | <span id="unfamiliar-author-newuser">named <input type="text" name="unfamiliar_author_newuser" value="" /></span></p> |
| 85 | 50 | </td> |
| @@ -85,71 +50,37 @@ | ||
| 85 | 50 | </td> |
| 86 | 51 | </tr> |
| 87 | 52 | |
| 88 | 53 | <?php |
| 89 | -endif; | |
| 90 | - | |
| 91 | 54 | if ($page->for_feed_settings()) : |
| 92 | - $map = $this->link->setting('map authors', NULL, array()); | |
| 93 | 55 | ?> |
| 94 | -<tr><th>Matching authors</th> | |
| 95 | -<td><p>How should FeedWordPress attribute posts from this feed to WordPress | |
| 96 | -authors?</p> | |
| 97 | -<ul class="settings"> | |
| 98 | -<li><p><input type="radio" name="author_rules_name[all]" value="*" | |
| 99 | -<?php if (isset($map['name']['*'])) : $author_action = $map['name']['*']; ?> | |
| 100 | - checked="checked" | |
| 101 | -<?php | |
| 102 | - else : | |
| 103 | - $author_action = NULL; | |
| 104 | - endif; ?> | |
| 105 | - /> All posts syndicated | |
| 106 | -from this feed <select class="author-rules" id="author-rules-all" | |
| 107 | -name="author_rules_action[all]" onchange="contextual_appearance('author-rules-all', 'author-rules-all-newuser', 'author-rules-all-default', 'newuser', 'inline');"> | |
| 108 | - <?php foreach ($page->authorlist as $local_author_id => $local_author_name) : ?> | |
| 109 | - <option value="<?php echo esc_attr($local_author_id); ?>"<?php fwp_selected_flag($local_author_id==$author_action); ?>>are assigned to <?php echo esc_html($local_author_name); ?></option> | |
| 110 | - <?php endforeach; ?> | |
| 111 | - <option value="newuser">will be assigned to a new user...</option> | |
| 112 | - <option value="filter"<?php fwp_selected_flag('filter'==$author_action); ?>>get filtered out</option> | |
| 113 | - </select> | |
| 114 | - <span class="author-rules-newuser" id="author-rules-all-newuser">named | |
| 115 | - <input type="text" name="author_rules_newuser[all]" value="" /></span></p></li> | |
| 116 | -<li><p><input type="radio" name="author_rules_name[all]" value="" | |
| 117 | -<?php if ( !isset($map['name']['*'])) : ?> | |
| 118 | - checked="checked" | |
| 119 | -<?php endif; ?> | |
| 120 | -/> Attribute posts to authors based on automatic mapping rules. (Blank out a | |
| 121 | -name to delete the rule. Fill in a new name at the bottom to create a new rule.)</p> | |
| 122 | - | |
| 56 | +<tr><th>Syndicated authors</th> | |
| 57 | +<td>For attributing posts by specific authors. Blank out a name to delete the rule. Fill in a new name at the bottom to create a new rule.</p> | |
| 123 | 58 | <table style="width: 100%"> |
| 124 | 59 | <?php |
| 125 | - if (isset($this->link->settings['map authors'])) : | |
| 60 | + if (isset($link->settings['map authors'])) : | |
| 126 | 61 | ?> |
| 127 | 62 | <?php |
| 128 | 63 | $page->rule_count=0; |
| 129 | - foreach ($this->link->settings['map authors'] as $author_rules) : | |
| 64 | + foreach ($link->settings['map authors'] as $author_rules) : | |
| 130 | 65 | foreach ($author_rules as $author_name => $author_action) : |
| 131 | - if ($author_name != '*') : | |
| 132 | - $page->rule_count++; | |
| 133 | - $authorRulesId = sanitize_html_class(sprintf("author-rules-%d", $page->rule_count)); | |
| 66 | + $page->rule_count++; | |
| 134 | 67 | ?> |
| 135 | 68 | <tr> |
| 136 | -<th style="text-align: left; width: 15.0em">Posts by <input type="text" name="author_rules_name[]" value="<?php echo esc_attr($author_name); ?>" size="11" /></th> | |
| 69 | +<th style="text-align: left; width: 15.0em">Posts by <input type="text" name="author_rules_name[]" value="<?php echo htmlspecialchars($author_name); ?>" size="11" /></th> | |
| 137 | 70 | <td> |
| 138 | - <select class="author-rules" id="<?php echo esc_attr($authorRulesId); ?>" name="author_rules_action[]" onchange="contextual_appearance('<?php echo esc_attr($authorRulesId); ?>', '<?php echo esc_attr($authorRulesId); ?>-newuser', '<?php echo esc_attr($authorRulesId); ?>-default', 'newuser', 'inline');"> | |
| 71 | + <select id="author-rules-<?php echo $page->rule_count; ?>" name="author_rules_action[]" onchange="contextual_appearance('author-rules-<?php echo $page->rule_count; ?>', 'author-rules-<?php echo $page->rule_count; ?>-newuser', 'author-rules-<?php echo $page->rule_count; ?>-default', 'newuser', 'inline');"> | |
| 139 | 72 | <?php foreach ($page->authorlist as $local_author_id => $local_author_name) : ?> |
| 140 | - <option value="<?php echo esc_attr($local_author_id); ?>"<?php fwp_selected_flag($local_author_id==$author_action); ?>>are assigned to <?php echo esc_attr($local_author_name); ?></option> | |
| 73 | + <option value="<?php echo $local_author_id; ?>"<?php if ($local_author_id==$author_action) : echo ' selected="selected"'; endif; ?>>are assigned to <?php echo $local_author_name; ?></option> | |
| 141 | 74 | <?php endforeach; ?> |
| 142 | 75 | <option value="newuser">will be assigned to a new user...</option> |
| 143 | - <option value="filter"<?php fwp_selected_flag('filter'==$author_action); ?>>get filtered out</option> | |
| 76 | + <option value="filter"<?php if ('filter'==$author_action) : echo ' selected="selected"'; endif; ?>>get filtered out</option> | |
| 144 | 77 | </select> |
| 145 | - | |
| 146 | - <span class="author-rules-newuser" id="<?php echo esc_attr($authorRulesId); ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></span> | |
| 78 | + | |
| 79 | + <span id="author-rules-<?php echo $page->rule_count; ?>-newuser">named <input type="text" name="author_rules_newuser[]" value="" /></span> | |
| 147 | 80 | </td> |
| 148 | 81 | </tr> |
| 149 | -<?php | |
| 150 | - endif; | |
| 151 | - endforeach; | |
| 82 | +<?php endforeach; | |
| 152 | 83 | endforeach; |
| 153 | 84 | endif; |
| 154 | 85 | ?> |
| 155 | 86 | |
| @@ -157,53 +88,31 @@ | ||
| 157 | 88 | <th style="text-align: left; width: 15.0em">Posts by <input type="text" name="add_author_rule_name" size="11" /></th> |
| 158 | 89 | <td> |
| 159 | 90 | <select id="add-author-rule" name="add_author_rule_action" onchange="contextual_appearance('add-author-rule', 'add-author-rule-newuser', 'add-author-rule-default', 'newuser', 'inline');"> |
| 160 | 91 | <?php foreach ($page->authorlist as $author_id => $author_name) : ?> |
| 161 | - <option value="<?php echo esc_attr($author_id); ?>">are assigned to <?php echo esc_html($author_name); ?></option> | |
| 92 | + <option value="<?php echo $author_id; ?>">are assigned to <?php echo $author_name; ?></option> | |
| 162 | 93 | <?php endforeach; ?> |
| 163 | 94 | <option value="newuser">will be assigned to a new user...</option> |
| 164 | 95 | <option value="filter">get filtered out</option> |
| 165 | 96 | </select> |
| 166 | - | |
| 97 | + | |
| 167 | 98 | <span id="add-author-rule-newuser">named <input type="text" name="add_author_rule_newuser" value="" /></span> |
| 168 | 99 | </td> |
| 169 | 100 | </tr> |
| 170 | - | |
| 171 | -<tr> | |
| 172 | -<th style="text-align: left; width: 15.0em">Unmatched authors</th> | |
| 173 | -<td> | |
| 174 | -<span>Authors who haven't been syndicated before</span> | |
| 175 | - <select style="max-width: 27.0em" id="unfamiliar-author" name="unfamiliar_author" onchange="contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline');"> | |
| 176 | -<?php if ($page->for_feed_settings()) : ?> | |
| 177 | - <option value="site-default"<?php fwp_selected_flag($unfamiliar, 'site-default'); ?>>are handled according to the default for all feeds</option> | |
| 178 | -<?php endif; ?> | |
| 179 | - <option value="create"<?php fwp_selected_flag($unfamiliar, 'create'); ?>>will have a new author account created for them</option> | |
| 180 | - <?php foreach ( $page->authorlist as $author_id => $author_name ) : ?> | |
| 181 | - <option value="<?php echo esc_attr($author_id); ?>"<?php fwp_selected_flag($unfamiliar, $author_id); ?>>will have their posts attributed to <?php echo esc_html($author_name); ?></option> | |
| 182 | - <?php endforeach; ?> | |
| 183 | - <option value="newuser">will have their posts attributed to a user named ...</option> | |
| 184 | - <option value="filter"<?php fwp_selected_flag($unfamiliar, 'filter'); ?>>get filtered out</option> | |
| 185 | - </select> | |
| 186 | - | |
| 187 | - <span id="unfamiliar-author-newuser"><input type="text" name="unfamiliar_author_newuser" value="" /></span></p> | |
| 101 | +</table> | |
| 188 | 102 | </td> |
| 189 | 103 | </tr> |
| 190 | -</table></li> | |
| 191 | -</ul> | |
| 192 | - | |
| 193 | -</td> | |
| 194 | -</tr> | |
| 195 | 104 | <?php endif; ?> |
| 196 | 105 | |
| 197 | -<?php if ( $page->for_default_settings() ) : ?> | |
| 106 | +<?php if ($page->for_default_settings()) : ?> | |
| 198 | 107 | <tr> |
| 199 | 108 | <th scope="row">Matching Authors</th> |
| 200 | 109 | <td><ul style="list-style: none; margin: 0; padding: 0;"> |
| 201 | -<li><div><label><input id="match-author-by-email" type="checkbox" name="match_author_by_email" value="yes" <?php fwp_selected_flag($match_author_by_email, null, "checked"); ?> onchange="contextual_appearance('match-author-by-email', 'unless-null-email', null, 'yes', 'block', /*checkbox=*/ true);" /> Treat syndicated authors with the same e-mail address as the same author.</label></div> | |
| 110 | +<li><div><label><input id="match-author-by-email" type="checkbox" name="match_author_by_email" value="yes" <?php if ($match_author_by_email) : ?>checked="checked" <?php endif; ?>onchange="contextual_appearance('match-author-by-email', 'unless-null-email', null, 'yes', 'block', /*checkbox=*/ true);" /> Treat syndicated authors with the same e-mail address as the same author.</label></div> | |
| 202 | 111 | <div id="unless-null-email"> |
| 203 | 112 | <p>Unless the e-mail address is one of the following anonymous e-mail addresses:</p> |
| 204 | 113 | <textarea name="null_emails" rows="3" style="width: 100%"> |
| 205 | -<?php print esc_html(implode("\n", $null_emails)); ?> | |
| 114 | +<?php print implode("\n", $null_emails); ?> | |
| 206 | 115 | </textarea> |
| 207 | 116 | </div></li> |
| 208 | 117 | </ul></td> |
| 209 | 118 | </tr> |
| @@ -210,18 +119,11 @@ | ||
| 210 | 119 | <?php endif; ?> |
| 211 | 120 | </tbody> |
| 212 | 121 | </table> |
| 213 | 122 | <?php |
| 214 | - } /* FeedWordPressAuthorsPage::syndicated_authors_box() */ | |
| 215 | - | |
| 216 | - /** | |
| 217 | - * Displays a box for fixing mismatched authors. | |
| 218 | - * | |
| 219 | - * @param FeedWordPressAuthorsPage $page FWP dashboard page. | |
| 220 | - * @param string|null $box Page box (unused). | |
| 221 | - */ | |
| 222 | - /*static*/ function fix_authors_box( $page, $box = NULL ) | |
| 223 | - { | |
| 123 | + } /* FeedWordPressAuthorsPage::syndicated_authors_box () */ | |
| 124 | + | |
| 125 | + /*static*/ function fix_authors_box ($page, $box = NULL) { | |
| 224 | 126 | ?> |
| 225 | 127 | <table class="form-table"> |
| 226 | 128 | <tbody> |
| 227 | 129 | <tr> |
| @@ -227,16 +129,16 @@ | ||
| 227 | 129 | <tr> |
| 228 | 130 | <th scope="row">Fixing mis-matched authors:</th> |
| 229 | 131 | <td><p style="margin: 0.5em 0px">Take all the posts from this feed attributed to |
| 230 | 132 | <select name="fix_mismatch_from"> |
| 231 | - <?php foreach ( $page->authorlist as $author_id => $author_name ) : ?> | |
| 232 | - <option value="<?php echo esc_attr( $author_id ); ?>"><?php echo esc_html( $author_name ); ?></option> | |
| 133 | + <?php foreach ($page->authorlist as $author_id => $author_name) : ?> | |
| 134 | + <option value="<?php echo $author_id; ?>"><?php echo $author_name; ?></option> | |
| 233 | 135 | <?php endforeach; ?> |
| 234 | 136 | </select> |
| 235 | 137 | and instead |
| 236 | 138 | <select id="fix-mismatch-to" name="fix_mismatch_to" onchange="contextual_appearance('fix-mismatch-to', 'fix-mismatch-to-newuser', null, 'newuser', 'inline');"> |
| 237 | 139 | <?php foreach ($page->authorlist as $author_id => $author_name) : ?> |
| 238 | - <option value="<?php echo esc_attr($author_id); ?>">re-assign them to <?php echo esc_html($author_name); ?></option> | |
| 140 | + <option value="<?php echo $author_id; ?>">re-assign them to <?php echo $author_name; ?></option> | |
| 239 | 141 | <?php endforeach; ?> |
| 240 | 142 | <option value="newuser">re-assign them to a new user...</option> |
| 241 | 143 | <option value="filter">delete them</option> |
| 242 | 144 | </select> |
| @@ -247,232 +149,274 @@ | ||
| 247 | 149 | </tr> |
| 248 | 150 | </tbody> |
| 249 | 151 | </table> |
| 250 | 152 | <?php |
| 251 | - } /* FeedWordPressAuthorsPage::fix_authors_box() */ | |
| 153 | + } /* FeedWordPressAuthorsPage::fix_authors_box () */ | |
| 154 | +} /* class FeedWordPressAuthorsPage */ | |
| 252 | 155 | |
| 253 | - function display() { | |
| 254 | - $this->boxes_by_methods = array( | |
| 255 | - 'syndicated_authors_box' => __('Syndicated Authors'), | |
| 256 | - 'fix_authors_box' => __('Reassign Authors'), | |
| 257 | - ); | |
| 258 | - if ($this->for_default_settings()) : | |
| 259 | - unset($this->boxes_by_methods['fix_authors_box']); | |
| 260 | - endif; | |
| 156 | +function fwp_authors_page () { | |
| 157 | + global $wpdb, $wp_db_version; | |
| 261 | 158 | |
| 262 | - parent::display(); | |
| 263 | - ?> | |
| 264 | -<script type="text/javascript"> | |
| 265 | - contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline'); | |
| 266 | -</script> | |
| 159 | + if (FeedWordPress::needs_upgrade()) : | |
| 160 | + fwp_upgrade_page(); | |
| 161 | + return; | |
| 162 | + endif; | |
| 267 | 163 | |
| 268 | -<?php if ($this->for_feed_settings()) : ?> | |
| 269 | -<script type="text/javascript"> | |
| 270 | - jQuery('.author-rules').each ( function () { | |
| 271 | - contextual_appearance(this.id, this.id+'-newuser', this.id+'-default', 'newuser', 'inline'); | |
| 272 | - } ); | |
| 164 | + FeedWordPressCompatibility::validate_http_request(/*action=*/ 'feedwordpress_author_settings', /*capability=*/ 'manage_links'); | |
| 273 | 165 | |
| 274 | - contextual_appearance('add-author-rule', 'add-author-rule-newuser', 'add-author-rule-default', 'newuser', 'inline'); | |
| 275 | - contextual_appearance('fix-mismatch-to', 'fix-mismatch-to-newuser', null, 'newuser', 'inline'); | |
| 276 | -</script> | |
| 277 | -<?php else : ?> | |
| 278 | -<script type="text/javascript"> | |
| 279 | - contextual_appearance('match-author-by-email', 'unless-null-email', null, 'yes', 'block', /*checkbox=*/ true); | |
| 280 | -</script> | |
| 281 | -<?php endif; | |
| 282 | - } /* FeedWordPressAuthorsPage::display () */ | |
| 166 | + $link = FeedWordPressAdminPage::submitted_link(); | |
| 167 | + $authorsPage = new FeedWordPressAuthorsPage($link); | |
| 283 | 168 | |
| 284 | - /** | |
| 285 | - * Checks if a mismatch fix was requested. | |
| 286 | - * | |
| 287 | - * @return bool True if a fix was requested and not empty. | |
| 288 | - */ | |
| 289 | - public function fix_mismatch_requested() { | |
| 290 | - /** @var string|null */ | |
| 291 | - $fix = FeedWordPress::post( 'fix_mismatch' ); | |
| 292 | - return ( ! is_null( $fix ) && strlen( $fix ) > 0 ); // possibly the same as `( ! empty( $fix ) )`. | |
| 293 | - } /* FeedWordPressAuthorsPage::fix_mismatch_requested() */ | |
| 169 | + $mesg = null; | |
| 294 | 170 | |
| 295 | - /** | |
| 296 | - * If a mismatch fix was requested, handles it here; | |
| 297 | - * else sends it to the parent class for processing. | |
| 298 | - */ | |
| 299 | - public function accept_POST() { | |
| 300 | - if ( self::fix_mismatch_requested() ) : | |
| 301 | - $this->fix_mismatch(); | |
| 171 | + if (isset($GLOBALS['fwp_post']['fix_mismatch'])) : | |
| 172 | + if ('newuser'==$GLOBALS['fwp_post']['fix_mismatch_to']) : | |
| 173 | + $newuser_name = trim($GLOBALS['fwp_post']['fix_mismatch_to_newuser']); | |
| 174 | + if (strlen($newuser_name) > 0) : | |
| 175 | + $userdata = array(); | |
| 176 | + $userdata['ID'] = NULL; | |
| 177 | + | |
| 178 | + $userdata['user_login'] = sanitize_user($newuser_name); | |
| 179 | + $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']); | |
| 180 | + | |
| 181 | + $userdata['user_nicename'] = sanitize_title($newuser_name); | |
| 182 | + $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']); | |
| 183 | + | |
| 184 | + $userdata['display_name'] = $wpdb->escape($newuser_name); | |
| 185 | + | |
| 186 | + $newuser_id = wp_insert_user($userdata); | |
| 187 | + if (is_numeric($newuser_id)) : | |
| 188 | + $fix_mismatch_to_id = $newuser_id; | |
| 189 | + else : | |
| 190 | + // TODO: Add some error detection and reporting | |
| 191 | + endif; | |
| 192 | + else : | |
| 193 | + // TODO: Add some error reporting | |
| 194 | + endif; | |
| 302 | 195 | else : |
| 303 | - parent::accept_POST(); | |
| 196 | + $fix_mismatch_to_id = $GLOBALS['fwp_post']['fix_mismatch_to']; | |
| 304 | 197 | endif; |
| 305 | - } /* FeedWordPressAuthorsPage::accept_POST() */ | |
| 306 | - | |
| 307 | - /** | |
| 308 | - * Fixes an author mismatch. | |
| 309 | - */ | |
| 310 | - function fix_mismatch() { | |
| 311 | - global $wpdb; | |
| 312 | - | |
| 313 | - $to = FeedWordPress::post( 'fix_mismatch_to' ); | |
| 314 | -// if ( 'newuser' === $fix_to ) : // will _always_ be false, since $fix_to is not called from anywhere (gwyneth 20230915) | |
| 315 | - if ( 'newuser' === $to ) : // probably this is what was intended! (gwyneth 20230920) | |
| 316 | - $newuser_name = trim( FeedWordPress::post( 'fix_mismatch_to_newuser', '' ) ); | |
| 317 | - $to = fwp_insert_new_user( $newuser_name ); | |
| 318 | - endif; | |
| 319 | - | |
| 320 | - $from = (int) FeedWordPress::post( 'fix_mismatch_from' ); | |
| 321 | - if ( is_numeric( $from ) ) : | |
| 322 | - | |
| 323 | - // Make a list of all the items by this author | |
| 324 | - // syndicated from this feed... | |
| 198 | + $fix_mismatch_from_id = (int) $GLOBALS['fwp_post']['fix_mismatch_from']; | |
| 199 | + if (is_numeric($fix_mismatch_from_id)) : | |
| 200 | + // Make a list of all the items by this author syndicated from this feed... | |
| 325 | 201 | $post_ids = $wpdb->get_col(" |
| 326 | 202 | SELECT {$wpdb->posts}.id |
| 327 | 203 | FROM {$wpdb->posts}, {$wpdb->postmeta} |
| 328 | 204 | WHERE ({$wpdb->posts}.id = {$wpdb->postmeta}.post_id) |
| 329 | 205 | AND {$wpdb->postmeta}.meta_key = 'syndication_feed_id' |
| 330 | - AND {$wpdb->postmeta}.meta_value = '{$this->link->id}' | |
| 331 | - AND {$wpdb->posts}.post_author = '{$from}' | |
| 206 | + AND {$wpdb->postmeta}.meta_value = '{$link->id}' | |
| 207 | + AND {$wpdb->posts}.post_author = '{$fix_mismatch_from_id}' | |
| 332 | 208 | "); |
| 333 | - | |
| 334 | - if ( count( $post_ids ) > 0 ) : | |
| 335 | - $N = count( $post_ids ); | |
| 336 | - | |
| 337 | - // $posts = 'post'.(($N==1) ? '' : 's'); // Wordpress has _n() for plurals... (gwyneth 20230920) | |
| 338 | - $posts = sprintf( _n( '%s post', '%s posts', $N, 'text-domain' ), number_format_i18n( $N ) ); | |
| 339 | - | |
| 209 | + | |
| 210 | + if (count($post_ids) > 0) : | |
| 340 | 211 | // Re-assign them all to the correct author |
| 341 | - if ( is_numeric( $to ) ) : // re-assign to a particular user | |
| 342 | - $post_set = "(" . implode( ",", $post_ids ) . ")"; | |
| 343 | - | |
| 212 | + if (is_numeric($fix_mismatch_to_id)) : // re-assign to a particular user | |
| 213 | + $post_set = "(".implode(",", $post_ids).")"; | |
| 214 | + | |
| 344 | 215 | // Getting the revisions too, if there are any |
| 345 | - $parent_in_clause = "OR {$wpdb->posts}.post_parent IN $post_set"; | |
| 346 | - | |
| 216 | + if (fwp_test_wp_version(FWP_SCHEMA_26)) : | |
| 217 | + $parent_in_clause = "OR {$wpdb->posts}.post_parent IN $post_set"; | |
| 218 | + else : | |
| 219 | + $parent_in_clause = ''; | |
| 220 | + endif; | |
| 221 | + | |
| 347 | 222 | $wpdb->query(" |
| 348 | - UPDATE {$wpdb->posts} | |
| 349 | - SET post_author='{$to}' | |
| 350 | - WHERE ({$wpdb->posts}.id IN $post_set | |
| 351 | - $parent_in_clause) | |
| 223 | + UPDATE {$wpdb->posts} | |
| 224 | + SET post_author='{$fix_mismatch_to_id}' | |
| 225 | + WHERE ({$wpdb->posts}.id IN $post_set | |
| 226 | + $parent_in_clause) | |
| 352 | 227 | "); |
| 353 | - // $this->mesg = sprintf(__("Re-assigned %d {$posts}."), $N); // see comment abpve | |
| 354 | - $this->mesg = __( "Re-assigned " ) . $posts; | |
| 228 | + $mesg = "Re-assigned ".count($post_ids)." post".((count($post_ids)==1)?'':'s')."."; | |
| 355 | 229 | |
| 356 | 230 | // ... and kill them all |
| 357 | - elseif ( 'filter' == $to ) : | |
| 358 | - foreach ( $post_ids as $post_id ) : | |
| 359 | - wp_delete_post( $post_id ); | |
| 360 | - endforeach; | |
| 361 | - | |
| 362 | - $this->mesg = __( "Deleted " ) . $posts; | |
| 231 | + elseif ($fix_mismatch_to_id=='filter') : | |
| 232 | + foreach ($post_ids as $post_id) : | |
| 233 | + wp_delete_post($post_id); | |
| 234 | + endforeach; | |
| 235 | + $mesg = "Deleted ".count($post_ids)." post".((count($post_ids)==1)?'':'s')."."; | |
| 363 | 236 | endif; |
| 364 | 237 | else : |
| 365 | - $this->mesg = __("Couldn't find any posts that matched your criteria."); | |
| 238 | + $mesg = "Couldn't find any posts that matched your criteria."; | |
| 366 | 239 | endif; |
| 367 | 240 | endif; |
| 368 | - $this->updated = false; | |
| 369 | - } /* FeedWordPressAuthorsPage::fix_mismatch() */ | |
| 241 | + elseif (isset($GLOBALS['fwp_post']['save'])) : | |
| 242 | + if (is_object($link) and $link->found()) : | |
| 243 | + $alter = array (); | |
| 370 | 244 | |
| 371 | - /** | |
| 372 | - * Presumably saves settings... | |
| 373 | - * | |
| 374 | - * @return void description | |
| 375 | - */ | |
| 376 | - function save_settings () { | |
| 377 | - if ($this->for_feed_settings()) : | |
| 378 | - // $alter = array(); // what is this array? It's never used. (gwyneth 20230920) | |
| 379 | - | |
| 380 | 245 | // Unfamiliar author rule |
| 381 | - $unfamiliar_author = FeedWordPress::post( 'unfamiliar_author' ); | |
| 382 | - if ( ! is_null( $unfamiliar_author ) ) : | |
| 383 | - if ( 'newuser' == $unfamiliar_author ) : | |
| 384 | - $new_name = trim( FeedWordPress::post( "unfamiliar_author_newuser" ) ); | |
| 385 | - $this->link->map_name_to_new_user(/*name=*/ null, $new_name); | |
| 246 | + if (isset($GLOBALS['fwp_post']["unfamiliar_author"])) : | |
| 247 | + if ('site-default'==$GLOBALS['fwp_post']["unfamiliar_author"]) : | |
| 248 | + unset($link->settings["unfamiliar author"]); | |
| 249 | + elseif ('newuser'==$GLOBALS['fwp_post']["unfamiliar_author"]) : | |
| 250 | + $newuser_name = trim($GLOBALS['fwp_post']["unfamiliar_author_newuser"]); | |
| 251 | + $link->map_name_to_new_user(/*name=*/ NULL, $newuser_name); | |
| 386 | 252 | else : |
| 387 | - $this->link->update_setting( | |
| 388 | - "unfamiliar author", | |
| 389 | - $unfamiliar_author, | |
| 390 | - 'site-default' | |
| 391 | - ); | |
| 253 | + $link->settings["unfamiliar author"] = $GLOBALS['fwp_post']["unfamiliar_author"]; | |
| 392 | 254 | endif; |
| 393 | 255 | endif; |
| 394 | - | |
| 256 | + | |
| 395 | 257 | // Handle author mapping rules |
| 396 | - $author_rules_name = FeedWordPress::post( 'author_rules_name' ); | |
| 397 | - $author_rules_action = FeedWordPress::post('author_rules_action' ); | |
| 398 | - if ( ! ( is_null( $author_rules_name ) || is_null( $author_rules_action ) ) ) : | |
| 399 | - if ( isset( $author_rules_name['all'] ) ) : | |
| 400 | - if ( strlen( $author_rules_name['all']) > 0 ) : | |
| 401 | - $author_rules_name = array( | |
| 402 | - 'all' => $author_rules_name['all'], | |
| 403 | - ); | |
| 404 | - | |
| 405 | - // Erase all the rest. | |
| 406 | - endif; | |
| 407 | - endif; | |
| 408 | - | |
| 409 | - unset($this->link->settings['map authors']); | |
| 410 | - foreach ($author_rules_name as $key => $name) : | |
| 258 | + if (isset($GLOBALS['fwp_post']['author_rules_name']) and isset($GLOBALS['fwp_post']['author_rules_action'])) : | |
| 259 | + unset($link->settings['map authors']); | |
| 260 | + foreach ($GLOBALS['fwp_post']['author_rules_name'] as $key => $name) : | |
| 411 | 261 | // Normalize for case and whitespace |
| 412 | - $name = strtolower( trim( $name ) ); | |
| 413 | - $author_action = strtolower( trim( $author_rules_action[$key] ) ); | |
| 414 | - | |
| 415 | - $author_rules_newuser = FeedWordPress::post('author_rules_newuser' ); | |
| 416 | - if ( strlen($name) > 0 ) : | |
| 417 | - if ( 'newuser' == $author_action ) : | |
| 418 | - $new_name = trim( $author_rules_newuser[ $key ] ); | |
| 419 | - $this->link->map_name_to_new_user($name, $new_name); | |
| 262 | + $name = strtolower(trim($name)); | |
| 263 | + $author_action = strtolower(trim($GLOBALS['fwp_post']['author_rules_action'][$key])); | |
| 264 | + | |
| 265 | + if (strlen($name) > 0) : | |
| 266 | + if ('newuser' == $author_action) : | |
| 267 | + $newuser_name = trim($GLOBALS['fwp_post']['author_rules_newuser'][$key]); | |
| 268 | + $link->map_name_to_new_user($name, $newuser_name); | |
| 420 | 269 | else : |
| 421 | - $this->link->settings['map authors']['name'][$name] = $author_action; | |
| 270 | + $link->settings['map authors']['name'][$name] = $author_action; | |
| 422 | 271 | endif; |
| 423 | 272 | endif; |
| 424 | 273 | endforeach; |
| 425 | 274 | endif; |
| 426 | 275 | |
| 427 | - $name = FeedWordPress::post( 'add_author_rule_name'); | |
| 428 | - $author_action = FeedWordPress::post( 'add_author_rule_action' ); | |
| 429 | - if ( ! ( is_null( $name ) || is_null( $author_action ) ) ) : | |
| 430 | - $name = strtolower( trim( $name ) ); | |
| 431 | - $author_action = strtolower( trim( $author_action ) ); | |
| 432 | - | |
| 276 | + if (isset($GLOBALS['fwp_post']['add_author_rule_name']) and isset($GLOBALS['fwp_post']['add_author_rule_action'])) : | |
| 277 | + $name = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_name'])); | |
| 278 | + $author_action = strtolower(trim($GLOBALS['fwp_post']['add_author_rule_action'])); | |
| 433 | 279 | if (strlen($name) > 0) : |
| 434 | 280 | if ('newuser' == $author_action) : |
| 435 | - $new_name = trim( FeedWordPress::post( 'add_author_rule_newuser' )); | |
| 436 | - $this->link->map_name_to_new_user($name, $new_name); | |
| 281 | + $newuser_name = trim($GLOBALS['fwp_post']['add_author_rule_newuser']); | |
| 282 | + $link->map_name_to_new_user($name, $newuser_name); | |
| 437 | 283 | else : |
| 438 | - $this->link->settings['map authors']['name'][$name] = $author_action; | |
| 284 | + $link->settings['map authors']['name'][$name] = $author_action; | |
| 439 | 285 | endif; |
| 440 | 286 | endif; |
| 441 | 287 | endif; |
| 442 | - | |
| 288 | + | |
| 289 | + // Save settings | |
| 290 | + $link->save_settings(/*reload=*/ true); | |
| 291 | + $updated_link = true; | |
| 292 | + | |
| 293 | + // Reset, reload | |
| 294 | + $link_id = $link->id; | |
| 295 | + unset($link); | |
| 296 | + $link = new SyndicatedLink($link_id); | |
| 443 | 297 | else : |
| 298 | + if ('newuser'==$GLOBALS['fwp_post']['unfamiliar_author']) : | |
| 299 | + $newuser_name = trim($GLOBALS['fwp_post']['unfamiliar_author_newuser']); | |
| 300 | + if (strlen($newuser_name) > 0) : | |
| 301 | + $userdata = array(); | |
| 302 | + $userdata['ID'] = NULL; | |
| 303 | + | |
| 304 | + $userdata['user_login'] = sanitize_user($newuser_name); | |
| 305 | + $userdata['user_login'] = apply_filters('pre_user_login', $userdata['user_login']); | |
| 306 | + | |
| 307 | + $userdata['user_nicename'] = sanitize_title($newuser_name); | |
| 308 | + $userdata['user_nicename'] = apply_filters('pre_user_nicename', $userdata['user_nicename']); | |
| 309 | + | |
| 310 | + $userdata['display_name'] = $wpdb->escape($newuser_name); | |
| 444 | 311 | |
| 445 | - $unfamiliar_author = FeedWordPress::post( 'unfamiliar_author' ); | |
| 446 | - if ( 'newuser' === $unfamiliar_author ) : | |
| 447 | - $new_name = FeedWordPress::post( 'unfamiliar_author_newuser' ); | |
| 448 | - $new_id = fwp_insert_new_user( trim( $new_name ) ); | |
| 449 | - if ( is_numeric( $new_id ) ) : | |
| 450 | - update_option( 'feedwordpress_unfamiliar_author', $new_id ); | |
| 312 | + $newuser_id = wp_insert_user($userdata); | |
| 313 | + if (is_numeric($newuser_id)) : | |
| 314 | + update_option('feedwordpress_unfamiliar_author', $newuser_id); | |
| 315 | + else : | |
| 316 | + // TODO: Add some error detection and reporting | |
| 317 | + endif; | |
| 451 | 318 | else : |
| 452 | - // TODO: Add some error detection and reporting | |
| 453 | - // Put WP_Error stuff into $this->mesg ? | |
| 454 | - endif; | |
| 319 | + // TODO: Add some error reporting | |
| 320 | + endif; | |
| 455 | 321 | else : |
| 456 | - update_option( 'feedwordpress_unfamiliar_author', $unfamiliar_author ); | |
| 322 | + update_option('feedwordpress_unfamiliar_author', $GLOBALS['fwp_post']['unfamiliar_author']); | |
| 457 | 323 | endif; |
| 458 | 324 | |
| 459 | - $by_email = FeedWordPress::post( 'match_author_by_email' ); | |
| 460 | - update_option( | |
| 461 | - 'feedwordpress_do_not_match_author_by_email', | |
| 462 | - ( isset( $by_email ) && 'yes' == $by_email ) ? 'no' : 'yes' | |
| 463 | - ); | |
| 325 | + if (isset($GLOBALS['fwp_post']['match_author_by_email']) and $GLOBALS['fwp_post']['match_author_by_email']=='yes') : | |
| 326 | + update_option('feedwordpress_do_not_match_author_by_email', 'no'); | |
| 327 | + else : | |
| 328 | + update_option('feedwordpress_do_not_match_author_by_email', 'yes'); | |
| 329 | + endif; | |
| 464 | 330 | |
| 465 | - $null_emails = FeedWordPress::post( 'null_emails', null, 'textarea' ); | |
| 466 | - if ( ! is_null( $null_emails ) ) : | |
| 467 | - update_option( 'feedwordpress_null_email_set', $null_emails ); | |
| 331 | + if (isset($GLOBALS['fwp_post']['null_emails'])) : | |
| 332 | + update_option('feedwordpress_null_email_set', $GLOBALS['fwp_post']['null_emails']); | |
| 468 | 333 | endif; |
| 334 | + | |
| 335 | + $updated_link = true; | |
| 469 | 336 | endif; |
| 470 | 337 | |
| 471 | - parent::save_settings(); | |
| 472 | - $this->refresh_author_list(); | |
| 473 | - } /* FeedWordPressAuthorsPage::save_settings() */ | |
| 338 | + do_action('feedwordpress_admin_page_authors_save', $GLOBALS['fwp_post'], $authorsPage); | |
| 339 | + else : | |
| 340 | + $updated_link = false; | |
| 341 | + endif; | |
| 342 | + | |
| 343 | + //////////////////////////////////////////////// | |
| 344 | + // Prepare settings page /////////////////////// | |
| 345 | + //////////////////////////////////////////////// | |
| 474 | 346 | |
| 475 | -} /* class FeedWordPressAuthorsPage */ | |
| 347 | + if ($updated_link) : | |
| 348 | +?> | |
| 349 | +<div class="updated"><p>Syndicated author settings updated.</p></div> | |
| 350 | +<?php elseif (!is_null($mesg)) : ?> | |
| 351 | +<div class="updated"><p><?php print esc_html($mesg); ?></p></div> | |
| 352 | +<?php endif; | |
| 476 | 353 | |
| 477 | -$authorsPage = new FeedWordPressAuthorsPage; | |
| 478 | -$authorsPage->display(); | |
| 354 | + if (function_exists('add_meta_box')) : | |
| 355 | + add_action( | |
| 356 | + FeedWordPressCompatibility::bottom_script_hook(__FILE__), | |
| 357 | + /*callback=*/ array($authorsPage, 'fix_toggles'), | |
| 358 | + /*priority=*/ 10000 | |
| 359 | + ); | |
| 360 | + FeedWordPressSettingsUI::ajax_nonce_fields(); | |
| 361 | + endif; | |
| 362 | + | |
| 363 | + $authorsPage->open_sheet('Syndicated Author'); | |
| 364 | + ?> | |
| 365 | + <div id="post-body"> | |
| 366 | + <?php | |
| 367 | + //////////////////////////////////////////////// | |
| 368 | + // Display settings boxes ////////////////////// | |
| 369 | + //////////////////////////////////////////////// | |
| 370 | + | |
| 371 | + $boxes_by_methods = array( | |
| 372 | + 'syndicated_authors_box' => __('Syndicated Authors'), | |
| 373 | + 'fix_authors_box' => __('Reassign Authors'), | |
| 374 | + ); | |
| 375 | + if ($authorsPage->for_default_settings()) : | |
| 376 | + unset($boxes_by_methods['fix_authors_box']); | |
| 377 | + endif; | |
| 378 | + | |
| 379 | + foreach ($boxes_by_methods as $method => $row) : | |
| 380 | + if (is_array($row)) : | |
| 381 | + $id = $row['id']; | |
| 382 | + $title = $row['title']; | |
| 383 | + else : | |
| 384 | + $id = 'feedwordpress_'.$method; | |
| 385 | + $title = $row; | |
| 386 | + endif; | |
| 387 | + | |
| 388 | + fwp_add_meta_box( | |
| 389 | + /*id=*/ $id, | |
| 390 | + /*title=*/ $title, | |
| 391 | + /*callback=*/ array('FeedWordPressAuthorsPage', $method), | |
| 392 | + /*page=*/ $authorsPage->meta_box_context(), | |
| 393 | + /*context=*/ $authorsPage->meta_box_context() | |
| 394 | + ); | |
| 395 | + endforeach; | |
| 396 | + do_action('feedwordpress_admin_page_authors_meta_boxes', $authorsPage); | |
| 397 | +?> | |
| 398 | + <div class="metabox-holder"> | |
| 399 | +<?php | |
| 400 | + fwp_do_meta_boxes($authorsPage->meta_box_context(), $authorsPage->meta_box_context(), $authorsPage); | |
| 401 | +?> | |
| 402 | + </div> <!-- class="metabox-holder" --> | |
| 403 | +</div> <!-- id="post-body" --> | |
| 404 | +<?php $authorsPage->close_sheet(); ?> | |
| 405 | + | |
| 406 | +<script type="text/javascript"> | |
| 407 | + contextual_appearance('unfamiliar-author', 'unfamiliar-author-newuser', 'unfamiliar-author-default', 'newuser', 'inline'); | |
| 408 | +<?php if (is_object($link) and $link->found()) : ?> | |
| 409 | +<?php for ($j=1; $j<=$authorsPage->rule_count; $j++) : ?> | |
| 410 | + contextual_appearance('author-rules-<?php echo $j; ?>', 'author-rules-<?php echo $j; ?>-newuser', 'author-rules-<?php echo $j; ?>-default', 'newuser', 'inline'); | |
| 411 | +<?php endfor; ?> | |
| 412 | + contextual_appearance('add-author-rule', 'add-author-rule-newuser', 'add-author-rule-default', 'newuser', 'inline'); | |
| 413 | + contextual_appearance('fix-mismatch-to', 'fix-mismatch-to-newuser', null, 'newuser', 'inline'); | |
| 414 | +<?php else : ?> | |
| 415 | + contextual_appearance('match-author-by-email', 'unless-null-email', null, 'yes', 'block', /*checkbox=*/ true); | |
| 416 | +<?php endif; ?> | |
| 417 | +</script> | |
| 418 | +<?php | |
| 419 | +} /* function fwp_authors_page () */ | |
| 420 | + | |
| 421 | + fwp_authors_page(); | |
| 422 | + | |
