diff --git a/admin-ui.php b/admin-ui.php index 2aef84d..6d08626 100644 --- a/admin-ui.php +++ b/admin-ui.php @@ -12,8 +12,8 @@ */ $dir = dirname(__FILE__); -require_once("${dir}/feedwordpressadminpage.class.php"); -require_once("${dir}/feedwordpresssettingsui.class.php"); +require_once("{$dir}/feedwordpressadminpage.class.php"); +require_once("{$dir}/feedwordpresssettingsui.class.php"); function fwp_update_set_results_message ($delta, $joiner = ';') { $mesg = array(); @@ -68,10 +68,10 @@ function fwp_tags_box ($tags, $object, $params = array()) { $params['textarea_name'] = "tax_input[$tax_name]"; endif; if (is_null($params['textarea_id'])) : - $params['textarea_id'] = "tax-input-${tax_name}"; + $params['textarea_id'] = "tax-input-{$tax_name}"; endif; if (is_null($params['input_id'])) : - $params['input_id'] = "new-tag-${tax_name}"; + $params['input_id'] = "new-tag-{$tax_name}"; endif; if (is_null($params['input_name'])) : $params['input_name'] = "newtag[$tax_name]"; @@ -260,7 +260,7 @@ function fwp_syndication_manage_page_links_table_rows ($links, $page, $visible = ${col}\n"; + print "\t{$col}\n"; endforeach; print "\n"; print "\n"; diff --git a/authors-page.php b/authors-page.php index 2427194..744eda4 100644 --- a/authors-page.php +++ b/authors-page.php @@ -301,7 +301,7 @@ function fix_mismatch ($post) { WHERE ({$wpdb->posts}.id IN $post_set $parent_in_clause) "); - $this->mesg = sprintf(__("Re-assigned %d ${posts}."), $N); + $this->mesg = sprintf(__("Re-assigned %d {$posts}."), $N); // ... and kill them all elseif ('filter'==$to) : @@ -309,7 +309,7 @@ function fix_mismatch ($post) { wp_delete_post($post_id); endforeach; - $this->mesg = sprintf(__("Deleted %d ${posts}."), $N); + $this->mesg = sprintf(__("Deleted %d {$posts}."), $N); endif; else : $this->mesg = __("Couldn't find any posts that matched your criteria."); diff --git a/extend/SimplePie/feedwordpie_item.class.php b/extend/SimplePie/feedwordpie_item.class.php index dd94e06..300428e 100644 --- a/extend/SimplePie/feedwordpie_item.class.php +++ b/extend/SimplePie/feedwordpie_item.class.php @@ -3,10 +3,10 @@ $ver = SIMPLEPIE_VERSION;; $mod = basename(__FILE__); -if ( is_readable("${subdir}/${ver}/${mod}") ) : - $modClassPath = "${subdir}/${ver}/${mod}"; +if ( is_readable("{$subdir}/{$ver}/{$mod}") ) : + $modClassPath = "{$subdir}/{$ver}/{$mod}"; else : - $modClassPath = "${subdir}/default/${mod}"; + $modClassPath = "{$subdir}/default/{$mod}"; endif; -require_once("${modClassPath}"); +require_once("{$modClassPath}"); diff --git a/extend/SimplePie/feedwordpie_parser.class.php b/extend/SimplePie/feedwordpie_parser.class.php index ef31a8c..21bad63 100644 --- a/extend/SimplePie/feedwordpie_parser.class.php +++ b/extend/SimplePie/feedwordpie_parser.class.php @@ -3,10 +3,10 @@ $ver = SIMPLEPIE_VERSION; $mod = basename(__FILE__); -if ( is_readable("${subdir}/${ver}/${mod}") ) : - $modClassPath = "${subdir}/${ver}/${mod}"; +if ( is_readable("{$subdir}/{$ver}/{$mod}") ) : + $modClassPath = "{$subdir}/{$ver}/{$mod}"; else : - $modClassPath = "${subdir}/default/${mod}"; + $modClassPath = "{$subdir}/default/{$mod}"; endif; -require_once("${modClassPath}"); +require_once("{$modClassPath}"); diff --git a/feeds-page.php b/feeds-page.php index 7442557..b523382 100644 --- a/feeds-page.php +++ b/feeds-page.php @@ -1037,7 +1037,7 @@ function display_feedfinder () { else: foreach ($finder as $url => $ff) : $url = esc_html($url); - print "

Searched for feeds at ${url}

\n"; + print "

Searched for feeds at {$url}

\n"; print "

".__('Error').": ".__("FeedWordPress couldn't find any feeds at").' '.htmlspecialchars($lookup).''; print ". ".__('Try another URL').".

"; diff --git a/feedwordpress.php b/feedwordpress.php index b1aa9a7..7feb968 100644 --- a/feedwordpress.php +++ b/feedwordpress.php @@ -110,7 +110,7 @@ $dependencyMet = (('class'==$unitType) ? class_exists($unitName) : function_exists($unitName)); if (!$dependencyMet) : - $phpFileName = ABSPATH . WPINC . "/${fileSlug}.php"; + $phpFileName = ABSPATH . WPINC . "/{$fileSlug}.php"; if (file_exists($phpFileName)) : require_once($phpFileName); else : @@ -126,28 +126,28 @@ // Dependences: modules packaged with FeedWordPress plugin $dir = dirname(__FILE__); -require_once("${dir}/externals/myphp/myphp.class.php"); -require_once("${dir}/feedwordpressadminpage.class.php"); -require_once("${dir}/feedwordpresssettingsui.class.php"); -require_once("${dir}/feedwordpressdiagnostic.class.php"); -require_once("${dir}/admin-ui.php"); -require_once("${dir}/template-functions.php"); -require_once("${dir}/feedwordpresssyndicationpage.class.php"); -require_once("${dir}/compatability.php"); // Legacy API -require_once("${dir}/syndicatedpost.class.php"); -require_once("${dir}/syndicatedlink.class.php"); -require_once("${dir}/feedwordpresshtml.class.php"); -require_once("${dir}/inspectpostmeta.class.php"); -require_once("${dir}/syndicationdataqueries.class.php"); -require_once("${dir}/extend/SimplePie/feedwordpie.class.php"); -require_once("${dir}/extend/SimplePie/feedwordpie_cache.class.php"); -require_once("${dir}/extend/SimplePie/feedwordpie_item.class.php"); -require_once("${dir}/extend/SimplePie/feedwordpie_file.class.php"); -require_once("${dir}/extend/SimplePie/feedwordpie_parser.class.php"); -require_once("${dir}/extend/SimplePie/feedwordpie_content_type_sniffer.class.php"); -require_once("${dir}/feedwordpressrpc.class.php"); -require_once("${dir}/feedwordpresshttpauthenticator.class.php"); -require_once("${dir}/feedwordpresslocalpost.class.php"); +require_once("{$dir}/externals/myphp/myphp.class.php"); +require_once("{$dir}/feedwordpressadminpage.class.php"); +require_once("{$dir}/feedwordpresssettingsui.class.php"); +require_once("{$dir}/feedwordpressdiagnostic.class.php"); +require_once("{$dir}/admin-ui.php"); +require_once("{$dir}/template-functions.php"); +require_once("{$dir}/feedwordpresssyndicationpage.class.php"); +require_once("{$dir}/compatability.php"); // Legacy API +require_once("{$dir}/syndicatedpost.class.php"); +require_once("{$dir}/syndicatedlink.class.php"); +require_once("{$dir}/feedwordpresshtml.class.php"); +require_once("{$dir}/inspectpostmeta.class.php"); +require_once("{$dir}/syndicationdataqueries.class.php"); +require_once("{$dir}/extend/SimplePie/feedwordpie.class.php"); +require_once("{$dir}/extend/SimplePie/feedwordpie_cache.class.php"); +require_once("{$dir}/extend/SimplePie/feedwordpie_item.class.php"); +require_once("{$dir}/extend/SimplePie/feedwordpie_file.class.php"); +require_once("{$dir}/extend/SimplePie/feedwordpie_parser.class.php"); +require_once("{$dir}/extend/SimplePie/feedwordpie_content_type_sniffer.class.php"); +require_once("{$dir}/feedwordpressrpc.class.php"); +require_once("{$dir}/feedwordpresshttpauthenticator.class.php"); +require_once("{$dir}/feedwordpresslocalpost.class.php"); #################################################################################### ## GLOBAL PARAMETERS ############################################################### @@ -222,7 +222,7 @@ function debug_out_human_readable_bytes ($quantity) { $quantity = floor($quantity / 1024); $magnitude = array_shift($orders); endwhile; - return "${quantity} ${magnitude}"; + return "{$quantity} {$magnitude}"; } function debug_out_feedwordpress_footer () { @@ -429,16 +429,16 @@ function syndication_comments_feed_link ($link) { return $link; } /* function syndication_comments_feed_link() */ - require_once("${dir}/feedwordpress.pings.functions.php"); + require_once("{$dir}/feedwordpress.pings.functions.php"); - require_once("${dir}/feedwordpress.wp-admin.post-edit.functions.php"); + require_once("{$dir}/feedwordpress.wp-admin.post-edit.functions.php"); ################################################################################ ## class FeedWordPressBoilerplateReformatter ################################### ################################################################################ -require_once("${dir}/feedwordpressboilerplatereformatter.class.php"); -require_once("${dir}/feedwordpressboilerplatereformatter.shortcode.functions.php"); +require_once("{$dir}/feedwordpressboilerplatereformatter.class.php"); +require_once("{$dir}/feedwordpressboilerplatereformatter.shortcode.functions.php"); ################################################################################ ## class FeedWordPress ######################################################### @@ -2129,7 +2129,7 @@ public function email_diagnostic_log ($params = array()) { $cell = date('j-M-y, h:i a', $cell); endif; $class = strtolower(preg_replace('/\s+/', '-', $col)); - $body .= "${cell}"; + $body .= "{$cell}"; endforeach; $body .= "\n"; endforeach; @@ -2255,7 +2255,7 @@ static function menu_cap ($sub = false) { public function plugin_dir_path ($path = '') { $dir = plugin_dir_path( __FILE__ ); - $file_path = "${dir}${path}"; + $file_path = "{$dir}{$path}"; return apply_filters( "feedwordpress_plugin_dir_path", $file_path ); } /* FeedWordPress::plugin_dir_path () */ diff --git a/feedwordpress.pings.functions.php b/feedwordpress.pings.functions.php index 041e110..cce0e4e 100644 --- a/feedwordpress.pings.functions.php +++ b/feedwordpress.pings.functions.php @@ -38,7 +38,7 @@ function fwp_release_pings () { if (!is_null($diag_message)) : FeedWordPress::diagnostic( 'syndicated_posts:do_pings', - "FeedWordPress ${diag_message}, fwp_held_ping=".json_encode($fwp_held_ping) + "FeedWordPress {$diag_message}, fwp_held_ping=".json_encode($fwp_held_ping) ); endif; } diff --git a/feedwordpressadminpage.class.php b/feedwordpressadminpage.class.php index 7391f68..3fc2b37 100644 --- a/feedwordpressadminpage.class.php +++ b/feedwordpressadminpage.class.php @@ -329,7 +329,7 @@ public function display_feed_settings_page_links ($params = array()) { if ($link['page']==basename($this->filename)) : print ""; else : - print ""; + print ""; endif; if ($params['long']) : print esc_html(__($link['long'])); diff --git a/feedwordpressdiagnostic.class.php b/feedwordpressdiagnostic.class.php index eeb7d88..0b20cee 100644 --- a/feedwordpressdiagnostic.class.php +++ b/feedwordpressdiagnostic.class.php @@ -16,7 +16,7 @@ public static function feed_error ($error, $old, $link) { $mesg = esc_html($mesg); FeedWordPress::diagnostic( 'updated_feeds:errors', - "Feed Error: [${url}] update returned error: $mesg" + "Feed Error: [{$url}] update returned error: $mesg" ); $hours = get_option('feedwordpress_diagnostics_persistent_errors_hours', 2); @@ -27,8 +27,8 @@ public static function feed_error ($error, $old, $link) { $mostRecent = date('r', $error['ts']); FeedWordPress::diagnostic( 'updated_feeds:errors:persistent', - "Feed Update Error: [${url}] returning errors" - ." since ${since}:
$mesg", + "Feed Update Error: [{$url}] returning errors" + ." since {$since}:
$mesg", $url, $error['since'], $error['ts'] ); endif; @@ -60,14 +60,14 @@ public static function critical_bug ($varname, $var, $line, $file = NULL) { global $wp_version; if (!is_null($file)) : - $location = "line # ${line} of ".basename($file); + $location = "line # {$line} of ".basename($file); else : - $location = "line # ${line}"; + $location = "line # {$line}"; endif; print '

Critical error: There may be a bug in FeedWordPress. Please contact the author and paste the following information into your e-mail:

'; print "\n"; - print "Triggered at ${location}\n"; + print "Triggered at {$location}\n"; print "FeedWordPress: ".FEEDWORDPRESS_VERSION."\n"; print "WordPress: {$wp_version}\n"; print "PHP: ".phpversion()."\n"; diff --git a/feedwordpresssettingsui.class.php b/feedwordpresssettingsui.class.php index 886ea97..dbe441f 100644 --- a/feedwordpresssettingsui.class.php +++ b/feedwordpresssettingsui.class.php @@ -11,7 +11,7 @@ static function is_admin () { $fwp = preg_quote(FeedWordPress::path()); $admin_page = ( is_admin() - and preg_match("|^${fwp}/|", MyPHP::request('page')) + and preg_match("|^{$fwp}/|", MyPHP::request('page')) ); endif; return $admin_page; @@ -95,7 +95,7 @@ static function fix_toggles_js ($context) { static public function get_template_part ( $slug, $name = null, $type = null, $args = array() ) { global $feedwordpress; - do_action( "feedwordpress_get_template_part_${slug}", $slug, $name, $type, $args ); + do_action( "feedwordpress_get_template_part_{$slug}", $slug, $name, $type, $args ); $templates = array(); $name = (string) $name; @@ -103,13 +103,13 @@ static public function get_template_part ( $slug, $name = null, $type = null, $a $ext = ".php"; if ( strlen($type) > 0 ): - $ext = ".${type}${ext}"; + $ext = ".{$type}{$ext}"; endif; if ( strlen($name) > 0 ) : - $templates[] = "${slug}-${name}${ext}"; + $templates[] = "{$slug}-{$name}{$ext}"; endif; - $templates[] = "${slug}${ext}"; + $templates[] = "{$slug}{$ext}"; do_action( "feedwordpress_get_template_part", $slug, $name, $type, $args ); diff --git a/feedwordpresssyndicationpage.class.php b/feedwordpresssyndicationpage.class.php index 8fb6930..c75e44a 100644 --- a/feedwordpresssyndicationpage.class.php +++ b/feedwordpresssyndicationpage.class.php @@ -132,7 +132,7 @@ function updates_requested () { // $link_list has previously been sanitized for html by self::requested_link_ids_sql $targets = $wpdb->get_results(" SELECT * FROM $wpdb->links - WHERE link_id IN ${link_list} + WHERE link_id IN {$link_list} "); if (is_array($targets)) : foreach ($targets as $target) : @@ -874,7 +874,7 @@ function multidelete_page () { // $link_list has previously been sanitized for html by self::requested_link_ids_sql $targets = $wpdb->get_results(" SELECT * FROM $wpdb->links - WHERE link_id IN ${link_list} + WHERE link_id IN {$link_list} "); ?> <form action="<?php print $this->form_action(); ?>" method="post"> @@ -997,7 +997,7 @@ function multiundelete_page () { // $link_list has previously been sanitized for html by self::requested_link_ids_sql $targets = $wpdb->get_results(" SELECT * FROM $wpdb->links - WHERE link_id IN ${link_list} + WHERE link_id IN {$link_list} "); ?> <form action="<?php print $this->form_action(); ?>" method="post"> @@ -1092,7 +1092,7 @@ function fwp_dashboard_update_if_requested ($object) { else : $display_uri = esc_html(feedwordpress_display_url($uri)); $uri = esc_html($uri); - echo "<li><p><strong>Error:</strong> There was a problem updating <code><a href=\"$uri\">${display_uri}</a></code></p></li>\n"; + echo "<li><p><strong>Error:</strong> There was a problem updating <code><a href=\"$uri\">{$display_uri}</a></code></p></li>\n"; endif; endforeach; echo "</ul>\n"; diff --git a/posts-page.php b/posts-page.php index 1f20dd6..e86448f 100644 --- a/posts-page.php +++ b/posts-page.php @@ -359,7 +359,7 @@ function formatting_box ($page, $box = NULL) { 'closed' => sprintf(__("Don't ".strtolower($how['accept'])." %s"), __($onThesePosts)), ); $params[$what] = array( - 'input-name' => "feed_${what}_status", + 'input-name' => "feed_{$what}_status", 'setting-default' => NULL, 'global-setting-default' => FeedWordPress::syndicated_status($what, /*default=*/ 'closed'), 'labels' => array( @@ -377,7 +377,7 @@ function formatting_box ($page, $box = NULL) { <tr><th scope="row"><?php print $how['label']; ?>:</th> <td><?php $this->setting_radio_control( - "$what status", "syndicated_${what}_status", + "$what status", "syndicated_{$what}_status", $settings[$what], $params[$what] ); ?></td></tr> diff --git a/syndicatedlink.class.php b/syndicatedlink.class.php index 459861f..4b66e6f 100644 --- a/syndicatedlink.class.php +++ b/syndicatedlink.class.php @@ -319,7 +319,7 @@ public function poll ($crash_ts = NULL) { $suffix = ($crashed ? 'crashed' : 'completed'); do_action('update_syndicated_feed_items', $this->id, $this); - do_action("update_syndicated_feed_items_${suffix}", $this->id, $this); + do_action("update_syndicated_feed_items_{$suffix}", $this->id, $this); $this->update_setting('update/processed', $processed); if (!$crashed) : @@ -880,7 +880,7 @@ public function postmeta ($params = array()) { // Now, run through and parse them all. foreach ($this->postmeta[/*parsed=*/ false] as $key => $meta) : - $meta = apply_filters("syndicated_link_post_meta_${key}_pre", $meta, $this); + $meta = apply_filters("syndicated_link_post_meta_{$key}_pre", $meta, $this); $this->postmeta[/*parsed=*/ false][$key] = $meta; $this->postmeta[/*parsed=*/ true][$key] = new FeedWordPressParsedPostMeta($meta); endforeach; diff --git a/syndicatedpost.class.php b/syndicatedpost.class.php index b0fc43d..803b740 100644 --- a/syndicatedpost.class.php +++ b/syndicatedpost.class.php @@ -207,10 +207,10 @@ public function __construct ($item, $source) { if (!is_null($value)) : if ($what=='title') : $key = 'syndication_source'; elseif ($what=='feed') : $key = 'syndication_feed'; - else : $key = "syndication_source_${what}"; + else : $key = "syndication_source_{$what}"; endif; - $sourcemeta["${key}_original"] = apply_filters( + $sourcemeta["{$key}_original"] = apply_filters( 'syndicated_item_original_source_'.$what, $value, $this @@ -1530,7 +1530,7 @@ protected function secure_term_ids () { // Allow FWP add-on filters to control the taxonomies we use to search for a term $taxonomies = apply_filters("syndicated_post_terms_match", $taxonomies, $what, $this); - $taxonomies = apply_filters("syndicated_post_terms_match_${what}", $taxonomies, $this); + $taxonomies = apply_filters("syndicated_post_terms_match_{$what}", $taxonomies, $this); // Allow FWP add-on filters to control with greater precision what happens on unmatched $unmatched = apply_filters("syndicated_post_terms_unfamiliar",