← All changes | syndicatedpost.class.php +891 -1184 trunk → 2011.0721 View file →

		@@ -1,8 +1,6 @@
1	1	<?php
2		-require_once dirname(__FILE__) . '/feedtime.class.php';
3		-require_once dirname(__FILE__) . '/syndicatedpostterm.class.php';
4		-require_once dirname(__FILE__) . '/syndicatedpostxpathquery.class.php';
	2	+require_once(dirname(__FILE__).'/feedtime.class.php');
5	3
6	4	/**
7	5	* class SyndicatedPost: FeedWordPress uses to manage the conversion of
8	6	* incoming items from the feed parser into posts for the WordPress
		@@ -11,31 +9,28 @@
11	9	* as some utility methods for extracting useful data from many
12	10	* different feed formats, which may be useful to FeedWordPress users
13	11	* who make use of feed data in PHP add-ons and filters.
14	12	*
15		- * @version 2017.1018
	13	+ * @version 2011.0601
16	14	*/
17	15	class SyndicatedPost {
18		- /** @var MagpieRSS|null MagpieRSS representation. */
19		- var $item = null;
20		- /** @var SimplePie_Item|null SimplePie_Item representation. */
21		- var $entry = null;
	16	+ var $item = null; // MagpieRSS representation
	17	+ var $entry = null; // SimplePie_Item representation
22	18
23	19	var $link = null;
24	20	var $feed = null;
25	21	var $feedmeta = null;
	22	+
	23	+ var $xmlns = array ();
26	24
27		- var $xmlns = array();
	25	+ var $post = array ();
28	26
29		- var $post = array();
30		-
31		- var $named = array();
32		- var $preset_terms = array();
33		- var $feed_terms = array();
34		-
	27	+ var $named = array ();
	28	+ var $preset_terms = array ();
	29	+ var $feed_terms = array ();
	30	+
35	31	var $_freshness = null;
36	32	var $_wp_id = null;
37		- var $_wp_post = null;
38	33
39	34	/**
40	35	* SyndicatedPost constructor: Given a feed item and the source from
41	36	* which it was taken, prepare a post that can be inserted into the
		@@ -44,68 +39,81 @@
44	39	*
45	40	* @param array $item The item syndicated from the feed.
46	41	* @param SyndicatedLink $source The feed it was syndicated from.
47	42	*/
48		- public function __construct( $item, $source ) {
49		- if ( empty( $item ) and empty( $source ) )
50		- return;
	43	+ function SyndicatedPost ($item, &$source) {
	44	+ global $wpdb;
51	45
52		- if ( is_array( $item )
53		- and isset( $item['simplepie'] )
54		- and isset( $item['magpie'] ) ) :
	46	+ if (is_array($item)
	47	+ and isset($item['simplepie'])
	48	+ and isset($item['magpie'])) :
55	49	$this->entry = $item['simplepie'];
56	50	$this->item = $item['magpie'];
57	51	$item = $item['magpie'];
58		- elseif ( is_a( $item, 'SimplePie_Item' ) ) :
	52	+ elseif (is_a($item, 'SimplePie_Item')) :
59	53	$this->entry = $item;
60		-
	54	+
61	55	// convert to Magpie for compat purposes
62		- $mpie = new MagpieFromSimplePie( $source->simplepie, $this->entry );
63		- $this->item = $mpie->get_item();
64		-
	56	+ $mp = new MagpieFromSimplePie($source->simplepie, $this->entry);
	57	+ $this->item = $mp->get_item();
	58	+
65	59	// done with conversion object
66		- $mpie = NULL; unset( $mpie );
	60	+ $mp = NULL; unset($mp);
67	61	else :
68	62	$this->item = $item;
69	63	endif;
70	64
71		- $this->link = $source;
	65	+ $this->link =& $source;
72	66	$this->feed = $source->magpie;
73	67	$this->feedmeta = $source->settings;
74	68
75		- FeedWordPress::diagnostic( 'feed_items', 'Considering item [' . $this->guid() . '] "' . $this->entry->get_title().'"');
	69	+ FeedWordPress::diagnostic('feed_items', 'Considering item ['.$this->guid().'] "'.$this->entry->get_title().'"');
76	70
77	71	# Dealing with namespaces can get so fucking fucked.
78	72	$this->xmlns['forward'] = $source->magpie->_XMLNS_FAMILIAR;
79	73	$this->xmlns['reverse'] = array();
80		- foreach ( $this->xmlns['forward'] as $url => $ns ) :
81		- if ( ! isset( $this->xmlns['reverse'][ $ns ] ) ) :
82		- $this->xmlns['reverse'][ $ns ] = array();
	74	+ foreach ($this->xmlns['forward'] as $url => $ns) :
	75	+ if (!isset($this->xmlns['reverse'][$ns])) :
	76	+ $this->xmlns['reverse'][$ns] = array();
83	77	endif;
84		- $this->xmlns['reverse'][ $ns ][] = $url;
	78	+ $this->xmlns['reverse'][$ns][] = $url;
85	79	endforeach;
86		-
	80	+
87	81	// Fucking SimplePie.
88	82	$this->xmlns['reverse']['rss'][] = '';
89	83
	84	+ # These globals were originally an ugly kludge around a bug in
	85	+ # apply_filters from WordPress 1.5. The bug was fixed in 1.5.1,
	86	+ # and I sure hope at this point that nobody writing filters for
	87	+ # FeedWordPress is still relying on them.
	88	+ #
	89	+ # Anyway, I hereby declare them DEPRECATED as of 8 February
	90	+ # 2010. I'll probably remove the globals within 1-2 releases in
	91	+ # the interests of code hygiene and memory usage. If you
	92	+ # currently use them in your filters, I advise you switch off to
	93	+ # accessing the public members SyndicatedPost::feed and
	94	+ # SyndicatedPost::feedmeta.
	95	+
	96	+ global $fwp_channel, $fwp_feedmeta;
	97	+ $fwp_channel = $this->feed; $fwp_feedmeta = $this->feedmeta;
	98	+
90	99	// Trigger global syndicated_item filter.
91		- $changed = apply_filters( 'syndicated_item', $this->item, $this );
	100	+ $changed = apply_filters('syndicated_item', $this->item, $this);
92	101	$this->item = $changed;
93		-
	102	+
94	103	// Allow for feed-specific syndicated_item filters.
95	104	$changed = apply_filters(
96		- "syndicated_item_" . $source->uri(),
	105	+ "syndicated_item_".$source->uri(),
97	106	$this->item,
98	107	$this
99	108	);
100	109	$this->item = $changed;
101		-
	110	+
102	111	# Filters can halt further processing by returning NULL
103		- if ( is_null( $this->item ) ) :
	112	+ if (is_null($this->item)) :
104	113	$this->post = NULL;
105	114	else :
106		-
107		- # Note that nothing is run through esc_sql() here.
	115	+ # Note that nothing is run through $wpdb->escape() here.
108	116	# That's deliberate. The escaping is done at the point
109	117	# of insertion, not here, to avoid double-escaping and
110	118	# to avoid screwing with syndicated_post filters
111	119
		@@ -110,16 +118,14 @@
110	118	# to avoid screwing with syndicated_post filters
111	119
112	120	$this->post['post_title'] = apply_filters(
113	121	'syndicated_item_title',
114		- $this->entry->get_title(),
115		- $this
	122	+ $this->entry->get_title(), $this
116	123	);
117	124
118	125	$this->named['author'] = apply_filters(
119	126	'syndicated_item_author',
120		- $this->author(),
121		- $this
	127	+ $this->author(), $this
122	128	);
123	129	// This just gives us an alphanumeric name for the author.
124	130	// We look up (or create) the numeric ID for the author
125	131	// in SyndicatedPost::add().
		@@ -125,68 +131,95 @@
125	131	// in SyndicatedPost::add().
126	132
127	133	$this->post['post_content'] = apply_filters(
128	134	'syndicated_item_content',
129		- $this->content(),
130		- $this
	135	+ $this->content(), $this
131	136	);
132		-
133		- $excerpt = apply_filters( 'syndicated_item_excerpt', $this->excerpt(), $this );
134		-
135		- if ( !empty( $excerpt ) ):
	137	+
	138	+ $excerpt = apply_filters('syndicated_item_excerpt', $this->excerpt(), $this);
	139	+ if (!empty($excerpt)):
136	140	$this->post['post_excerpt'] = $excerpt;
137	141	endif;
138	142
139	143	// Dealing with timestamps in WordPress is so fucking fucked.
140		- $offset = (int) get_option( 'gmt_offset' ) * 60 * 60;
141		- $post_date_gmt = $this->published( array( 'default' => -1 ) );
142		- $post_modified_gmt = $this->updated( array( 'default' => -1 ) );
	144	+ $offset = (int) get_option('gmt_offset') * 60 * 60;
	145	+ $post_date_gmt = $this->published(array('default' => -1));
	146	+ $post_modified_gmt = $this->updated(array('default' => -1));
143	147
144		- $this->post['post_date_gmt'] = gmdate( 'Y-m-d H:i:s', $post_date_gmt );
145		- $this->post['post_date'] = gmdate( 'Y-m-d H:i:s', $post_date_gmt + $offset );
146		- $this->post['post_modified_gmt'] = gmdate( 'Y-m-d H:i:s', $post_modified_gmt );
147		- $this->post['post_modified'] = gmdate( 'Y-m-d H:i:s', $post_modified_gmt + $offset );
	148	+ $this->post['post_date_gmt'] = gmdate('Y-m-d H:i:s', $post_date_gmt);
	149	+ $this->post['post_date'] = gmdate('Y-m-d H:i:s', $post_date_gmt + $offset);
	150	+ $this->post['post_modified_gmt'] = gmdate('Y-m-d H:i:s', $post_modified_gmt);
	151	+ $this->post['post_modified'] = gmdate('Y-m-d H:i:s', $post_modified_gmt + $offset);
148	152
149	153	// Use feed-level preferences or the global default.
150		- $this->post['post_status'] = $this->link->syndicated_status( 'post', 'publish' );
151		- $this->post['comment_status'] = $this->link->syndicated_status( 'comment', 'closed' );
152		- $this->post['ping_status'] = $this->link->syndicated_status( 'ping', 'closed' );
	154	+ $this->post['post_status'] = $this->link->syndicated_status('post', 'publish');
	155	+ $this->post['comment_status'] = $this->link->syndicated_status('comment', 'closed');
	156	+ $this->post['ping_status'] = $this->link->syndicated_status('ping', 'closed');
153	157
154	158	// Unique ID (hopefully a unique tag: URI); failing that, the permalink
155		- $this->post['guid'] = apply_filters( 'syndicated_item_guid', $this->guid(), $this );
	159	+ $this->post['guid'] = apply_filters('syndicated_item_guid', $this->guid(), $this);
156	160
157		- // User-supplied custom settings to apply to each post.
158		- // Do first so that FWP-generated custom settings will
159		- // overwrite if necessary; thus preventing any munging.
160		- $postMetaIn = $this->link->postmeta( array( "parsed" => true ) );
	161	+ // User-supplied custom settings to apply to each post. Do first so that FWP-generated custom settings will overwrite if necessary; thus preventing any munging
	162	+ $default_custom_settings = get_option('feedwordpress_custom_settings');
	163	+ if ($default_custom_settings and !is_array($default_custom_settings)) :
	164	+ $default_custom_settings = unserialize($default_custom_settings);
	165	+ endif;
	166	+ if (!is_array($default_custom_settings)) :
	167	+ $default_custom_settings = array();
	168	+ endif;
	169	+
	170	+ $custom_settings = (isset($this->link->settings['postmeta']) ? $this->link->settings['postmeta'] : null);
	171	+ if ($custom_settings and !is_array($custom_settings)) :
	172	+ $custom_settings = unserialize($custom_settings);
	173	+ endif;
	174	+ if (!is_array($custom_settings)) :
	175	+ $custom_settings = array();
	176	+ endif;
	177	+
	178	+ $postMetaIn = array_merge($default_custom_settings, $custom_settings);
161	179	$postMetaOut = array();
162	180
163		- foreach ( $postMetaIn as $key => $meta ) :
164		- $postMetaOut[ $key ] = $meta->do_substitutions( $this );
	181	+ // Big ugly fuckin loop to do any element substitutions
	182	+ // that we may need.
	183	+ foreach ($postMetaIn as $key => $values) :
	184	+ if (is_string($values)) : $values = array($values); endif;
	185	+
	186	+ $postMetaOut[$key] = array();
	187	+ foreach ($values as $value) :
	188	+ if (preg_match('/\$\( ([^)]+) \)/x', $value, $ref)) :
	189	+ $elements = $this->query($ref[1]);
	190	+ foreach ($elements as $element) :
	191	+ $postMetaOut[$key][] = str_replace(
	192	+ $ref[0],
	193	+ $element,
	194	+ $value
	195	+ );
	196	+ endforeach;
	197	+ else :
	198	+ $postMetaOut[$key][] = $value;
	199	+ endif;
	200	+ endforeach;
165	201	endforeach;
166	202
167		- foreach ( $postMetaOut as $key => $values ) :
168		- if ( is_null( $values ) ) { // have chosen to replace value with empty string
169		- $values = [ '' ];
170		- }
171		- $this->post['meta'][ $key ] = array();
172		- foreach ( $values as $value ) :
173		- $this->post['meta'][ $key ][] = apply_filters( "syndicated_post_meta_{$key}", $value, $this );
	203	+ foreach ($postMetaOut as $key => $values) :
	204	+ $this->post['meta'][$key] = array();
	205	+ foreach ($values as $value) :
	206	+ $this->post['meta'][$key][] = apply_filters("syndicated_post_meta_{$key}", $value, $this);
174	207	endforeach;
175	208	endforeach;
176		-
	209	+
177	210	// RSS 2.0 / Atom 1.0 enclosure support
178	211	$enclosures = $this->entry->get_enclosures();
179		- if ( is_array( $enclosures ) ) : foreach ( $enclosures as $enclosure ) :
	212	+ if (is_array($enclosures)) : foreach ($enclosures as $enclosure) :
180	213	$this->post['meta']['enclosure'][] =
181		- apply_filters( 'syndicated_item_enclosure_url', $enclosure->get_link(), $this ) . "\n".
182		- apply_filters( 'syndicated_item_enclosure_length', $enclosure->get_length(), $this ) . "\n".
183		- apply_filters( 'syndicated_item_enclosure_type', $enclosure->get_type(), $this );
	214	+ apply_filters('syndicated_item_enclosure_url', $enclosure->get_link(), $this)."\n".
	215	+ apply_filters('syndicated_item_enclosure_length', $enclosure->get_length(), $this)."\n".
	216	+ apply_filters('syndicated_item_enclosure_type', $enclosure->get_type(), $this);
184	217	endforeach; endif;
185	218
186	219	// In case you want to point back to the blog this was
187	220	// syndicated from.
188		-
	221	+
189	222	$sourcemeta['syndication_source'] = apply_filters(
190	223	'syndicated_item_source_title',
191	224	$this->link->name(),
192	225	$this
		@@ -200,21 +233,21 @@
200	233	'syndicated_item_source_id',
201	234	$this->link->guid(),
202	235	$this
203	236	);
204		-
	237	+
205	238	// Make use of atom:source data, if present in an aggregated feed
206	239	$entry_source = $this->source();
207		- if ( ! is_null( $entry_source ) ) :
208		- foreach ( $entry_source as $what => $value ) :
209		- if ( ! is_null( $value ) ) :
210		- if ( 'title' == $what ) : $key = 'syndication_source';
211		- elseif ( 'feed' == $what ) : $key = 'syndication_feed';
212		- else : $key = "syndication_source_{$what}";
	240	+ if (!is_null($entry_source)) :
	241	+ foreach ($entry_source as $what => $value) :
	242	+ if (!is_null($value)) :
	243	+ if ($what=='title') : $key = 'syndication_source';
	244	+ elseif ($what=='feed') : $key = 'syndication_feed';
	245	+ else : $key = "syndication_source_${what}";
213	246	endif;
214		-
215		- $sourcemeta["{$key}_original"] = apply_filters(
216		- 'syndicated_item_original_source_' . $what,
	247	+
	248	+ $sourcemeta["${key}_original"] = apply_filters(
	249	+ 'syndicated_item_original_source_'.$what,
217	250	$value,
218	251	$this
219	252	);
220	253	endif;
		@@ -219,79 +252,136 @@
219	252	);
220	253	endif;
221	254	endforeach;
222	255	endif;
223		-
224		- foreach ( $sourcemeta as $meta_key => $value ) :
225		- if ( !is_null( $value ) ) :
226		- $this->post['meta'][ $meta_key ] = $value;
	256	+
	257	+ foreach ($sourcemeta as $meta_key => $value) :
	258	+ if (!is_null($value)) :
	259	+ $this->post['meta'][$meta_key] = $value;
227	260	endif;
228	261	endforeach;
229	262
230	263	// Store information on human-readable and machine-readable comment URIs
231		-
	264	+
232	265	// Human-readable comment URI
233		- $commentLink = apply_filters( 'syndicated_item_comments', $this->comment_link(), $this );
234		- if ( ! is_null( $commentLink) ) : $this->post['meta']['rss:comments'] = $commentLink; endif;
	266	+ $commentLink = apply_filters('syndicated_item_comments', $this->comment_link(), $this);
	267	+ if (!is_null($commentLink)) : $this->post['meta']['rss:comments'] = $commentLink; endif;
235	268
236	269	// Machine-readable content feed URI
237		- $commentFeed = apply_filters( 'syndicated_item_commentrss', $this->comment_feed(), $this );
238		- if ( ! is_null( $commentFeed ) ) : $this->post['meta']['wfw:commentRSS'] = $commentFeed; endif;
	270	+ $commentFeed = apply_filters('syndicated_item_commentrss', $this->comment_feed(), $this);
	271	+ if (!is_null($commentFeed)) : $this->post['meta']['wfw:commentRSS'] = $commentFeed; endif;
239	272	// Yeah, yeah, now I know that it's supposed to be
240	273	// wfw:commentRss. Oh well. Path dependence, sucka.
241	274
242	275	// Store information to identify the feed that this came from
243		- if ( isset( $this->feedmeta['link/uri'] ) ) :
	276	+ if (isset($this->feedmeta['link/uri'])) :
244	277	$this->post['meta']['syndication_feed'] = $this->feedmeta['link/uri'];
245	278	endif;
246		- if ( isset( $this->feedmeta['link/id'] ) ) :
	279	+ if (isset($this->feedmeta['link/id'])) :
247	280	$this->post['meta']['syndication_feed_id'] = $this->feedmeta['link/id'];
248	281	endif;
249	282
250		- if ( isset( $this->item['source_link_self'] ) ) :
	283	+ if (isset($this->item['source_link_self'])) :
251	284	$this->post['meta']['syndication_feed_original'] = $this->item['source_link_self'];
252	285	endif;
253	286
254	287	// In case you want to know the external permalink...
255		- $this->post['meta']['syndication_permalink'] = apply_filters( 'syndicated_item_link', $this->permalink() );
	288	+ $this->post['meta']['syndication_permalink'] = apply_filters('syndicated_item_link', $this->permalink());
256	289
257	290	// Store a hash of the post content for checking whether something needs to be updated
258	291	$this->post['meta']['syndication_item_hash'] = $this->update_hash();
259	292
260		- // Categories, Tags, and other Terms: from settings assignments (global settings, subscription settings),
261		- // and from feed assignments (item metadata, post content)
262		- $this->preset_terms = apply_filters( 'syndicated_item_preset_terms', $this->get_terms_from_settings(), $this );
263		- $this->feed_terms = apply_filters( 'syndicated_item_feed_terms', $this->get_terms_from_feeds(), $this );
	293	+ // Categories: start with default categories, if any.
	294	+ $cats = array();
	295	+ if ('no' != $this->link->setting('add/category', NULL, 'yes')) :
	296	+ $fc = get_option("feedwordpress_syndication_cats");
	297	+ if ($fc) :
	298	+ $cats = array_merge($cats, explode("\n", $fc));
	299	+ endif;
	300	+ endif;
264	301
265		- $this->post['post_type'] = apply_filters(
266		- 'syndicated_post_type',
267		- $this->link->setting( 'syndicated post type', 'syndicated_post_type', 'post' ),
268		- $this
269		- );
	302	+ $fc = $this->link->setting('cats', NULL, array());
	303	+ if (is_array($fc)) :
	304	+ $cats = array_merge($cats, $fc);
	305	+ endif;
	306	+ $this->preset_terms['category'] = $cats;
	307	+
	308	+ // Now add categories from the post, if we have 'em
	309	+ $cats = array();
	310	+ $post_cats = $this->entry->get_categories();
	311	+ if (is_array($post_cats)) : foreach ($post_cats as $cat) :
	312	+ $cat_name = $cat->get_term();
	313	+ if (!$cat_name) : $cat_name = $cat->get_label(); endif;
	314	+
	315	+ if ($this->link->setting('cat_split', NULL, NULL)) :
	316	+ $pcre = "\007".$this->feedmeta['cat_split']."\007";
	317	+ $cats = array_merge(
	318	+ $cats,
	319	+ preg_split(
	320	+ $pcre,
	321	+ $cat_name,
	322	+ -1 /*=no limit*/,
	323	+ PREG_SPLIT_NO_EMPTY
	324	+ )
	325	+ );
	326	+ else :
	327	+ $cats[] = $cat_name;
	328	+ endif;
	329	+ endforeach; endif;
	330	+
	331	+ $this->feed_terms['category'] = apply_filters('syndicated_item_categories', $cats, $this);
	332	+
	333	+ // Tags: start with default tags, if any
	334	+ $tags = array();
	335	+ if ('no' != $this->link->setting('add/post_tag', NULL, 'yes')) :
	336	+ $ft = get_option("feedwordpress_syndication_tags", NULL);
	337	+ $tags = (is_null($ft) ? array() : explode(FEEDWORDPRESS_CAT_SEPARATOR, $ft));
	338	+ endif;
	339	+
	340	+ $ft = $this->link->setting('tags', NULL, array());
	341	+ if (is_array($ft)) :
	342	+ $tags = array_merge($tags, $ft);
	343	+ endif;
	344	+ $this->preset_terms['post_tag'] = $tags;
	345	+
	346	+ // Scan post for /a[@rel='tag'] and use as tags if present
	347	+ $tags = $this->inline_tags();
	348	+ $this->feed_terms['post_tag'] = apply_filters('syndicated_item_tags', $tags, $this);
	349	+
	350	+ $taxonomies = $this->link->taxonomies();
	351	+ $feedTerms = $this->link->setting('terms', NULL, array());
	352	+ $globalTerms = get_option('feedwordpress_syndication_terms', array());
	353	+
	354	+ $specials = array('category' => 'cats', 'post_tag' => 'tags');
	355	+ foreach ($taxonomies as $tax) :
	356	+ if (!isset($specials[$tax])) :
	357	+ $terms = array();
	358	+
	359	+ // See if we should get the globals
	360	+ if ('no' != $this->link->setting("add/$tax", NULL, 'yes')) :
	361	+ if (isset($globalTerms[$tax])) :
	362	+ $terms = $globalTerms[$tax];
	363	+ endif;
	364	+ endif;
	365	+
	366	+ // Now merge in the locals
	367	+ if (isset($feedTerms[$tax])) :
	368	+ $terms = array_merge($terms, $feedTerms[$tax]);
	369	+ endif;
	370	+
	371	+ // That's all, folks.
	372	+ $this->preset_terms[$tax] = $terms;
	373	+ endif;
	374	+ endforeach;
	375	+
	376	+ $this->post['post_type'] = apply_filters('syndicated_post_type', $this->link->setting('syndicated post type', 'syndicated_post_type', 'post'), $this);
270	377	endif;
271		- } /* SyndicatedPost::__construct() */
	378	+ } /* SyndicatedPost::SyndicatedPost() */
272	379
273	380	#####################################
274	381	#### EXTRACT DATA FROM FEED ITEM ####
275	382	#####################################
276		-
277		- function substitution_function ($name) {
278		- $ret = NULL;
279		-
280		- switch ($name) :
281		- // Allowed PHP string functions
282		- case 'trim':
283		- case 'ltrim':
284		- case 'rtrim':
285		- case 'strtoupper':
286		- case 'strtolower':
287		- case 'urlencode':
288		- case 'urldecode':
289		- $ret = $name;
290		- endswitch;
291		- return $ret;
292		- }
293		-
	383	+
294	384	/**
295	385	* SyndicatedPost::query uses an XPath-like syntax to query arbitrary
296	386	* elements within the syndicated item.
297	387	*
		@@ -298,29 +388,100 @@
298	388	* @param string $path
299	389	* @returns array of string values representing contents of matching
300	390	* elements or attributes
301	391	*/
302		- public function query ($path) {
303		- $xq = new SyndicatedPostXPathQuery(array("path" => $path));
	392	+ function query ($path) {
	393	+ $urlHash = array();
304	394
305		- $feedChannel = array_merge(
306		- $this->get_feed_root_element(),
307		- $this->get_feed_channel_elements()
308		- );
	395	+ // Allow {url} notation for namespaces. URLs will contain : and /, so...
	396	+ preg_match_all('/{([^}]+)}/', $path, $match, PREG_SET_ORDER);
	397	+ foreach ($match as $ref) :
	398	+ $urlHash[md5($ref[1])] = $ref[1];
	399	+ endforeach;
	400	+
	401	+ foreach ($urlHash as $hash => $url) :
	402	+ $path = str_replace('{'.$url.'}', '{#'.$hash.'}', $path);
	403	+ endforeach;
309	404
310		- $matches = $xq->match(array(
311		- "type" => $this->link->simplepie->get_type(),
312		- "xmlns" => $this->xmlns,
313		- "map" => array(
314		- "/" => array($this->entry->data),
315		- "item" => array($this->entry->data),
316		- "feed" => $feedChannel,
317		- "channel" => $feedChannel
318		- ),
319		- "context" => $this->entry->data,
320		- "parent" => $feedChannel,
321		- ));
	405	+ $path = explode('/', $path);
	406	+ foreach ($path as $index => $node) :
	407	+ if (preg_match('/{#([^}]+)}/', $node, $ref)) :
	408	+ if (isset($urlHash[$ref[1]])) :
	409	+ $path[$index] = str_replace(
	410	+ '{#'.$ref[1].'}',
	411	+ '{'.$urlHash[$ref[1]].'}',
	412	+ $node
	413	+ );
	414	+ endif;
	415	+ endif;
	416	+ endforeach;
322	417
	418	+ // Start out with a get_item_tags query.
	419	+ $node = '';
	420	+ while (strlen($node)==0 and !is_null($node)) :
	421	+ $node = array_shift($path);
	422	+ endwhile;
	423	+
	424	+ switch ($node) :
	425	+ case 'feed' :
	426	+ case 'channel' :
	427	+ $node = array_shift($path);
	428	+ $data = $this->get_feed_root_element();
	429	+ $data = array_merge($data, $this->get_feed_channel_elements());
	430	+ break;
	431	+ case 'item' :
	432	+ $node = array_shift($path);
	433	+ default :
	434	+ $data = array($this->entry->data);
	435	+ $method = NULL;
	436	+ endswitch;
	437	+
	438	+ while (!is_null($node)) :
	439	+ if (strlen($node) > 0) :
	440	+ $matches = array();
	441	+
	442	+ list($axis, $element) = $this->xpath_name_and_axis($node);
	443	+
	444	+ foreach ($data as $datum) :
	445	+ if (!is_string($datum) and isset($datum[$axis])) :
	446	+ foreach ($datum[$axis] as $ns => $elements) :
	447	+ if (isset($elements[$element])) :
	448	+ // Potential match.
	449	+ // Check namespace.
	450	+ if (is_string($elements[$element])) : // Attribute
	451	+ $addenda = array($elements[$element]);
	452	+ $contexts = array($datum);
	453	+ else : // Element
	454	+ $addenda = $elements[$element];
	455	+ $contexts = $elements[$element];
	456	+ endif;
	457	+
	458	+ foreach ($addenda as $index => $addendum) :
	459	+ $context = $contexts[$index];
	460	+
	461	+ $namespaces = $this->xpath_possible_namespaces($node, $context);
	462	+ if (in_array($ns, $namespaces)) :
	463	+ $matches[] = $addendum;
	464	+ endif;
	465	+ endforeach;
	466	+ endif;
	467	+ endforeach;
	468	+ endif;
	469	+ endforeach;
	470	+
	471	+ $data = $matches;
	472	+ endif;
	473	+ $node = array_shift($path);
	474	+ endwhile;
	475	+
	476	+ $matches = array();
	477	+ foreach ($data as $datum) :
	478	+ if (is_string($datum)) :
	479	+ $matches[] = $datum;
	480	+ elseif (isset($datum['data'])) :
	481	+ $matches[] = $datum['data'];
	482	+ endif;
	483	+ endforeach;
323	484	return $matches;
324	485	} /* SyndicatedPost::query() */
325	486
326	487	function get_feed_root_element () {
		@@ -339,13 +500,13 @@
339	500	SIMPLEPIE_NAMESPACE_RSS_10,
340	501	'http://backend.userland.com/RSS2',
341	502	SIMPLEPIE_NAMESPACE_RSS_20,
342	503	);
343		-
	504	+
344	505	$matches = array();
345	506	foreach ($rss as $ns) :
346	507	$data = $this->link->simplepie->get_feed_tags($ns, 'channel');
347		- if ( !is_null($data)) :
	508	+ if (!is_null($data)) :
348	509	$matches = array_merge($matches, $data);
349	510	endif;
350	511	endforeach;
351	512	return $matches;
		@@ -350,116 +511,139 @@
350	511	endforeach;
351	512	return $matches;
352	513	} /* SyndicatedPost::get_feed_channel_elements() */
353	514
354		- public function get_categories ($params = array()) {
355		- return $this->entry->get_categories();
356		- }
	515	+ function xpath_default_namespace () {
	516	+ // Get the default namespace.
	517	+ $type = $this->link->simplepie->get_type();
	518	+ if ($type & SIMPLEPIE_TYPE_ATOM_10) :
	519	+ $defaultNS = SIMPLEPIE_NAMESPACE_ATOM_10;
	520	+ elseif ($type & SIMPLEPIE_TYPE_ATOM_03) :
	521	+ $defaultNS = SIMPLEPIE_NAMESPACE_ATOM_03;
	522	+ elseif ($type & SIMPLEPIE_TYPE_RSS_090) :
	523	+ $defaultNS = SIMPLEPIE_NAMESPACE_RSS_090;
	524	+ elseif ($type & SIMPLEPIE_TYPE_RSS_10) :
	525	+ $defaultNS = SIMPLEPIE_NAMESPACE_RSS_10;
	526	+ elseif ($type & SIMPLEPIE_TYPE_RSS_20) :
	527	+ $defaultNS = SIMPLEPIE_NAMESPACE_RSS_20;
	528	+ else :
	529	+ $defaultNS = SIMPLEPIE_NAMESPACE_RSS_20;
	530	+ endif;
	531	+ return $defaultNS;
	532	+ } /* SyndicatedPost::xpath_default_namespace() */
357	533
358		- public function title ($params = array()) {
359		- return $this->entry->get_title();
360		- } /* SyndicatedPost::title () */
	534	+ function xpath_name_and_axis ($node) {
	535	+ $ns = NULL; $element = NULL;
361	536
362		- public function content ($params = array())
363		- {
364		- $params = wp_parse_args($params, array(
365		- "full only" => false,
366		- ));
	537	+ if (substr($node, 0, 1)=='@') :
	538	+ $axis = 'attribs'; $node = substr($node, 1);
	539	+ else :
	540	+ $axis = 'child';
	541	+ endif;
367	542
368		- $content = NULL;
	543	+ if (preg_match('/^{([^}]*)}(.*)$/', $node, $ref)) :
	544	+ $element = $ref[2];
	545	+ elseif (strpos($node, ':') !== FALSE) :
	546	+ list($xmlns, $element) = explode(':', $node, 2);
	547	+ else :
	548	+ $element = $node;
	549	+ endif;
	550	+ return array($axis, $element);
	551	+ } /* SyndicatedPost::xpath_local_name () */
369	552
370		- // FIXME: This is one of the main places in the code still using
371		- // the outmoded SimplePie - to - Magpie construction. We could
372		- // replace using SimplePie_Item::get_tags() here. (Or if really
373		- // ambitious we could attempt to just use
374		- // SimplePie_Item::get_content() with content-only set to TRUE
375		- // and some sanitization in effect. -CJ 1jul14
	553	+ function xpath_possible_namespaces ($node, $datum = array()) {
	554	+ $ns = NULL; $element = NULL;
376	555
377		- // atom:content, standard method of providing full HTML content
378		- // in Atom feeds.
	556	+ if (substr($node, 0, 1)=='@') :
	557	+ $attr = '@'; $node = substr($node, 1);
	558	+ else :
	559	+ $attr = '';
	560	+ endif;
	561	+
	562	+ if (preg_match('/^{([^}]*)}(.*)$/', $node, $ref)) :
	563	+ $ns = array($ref[1]);
	564	+ elseif (strpos($node, ':') !== FALSE) :
	565	+ list($xmlns, $element) = explode(':', $node, 2);
	566	+
	567	+ if (isset($this->xmlns['reverse'][$xmlns])) :
	568	+ $ns = $this->xmlns['reverse'][$xmlns];
	569	+ else :
	570	+ $ns = array($xmlns);
	571	+ endif;
	572	+
	573	+ // Fucking SimplePie. For attributes in default xmlns.
	574	+ $defaultNS = $this->xpath_default_namespace();
	575	+ if (isset($this->xmlns['forward'][$defaultNS])
	576	+ and ($xmlns==$this->xmlns['forward'][$defaultNS])) :
	577	+ $ns[] = '';
	578	+ endif;
	579	+
	580	+ if (isset($datum['xmlns'])) :
	581	+ if (isset($datum['xmlns'][$xmlns])) :
	582	+ $ns[] = $datum['xmlns'][$xmlns];
	583	+ endif;
	584	+ endif;
	585	+ else :
	586	+ // Often in SimplePie, the default namespace gets stored
	587	+ // as an empty string rather than a URL.
	588	+ $ns = array($this->xpath_default_namespace(), '');
	589	+ endif;
	590	+ return array_unique($ns);
	591	+ } /* SyndicatedPost::xpath_possible_namespaces() */
	592	+
	593	+ function content () {
	594	+ $content = NULL;
379	595	if (isset($this->item['atom_content'])) :
380	596	$content = $this->item['atom_content'];
381		- elseif (isset($this->item['atom']['atom_content'])) :
382		- $content = $this->item['atom']['atom_content'];
383		-
384		- // Some exotics: back in the day, before widespread convergence
385		- // on content:encoding, some RSS feeds took advantage of XML
386		- // namespaces to use an inline xhtml:body or xhtml:div element
387		- // for full-content HTML. (E.g. Sam Ruby's feed, IIRC.)
388	597	elseif (isset($this->item['xhtml']['body'])) :
389	598	$content = $this->item['xhtml']['body'];
390	599	elseif (isset($this->item['xhtml']['div'])) :
391	600	$content = $this->item['xhtml']['div'];
392		-
393		- // content:encoded, most common method of providing full HTML in
394		- // RSS 2.0 feeds.
395	601	elseif (isset($this->item['content']['encoded']) and $this->item['content']['encoded']):
396	602	$content = $this->item['content']['encoded'];
397		-
398		- // Fall back on elements that sometimes may contain full HTML
399		- // but sometimes not.
400		- elseif ( ! $params['full only']) :
401		-
402		- // description element is sometimes used for full HTML
403		- // sometimes for summary text in RSS. (By the letter of
404		- // the standard, it should just be for summary text.)
405		- if (isset($this->item['description'])) :
406		- $content = $this->item['description'];
407		- endif;
408		-
	603	+ elseif (isset($this->item['description'])) :
	604	+ $content = $this->item['description'];
409	605	endif;
410		-
411	606	return $content;
412	607	} /* SyndicatedPost::content() */
413	608
414		- public function excerpt () {
	609	+ function excerpt () {
415	610	# Identify and sanitize excerpt: atom:summary, or rss:description
416	611	$excerpt = $this->entry->get_description();
417		-
	612	+
418	613	# Many RSS feeds use rss:description, inadvisably, to
419	614	# carry the entire post (typically with escaped HTML).
420	615	# If that's what happened, we don't want the full
421	616	# content for the excerpt.
422	617	$content = $this->content();
	618	+
	619	+ // Ignore whitespace, case, and tag cruft.
	620	+ $theExcerpt = preg_replace('/\s+/', '', strtolower(strip_tags($excerpt)));
	621	+ $theContent = preg_replace('/\s+/', '', strtolower(strip_tags($content)));
423	622
424		- // Ignore whitespace, case, and tag cruft.
425		- $theExcerpt = preg_replace('/\s+/', '', strtolower(strip_tags(html_entity_decode($excerpt))));
426		- $theContent = preg_replace('/\s+/', '', strtolower(strip_tags(html_entity_decode($content))));
427	623	if ( empty($excerpt) or $theExcerpt == $theContent ) :
428	624	# If content is available, generate an excerpt.
429	625	if ( strlen(trim($content)) > 0 ) :
430	626	$excerpt = strip_tags($content);
431	627	if (strlen($excerpt) > 255) :
432		- if (is_object($this->link) and is_object($this->link->simplepie)) :
433		- $encoding = $this->link->simplepie->get_encoding();
434		- else :
435		- $encoding = get_option('blog_charset', 'utf8');
436		- endif;
437		- $excerpt = mb_substr($excerpt,0,252,$encoding).'...';
	628	+ $excerpt = substr($excerpt,0,252).'...';
438	629	endif;
439	630	endif;
440	631	endif;
441		-
442	632	return $excerpt;
443	633	} /* SyndicatedPost::excerpt() */
444	634
445		- /**
446		- * SyndicatedPost::permalink: returns the permalink for the post, as provided by the
447		- * source feed.
448		- *
449		- * @return string The URL of the original permalink for this syndicated post
450		- */
451		- public function permalink () {
	635	+ function permalink () {
452	636	// Handles explicit <link> elements and also RSS 2.0 cases with
453	637	// <guid isPermaLink="true">, etc. Hooray!
454	638	$permalink = $this->entry->get_link();
455	639	return $permalink;
456		- } /* SyndicatedPost::permalink () */
	640	+ }
457	641
458		- public function created ($params = array()) {
459		- $unfiltered = false; // $default = NULL; // seems to be unused on this function (gwyneth 20230916)
	642	+ function created ($params = array()) {
	643	+ $unfiltered = false; $default = NULL;
460	644	extract($params);
461		-
	645	+
462	646	$date = '';
463	647	if (isset($this->item['dc']['created'])) :
464	648	$date = $this->item['dc']['created'];
465	649	elseif (isset($this->item['dcterms']['created'])) :
		@@ -468,25 +652,25 @@
468	652	$date = $this->item['created'];
469	653	endif;
470	654
471	655	$time = new FeedTime($date);
472		- $tstamp = $time->timestamp();
473		- if ( ! $unfiltered) :
474		- apply_filters('syndicated_item_created', $tstamp, $this);
	656	+ $ts = $time->timestamp();
	657	+ if (!$unfiltered) :
	658	+ apply_filters('syndicated_item_created', $ts, $this);
475	659	endif;
476		- return $tstamp;
	660	+ return $ts;
477	661	} /* SyndicatedPost::created() */
478	662
479		- public function published ($params = array(), $default = NULL) {
	663	+ function published ($params = array(), $default = NULL) {
480	664	$fallback = true; $unfiltered = false;
481		- if ( !is_array($params)) : // Old style
	665	+ if (!is_array($params)) : // Old style
482	666	$fallback = $params;
483	667	else : // New style
484	668	extract($params);
485	669	endif;
486		-
	670	+
487	671	$date = '';
488		- $tstamp = null;
	672	+ $ts = null;
489	673
490	674	# RSS is a fucking mess. Figure out whether we have a date in
491	675	# <dc:date>, <issued>, <pubDate>, etc., and get it into Unix
492	676	# epoch format for reformatting. If we can't find anything,
		@@ -501,34 +685,34 @@
501	685	$date = $this->item['issued'];
502	686	elseif (isset($this->item['pubdate'])): // RSS 2.0
503	687	$date = $this->item['pubdate'];
504	688	endif;
505		-
	689	+
506	690	if (strlen($date) > 0) :
507	691	$time = new FeedTime($date);
508		- $tstamp = $time->timestamp();
	692	+ $ts = $time->timestamp();
509	693	elseif ($fallback) : // Fall back to <updated> / <modified> if present
510		- $tstamp = $this->updated(/*fallback=*/ false, /*default=*/ $default);
	694	+ $ts = $this->updated(/*fallback=*/ false, /*default=*/ $default);
511	695	endif;
512		-
	696	+
513	697	# If everything failed, then default to the current time.
514		- if (is_null($tstamp)) :
	698	+ if (is_null($ts)) :
515	699	if (-1 == $default) :
516		- $tstamp = time();
	700	+ $ts = time();
517	701	else :
518		- $tstamp = $default;
	702	+ $ts = $default;
519	703	endif;
520	704	endif;
521		-
522		- if ( ! $unfiltered) :
523		- $tstamp = apply_filters('syndicated_item_published', $tstamp, $this);
	705	+
	706	+ if (!$unfiltered) :
	707	+ $ts = apply_filters('syndicated_item_published', $ts, $this);
524	708	endif;
525		- return $tstamp;
	709	+ return $ts;
526	710	} /* SyndicatedPost::published() */
527	711
528		- public function updated ($params = array(), $default = -1) {
	712	+ function updated ($params = array(), $default = -1) {
529	713	$fallback = true; $unfiltered = false;
530		- if ( !is_array($params)) : // Old style
	714	+ if (!is_array($params)) : // Old style
531	715	$fallback = $params;
532	716	else : // New style
533	717	extract($params);
534	718	endif;
		@@ -533,9 +717,9 @@
533	717	extract($params);
534	718	endif;
535	719
536	720	$date = '';
537		- $tstamp = null;
	721	+ $ts = null;
538	722
539	723	# As far as I know, only dcterms and Atom have reliable ways to
540	724	# specify when something was *modified* last. If neither is
541	725	# available, then we'll try to get the time of publication.
		@@ -547,29 +731,29 @@
547	731	$date = $this->item['modified'];
548	732	elseif (isset($this->item['updated'])): // Atom 1.0
549	733	$date = $this->item['updated'];
550	734	endif;
551		-
	735	+
552	736	if (strlen($date) > 0) :
553	737	$time = new FeedTime($date);
554		- $tstamp = $time->timestamp();
	738	+ $ts = $time->timestamp();
555	739	elseif ($fallback) : // Fall back to issued / dc:date
556		- $tstamp = $this->published(/*fallback=*/ false, /*default=*/ $default);
	740	+ $ts = $this->published(/*fallback=*/ false, /*default=*/ $default);
557	741	endif;
558		-
	742	+
559	743	# If everything failed, then default to the current time.
560		- if (is_null($tstamp)) :
	744	+ if (is_null($ts)) :
561	745	if (-1 == $default) :
562		- $tstamp = time();
	746	+ $ts = time();
563	747	else :
564		- $tstamp = $default;
	748	+ $ts = $default;
565	749	endif;
566	750	endif;
567	751
568		- if ( ! $unfiltered) :
569		- $tstamp = apply_filters('syndicated_item_updated', $tstamp, $this);
	752	+ if (!$unfiltered) :
	753	+ apply_filters('syndicated_item_updated', $ts, $this);
570	754	endif;
571		- return $tstamp;
	755	+ return $ts;
572	756	} /* SyndicatedPost::updated() */
573	757
574	758	var $_hashes = array();
575	759	function stored_hashes ($id = NULL) {
		@@ -576,9 +760,9 @@
576	760	if (is_null($id)) :
577	761	$id = $this->wp_id();
578	762	endif;
579	763
580		- if ( !isset($this->_hashes[$id])) :
	764	+ if (!isset($this->_hashes[$id])) :
581	765	$this->_hashes[$id] = get_post_custom_values(
582	766	'syndication_item_hash', $id
583	767	);
584	768	if (is_null($this->_hashes[$id])) :
		@@ -587,45 +771,17 @@
587	771	endif;
588	772	return $this->_hashes[$id];
589	773	}
590	774
591		- function update_hash ($hashed = true) {
592		- // Basis for tracking possible changes to item.
593		- $hash = array(
594		- "title" => $this->entry->get_title(),
595		- "link" => $this->permalink(),
596		- "content" => $this->content(),
597		- "excerpt" => $this->excerpt(),
598		- );
599		-
600		- if ($hashed) :
601		- $hash = md5(serialize($hash));
602		- endif;
603		-
604		- return $hash;
	775	+ function update_hash () {
	776	+ return md5(serialize($this->item));
605	777	} /* SyndicatedPost::update_hash() */
606	778
607		- /**
608		- * SyndicatedPost::normalize_guid_prefix(): generates a normalized URL
609		- * prefix (including scheme, authority, full path, and the beginning of
610		- * a query string) for creating guids that conform to WordPress's
611		- * internal constraints on the URL space for valid guids. To create a
612		- * normalized guid, just concatenate a valid URL query parameter value
613		- * to the returned URL.
614		- *
615		- * @return string The URL prefix generated.
616		- *
617		- * @uses trailingslashit()
618		- * @uses home_url()
619		- * @uses apply_filters()
620		- */
621		- static function normalize_guid_prefix () {
622		- $scheme = 'http';
623		- $url = trailingslashit(home_url(/*path=*/ '', $scheme));
624		- return apply_filters('syndicated_item_guid_normalized_prefix', $url . '?guid=', $scheme);
625		- } /* SyndicatedPost::normalize_guid_prefix() */
626		-
627		- static function normalize_guid ($guid) {
	779	+ /*static*/ function normalize_guid_prefix () {
	780	+ return trailingslashit(get_bloginfo('url')).'?guid=';
	781	+ }
	782	+
	783	+ /*static*/ function normalize_guid ($guid) {
628	784	$guid = trim($guid);
629	785	if (preg_match('/^[0-9a-z]{32}$/i', $guid)) : // MD5
630	786	$guid = SyndicatedPost::normalize_guid_prefix().strtolower($guid);
631	787	elseif ((strlen(esc_url($guid)) == 0) or (esc_url($guid) != $guid)) :
		@@ -631,30 +787,12 @@
631	787	elseif ((strlen(esc_url($guid)) == 0) or (esc_url($guid) != $guid)) :
632	788	$guid = SyndicatedPost::normalize_guid_prefix().md5($guid);
633	789	endif;
634	790	$guid = trim($guid);
635		-
636	791	return $guid;
637	792	} /* SyndicatedPost::normalize_guid() */
638		-
639		- static function alternative_guid_prefix () {
640		- $scheme = 'https';
641		- $url = trailingslashit(home_url(/*path=*/ '', $scheme));
642		- return apply_filters('syndicated_item_guid_normalized_prefix', $url . '?guid=', $scheme);
643		- }
644		- static function alternative_guid ($guid) {
645		- $guid = trim($guid);
646		- if (preg_match('/^[0-9a-z]{32}$/i', $guid)) : // MD5
647		- $guid = SyndicatedPost::alternative_guid_prefix().strtolower($guid);
648		- elseif ((strlen(esc_url($guid)) == 0) or (esc_url($guid) != $guid)) :
649		- $guid = SyndicatedPost::alternative_guid_prefix().md5($guid);
650		- endif;
651		- $guid = trim($guid);
652		-
653		- return $guid;
654		- } /* SyndicatedPost::normalize_guid() */
655		-
656		- public function guid () {
	793	+
	794	+ function guid () {
657	795	$guid = null;
658	796	if (isset($this->item['id'])): // Atom 0.3 / 1.0
659	797	$guid = $this->item['id'];
660	798	elseif (isset($this->item['atom']['id'])) : // Namespaced Atom
		@@ -663,14 +801,14 @@
663	801	$guid = $this->item['guid'];
664	802	elseif (isset($this->item['dc']['identifier'])) : // yeah, right
665	803	$guid = $this->item['dc']['identifier'];
666	804	endif;
667		-
	805	+
668	806	// Un-set or too long to use as-is. Generate a tag: URI.
669	807	if (is_null($guid) or strlen($guid) > 250) :
670	808	// In case we need to check this again
671	809	$original_guid = $guid;
672		-
	810	+
673	811	// The feed does not seem to have provided us with a
674	812	// usable unique identifier, so we'll have to cobble
675	813	// together a tag: URI that might work for us. The base
676	814	// of the URI will be the host name of the feed source ...
		@@ -684,19 +822,19 @@
684	822	// gets clipped by MySQL, uniqueness tests will fail
685	823	// forever after and the post will be endlessly
686	824	// reduplicated. So, instead, Guids Of A Certain Length
687	825	// are hashed down into a nice, manageable tag: URI.
688		- if ( !is_null($original_guid)) :
	826	+ if (!is_null($original_guid)) :
689	827	$guid .= ',2010-12-03:id.'.md5($original_guid);
690		-
	828	+
691	829	// If we have a date of creation, then we can use that
692	830	// to uniquely identify the item. (On the other hand, if
693	831	// the feed producer was consicentious enough to
694	832	// generate dates of creation, she probably also was
695	833	// conscientious enough to generate unique identifiers.)
696		- elseif ( !is_null($this->created())) :
	834	+ elseif (!is_null($this->created())) :
697	835	$guid .= '://post.'.date('YmdHis', $this->created());
698		-
	836	+
699	837	// Otherwise, use both the URI of the item, *and* the
700	838	// item's title. We have to use both because titles are
701	839	// often not unique, and sometimes links aren't unique
702	840	// either (e.g. Bitch (S)HITLIST, Mozilla Dot Org news,
		@@ -705,86 +843,65 @@
705	843	// this is about the best we can do.
706	844	else :
707	845	$link = $this->permalink();
708	846	if (is_null($link)) : $link = $this->link->uri(); endif;
709		- $guid .= '://'.md5($link.'/'.$this->title());
	847	+ $guid .= '://'.md5($link.'/'.$this->item['title']);
710	848	endif;
711	849	endif;
712	850	return $guid;
713	851	} /* SyndicatedPost::guid() */
714		-
715		- public function author () {
	852	+
	853	+ function author () {
716	854	$author = array ();
717		-
718		- $aa = $this->entry->get_authors();
719		- if (is_countable($aa) and count($aa) > 0) :
720		- $a = reset($aa);
721		-
722		- $author = array(
723		- 'name' => $a->get_name(),
724		- 'email' => $a->get_email(),
725		- 'uri' => $a->get_link(),
726		- );
727		- endif;
728		-
729		- if (FEEDWORDPRESS_COMPATIBILITY) :
730		- // Search through the MagpieRSS elements: Atom, Dublin Core, RSS
731		- if (isset($this->item['author_name'])):
732		- $author['name'] = $this->item['author_name'];
733		- elseif (isset($this->item['dc']['creator'])):
734		- $author['name'] = $this->item['dc']['creator'];
735		- elseif (isset($this->item['dc']['contributor'])):
736		- $author['name'] = $this->item['dc']['contributor'];
737		- elseif (isset($this->feed->channel['dc']['creator'])) :
738		- $author['name'] = $this->feed->channel['dc']['creator'];
739		- elseif (isset($this->feed->channel['dc']['contributor'])) :
740		- $author['name'] = $this->feed->channel['dc']['contributor'];
741		- elseif (isset($this->feed->channel['author_name'])) :
742		- $author['name'] = $this->feed->channel['author_name'];
743		- elseif ($this->feed->is_rss() and isset($this->item['author'])) :
744		- // The author element in RSS is allegedly an
745		- // e-mail address, but lots of people don't use
746		- // it that way. So let's make of it what we can.
747		- $author = parse_email_with_realname($this->item['author']);
748		-
749		- if ( !isset($author['name'])) :
750		- if (isset($author['email'])) :
751		- $author['name'] = $author['email'];
752		- else :
753		- $author['name'] = $this->feed->channel['title'];
754		- endif;
	855	+
	856	+ if (isset($this->item['author_name'])):
	857	+ $author['name'] = $this->item['author_name'];
	858	+ elseif (isset($this->item['dc']['creator'])):
	859	+ $author['name'] = $this->item['dc']['creator'];
	860	+ elseif (isset($this->item['dc']['contributor'])):
	861	+ $author['name'] = $this->item['dc']['contributor'];
	862	+ elseif (isset($this->feed->channel['dc']['creator'])) :
	863	+ $author['name'] = $this->feed->channel['dc']['creator'];
	864	+ elseif (isset($this->feed->channel['dc']['contributor'])) :
	865	+ $author['name'] = $this->feed->channel['dc']['contributor'];
	866	+ elseif (isset($this->feed->channel['author_name'])) :
	867	+ $author['name'] = $this->feed->channel['author_name'];
	868	+ elseif ($this->feed->is_rss() and isset($this->item['author'])) :
	869	+ // The author element in RSS is allegedly an
	870	+ // e-mail address, but lots of people don't use
	871	+ // it that way. So let's make of it what we can.
	872	+ $author = parse_email_with_realname($this->item['author']);
	873	+
	874	+ if (!isset($author['name'])) :
	875	+ if (isset($author['email'])) :
	876	+ $author['name'] = $author['email'];
	877	+ else :
	878	+ $author['name'] = $this->feed->channel['title'];
755	879	endif;
756	880	endif;
	881	+ elseif ($this->link->name()) :
	882	+ $author['name'] = $this->link->name();
	883	+ else :
	884	+ $url = parse_url($this->link->uri());
	885	+ $author['name'] = $url['host'];
757	886	endif;
758		-
759		- if ( !isset($author['name']) or is_null($author['name'])) :
760		- // Nothing found. Try some crappy defaults.
761		- if ($this->link->name()) :
762		- $author['name'] = $this->link->name();
763		- else :
764		- $url = parse_url($this->link->uri());
765		- $author['name'] = $url['host'];
766		- endif;
	887	+
	888	+ if (isset($this->item['author_email'])):
	889	+ $author['email'] = $this->item['author_email'];
	890	+ elseif (isset($this->feed->channel['author_email'])) :
	891	+ $author['email'] = $this->feed->channel['author_email'];
767	892	endif;
768		-
769		- if (FEEDWORDPRESS_COMPATIBILITY) :
770		- if (isset($this->item['author_email'])):
771		- $author['email'] = $this->item['author_email'];
772		- elseif (isset($this->feed->channel['author_email'])) :
773		- $author['email'] = $this->feed->channel['author_email'];
774		- endif;
775		-
776		- if (isset($this->item['author_uri'])):
777		- $author['uri'] = $this->item['author_uri'];
778		- elseif (isset($this->item['author_url'])):
779		- $author['uri'] = $this->item['author_url'];
780		- elseif (isset($this->feed->channel['author_uri'])) :
781		- $author['uri'] = $this->item['author_uri'];
782		- elseif (isset($this->feed->channel['author_url'])) :
783		- $author['uri'] = $this->item['author_url'];
784		- elseif (isset($this->feed->channel['link'])) :
785		- $author['uri'] = $this->feed->channel['link'];
786		- endif;
	893	+
	894	+ if (isset($this->item['author_uri'])):
	895	+ $author['uri'] = $this->item['author_uri'];
	896	+ elseif (isset($this->item['author_url'])):
	897	+ $author['uri'] = $this->item['author_url'];
	898	+ elseif (isset($this->feed->channel['author_uri'])) :
	899	+ $author['uri'] = $this->item['author_uri'];
	900	+ elseif (isset($this->feed->channel['author_url'])) :
	901	+ $author['uri'] = $this->item['author_url'];
	902	+ elseif (isset($this->feed->channel['link'])) :
	903	+ $author['uri'] = $this->feed->channel['link'];
787	904	endif;
788	905
789	906	return $author;
790	907	} /* SyndicatedPost::author() */
		@@ -789,121 +906,8 @@
789	906	return $author;
790	907	} /* SyndicatedPost::author() */
791	908
792	909	/**
793		- * SyndicatedPost::get_terms_from_settings(): Return an array of terms to associate with the incoming
794		- * post based on the Categories, Tags, and other terms associated with each new post by the user's
795		- * settings (global and feed-specific).
796		- *
797		- * @since 2016.0331
798		- * @return array of lists, each element has the taxonomy for a key ('category', 'post_tag', etc.),
799		- * and a list of term codes (either alphanumeric names, or ID numbers encoded in a format that
800		- * SyndicatedLink::category_ids() can understand) within that taxonomy
801		- *
802		- */
803		- public function get_terms_from_settings () {
804		- // Categories: start with default categories, if any.
805		- $cats = array();
806		- if ('no' != $this->link->setting('add/category', NULL, 'yes')) :
807		- $fc = get_option("feedwordpress_syndication_cats");
808		- if ($fc) :
809		- $cats = array_merge($cats, explode("\n", $fc));
810		- endif;
811		- endif;
812		-
813		- $fc = $this->link->setting('cats',NULL, array());
814		- if (is_array($fc)) :
815		- $cats = array_merge($cats, $fc);
816		- endif;
817		- $preset_terms['category'] = $cats;
818		-
819		- // Tags: start with default tags, if any
820		- $tags = array();
821		- if ('no' != $this->link->setting('add/post_tag', NULL, 'yes')) :
822		- $ft = get_option("feedwordpress_syndication_tags", NULL);
823		- $tags = (is_null($ft) ? array() : explode(FEEDWORDPRESS_CAT_SEPARATOR, $ft));
824		- endif;
825		-
826		- $ft = $this->link->setting('tags', NULL, array());
827		- if (is_array($ft)) :
828		- $tags = array_merge($tags, $ft);
829		- endif;
830		- $preset_terms['post_tag'] = $tags;
831		-
832		- $taxonomies = $this->link->taxonomies();
833		- $feedTerms = $this->link->setting('terms', NULL, array());
834		- $globalTerms = get_option('feedwordpress_syndication_terms', array());
835		- $specials = array('category' => 'cats', 'post_tag' => 'tags');
836		-
837		- foreach ($taxonomies as $tax) :
838		- // category and tag settings have already previously been handled
839		- // but if this is from another taxonomy, then...
840		- if ( !isset($specials[$tax])) :
841		- $terms = array();
842		-
843		- // See if we should get the globals
844		- if ('no' != $this->link->setting("add/$tax", NULL, 'yes')) :
845		- if (isset($globalTerms[$tax])) :
846		- $terms = $globalTerms[$tax];
847		- endif;
848		- endif;
849		-
850		- // Now merge in the locals
851		- if (isset($feedTerms[$tax])) :
852		- $terms = array_merge($terms, $feedTerms[$tax]);
853		- endif;
854		-
855		- // That's all, folks.
856		- $preset_terms[$tax] = $terms;
857		- endif;
858		- endforeach;
859		-
860		- return $preset_terms;
861		- } /* SyndicatedPost::get_terms_from_settings () */
862		-
863		- /**
864		- * SyndicatedPost::get_terms_from_feeds(): Return an array of terms to associate with the incoming
865		- * post based on the contents of the subscribed feed (atom:category and rss:category elements, dc:subject
866		- * elements, tags embedded using microformats in the post content, etc.)
867		- *
868		- * @since 2016.0331
869		- * @return array of lists, each element has the taxonomy for a key ('category', 'post_tag', etc.),
870		- * and a list of alphanumeric term names
871		- */
872		- public function get_terms_from_feeds () {
873		- // Now add categories from the post, if we have 'em
874		- $cats = array();
875		- $post_cats = $this->entry->get_categories();
876		- if (is_array($post_cats)) : foreach ($post_cats as $cat) :
877		- $cat_name = $cat->get_term();
878		- if ( ! $cat_name) : $cat_name = $cat->get_label(); endif;
879		-
880		- if ($this->link->setting('cat_split', NULL, NULL)) :
881		- $pcre = "\007".$this->feedmeta['cat_split']."\007";
882		- $cats = array_merge(
883		- $cats,
884		- preg_split(
885		- $pcre,
886		- $cat_name,
887		- -1 /*=no limit*/,
888		- PREG_SPLIT_NO_EMPTY
889		- )
890		- );
891		- else :
892		- $cats[] = $cat_name;
893		- endif;
894		- endforeach; endif;
895		-
896		- $feed_terms['category'] = apply_filters('syndicated_item_categories', $cats, $this);
897		-
898		- // Scan post for /a[@rel='tag'] and use as tags if present
899		- $tags = $this->inline_tags();
900		- $feed_terms['post_tag'] = apply_filters('syndicated_item_tags', $tags, $this);
901		-
902		- return $feed_terms;
903		- } /* SyndicatedPost::get_terms_from_feeds () */
904		-
905		- /**
906	910	* SyndicatedPost::inline_tags: Return a list of all the tags embedded
907	911	* in post content using the a[@rel="tag"] microformat.
908	912	*
909	913	* @since 2010.0630
		@@ -913,9 +917,9 @@
913	917	$tags = array();
914	918	$content = $this->content();
915	919	$pattern = FeedWordPressHTML::tagWithAttributeRegex('a', 'rel', 'tag');
916	920	preg_match_all($pattern, $content, $refs, PREG_SET_ORDER);
917		- if (is_countable($refs) and count($refs) > 0) :
	921	+ if (count($refs) > 0) :
918	922	foreach ($refs as $ref) :
919	923	$tag = FeedWordPressHTML::tagWithAttributeMatch($ref);
920	924	$tags[] = $tag['content'];
921	925	endforeach;
		@@ -921,9 +925,9 @@
921	925	endforeach;
922	926	endif;
923	927	return $tags;
924	928	}
925		-
	929	+
926	930	/**
927	931	* SyndicatedPost::isTaggedAs: Test whether a feed item is
928	932	* tagged / categorized with a given string. Case and leading and
929	933	* trailing whitespace are ignored.
		@@ -929,9 +933,9 @@
929	933	* trailing whitespace are ignored.
930	934	*
931	935	* @param string $tag Tag to check for
932	936	*
933		- * @return bool Whether or not at least one of the categories / tags on
	937	+ * @return bool Whether or not at least one of the categories / tags on
934	938	* $this->item is set to $tag (modulo case and leading and trailing
935	939	* whitespace)
936	940	*/
937	941	function isTaggedAs ($tag) {
		@@ -944,9 +948,9 @@
944	948	// If we have the new MagpieRSS, the number of category elements
945	949	// on this item is stored under index "category#".
946	950	if (isset($this->item['category#'])) :
947	951	$numberOfCategories = (int) $this->item['category#'];
948		-
	952	+
949	953	// We REALLY shouldn't have the old and busted MagpieRSS, but in
950	954	// case we do, it doesn't support multiple categories, but there
951	955	// might still be a single value under the "category" index.
952	956	elseif (isset($this->item['category'])) :
		@@ -985,27 +989,27 @@
985	989	* that will be returned to only those with a MIME type which
986	990	* matches this regular expression.
987	991	* @return array
988	992	*/
989		- function enclosures( $type = '/.*/' ) {
	993	+ function enclosures ($type = '/.*/') {
990	994	$enclosures = array();
991	995
992		- if ( isset( $this->item['enclosure#'] ) ) :
	996	+ if (isset($this->item['enclosure#'])) :
993	997	// Loop through enclosure, enclosure#2, enclosure#3, ....
994		- for ( $i = 1; $i <= $this->item['enclosure#']; $i++ ) :
995		- $eid = ( ( $i > 1 ) ? "#{$i}" : "" ); // this was set as #{$id} — was that a typo? (gwyneth 20230919)
	998	+ for ($i = 1; $i <= $this->item['enclosure#']; $i++) :
	999	+ $eid = (($i > 1) ? "#{$id}" : "");
996	1000
997	1001	// Does it match the type we want?
998		- if ( preg_match($type, $this->item["enclosure{$eid}@type"] ) ) :
	1002	+ if (preg_match($type, $this->item["enclosure{$eid}@type"])) :
999	1003	$enclosures[] = array(
1000		- "url" => $this->item["enclosure{$eid}@url"],
1001		- "type" => $this->item["enclosure{$eid}@type"],
	1004	+ "url" => $this->item["enclosure{$eid}@url"],
	1005	+ "type" => $this->item["enclosure{$eid}@type"],
1002	1006	"length" => $this->item["enclosure{$eid}@length"],
1003	1007	);
1004	1008	endif;
1005	1009	endfor;
1006	1010	endif;
1007		- return $enclosures;
	1011	+ return $enclosures;
1008	1012	} /* SyndicatedPost::enclosures() */
1009	1013
1010	1014	function source ($what = NULL) {
1011	1015	$ret = NULL;
		@@ -1014,9 +1018,9 @@
1014	1018	$ret = array();
1015	1019	$ret['title'] = $source->get_title();
1016	1020	$ret['uri'] = $source->get_link();
1017	1021	$ret['feed'] = $source->get_link(0, 'self');
1018		-
	1022	+
1019	1023	if ($id_tags = $source->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id')) :
1020	1024	$ret['id'] = $id_tags[0]['data'];
1021	1025	elseif ($id_tags = $source->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id')) :
1022	1026	$ret['id'] = $id_tags[0]['data'];
		@@ -1027,18 +1031,18 @@
1027	1031	elseif ($id_tags = $source->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'guid')) :
1028	1032	$ret['id'] = $id_tags[0]['data'];
1029	1033	endif;
1030	1034	endif;
1031		-
1032		- if ( !is_null($what) and is_scalar($what)) :
	1035	+
	1036	+ if (!is_null($what) and is_scalar($what)) :
1033	1037	$ret = $ret[$what];
1034	1038	endif;
1035	1039	return $ret;
1036	1040	}
1037		-
	1041	+
1038	1042	function comment_link () {
1039	1043	$url = null;
1040		-
	1044	+
1041	1045	// RSS 2.0 has a standard <comments> element:
1042	1046	// "<comments> is an optional sub-element of <item>. If present,
1043	1047	// it is the url of the comments page for the item."
1044	1048	// <http://cyber.law.harvard.edu/rss/rss.html#ltcommentsgtSubelementOfLtitemgt>
		@@ -1049,15 +1053,15 @@
1049	1053	// The convention in Atom feeds is to use a standard <link>
1050	1054	// element with @rel="replies" and @type="text/html".
1051	1055	// Unfortunately, SimplePie_Item::get_links() allows us to filter
1052	1056	// by the value of @rel, but not by the value of @type. *sigh*
1053		-
	1057	+
1054	1058	// Try Atom 1.0 first
1055	1059	$linkElements = $this->entry->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link');
1056		-
	1060	+
1057	1061	// Fall back and try Atom 0.3
1058	1062	if (is_null($linkElements)) : $linkElements = $this->entry->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'); endif;
1059		-
	1063	+
1060	1064	// Now loop through the elements, screening by @rel and @type
1061	1065	if (is_array($linkElements)) : foreach ($linkElements as $link) :
1062	1066	$rel = (isset($link['attribs']['']['rel']) ? $link['attribs']['']['rel'] : 'alternate');
1063	1067	$type = (isset($link['attribs']['']['type']) ? $link['attribs']['']['type'] : NULL);
		@@ -1143,15 +1147,14 @@
1143	1147
1144	1148	function resolve_single_relative_uri ($refs) {
1145	1149	$tag = FeedWordPressHTML::attributeMatch($refs);
1146	1150	$url = SimplePie_Misc::absolutize_url($tag['value'], $this->_base);
1147		-
1148	1151	return $tag['prefix'] . $url . $tag['suffix'];
1149	1152	} /* function SyndicatedPost::resolve_single_relative_uri() */
1150	1153
1151		- static function resolve_relative_uris ($content, $obj) {
	1154	+ function resolve_relative_uris ($content, $obj) {
1152	1155	$set = $obj->link->setting('resolve relative', 'resolve_relative', 'yes');
1153		- if ($set and $set != 'no') :
	1156	+ if ($set and $set != 'no') :
1154	1157	// Fallback: if we don't have anything better, use the
1155	1158	// item link from the feed
1156	1159	$obj->_base = $obj->permalink(); // Reset the base for resolving relative URIs
1157	1160
		@@ -1164,22 +1167,16 @@
1164	1167
1165	1168	foreach ($obj->uri_attrs as $pair) :
1166	1169	list($tag, $attr) = $pair;
1167	1170	$pattern = FeedWordPressHTML::attributeRegex($tag, $attr);
1168		-
1169		- // FIXME: Encountered issue while testing an extremely long (= 88827 characters) item
1170		- // Relying on preg_replace_callback() here can cause a PHP seg fault on my development
1171		- // server. preg_match_all() causes a similar problem. Apparently this is a PCRE issue
1172		- // Cf. discussion of similar issue <https://bugs.php.net/bug.php?id=65009>
1173	1171	$content = preg_replace_callback (
1174	1172	$pattern,
1175		- array($obj, 'resolve_single_relative_uri'),
	1173	+ array(&$obj, 'resolve_single_relative_uri'),
1176	1174	$content
1177	1175	);
1178		-
1179	1176	endforeach;
1180	1177	endif;
1181		-
	1178	+
1182	1179	return $content;
1183	1180	} /* function SyndicatedPost::resolve_relative_uris () */
1184	1181
1185	1182	var $strip_attrs = array (
		@@ -1192,9 +1189,9 @@
1192	1189	$tag = FeedWordPressHTML::attributeMatch($refs);
1193	1190	return $tag['before_attribute'].$tag['after_attribute'];
1194	1191	}
1195	1192
1196		- static function sanitize_content ($content, $obj) {
	1193	+ function sanitize_content ($content, $obj) {
1197	1194	# This kind of sucks. I intend to replace it with
1198	1195	# lib_filter sometime soon.
1199	1196	foreach ($obj->strip_attrs as $pair):
1200	1197	list($tag,$attr) = $pair;
		@@ -1201,9 +1198,9 @@
1201	1198	$pattern = FeedWordPressHTML::attributeRegex($tag, $attr);
1202	1199
1203	1200	$content = preg_replace_callback (
1204	1201	$pattern,
1205		- array($obj, 'strip_attribute_from_tag'),
	1202	+ array(&$obj, 'strip_attribute_from_tag'),
1206	1203	$content
1207	1204	);
1208	1205	endforeach;
1209	1206	return $content;
		@@ -1229,140 +1226,78 @@
1229	1226	* match the latest revision, or a previously syndicated post that is
1230	1227	* still up-to-date.
1231	1228	*
1232	1229	* @return int A status code representing the freshness of the post
1233		- * -1 = post already syndicated; has a revision that needs to be stored, but not updated to
1234	1230	* 0 = post already syndicated; no update needed
1235	1231	* 1 = post already syndicated, but needs to be updated to latest
1236	1232	* 2 = post has not yet been syndicated; needs to be created
1237	1233	*/
1238		- function freshness ($format = 'number') {
	1234	+ function freshness () {
	1235	+ global $wpdb;
1239	1236
1240	1237	if ($this->filtered()) : // This should never happen.
1241		- FeedWordPressDiagnostic::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
	1238	+ FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
1242	1239	endif;
1243		-
	1240	+
1244	1241	if (is_null($this->_freshness)) : // Not yet checked and cached.
1245		- $guid = $this->post['guid'];
1246		- $eguid = esc_sql($this->post['guid']);
	1242	+ $guid = $wpdb->escape($this->guid());
1247	1243
1248	1244	$q = new WP_Query(array(
1249	1245	'fields' => '_synfresh', // id, guid, post_modified_gmt
1250	1246	'ignore_sticky_posts' => true,
1251		- 'guid' => $eguid, // it's always better to use the escaped version, right? (gwyneth 20230915)
	1247	+ 'guid' => $this->guid(),
1252	1248	));
1253		-
	1249	+
1254	1250	$old_post = NULL;
1255	1251	if ($q->have_posts()) :
1256	1252	while ($q->have_posts()) : $q->the_post();
1257		- if (get_post_type($q->post->ID) == $this->post['post_type']):
1258		- $old_post = $q->post;
1259		- endif;
	1253	+ $old_post = $q->post;
1260	1254	endwhile;
1261	1255	endif;
1262		-
	1256	+
1263	1257	if (is_null($old_post)) : // No post with this guid
1264		- FeedWordPress::diagnostic('feed_items:freshness', 'Item ['.$guid.'] "'.$this->entry->get_title().'" is a NEW POST.');
	1258	+ FeedWordPress::diagnostic('feed_items:freshness', 'Item ['.$this->guid().'] "'.$this->entry->get_title().'" is a NEW POST.');
1265	1259	$this->_wp_id = NULL;
1266	1260	$this->_freshness = 2; // New content
1267	1261	else :
1268		- // Presume there is nothing new until we find
1269		- // something new.
1270		- $updated = false;
1271		- $live = false;
	1262	+ preg_match('/([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+):([0-9]+)/', $old_post->post_modified_gmt, $backref);
1272	1263
1273		- // Pull the list of existing revisions to get
1274		- // timestamps.
1275		- $revisions = wp_get_post_revisions($old_post->ID);
1276		- foreach ($revisions as $rev) :
1277		- $revisions_ts[] = mysql2date('G', $rev->post_modified_gmt);
1278		- endforeach;
1279		-
1280		- $revisions_ts[] = mysql2date('G', $old_post->post_modified_gmt);
1281		- $last_rev_ts = end($revisions_ts);
	1264	+ $last_rev_ts = gmmktime($backref[4], $backref[5], $backref[6], $backref[2], $backref[3], $backref[1]);
1282	1265	$updated_ts = $this->updated(/*fallback=*/ true, /*default=*/ NULL);
1283		-
1284		- // If we have an explicit updated timestamp,
1285		- // check that against existing stamps.
1286		- if ( !is_null($updated_ts)) :
1287		- $updated = !in_array($updated_ts, $revisions_ts);
1288		-
1289		- // If this a newer revision, make it go
1290		- // live. If an older one, just record
1291		- // the contents.
1292		- $live = ($updated and ($updated_ts > $last_rev_ts));
1293		- endif;
1294		-
1295		- // This is a revision we haven't seen before, judging by the date.
1296		-
1297		- $updatedReason = NULL;
1298		- if ($updated) :
1299		- $updatedReason = preg_replace(
1300		- "/\s+/", " ",
1301		- 'has been marked with a new timestamp ('
1302		- .date('Y-m-d H:i:s', $updated_ts)
1303		- ." > "
1304		- .date('Y-m-d H:i:s', $last_rev_ts)
1305		- .')'
1306		- );
1307		-
1308		- // The date does not indicate a new revision, so
1309		- // let's check the hash.
1310		- else :
	1266	+
	1267	+ // Check timestamps...
	1268	+ $updated = (
	1269	+ !is_null($updated_ts)
	1270	+ and ($updated_ts > $last_rev_ts)
	1271	+ );
	1272	+
	1273	+
	1274	+ if (!$updated) :
1311	1275	// Or the hash...
1312	1276	$hash = $this->update_hash();
1313	1277	$seen = $this->stored_hashes($old_post->ID);
1314		- if (is_countable($seen) and count($seen) > 0) :
	1278	+ if (count($seen) > 0) :
1315	1279	$updated = !in_array($hash, $seen); // Not seen yet?
1316	1280	else :
1317	1281	$updated = true; // Can't find syndication meta-data
1318	1282	endif;
1319		-
1320		- if ($updated and FeedWordPressDiagnostic::is_on('feed_items:freshness:reasons')) :
1321		- // In the absence of definitive
1322		- // timestamp information, we
1323		- // just have to assume that a
1324		- // hash we haven't seen before
1325		- // is a newer version.
1326		- $live = true;
1327		-
1328		- $updatedReason = ' has a not-yet-seen update hash: '
1329		- .MyPHP::val($hash)
1330		- .' not in {'
1331		- .implode(", ", array_map(array('FeedWordPress', 'val'), $seen))
1332		- .'}. Basis: '
1333		- .MyPHP::val(array_keys($this->update_hash(false)));
1334		- endif;
1335	1283	endif;
1336		-
	1284	+
1337	1285	$frozen = false;
1338	1286	if ($updated) : // Ignore if the post is frozen
1339	1287	$frozen = ('yes' == $this->link->setting('freeze updates', 'freeze_updates', NULL));
1340		- if ( ! $frozen) :
1341		- $frozen_value = get_post_meta($old_post->ID, '_syndication_freeze_updates', /*single=*/ true);
1342		- $frozen = ( !is_null($frozen_value) and ('yes' == $frozen_value));
1343		-
1344		- if ($frozen) :
1345		- $updatedReason = ' IS BLOCKED FROM BEING UPDATED BY A UPDATE LOCK ON THIS POST, EVEN THOUGH IT '.$updatedReason;
1346		- endif;
1347		- else :
1348		- $updatedReason = ' IS BLOCKED FROM BEING UPDATED BY A FEEDWORDPRESS UPDATE LOCK, EVEN THOUGH IT '.$updatedReason;
	1288	+ if (!$frozen) :
	1289	+ $frozen_values = get_post_custom_values('_syndication_freeze_updates', $old_post->ID);
	1290	+ $frozen = (count($frozen_values) > 0 and 'yes' == $frozen_values[0]);
1349	1291	endif;
1350	1292	endif;
1351		- $live = ($live and ! $frozen);
	1293	+ $updated = ($updated and !$frozen);
1352	1294
1353	1295	if ($updated) :
1354		- FeedWordPress::diagnostic('feed_items:freshness', 'Item ['.$guid.'] "'.$this->entry->get_title().'" is an update of an existing post.');
1355		- if ( !is_null($updatedReason)) :
1356		- $updatedReason = preg_replace('/\s+/', ' ', $updatedReason);
1357		- FeedWordPress::diagnostic('feed_items:freshness:reasons', 'Item ['.$guid.'] "'.$this->entry->get_title().'" '.$updatedReason);
1358		- endif;
1359		-
1360		- $this->_freshness = apply_filters('syndicated_item_freshness', ($live ? 1 : -1), $updated, $frozen, $updated_ts, $last_rev_ts, $this);
1361		-
	1296	+ FeedWordPress::diagnostic('feed_items:freshness', 'Item ['.$this->guid().'] "'.$this->entry->get_title().'" is an update of an existing post.');
	1297	+ $this->_freshness = 1; // Updated content
1362	1298	$this->_wp_id = $old_post->ID;
1363		- $this->_wp_post = $old_post;
1364		-
	1299	+
1365	1300	// We want this to keep a running list of all the
1366	1301	// processed update hashes.
1367	1302	$this->post['meta']['syndication_item_hash'] = array_merge(
1368	1303	$this->stored_hashes(),
		@@ -1368,96 +1303,17 @@
1368	1303	$this->stored_hashes(),
1369	1304	array($this->update_hash())
1370	1305	);
1371	1306	else :
1372		- FeedWordPress::diagnostic('feed_items:freshness', 'Item ['.$guid.'] "'.$this->entry->get_title().'" is a duplicate of an existing post.');
	1307	+ FeedWordPress::diagnostic('feed_items:freshness', 'Item ['.$this->guid().'] "'.$this->entry->get_title().'" is a duplicate of an existing post.');
1373	1308	$this->_freshness = 0; // Same old, same old
1374	1309	$this->_wp_id = $old_post->ID;
1375	1310	endif;
1376	1311	endif;
1377	1312	endif;
1378		-
1379		- switch ($format) :
1380		- case 'status' :
1381		- switch ($this->_freshness) :
1382		- case -1:
1383		- $ret = 'stored';
1384		- break;
1385		- case 0:
1386		- $ret = NULL;
1387		- break;
1388		- case 1:
1389		- $ret = 'updated';
1390		- break;
1391		- case 2:
1392		- default:
1393		- $ret = 'new';
1394		- break;
1395		- endswitch;
1396		- break;
1397		- case 'number' :
1398		- default :
1399		- $ret = $this->_freshness;
1400		- endswitch;
1401		-
1402		-
1403		- return $ret;
1404		- } /* SyndicatedPost::freshness () */
1405		-
1406		- function has_fresh_content () {
1407		- return ( ! $this->filtered() and $this->freshness() != 0 );
1408		- } /* SyndicatedPost::has_fresh_content () */
1409		-
1410		- function this_revision_needs_original_post ($freshness = NULL) {
1411		- if (is_null($freshness)) :
1412		- $freshness = $this->freshness();
1413		- endif;
1414		- return ( $freshness >= 2 );
	1313	+ return $this->_freshness;
1415	1314	}
1416	1315
1417		- function this_revision_is_current ($freshness = NULL) {
1418		- if (is_null($freshness)) :
1419		- $freshness = $this->freshness();
1420		- endif;
1421		- return ( $freshness >= 1 );
1422		- } /* SyndicatedPost::this_revision_is_current () */
1423		-
1424		- function fresh_content_is_update () {
1425		- return ($this->freshness() < 2);
1426		- } /* SyndicatedPost::fresh_content_is_update () */
1427		-
1428		- function fresh_storage_diagnostic () {
1429		- $ret = NULL;
1430		- switch ($this->freshness()) :
1431		- case -1 :
1432		- $ret = 'Storing alternate revision of existing post # '.$this->wp_id().', "'.$this->post['post_title'].'"';
1433		- break;
1434		- case 1 :
1435		- $ret = 'Updating existing post # '.$this->wp_id().', "'.$this->post['post_title'].'"';
1436		- break;
1437		- case 2 :
1438		- default :
1439		- $ret = 'Inserting new post "'.$this->post['post_title'].'"';
1440		- break;
1441		- endswitch;
1442		- return $ret;
1443		- } /* SyndicatedPost::fresh_storage_diagnostic() */
1444		-
1445		- function fresh_storage_hook () {
1446		- $ret = NULL;
1447		- switch ($this->freshness()) :
1448		- case -1 :
1449		- case 1 :
1450		- $ret = 'update_syndicated_item';
1451		- break;
1452		- case 2 :
1453		- default :
1454		- $ret = 'post_syndicated_item';
1455		- break;
1456		- endswitch;
1457		- return $ret;
1458		- } /* SyndicatedPost::fresh_storage_hook () */
1459		-
1460	1316	#################################################
1461	1317	#### INTERNAL STORAGE AND MANAGEMENT METHODS ####
1462	1318	#################################################
1463	1319
		@@ -1462,11 +1318,11 @@
1462	1318	#################################################
1463	1319
1464	1320	function wp_id () {
1465	1321	if ($this->filtered()) : // This should never happen.
1466		- FeedWordPressDiagnostic::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
	1322	+ FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
1467	1323	endif;
1468		-
	1324	+
1469	1325	if (is_null($this->_wp_id) and is_null($this->_freshness)) :
1470	1326	$fresh = $this->freshness(); // sets WP DB id in the process
1471	1327	endif;
1472	1328	return $this->_wp_id;
		@@ -1471,183 +1327,114 @@
1471	1327	endif;
1472	1328	return $this->_wp_id;
1473	1329	}
1474	1330
1475		- /**
1476		- * SyndicatedPost::secure_author_id(). Look up, or create, a numeric ID
1477		- * for the author of the incoming post.
1478		- *
1479		- * side effect: int|NULL stored in $this->post['post_author']
1480		- * side effect: IF no valid author is found, NULL stored in $this->post
1481		- * side effect: diagnostic output in case item is rejected with NULL author
1482		- *
1483		- * @used-by SyndicatedPost::store
1484		- *
1485		- * @uses SyndicatedPost::post
1486		- * @uses SyndicatedPost::author_id
1487		- * @uses SyndicatedLink::setting
1488		- * @uses FeedWordPress::diagnostic
1489		- */
1490		- protected function secure_author_id () {
1491		- # -- Look up, or create, numeric ID for author
1492		- $this->post['post_author'] = $this->author_id (
1493		- $this->link->setting('unfamiliar author', 'unfamiliar_author', 'create')
1494		- );
	1331	+ function store () {
	1332	+ global $wpdb;
1495	1333
1496		- if (is_null($this->post['post_author'])) :
1497		- FeedWordPress::diagnostic('feed_items:rejected', 'Filtered out item ['.$this->guid().'] without syndication: no author available');
1498		- $this->post = NULL;
	1334	+ if ($this->filtered()) : // This should never happen.
	1335	+ FeedWordPress::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
1499	1336	endif;
1500		- } /* SyndicatedPost::secure_author_id() */
	1337	+
	1338	+ $freshness = $this->freshness();
	1339	+ if ($freshness > 0) :
	1340	+ # -- Look up, or create, numeric ID for author
	1341	+ $this->post['post_author'] = $this->author_id (
	1342	+ $this->link->setting('unfamiliar author', 'unfamiliar_author', 'create')
	1343	+ );
1501	1344
1502		- /**
1503		- * SyndicatedPost::secure_term_ids(). Look up, or create, numeric IDs
1504		- * for the terms (categories, tags, etc.) assigned to the incoming post,
1505		- * whether by global settings, feed settings, or by the tags on the feed.
1506		- *
1507		- * side effect: array of term ids stored in $this->post['tax_input']
1508		- * side effect: IF settings or filters determine post should be filtered out,
1509		- * NULL stored in $this->post
1510		- *
1511		- * @used-by SyndicatedPost::store
1512		- *
1513		- * @uses apply_filters
1514		- * @uses SyndicatedLink::setting
1515		- * @uses SyndicatedPost::category_ids
1516		- * @uses SyndicatedPost::preset_terms
1517		- * @uses SyndicatedPost::post
1518		- */
1519		- protected function secure_term_ids () {
1520		- $mapping = apply_filters('syndicated_post_terms_mapping', array(
1521		- 'category' => array('abbr' => 'cats', 'unfamiliar' => 'category', 'domain' => array('category', 'post_tag')),
1522		- 'post_tag' => array('abbr' => 'tags', 'unfamiliar' => 'post_tag', 'domain' => array('post_tag')),
1523		- ), $this);
1524		-
1525		- $termSet = array(); $valid = null;
1526		- foreach ($this->feed_terms as $what => $anTerms) :
1527		- // Default to using the inclusive procedures (for cats) rather than exclusive (for inline tags)
1528		- $taxes = (isset($mapping[$what]) ? $mapping[$what] : $mapping['category']);
1529		- $unfamiliar = $taxes['unfamiliar'];
1530		-
1531		- if ( !is_null($this->post)) : // Not filtered out yet
1532		- # -- Look up, or create, numeric ID for categories
1533		- $taxonomies = $this->link->setting("match/".$taxes['abbr'], 'match_'.$taxes['abbr'], $taxes['domain']);
1534		-
1535		- // Eliminate dummy variables
1536		- $taxonomies = array_filter( $taxonomies, 'remove_dummy_zero' );
1537		-
1538		- // Allow FWP add-on filters to control the taxonomies we use to search for a term
1539		- $taxonomies = apply_filters("syndicated_post_terms_match", $taxonomies, $what, $this);
1540		- $taxonomies = apply_filters("syndicated_post_terms_match_{$what}", $taxonomies, $this);
1541		-
1542		- // Allow FWP add-on filters to control with greater precision what happens on unmatched
1543		- $unmatched = apply_filters("syndicated_post_terms_unfamiliar",
1544		- $this->link->setting(
1545		- "unfamiliar {$unfamiliar}",
1546		- "unfamiliar_{$unfamiliar}",
1547		- 'create:'.$unfamiliar
1548		- ),
1549		- $what,
1550		- $this
1551		- );
1552		-
1553		- $terms = $this->category_ids (
1554		- $anTerms,
1555		- $unmatched,
1556		- /*taxonomies=*/ $taxonomies,
1557		- array(
1558		- 'singleton' => false, // I don't like surprises
1559		- 'filters' => true,
1560		- )
1561		- );
1562		-
1563		- if (is_null($terms) or is_null($termSet)) :
1564		- // filtered out -- no matches
1565		- else :
1566		- $valid = true;
1567		-
1568		- // filter mode off, or at least one match
1569		- foreach ($terms as $tax => $term_ids) :
1570		- if ( !isset($termSet[$tax])) :
1571		- $termSet[$tax] = array();
1572		- endif;
1573		- $termSet[$tax] = array_merge($termSet[$tax], $term_ids);
1574		- endforeach;
1575		- endif;
	1345	+ if (is_null($this->post['post_author'])) :
	1346	+ FeedWordPress::diagnostic('feed_items:rejected', 'Filtered out item ['.$this->guid().'] without syndication: no author available');
	1347	+ $this->post = NULL;
1576	1348	endif;
1577		- endforeach;
	1349	+ endif;
	1350	+
	1351	+ if (!$this->filtered() and $freshness > 0) :
	1352	+ $consider = array(
	1353	+ 'category' => array('abbr' => 'cats', 'domain' => array('category', 'post_tag')),
	1354	+ 'post_tag' => array('abbr' => 'tags', 'domain' => array('post_tag')),
	1355	+ );
1578	1356
1579		- if (is_null($valid)) : // Plonked
1580		- $this->post = NULL;
1581		- else : // We can proceed
1582		- $this->post['tax_input'] = array();
1583		- foreach ($termSet as $tax => $term_ids) :
1584		- if ( !isset($this->post['tax_input'][$tax])) :
1585		- $this->post['tax_input'][$tax] = array();
1586		- endif;
1587		- $this->post['tax_input'][$tax] = array_merge(
1588		- $this->post['tax_input'][$tax],
1589		- $term_ids
1590		- );
1591		- endforeach;
	1357	+ $termSet = array(); $valid = null;
	1358	+ foreach ($consider as $what => $taxes) :
	1359	+ if (!is_null($this->post)) : // Not filtered out yet
	1360	+ # -- Look up, or create, numeric ID for categories
	1361	+ $taxonomies = $this->link->setting("match/".$taxes['abbr'], 'match_'.$taxes['abbr'], $taxes['domain']);
	1362	+
	1363	+ // Eliminate dummy variables
	1364	+ $taxonomies = array_filter($taxonomies, 'remove_dummy_zero');
	1365	+
	1366	+ $terms = $this->category_ids (
	1367	+ $this->feed_terms[$what],
	1368	+ $this->link->setting("unfamiliar {$what}", "unfamiliar_{$what}", 'create:'.$what),
	1369	+ /*taxonomies=*/ $taxonomies,
	1370	+ array(
	1371	+ 'singleton' => false, // I don't like surprises
	1372	+ 'filters' => true,
	1373	+ )
	1374	+ );
	1375	+
	1376	+ if (is_null($terms) or is_null($termSet)) :
	1377	+ // filtered out -- no matches
	1378	+ else :
	1379	+ $valid = true;
1592	1380
1593		- // Now let's add on the feed and global presets
1594		- foreach ($this->preset_terms as $tax => $term_ids) :
1595		- if ( !isset($this->post['tax_input'][$tax])) :
1596		- $this->post['tax_input'][$tax] = array();
	1381	+ // filter mode off, or at least one match
	1382	+ foreach ($terms as $tax => $term_ids) :
	1383	+ if (!isset($termSet[$tax])) :
	1384	+ $termSet[$tax] = array();
	1385	+ endif;
	1386	+ $termSet[$tax] = array_merge($termSet[$tax], $term_ids);
	1387	+ endforeach;
	1388	+ endif;
1597	1389	endif;
1598		-
1599		- $this->post['tax_input'][$tax] = array_merge (
1600		- $this->post['tax_input'][$tax],
1601		- $this->category_ids (
1602		- /*terms=*/ $term_ids,
1603		- /*unfamiliar=*/ 'create:'.$tax, // These are presets; for those added in a tagbox editor, the tag may not yet exist
1604		- /*taxonomies=*/ array($tax),
1605		- array(
1606		- 'singleton' => true,
1607		- ))
1608		- );
1609	1390	endforeach;
1610		- endif;
1611		- } /* SyndicatedPost::secure_term_ids() */
1612	1391
1613		- /**
1614		- * SyndicatedPost::store
1615		- *
1616		- * @uses SyndicatedPost::secure_author_id
1617		- */
1618		- public function store () {
1619		- if ($this->filtered()) : // This should never happen.
1620		- FeedWordPressDiagnostic::critical_bug('SyndicatedPost', $this, __LINE__, __FILE__);
1621		- endif;
	1392	+ if (is_null($valid)) : // Plonked
	1393	+ $this->post = NULL;
	1394	+ else : // We can proceed
	1395	+ $this->post['tax_input'] = array();
	1396	+ foreach ($termSet as $tax => $term_ids) :
	1397	+ if (!isset($this->post['tax_input'][$tax])) :
	1398	+ $this->post['tax_input'][$tax] = array();
	1399	+ endif;
	1400	+ $this->post['tax_input'][$tax] = array_merge(
	1401	+ $this->post['tax_input'][$tax],
	1402	+ $term_ids
	1403	+ );
	1404	+ endforeach;
1622	1405
1623		- $freshness = $this->freshness(); // see above: this sets WP DB id in the process (gwyneth 20230919)
1624		- if ($this->has_fresh_content()) :
1625		- $this->secure_author_id();
	1406	+ // Now let's add on the feed and global presets
	1407	+ foreach ($this->preset_terms as $tax => $term_ids) :
	1408	+ if (!isset($this->post['tax_input'][$tax])) :
	1409	+ $this->post['tax_input'][$tax] = array();
	1410	+ endif;
	1411	+
	1412	+ $this->post['tax_input'][$tax] = array_merge (
	1413	+ $this->post['tax_input'][$tax],
	1414	+ $this->category_ids (
	1415	+ /*terms=*/ $term_ids,
	1416	+ /*unfamiliar=*/ 'create:'.$tax, // These are presets; for those added in a tagbox editor, the tag may not yet exist
	1417	+ /*taxonomies=*/ array($tax),
	1418	+ array(
	1419	+ 'singleton' => true,
	1420	+ ))
	1421	+ );
	1422	+ endforeach;
	1423	+ endif;
1626	1424	endif;
1627		-
1628		- if ($this->has_fresh_content()) : // Was this filtered during author_id lookup?
1629		- $this->secure_term_ids();
1630		- endif;
1631		-
1632		- // We have to check again in case the post has been filtered
1633		- // during the category/tags/taxonomy terms lookup
1634		- if ($this->has_fresh_content()) :
	1425	+
	1426	+ if (!$this->filtered() and $freshness > 0) :
1635	1427	// Filter some individual fields
1636		-
1637		- // If there already is a post slug (from syndication or by manual
1638		- // editing) don't cause WP to overwrite it by sending in a NULL
1639		- // post_name. Props Chris Fritz 2012-11-28.
1640		- $post_name = (is_null($this->_wp_post) ? NULL : $this->_wp_post->post_name);
1641		-
	1428	+
1642	1429	// Allow filters to set post slug. Props niska.
1643		- $post_name = apply_filters('syndicated_post_slug', $post_name, $this);
1644		- if ( !empty($post_name)) :
	1430	+ $post_name = apply_filters('syndicated_post_slug', NULL, $this);
	1431	+ if (!empty($post_name)) :
1645	1432	$this->post['post_name'] = $post_name;
1646	1433	endif;
1647		-
	1434	+
1648	1435	$this->post = apply_filters('syndicated_post', $this->post, $this);
1649		-
	1436	+
1650	1437	// Allow for feed-specific syndicated_post filters.
1651	1438	$this->post = apply_filters(
1652	1439	"syndicated_post_".$this->link->uri(),
1653	1440	$this->post,
		@@ -1653,56 +1440,39 @@
1653	1440	$this->post,
1654	1441	$this
1655	1442	);
1656	1443	endif;
1657		-
	1444	+
1658	1445	// Hook in early to make sure these get inserted if at all possible
1659	1446	add_action(
1660	1447	/*hook=*/ 'transition_post_status',
1661		- /*callback=*/ array($this, 'add_rss_meta'),
	1448	+ /*callback=*/ array(&$this, 'add_rss_meta'),
1662	1449	/*priority=*/ -10000, /* very early */
1663	1450	/*arguments=*/ 3
1664	1451	);
1665	1452
	1453	+ $retval = array(1 => 'updated', 2 => 'new');
	1454	+
1666	1455	$ret = false;
1667		- if ($this->has_fresh_content()) :
1668		- $diag = $this->fresh_storage_diagnostic();
1669		- if ( !is_null($diag)) :
1670		- FeedWordPress::diagnostic('syndicated_posts', $diag);
1671		- endif;
	1456	+ if (!$this->filtered() and isset($retval[$freshness])) :
	1457	+ $diag = array(
	1458	+ 1 => 'Updating existing post # '.$this->wp_id().', "'.$this->post['post_title'].'"',
	1459	+ 2 => 'Inserting new post "'.$this->post['post_title'].'"',
	1460	+ );
	1461	+ FeedWordPress::diagnostic('syndicated_posts', $diag[$freshness]);
1672	1462
1673		- $this->insert_post(/*update=*/ $this->fresh_content_is_update(), $this->freshness());
	1463	+ $this->insert_post(/*update=*/ ($freshness == 1));
	1464	+
	1465	+ $hook = array( 1 => 'update_syndicated_item', 2 => 'post_syndicated_item' );
	1466	+ do_action($hook[$freshness], $this->wp_id(), $this);
1674	1467
1675		- $hook = $this->fresh_storage_hook();
1676		- if ( !is_null($hook)) :
1677		- do_action($hook, $this->wp_id(), $this);
1678		- endif;
1679		-
1680		- $ret = $this->freshness('status');
	1468	+ $ret = $retval[$freshness];
1681	1469	endif;
1682	1470
1683		- // If this is a legit, non-filtered post, tag it as found on the
1684		- // feed regardless of fresh or stale status
1685		- if ( ! $this->filtered()) :
1686		- $key = '_feedwordpress_retire_me_' . $this->link->id;
1687		- delete_post_meta($this->wp_id(), $key);
1688		-
1689		- $status = get_post_field('post_status', $this->wp_id());
1690		- if ('fwpretired'==$status and $this->link->is_non_incremental()) :
1691		- FeedWordPress::diagnostic('syndicated_posts', "Un-retiring previously retired post # ".$this->wp_id()." due to re-appearance on non-incremental feed.");
1692		- set_post_field('post_status', $this->post['post_status'], $this->wp_id());
1693		- wp_transition_post_status($this->post['post_status'], $status, $this->post);
1694		- elseif ('fwpzapped'==$status) :
1695		- // Set this new revision up to be
1696		- // blanked on the next update.
1697		- add_post_meta($this->wp_id(), '_feedwordpress_zapped_blank_me', 2, /*single=*/ true);
1698		- endif;
1699		- endif;
1700		-
1701	1471	// Remove add_rss_meta hook
1702	1472	remove_action(
1703	1473	/*hook=*/ 'transition_post_status',
1704		- /*callback=*/ array($this, 'add_rss_meta'),
	1474	+ /*callback=*/ array(&$this, 'add_rss_meta'),
1705	1475	/*priority=*/ -10000, /* very early */
1706	1476	/*arguments=*/ 3
1707	1477	);
1708	1478
		@@ -1707,20 +1477,19 @@
1707	1477	);
1708	1478
1709	1479	return $ret;
1710	1480	} /* function SyndicatedPost::store () */
	1481	+
	1482	+ function insert_post ($update = false) {
	1483	+ global $wpdb;
1711	1484
1712		- function insert_post ($update = false, $freshness = 2) {
1713	1485	$dbpost = $this->normalize_post(/*new=*/ true);
1714		-
1715		- $ret = null;
1716		-
1717		- if ( !is_null($dbpost)) :
	1486	+ if (!is_null($dbpost)) :
1718	1487	$dbpost['post_pingback'] = false; // Tell WP 2.1 and 2.2 not to process for pingbacks
1719		-
	1488	+
1720	1489	// This is a ridiculous fucking kludge necessitated by WordPress 2.6 munging authorship meta-data
1721	1490	add_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1722		-
	1491	+
1723	1492	// Kludge to prevent kses filters from stripping the
1724	1493	// content of posts when updating without a logged in
1725	1494	// user who has `unfiltered_html` capability.
1726	1495	$mungers = array('wp_filter_kses', 'wp_filter_post_kses');
		@@ -1730,33 +1499,33 @@
1730	1499	remove_filter('content_save_pre', $munger);
1731	1500	$removed[] = $munger;
1732	1501	endif;
1733	1502	endforeach;
1734		-
	1503	+
1735	1504	if ($update and function_exists('get_post_field')) :
1736	1505	// Don't munge status fields that the user may
1737	1506	// have reset manually
1738	1507	$doNotMunge = array('post_status', 'comment_status', 'ping_status');
1739		-
	1508	+
1740	1509	foreach ($doNotMunge as $field) :
1741	1510	$dbpost[$field] = get_post_field($field, $this->wp_id());
1742		- endforeach;
	1511	+ endforeach;
1743	1512	endif;
1744		-
	1513	+
1745	1514	// WP3's wp_insert_post scans current_user_can() for the
1746	1515	// tax_input, with no apparent way to override. Ugh.
1747	1516	add_action(
1748	1517	/*hook=*/ 'transition_post_status',
1749		- /*callback=*/ array($this, 'add_terms'),
	1518	+ /*callback=*/ array(&$this, 'add_terms'),
1750	1519	/*priority=*/ -10001, /* very early */
1751	1520	/*arguments=*/ 3
1752	1521	);
1753		-
	1522	+
1754	1523	// WP3 appears to override whatever you give it for
1755	1524	// post_modified. Ugh.
1756	1525	add_action(
1757	1526	/*hook=*/ 'transition_post_status',
1758		- /*callback=*/ array($this, 'fix_post_modified_ts'),
	1527	+ /*callback=*/ array(&$this, 'fix_post_modified_ts'),
1759	1528	/*priority=*/ -10000, /* very early */
1760	1529	/*arguments=*/ 3
1761	1530	);
1762	1531
		@@ -1763,57 +1532,14 @@
1763	1532	if ($update) :
1764	1533	$this->post['ID'] = $this->wp_id();
1765	1534	$dbpost['ID'] = $this->post['ID'];
1766	1535	endif;
	1536	+
	1537	+ $this->_wp_id = wp_insert_post($dbpost, /*return wp_error=*/ true);
1767	1538
1768		- // O.K., is this a new post? If so, we need to create
1769		- // the basic post record before we do anything else.
1770		- if ($this->this_revision_needs_original_post()) :
1771		- // *sigh*, for handling inconsistent slash expectations < 3.6
1772		- $sdbpost = $this->db_sanitize_post($dbpost);
1773		-
1774		- // Go ahead and insert the first post record to
1775		- // anchor the revision history.
1776		-
1777		- $this->_wp_id = wp_insert_post($sdbpost, /*return wp_error=*/ true);
1778		-
1779		- $dbpost['ID'] = $this->_wp_id;
1780		- endif;
1781		-
1782		- // Sanity check: if the attempt to insert post
1783		- // returned an error, then feeding that error
1784		- // object in to _wp_put_post_revision() would
1785		- // cause a fatal error. Better to break out.
1786		- if ( !is_wp_error($this->_wp_id)) :
1787		- // Now that we've made sure the original exists, insert
1788		- // this version here as a revision.
1789		- $revision_id = _wp_put_post_revision($dbpost, /*autosave=*/ false);
1790		-
1791		- if ( ! $this->this_revision_needs_original_post()) :
1792		-
1793		- if ($this->this_revision_is_current()) :
1794		-
1795		- wp_restore_post_revision($revision_id);
1796		-
1797		- else :
1798		-
1799		- // If we do not activate this revision, then the
1800		- // add_rss_meta will not be called, which is
1801		- // more or less as it should be, but that means
1802		- // we have to actively record this revision's
1803		- // update hash from here.
1804		- $postId = $this->post['ID'];
1805		- $key = 'syndication_item_hash';
1806		- $hash = $this->update_hash();
1807		- FeedWordPress::diagnostic('syndicated_posts:meta_data', "Adding post meta-datum to post [$postId]: [$key] = ".FeedWordPress::val($hash, /*no newlines=*/ true));
1808		- add_post_meta( $postId, $key, $hash, /*unique=*/ false );
1809		- endif;
1810		- endif;
1811		- endif;
1812		-
1813	1539	remove_action(
1814	1540	/*hook=*/ 'transition_post_status',
1815		- /*callback=*/ array($this, 'add_terms'),
	1541	+ /*callback=*/ array(&$this, 'add_terms'),
1816	1542	/*priority=*/ -10001, /* very early */
1817	1543	/*arguments=*/ 3
1818	1544	);
1819	1545
		@@ -1818,9 +1544,9 @@
1818	1544	);
1819	1545
1820	1546	remove_action(
1821	1547	/*hook=*/ 'transition_post_status',
1822		- /*callback=*/ array($this, 'fix_post_modified_ts'),
	1548	+ /*callback=*/ array(&$this, 'fix_post_modified_ts'),
1823	1549	/*priority=*/ -10000, /* very early */
1824	1550	/*arguments=*/ 3
1825	1551	);
1826	1552
		@@ -1826,45 +1552,32 @@
1826	1552
1827	1553	// Turn off ridiculous fucking kludges #1 and #2
1828	1554	remove_action('_wp_put_post_revision', array($this, 'fix_revision_meta'));
1829	1555	foreach ($removed as $filter) :
1830		- add_filter('content_save_pre', $filter);
	1556	+ add_filter('content_save_pre', $removed);
1831	1557	endforeach;
1832		-
	1558	+
1833	1559	$this->validate_post_id($dbpost, $update, array(__CLASS__, __FUNCTION__));
1834		-
1835		- $ret = $this->_wp_id;
1836	1560	endif;
1837		- return $ret;
1838	1561	} /* function SyndicatedPost::insert_post () */
1839		-
1840		- /**
1841		- * SyndicatedPost::insert_new(). Uses the data collected in this post object to insert
1842		- * a new post into the wp_posts table.
1843		- *
1844		- * @uses SyndicatedPost::insert_post
1845		- */
	1562	+
1846	1563	function insert_new () {
1847		- $this->insert_post(/*update=*/ false, 1);
	1564	+ $this->insert_post(/*update=*/ false);
1848	1565	} /* SyndicatedPost::insert_new() */
1849	1566
1850		- /**
1851		- * SyndicatedPost::insert_new(). Uses the data collected in this post object to update
1852		- * an existing post in the wp_posts table.
1853		- *
1854		- * @uses SyndicatedPost::insert_post
1855		- */
1856	1567	function update_existing () {
1857		- $this->insert_post(/*update=*/ true, 2);
	1568	+ $this->insert_post(/*update=*/ true);
1858	1569	} /* SyndicatedPost::update_existing() */
1859	1570
1860	1571	/**
1861	1572	* SyndicatedPost::normalize_post()
1862	1573	*
1863		- * @param bool $new If true, this post is to be inserted anew. If false, it is an update of an existing post. (Unused)
	1574	+ * @param bool $new If true, this post is to be inserted anew. If false, it is an update of an existing post.
1864	1575	* @return array A normalized representation of the post ready to be inserted into the database or sent to the WordPress API functions
1865	1576	*/
1866		- function normalize_post( $new = true ) {
	1577	+ function normalize_post ($new = true) {
	1578	+ global $wpdb;
	1579	+
1867	1580	$out = $this->post;
1868	1581
1869	1582	$fullPost = $out['post_title'].$out['post_content'];
1870	1583	$fullPost .= (isset($out['post_excerpt']) ? $out['post_excerpt'] : '');
		@@ -1878,9 +1591,9 @@
1878	1591	else :
1879	1592	$feed_url = parse_url($this->post['meta']['syndication_feed']);
1880	1593	$source_title = $feed_url['host'];
1881	1594	endif;
1882		-
	1595	+
1883	1596	$out['post_title'] = $source_title
1884	1597	.' '.gmdate('Y-m-d H:i:s', $this->published() + $offset);
1885	1598	// FIXME: Option for what to fill a blank title with...
1886	1599	endif;
		@@ -1887,78 +1600,18 @@
1887	1600
1888	1601	// Normalize the guid if necessary.
1889	1602	$out['guid'] = SyndicatedPost::normalize_guid($out['guid']);
1890	1603
1891		- return $out;
1892		- }
1893		-
1894		- public function db_sanitize_post_check_encoding ($out) {
1895		- // Check encoding recursively: every string field needs to be checked
1896		- // for character encoding issues. This is a bit problematic because we
1897		- // *should* be using DB_CHARSET, but DB_CHARSET sometimes has values
1898		- // that work for MySQL but not for PHP mb_check_encoding. So instead
1899		- // we must rely on WordPress setting blog_charset and hope that the user
1900		- // has got their database encoding set up to roughly match
1901		- $charset = get_option('blog_charset', 'utf8');
1902		-
	1604	+ // Why the fuck doesn't wp_insert_post already do this?
1903	1605	foreach ($out as $key => $value) :
1904	1606	if (is_string($value)) :
1905		-
1906		- if ( !function_exists('mb_check_encoding') or mb_check_encoding($value, $charset)) :
1907		- $out[$key] = $value;
1908		- else :
1909		- $fromCharset = mb_detect_encoding($value, mb_detect_order(), /*strict=*/ true);
1910		- $out[$key] = mb_convert_encoding($value, $charset, $fromCharset);
1911		- endif;
1912		-
1913		- elseif (is_array($value)) :
1914		- $out[$key] = $this->db_sanitize_post_check_encoding($value);
1915		-
	1607	+ $out[$key] = $wpdb->escape($value);
1916	1608	else :
1917	1609	$out[$key] = $value;
1918	1610	endif;
1919		-
1920	1611	endforeach;
1921	1612
1922	1613	return $out;
1923		- } /* SyndicatedPost::db_sanitize_post_check_encoding () */
1924		-
1925		- function db_sanitize_post ($out) {
1926		- global $wp_db_version;
1927		-
1928		- $out = $this->db_sanitize_post_check_encoding($out);
1929		-
1930		- // < 3.6. Core API, including `wp_insert_post()`, expects
1931		- // properly slashed data. If `wp_slash()` exists, then
1932		- // this is after the big change-over in how data slashing
1933		- // was handled.
1934		- if ( !function_exists('wp_slash')) :
1935		-
1936		- foreach ($out as $key => $value) :
1937		- if (is_string($value)) :
1938		- $out[$key] = esc_sql($value);
1939		- else :
1940		- $out[$key] = $value;
1941		- endif;
1942		- endforeach;
1943		-
1944		- // For revisions [@23416,@23554), core API expects
1945		- // unslashed data. Cf. <https://core.trac.wordpress.org/browser/trunk/wp-includes/post.php?rev=23416>
1946		- // NOOP for those revisions.
1947		-
1948		- // In revisions @23554 to present, `wp_insert_post()`
1949		- // expects slashed data once again.
1950		- // Cf. <https://core.trac.wordpress.org/changeset/23554/trunk/wp-includes/post.php?contextall=1>
1951		- // But at least now we can use the wp_slash API function to do that.
1952		- // Hooray.
1953		-
1954		- elseif ($wp_db_version >= 23524) :
1955		-
1956		- $out = wp_slash($out);
1957		-
1958		- endif;
1959		-
1960		- return $out;
1961	1614	}
1962	1615
1963	1616	/**
1964	1617	* SyndicatedPost::validate_post_id()
		@@ -1970,9 +1623,9 @@
1970	1623	if (is_array($ns)) : $ns = implode('::', $ns);
1971	1624	else : $ns = (string) $ns; endif;
1972	1625
1973	1626	// This should never happen.
1974		- if ( !is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
	1627	+ if (!is_numeric($this->_wp_id) or ($this->_wp_id == 0)) :
1975	1628	$verb = ($is_update ? 'update existing' : 'insert new');
1976	1629	$guid = $this->guid();
1977	1630	$url = $this->permalink();
1978	1631	$feed = $this->link->uri(array('add_params' => true));
		@@ -1980,11 +1633,10 @@
1980	1633	// wp_insert_post failed. Diagnostics, or barf up a critical bug
1981	1634	// notice if we are in debug mode.
1982	1635	$mesg = "Failed to $verb item [$guid]. WordPress API returned no valid post ID.\n"
1983	1636	."\t\tID = ".serialize($this->_wp_id)."\n"
1984		- ."\t\tURL = ".MyPHP::val($url)
1985		- ."\t\tFeed = ".MyPHP::val($feed);
1986		-
	1637	+ ."\t\tURL = ".FeedWordPress::val($url)
	1638	+ ."\t\tFeed = ".FeedWordPress::val($feed);
1987	1639	FeedWordPress::diagnostic('updated_feeds:errors', "WordPress API error: $mesg");
1988	1640	FeedWordPress::diagnostic('feed_items:rejected', $mesg);
1989	1641
1990	1642	$mesg = <<<EOM
		@@ -1990,13 +1642,13 @@
1990	1642	$mesg = <<<EOM
1991	1643	The WordPress API returned an invalid post ID
1992	1644	when FeedWordPress tried to $verb item $guid
1993	1645	[URL: $url]
1994		- from the feed at $feed
	1646	+ from the feed at $feed
1995	1647
1996		-$ns::_wp_id
	1648	+$ns::_wp_id
1997	1649	EOM;
1998		- FeedWordPressDiagnostic::noncritical_bug(
	1650	+ FeedWordPress::noncritical_bug(
1999	1651	/*message=*/ $mesg,
2000	1652	/*var =*/ array(
2001	1653	"\$this->_wp_id" => $this->_wp_id,
2002	1654	"\$dbpost" => $dbpost,
		@@ -2004,18 +1656,18 @@
2004	1656	/*line # =*/ __LINE__, /*filename=*/ __FILE__
2005	1657	);
2006	1658	endif;
2007	1659	} /* SyndicatedPost::validate_post_id() */
2008		-
	1660	+
2009	1661	/**
2010		- * SyndicatedPost::fix_revision_meta() - Ensures that we get the meta
2011		- * data (authorship, guid, etc.) that we want when storing revisions of
2012		- * a syndicated post.
	1662	+ * SyndicatedPost::fix_revision_meta() - Fixes the way WP 2.6+ fucks up
	1663	+ * meta-data (authorship, etc.) when storing revisions of an updated
	1664	+ * syndicated post.
2013	1665	*
2014		- * In their infinite wisdom, the WordPress coders seem to have made it
2015		- * completely impossible for a plugin that uses wp_insert_post() to set
2016		- * certain meta-data (such as the author) when you store an old revision
2017		- * of an updated post. Instead, it uses the WordPress defaults (= cur.
	1666	+ * In their infinite wisdom, the WordPress coders have made it completely
	1667	+ * impossible for a plugin that uses wp_insert_post() to set certain
	1668	+ * meta-data (such as the author) when you store an old revision of an
	1669	+ * updated post. Instead, it uses the WordPress defaults (= currently
2018	1670	* active user ID if the process is running with a user logged in, or
2019	1671	* = #0 if there is no user logged in). This results in bogus authorship
2020	1672	* data for revisions that are syndicated from off the feed, unless we
2021	1673	* use a ridiculous kludge like this to end-run the munging of meta-data
		@@ -2022,24 +1674,21 @@
2022	1674	* by _wp_put_post_revision.
2023	1675	*
2024	1676	* @param int $revision_id The revision ID to fix up meta-data
2025	1677	*/
2026		- function fix_revision_meta( $revision_id ) {
2027		- $post_author = (int) $this->post['post_author']; // is this a global? And if it is, where is it defined? (gwyneth 20230919)
2028		-
	1678	+ function fix_revision_meta ($revision_id) {
	1679	+ global $wpdb;
	1680	+
	1681	+ $post_author = (int) $this->post['post_author'];
	1682	+
2029	1683	$revision_id = (int) $revision_id;
2030		-
2031		- // Let's fix the author.
2032		- set_post_field( 'post_author', $this->post['post_author'], $revision_id );
2033		-
2034		- // Let's fix the GUID to a dummy URL with the update hash.
2035		- set_post_field( 'guid', 'http://feedwordpress.radgeek.com/?rev=' . $this->update_hash(), $revision_id );
2036		-
2037		- // Let's fire an event for add-ons and filters
2038		- do_action( 'syndicated_post_fix_revision_meta', $revision_id, $this );
2039		-
	1684	+ $wpdb->query("
	1685	+ UPDATE $wpdb->posts
	1686	+ SET post_author={$this->post['post_author']}
	1687	+ WHERE post_type = 'revision' AND ID='$revision_id'
	1688	+ ");
2040	1689	} /* SyndicatedPost::fix_revision_meta () */
2041		-
	1690	+
2042	1691	/**
2043	1692	* SyndicatedPost::add_terms() -- if FeedWordPress is processing an
2044	1693	* automatic update, that generally means that wp_insert_post() is being
2045	1694	* called under the user credentials of whoever is viewing the blog at
		@@ -2056,9 +1705,8 @@
2056	1705	* @param string $old_status Unused action parameter.
2057	1706	* @param object $post The database record for the post just inserted.
2058	1707	*/
2059	1708	function add_terms ($new_status, $old_status, $post) {
2060		-
2061	1709	if ($new_status!='inherit') : // Bail if we are creating a revision.
2062	1710	if ( is_array($this->post) and isset($this->post['tax_input']) and is_array($this->post['tax_input']) ) :
2063	1711	foreach ($this->post['tax_input'] as $taxonomy => $terms) :
2064	1712	if (is_array($terms)) :
		@@ -2063,30 +1711,14 @@
2063	1711	foreach ($this->post['tax_input'] as $taxonomy => $terms) :
2064	1712	if (is_array($terms)) :
2065	1713	$terms = array_filter($terms); // strip out empties
2066	1714	endif;
2067		-
2068		- $res = wp_set_post_terms(
2069		- /*post_id=*/ $post->ID,
2070		- /*terms=*/ $terms,
2071		- /*taxonomy=*/ $taxonomy
2072		- );
2073		-
2074		- FeedWordPress::diagnostic(
2075		- 'syndicated_posts:categories',
2076		- 'Category: post('.json_encode($post->ID).') '.$taxonomy
2077		- .' := '
2078		- .json_encode($terms)
2079		- .' / result: '
2080		- .json_encode($res)
2081		- );
2082		-
	1715	+ wp_set_post_terms($post->ID, $terms, $taxonomy);
2083	1716	endforeach;
2084	1717	endif;
2085	1718	endif;
2086		-
2087	1719	} /* SyndicatedPost::add_terms () */
2088		-
	1720	+
2089	1721	/**
2090	1722	* SyndicatedPost::fix_post_modified_ts() -- We would like to set
2091	1723	* post_modified and post_modified_gmt to reflect the value of
2092	1724	* <atom:updated> or equivalent elements on the feed. Unfortunately,
		@@ -2109,9 +1741,9 @@
2109	1741	'post_modified_gmt' => $this->post['post_modified_gmt'],
2110	1742	), /*where=*/ array('ID' => $post->ID) );
2111	1743	endif;
2112	1744	} /* SyndicatedPost::fix_post_modified_ts () */
2113		-
	1745	+
2114	1746	/**
2115	1747	* SyndicatedPost::add_rss_meta: adds interesting meta-data to each entry
2116	1748	* using the space for custom keys. The set of keys and values to add is
2117	1749	* specified by the keys and values of $post['meta']. This is used to
		@@ -2125,9 +1757,9 @@
2125	1757	* @param string $new_status Unused action parameter.
2126	1758	* @param string $old_status Unused action parameter.
2127	1759	* @param object $post The database record for the post just inserted.
2128	1760	*/
2129		- function add_rss_meta($new_status, $old_status, $post) {
	1761	+ function add_rss_meta ($new_status, $old_status, $post) {
2130	1762	global $wpdb;
2131	1763	if ($new_status!='inherit') : // Bail if we are creating a revision.
2132	1764	FeedWordPress::diagnostic('syndicated_posts:meta_data', 'Adding post meta-data: {'.implode(", ", array_keys($this->post['meta'])).'}');
2133	1765
		@@ -2132,9 +1764,9 @@
2132	1764	FeedWordPress::diagnostic('syndicated_posts:meta_data', 'Adding post meta-data: {'.implode(", ", array_keys($this->post['meta'])).'}');
2133	1765
2134	1766	if ( is_array($this->post) and isset($this->post['meta']) and is_array($this->post['meta']) ) :
2135	1767	$postId = $post->ID;
2136		-
	1768	+
2137	1769	// Aggregated posts should NOT send out pingbacks.
2138	1770	// WordPress 2.1-2.2 claim you can tell them not to
2139	1771	// using $post_pingback, but they don't listen, so we
2140	1772	// make sure here.
		@@ -2141,12 +1773,12 @@
2141	1773	$result = $wpdb->query("
2142	1774	DELETE FROM $wpdb->postmeta
2143	1775	WHERE post_id='$postId' AND meta_key='_pingme'
2144	1776	");
2145		-
	1777	+
2146	1778	foreach ( $this->post['meta'] as $key => $values ) :
2147		- $eKey = esc_sql($key);
2148		-
	1779	+ $eKey = $wpdb->escape($key);
	1780	+
2149	1781	// If this is an update, clear out the old
2150	1782	// values to avoid duplication.
2151	1783	$result = $wpdb->query("
2152	1784	DELETE FROM $wpdb->postmeta
		@@ -2151,21 +1783,16 @@
2151	1783	$result = $wpdb->query("
2152	1784	DELETE FROM $wpdb->postmeta
2153	1785	WHERE post_id='$postId' AND meta_key='$eKey'
2154	1786	");
2155		-
	1787	+
2156	1788	// Allow for either a single value or an array
2157		- if ( !is_array($values)) $values = array($values);
	1789	+ if (!is_array($values)) $values = array($values);
2158	1790	foreach ( $values as $value ) :
2159		- FeedWordPress::diagnostic('syndicated_posts:meta_data', "Adding post meta-datum to post [$postId]: [$key] = ".MyPHP::val($value, /*no newlines=*/ true));
	1791	+ FeedWordPress::diagnostic('syndicated_posts:meta_data', "Adding post meta-datum to post [$postId]: [$key] = ".FeedWordPress::val($value, /*no newlines=*/ true));
2160	1792	add_post_meta($postId, $key, $value, /*unique=*/ false);
2161	1793	endforeach;
2162	1794	endforeach;
2163		-
2164		- if ( $result === false)
2165		- {
2166		- error_log( "delete query failed: " . $wpdb->last_error );
2167		- }
2168	1795	endif;
2169	1796	endif;
2170	1797	} /* SyndicatedPost::add_rss_meta () */
2171	1798
		@@ -2185,9 +1812,9 @@
2185	1812
2186	1813	$source = $this->source();
2187	1814	$forbidden = apply_filters('feedwordpress_forbidden_author_names',
2188	1815	array('admin', 'administrator', 'www', 'root'));
2189		-
	1816	+
2190	1817	// Prepare the list of candidates to try for author name: name from
2191	1818	// feed, original source title (if any), immediate source title live
2192	1819	// from feed, subscription title, prettied version of feed homepage URL,
2193	1820	// prettied version of feed URL, or, failing all, use "unknown author"
		@@ -2194,32 +1821,31 @@
2194	1821	// as last resort
2195	1822
2196	1823	$candidates = array();
2197	1824	$candidates[] = $a['name'];
2198		- if ( !is_null($source)) : $candidates[] = $source['title']; endif;
	1825	+ if (!is_null($source)) : $candidates[] = $source['title']; endif;
2199	1826	$candidates[] = $this->link->name(/*fromFeed=*/ true);
2200	1827	$candidates[] = $this->link->name(/*fromFeed=*/ false);
2201	1828	if (strlen($this->link->homepage()) > 0) : $candidates[] = feedwordpress_display_url($this->link->homepage()); endif;
2202	1829	$candidates[] = feedwordpress_display_url($this->link->uri());
2203	1830	$candidates[] = 'unknown author';
2204		-
	1831	+
2205	1832	// Pick the first one that works from the list, screening against empty
2206	1833	// or forbidden names.
2207		-
	1834	+
2208	1835	$author = NULL;
2209		- foreach ($candidates as $candidate) {
2210		- if ( !is_null($candidate)
2211		- and (strlen(trim($candidate)) > 0)
2212		- and !in_array(strtolower(trim($candidate)), $forbidden)) :
2213		- $author = $candidate;
2214		- break;
	1836	+ while (is_null($author) and ($candidate = each($candidates))) :
	1837	+ if (!is_null($candidate['value'])
	1838	+ and (strlen(trim($candidate['value'])) > 0)
	1839	+ and !in_array(strtolower(trim($candidate['value'])), $forbidden)) :
	1840	+ $author = $candidate['value'];
2215	1841	endif;
2216		- }
2217		-
	1842	+ endwhile;
	1843	+
2218	1844	$email = (isset($a['email']) ? $a['email'] : NULL);
2219	1845	$authorUrl = (isset($a['uri']) ? $a['uri'] : NULL);
2220	1846
2221		-
	1847	+
2222	1848	$hostUrl = $this->link->homepage();
2223	1849	if (is_null($hostUrl) or (strlen($hostUrl) < 0)) :
2224	1850	$hostUrl = $this->link->uri();
2225	1851	endif;
		@@ -2244,9 +1870,9 @@
2244	1870	//
2245	1871	// Uniqueness will be guaranteed below if necessary.
2246	1872
2247	1873	$url = parse_url($hostUrl);
2248		-
	1874	+
2249	1875	$login = sanitize_user($url['host'], /*strict=*/ true);
2250	1876	if (strlen($login) < 1) :
2251	1877	// This isn't working. Frak it.
2252	1878	$login = 'syndicated';
		@@ -2257,13 +1883,13 @@
2257	1883
2258	1884	$nice_author = sanitize_title($author);
2259	1885	$nice_author = apply_filters('pre_user_nicename', $nice_author);
2260	1886
2261		- $reg_author = esc_sql(preg_quote($author ?: "(unknown)"));
2262		- $author = esc_sql($author);
2263		- $email = esc_sql($email);
2264		- $test_email = esc_sql($test_email);
2265		- $authorUrl = esc_sql($authorUrl);
	1887	+ $reg_author = $wpdb->escape(preg_quote($author));
	1888	+ $author = $wpdb->escape($author);
	1889	+ $email = $wpdb->escape($email);
	1890	+ $test_email = $wpdb->escape($test_email);
	1891	+ $authorUrl = $wpdb->escape($authorUrl);
2266	1892
2267	1893	// Check for an existing author rule....
2268	1894	if (isset($this->link->settings['map authors']['name']['*'])) :
2269	1895	$author_rule = $this->link->settings['map authors']['name']['*'];
		@@ -2273,17 +1899,15 @@
2273	1899	$author_rule = NULL;
2274	1900	endif;
2275	1901
2276	1902	// User name is mapped to a particular author. If that author ID exists, use it.
2277		- // Note: get_userdata() is a pluggable function, so it might not be available yet;
2278		- // check if it exists before using it, or WP will throw a fatal error. (gwyneth 20220223)
2279		- if (is_numeric($author_rule) and function_exists('get_userdata') and get_userdata((int) $author_rule)) :
	1903	+ if (is_numeric($author_rule) and get_userdata((int) $author_rule)) :
2280	1904	$id = (int) $author_rule;
2281	1905
2282	1906	// User name is filtered out
2283	1907	elseif ('filter' == $author_rule) :
2284	1908	$id = NULL;
2285		-
	1909	+
2286	1910	else :
2287	1911	// Check the database for an existing author record that might fit
2288	1912
2289	1913	// First try the user core data table.
		@@ -2294,9 +1918,9 @@
2294	1918	OR (
2295	1919	LENGTH(TRIM(LCASE(user_email))) > 0
2296	1920	AND TRIM(LCASE(user_email)) = TRIM(LCASE('$test_email'))
2297	1921	)");
2298		-
	1922	+
2299	1923	// If that fails, look for aliases in the user meta data table
2300	1924	if (is_null($id)) :
2301	1925	$id = $wpdb->get_var(
2302	1926	"SELECT user_id FROM $wpdb->usermeta
		@@ -2318,11 +1942,11 @@
2318	1942	if (is_null($id)) :
2319	1943	if ($unfamiliar_author === 'create') :
2320	1944	$userdata = array();
2321	1945
2322		- #-- we need *something* for the email here or WordPress
2323		- #-- is liable to pitch a fit. So, make something up if
2324		- #-- necessary. (Ugh.)
	1946	+ // WordPress 3 is going to pitch a fit if we attempt to register
	1947	+ // more than one user account with an empty e-mail address, so we
	1948	+ // need *something* here. Ugh.
2325	1949	if (strlen($email) == 0 or FeedWordPress::is_null_email($email)) :
2326	1950	$url = parse_url($hostUrl);
2327	1951	$email = $nice_author.'@'.$url['host'];
2328	1952	endif;
		@@ -2334,20 +1958,15 @@
2334	1958	$userdata['user_pass'] = substr(md5(uniqid(microtime())), 0, 6); // just something random to lock it up
2335	1959	$userdata['user_email'] = $email;
2336	1960	$userdata['user_url'] = $authorUrl;
2337	1961	$userdata['nickname'] = $author;
2338		-
2339	1962	$parts = preg_split('/\s+/', trim($author), 2);
2340	1963	if (isset($parts[0])) : $userdata['first_name'] = $parts[0]; endif;
2341	1964	if (isset($parts[1])) : $userdata['last_name'] = $parts[1]; endif;
2342		-
2343	1965	$userdata['display_name'] = $author;
2344	1966	$userdata['role'] = 'contributor';
2345		-
2346		- #-- loop. Keep trying to add the user until you get it
2347		- #-- right. Or until PHP crashes, I guess.
2348		- $insanity = 0;
2349		- do {
	1967	+
	1968	+ do { // Keep trying until you get it right. Or until PHP crashes, I guess.
2350	1969	$id = wp_insert_user($userdata);
2351	1970	if (is_wp_error($id)) :
2352	1971	$codes = $id->get_error_code();
2353	1972	switch ($codes) :
		@@ -2352,62 +1971,27 @@
2352	1971	$codes = $id->get_error_code();
2353	1972	switch ($codes) :
2354	1973	case 'empty_user_login' :
2355	1974	case 'existing_user_login' :
2356		- case 'invalid_username' :
2357	1975	// Add a random disambiguator
2358	1976	$userdata['user_login'] .= substr(md5(uniqid(microtime())), 0, 6);
2359	1977	break;
2360		- case 'user_login_too_long' :
2361		- // Limit length to 53 characters; if we end up needing a random disambiguator,
2362		- // we should still have space to add it.
2363		- $userdata['user_login'] = mb_substr( $userdata['user_login'], 0, 53 );
2364		- break;
2365		- case 'user_nicename_too_long' :
2366		- // Add a limited 50 characters user_nicename based on user_login
2367		- $userdata['user_nicename'] = mb_substr( $userdata['user_login'], 0, 50 );
2368		- break;
2369	1978	case 'existing_user_email' :
2370		- // Disassemble email for username, host
	1979	+ // No disassemble!
2371	1980	$parts = explode('@', $userdata['user_email'], 2);
2372		-
	1981	+
2373	1982	// Add a random disambiguator as a gmail-style username extension
2374	1983	$parts[0] .= '+'.substr(md5(uniqid(microtime())), 0, 6);
2375		-
	1984	+
2376	1985	// Reassemble
2377	1986	$userdata['user_email'] = $parts[0].'@'.$parts[1];
2378	1987	break;
2379		- default :
2380		- if ( $insanity > 10 ) :
2381		- // Try some settings that are unlikely to cause complaint...
2382		- $url = parse_url($hostUrl);
2383		-
2384		- $userdata['user_login'] = substr(md5(uniqid(microtime())), 0, 6);
2385		- $userdata['user_nicename'] = $userdata['user_login'];
2386		- $userdata['user_email'] = 'noreply@' . $url['host'];
2387		- elseif ( $insanity > 50 ) :
2388		- // Stop doing the same thing and expecting a different result
2389		- break;
2390		- endif;
2391	1988	endswitch;
2392	1989	endif;
2393		- $insanity = $insanity + 1;
2394	1990	} while (is_wp_error($id));
2395		-
2396		- // $id should now contain the numeric ID of a newly minted
2397		- // user account. Let's mark them as having been generated
2398		- // by FeedWordPress in the usermeta table, as per the
2399		- // suggestion of @boonebgorges, in case we need to process,
2400		- // winnow, filter, or merge syndicated author accounts, &c.
2401		- if ( !is_wp_error($id)) :
2402		- add_user_meta($id, 'feedwordpress_generated', 1);
2403		- else :
2404		- $id = null;
2405		- endif;
2406		- // also see comment above regarding get_userdata(). (gwyneth 20220223)
2407		- elseif ( is_numeric( $unfamiliar_author ) and function_exists( 'get_userdata ') and get_userdata((int) $unfamiliar_author ) ) :
	1991	+ elseif (is_numeric($unfamiliar_author) and get_userdata((int) $unfamiliar_author)) :
2408	1992	$id = (int) $unfamiliar_author;
2409		- elseif ( $unfamiliar_author === 'default' ) :
	1993	+ elseif ($unfamiliar_author === 'default') :
2410	1994	$id = 1;
2411	1995	endif;
2412	1996	endif;
2413	1997	endif;
		@@ -2413,9 +1997,9 @@
2413	1997	endif;
2414	1998
2415	1999	if ($id) :
2416	2000	$this->link->settings['map authors']['name'][strtolower(trim($author))] = $id;
2417		-
	2001	+
2418	2002	// Multisite: Check whether the author has been recorded
2419	2003	// on *this* blog before. If not, put her down as a
2420	2004	// Contributor for *this* blog.
2421	2005	$user = new WP_User((int) $id);
		@@ -2422,21 +2006,144 @@
2422	2006	if (empty($user->roles)) :
2423	2007	$user->add_role('contributor');
2424	2008	endif;
2425	2009	endif;
2426		- return $id;
	2010	+ return $id;
2427	2011	} /* function SyndicatedPost::author_id () */
2428	2012
2429	2013	/**
2430		- * category_ids: look up (and create) category ids from a list of
2431		- * categories
	2014	+ * category_ids: look up (and create) category ids from a list of categories
2432	2015	*
2433	2016	* @param array $cats
2434	2017	* @param string $unfamiliar_category
2435	2018	* @param array|null $taxonomies
2436	2019	* @return array
2437		- */
	2020	+ */
2438	2021	function category_ids ($cats, $unfamiliar_category = 'create', $taxonomies = NULL, $params = array()) {
2439		- return $this->link->category_ids($this, $cats, $unfamiliar_category, $taxonomies, $params);
2440		- } /* SyndicatedPost::category_ids () */
	2022	+ $singleton = (isset($params['singleton']) ? $params['singleton'] : true);
	2023	+ $allowFilters = (isset($params['filters']) ? $params['filters'] : false);
	2024	+
	2025	+ $catTax = 'category';
2441	2026
	2027	+ if (is_null($taxonomies)) :
	2028	+ $taxonomies = array('category');
	2029	+ endif;
	2030	+
	2031	+ // We need to normalize whitespace because (1) trailing
	2032	+ // whitespace can cause PHP and MySQL not to see eye to eye on
	2033	+ // VARCHAR comparisons for some versions of MySQL (cf.
	2034	+ // <http://dev.mysql.com/doc/mysql/en/char.html>), and (2)
	2035	+ // because I doubt most people want to make a semantic
	2036	+ // distinction between 'Computers' and 'Computers '
	2037	+ $cats = array_map('trim', $cats);
	2038	+
	2039	+ $terms = array();
	2040	+ foreach ($taxonomies as $tax) :
	2041	+ $terms[$tax] = array();
	2042	+ endforeach;
	2043	+
	2044	+ foreach ($cats as $cat_name) :
	2045	+ if (preg_match('/^{([^#}]*)#([0-9]+)}$/', $cat_name, $backref)) :
	2046	+ $cat_id = (int) $backref[2];
	2047	+ $tax = $backref[1];
	2048	+ if (strlen($tax) < 1) :
	2049	+ $tax = $catTax;
	2050	+ endif;
	2051	+
	2052	+ $term = term_exists($cat_id, $tax);
	2053	+ if (!is_wp_error($term) and !!$term) :
	2054	+ if (!isset($terms[$tax])) :
	2055	+ $terms[$tax] = array();
	2056	+ endif;
	2057	+ $terms[$tax][] = $cat_id;
	2058	+ endif;
	2059	+ elseif (strlen($cat_name) > 0) :
	2060	+ $familiar = false;
	2061	+ foreach ($taxonomies as $tax) :
	2062	+ if ($tax!='category' or strtolower($cat_name)!='uncategorized') :
	2063	+ $term = term_exists($cat_name, $tax);
	2064	+ if (!is_wp_error($term) and !!$term) :
	2065	+ $familiar = true;
	2066	+
	2067	+ if (is_array($term)) :
	2068	+ $term_id = (int) $term['term_id'];
	2069	+ else :
	2070	+ $term_id = (int) $term;
	2071	+ endif;
	2072	+
	2073	+ if (!isset($terms[$tax])) :
	2074	+ $terms[$tax] = array();
	2075	+ endif;
	2076	+ $terms[$tax][] = $term_id;
	2077	+ break; // We're done here.
	2078	+ endif;
	2079	+ endif;
	2080	+ endforeach;
	2081	+
	2082	+ if (!$familiar) :
	2083	+ if ('tag'==$unfamiliar_category) :
	2084	+ $unfamiliar_category = 'create:post_tag';
	2085	+ endif;
	2086	+
	2087	+ if (preg_match('/^create(:(.*))?$/i', $unfamiliar_category, $ref)) :
	2088	+ $tax = $catTax; // Default
	2089	+ if (isset($ref[2]) and strlen($ref[2]) > 2) :
	2090	+ $tax = $ref[2];
	2091	+ endif;
	2092	+ $term = wp_insert_term($cat_name, $tax);
	2093	+ if (is_wp_error($term)) :
	2094	+ FeedWordPress::noncritical_bug('term insertion problem', array('cat_name' => $cat_name, 'term' => $term, 'this' => $this), __LINE__, __FILE__);
	2095	+ else :
	2096	+ if (!isset($terms[$tax])) :
	2097	+ $terms[$tax] = array();
	2098	+ endif;
	2099	+ $terms[$tax][] = (int) $term['term_id'];
	2100	+ endif;
	2101	+ endif;
	2102	+ endif;
	2103	+ endif;
	2104	+ endforeach;
	2105	+
	2106	+ $filtersOn = $allowFilters;
	2107	+ if ($allowFilters) :
	2108	+ $filters = array_filter(
	2109	+ $this->link->setting('match/filter', 'match_filter', array()),
	2110	+ 'remove_dummy_zero'
	2111	+ );
	2112	+ $filtersOn = ($filtersOn and is_array($filters) and (count($filters) > 0));
	2113	+ endif;
	2114	+
	2115	+ // Check for filter conditions
	2116	+ foreach ($terms as $tax => $term_ids) :
	2117	+ if ($filtersOn
	2118	+ and (count($term_ids)==0)
	2119	+ and in_array($tax, $filters)) :
	2120	+ $terms = NULL; // Drop the post
	2121	+ break;
	2122	+ else :
	2123	+ $terms[$tax] = array_unique($term_ids);
	2124	+ endif;
	2125	+ endforeach;
	2126	+
	2127	+ if ($singleton and count($terms)==1) : // If we only searched one, just return the term IDs
	2128	+ $terms = end($terms);
	2129	+ endif;
	2130	+ return $terms;
	2131	+ } // function SyndicatedPost::category_ids ()
	2132	+
	2133	+ function use_api ($tag) {
	2134	+ global $wp_db_version;
	2135	+ switch ($tag) :
	2136	+ case 'wp_insert_post':
	2137	+ // Before 2.2, wp_insert_post does too much of the wrong stuff to use it
	2138	+ // In 1.5 it was such a resource hog it would make PHP segfault on big updates
	2139	+ $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_21);
	2140	+ break;
	2141	+ case 'post_status_pending':
	2142	+ $ret = (isset($wp_db_version) and $wp_db_version > FWP_SCHEMA_23);
	2143	+ break;
	2144	+ endswitch;
	2145	+ return $ret;
	2146	+ } // function SyndicatedPost::use_api ()
	2147	+
2442	2148	} /* class SyndicatedPost */
	2149	+