}
}
+ $forceRedirect = false;
+
if ( 'publish' === get_post_status( $post_id ) ) {
$redirect = get_post_permalink( $post_id );
+ } elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+ $forceRedirect = true;
+ $redirect = get_edit_post_link( $post_id, 'js' );
} else {
$redirect = false;
}
$redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post['post_status'] );
if ( $redirect ) {
- wp_send_json_success( array( 'redirect' => $redirect ) );
+ wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
} else {
wp_send_json_success( array( 'postSaved' => true ) );
}
continue;
}
- // @todo Find a more performant to check existence, maybe get_term() with a separate parent check.
- if ( ! $cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) ) {
- $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+ // @todo Find a more performant way to check existence, maybe get_term() with a separate parent check.
+ if ( term_exists( $cat_name, $taxonomy->name, $parent ) ) {
+ if ( count( $names ) === 1 ) {
+ wp_send_json_error( array( 'errorMessage' => __( 'This category already exists.' ) ) );
+ } else {
+ continue;
+ }
}
+ $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+
if ( is_wp_error( $cat_id ) ) {
continue;
} elseif ( is_array( $cat_id ) ) {
* @return string Source's HTML sanitized markup
*/
public function fetch_source_html( $url ) {
- // Download source page to tmp file.
- $source_tmp_file = ( ! empty( $url ) ) ? download_url( $url, 30 ) : '';
- $source_content = '';
-
- if ( ! is_wp_error( $source_tmp_file ) && file_exists( $source_tmp_file ) ) {
-
- // Get the content of the source page from the tmp file..
- $source_content = wp_kses(
- @file_get_contents( $source_tmp_file ),
- array(
- 'img' => array(
- 'src' => array(),
- 'width' => array(),
- 'height' => array(),
- ),
- 'iframe' => array(
- 'src' => array(),
- ),
- 'link' => array(
- 'rel' => array(),
- 'itemprop' => array(),
- 'href' => array(),
- ),
- 'meta' => array(
- 'property' => array(),
- 'name' => array(),
- 'content' => array(),
- )
- )
- );
+ global $wp_version;
+
+ if ( empty( $url ) ) {
+ return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+ }
- // All done with backward compatibility. Let's do some cleanup, for good measure :)
- unlink( $source_tmp_file );
+ $remote_url = wp_safe_remote_get( $url, array(
+ 'timeout' => 30,
+ // Use an explicit user-agent for Press This
+ 'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
+ ) );
- } else if ( is_wp_error( $source_tmp_file ) ) {
- $source_content = new WP_Error( 'upload-error', sprintf( __( 'Error: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
- } else if ( ! file_exists( $source_tmp_file ) ) {
- $source_content = new WP_Error( 'no-local-file', sprintf( __( 'Error: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
+ if ( is_wp_error( $remote_url ) ) {
+ return $remote_url;
}
+ $useful_html_elements = array(
+ 'img' => array(
+ 'src' => true,
+ 'width' => true,
+ 'height' => true,
+ ),
+ 'iframe' => array(
+ 'src' => true,
+ ),
+ 'link' => array(
+ 'rel' => true,
+ 'itemprop' => true,
+ 'href' => true,
+ ),
+ 'meta' => array(
+ 'property' => true,
+ 'name' => true,
+ 'content' => true,
+ )
+ );
+
+ $source_content = wp_remote_retrieve_body( $remote_url );
+ $source_content = wp_kses( $source_content, $useful_html_elements );
+
return $source_content;
}
/**
* Utility method to limit image source URLs.
*
- * Excluded URLs include share-this type buttons, loaders, spinners, spacers, WP interface images,
- * tiny buttons or thumbs, mathtag.com or quantserve.com images, or the WP stats gif.
+ * Excluded URLs include share-this type buttons, loaders, spinners, spacers, WordPress interface images,
+ * tiny buttons or thumbs, mathtag.com or quantserve.com images, or the WordPress.com stats gif.
*
* @ignore
* @since 4.2.0
private function _limit_img( $src ) {
$src = $this->_limit_url( $src );
- if ( preg_match( '/\/ad[sx]{1}?\//', $src ) ) {
+ if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
// Ads
return '';
- } else if ( preg_match( '/(\/share-?this[^\.]+?\.[a-z0-9]{3,4})(\?.*)?$/', $src ) ) {
+ } else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
// Share-this type button
return '';
- } else if ( preg_match( '/\/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)/', $src ) ) {
+ } else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
// Loaders, spinners, spacers
return '';
- } else if ( preg_match( '/\/([^\.\/]+[-_]{1})?(spinner|loading|spacer|blank)s?([-_]{1}[^\.\/]+)?\.[a-z0-9]{3,4}/', $src ) ) {
+ } else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
// Fancy loaders, spinners, spacers
return '';
- } else if ( preg_match( '/([^\.\/]+[-_]{1})?thumb[^.]*\.(gif|jpg|png)$/', $src ) ) {
+ } else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
// Thumbnails, too small, usually irrelevant to context
return '';
- } else if ( preg_match( '/\/wp-includes\//', $src ) ) {
- // Classic WP interface images
+ } else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+ // Classic WordPress interface images
return '';
- } else if ( preg_match( '/[^\d]{1}\d{1,2}x\d+\.(gif|jpg|png)$/', $src ) ) {
+ } else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
// Most often tiny buttons/thumbs (< 100px wide)
return '';
- } else if ( preg_match( '/\/pixel\.(mathtag|quantserve)\.com/', $src ) ) {
+ } else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
// See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
return '';
- } else if ( preg_match( '/\/[gb]\.gif(\?.+)?$/', $src ) ) {
- // Classic WP stats gif
+ } else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+ // WordPress.com stats gif
return '';
}
private function _limit_embed( $src ) {
$src = $this->_limit_url( $src );
- if ( preg_match( '/\/\/(m|www)\.youtube\.com\/(embed|v)\/([^\?]+)\?.+$/', $src, $src_matches ) ) {
+ if ( empty( $src ) )
+ return '';
+
+ if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
// Embedded Youtube videos (www or mobile)
$src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
- } else if ( preg_match( '/\/\/player\.vimeo\.com\/video\/([\d]+)([\?\/]{1}.*)?$/', $src, $src_matches ) ) {
+ } else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
// Embedded Vimeo iframe videos
$src = 'https://vimeo.com/' . (int) $src_matches[1];
- } else if ( preg_match( '/\/\/vimeo\.com\/moogaloop\.swf\?clip_id=([\d]+)$/', $src, $src_matches ) ) {
+ } else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
// Embedded Vimeo Flash videos
$src = 'https://vimeo.com/' . (int) $src_matches[1];
- } else if ( preg_match( '/\/\/vine\.co\/v\/([^\/]+)\/embed/', $src, $src_matches ) ) {
+ } else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
// Embedded Vine videos
$src = 'https://vine.co/v/' . $src_matches[1];
- } else if ( preg_match( '/\/\/(www\.)?dailymotion\.com\/embed\/video\/([^\/\?]+)([\/\?]{1}.+)?/', $src, $src_matches ) ) {
+ } else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
// Embedded Daily Motion videos
$src = 'https://www.dailymotion.com/video/' . $src_matches[2];
- } else if ( ! preg_match( '/\/\/(m|www)\.youtube\.com\/watch\?/', $src ) // Youtube video page (www or mobile)
- && ! preg_match( '/\/youtu\.be\/.+$/', $src ) // Youtu.be video page
- && ! preg_match( '/\/\/vimeo\.com\/[\d]+$/', $src ) // Vimeo video page
- && ! preg_match( '/\/\/(www\.)?dailymotion\.com\/video\/.+$/', $src ) // Daily Motion video page
- && ! preg_match( '/\/\/soundcloud\.com\/.+$/', $src ) // SoundCloud audio page
- && ! preg_match( '/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/', $src ) // Twitter status page
- && ! preg_match( '/\/\/vine\.co\/v\/[^\/]+/', $src ) ) { // Vine video page
- $src = '';
+ } else {
+ require_once( ABSPATH . WPINC . '/class-oembed.php' );
+ $oembed = _wp_oembed_get_object();
+
+ if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+ $src = '';
+ }
}
return $src;
}
}
}
+
+ // Support passing a single image src as `i`
+ if ( ! empty( $_REQUEST['i'] ) && ( $img_src = $this->_limit_img( wp_unslash( $_REQUEST['i'] ) ) ) ) {
+ if ( empty( $data['_images'] ) ) {
+ $data['_images'] = array( $img_src );
+ } elseif ( ! in_array( $img_src, $data['_images'], true ) ) {
+ array_unshift( $data['_images'], $img_src );
+ }
+ }
}
/**
$press_this = str_replace( '.css', '-rtl.css', $press_this );
}
- return $styles . $press_this;
+ $open_sans_font_url = '';
+
+ /* translators: If there are characters in your language that are not supported
+ * by Open Sans, translate this to 'off'. Do not translate into your own language.
+ */
+ if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+ $subsets = 'latin,latin-ext';
+
+ /* translators: To add an additional Open Sans character subset specific to your language,
+ * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
+ */
+ $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+
+ if ( 'cyrillic' == $subset ) {
+ $subsets .= ',cyrillic,cyrillic-ext';
+ } elseif ( 'greek' == $subset ) {
+ $subsets .= ',greek,greek-ext';
+ } elseif ( 'vietnamese' == $subset ) {
+ $subsets .= ',vietnamese';
+ }
+
+ $query_args = array(
+ 'family' => urlencode( 'Open Sans:400italic,700italic,400,600,700' ),
+ 'subset' => urlencode( $subsets ),
+ );
+
+ $open_sans_font_url = ',' . add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+ }
+
+ return $styles . $press_this . $open_sans_font_url;
}
/**
?>
<div id="post-formats-select">
- <fieldset><legend class="screen-reader-text"><?php _e( 'Post formats' ); ?></legend>
+ <fieldset><legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> />
<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
<?php
if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
?>
- <button type="button" class="add-cat-toggle button-subtle" aria-expanded="false">
+ <button type="button" class="add-cat-toggle button-link" aria-expanded="false">
<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e( 'Toggle add category' ); ?></span>
</button>
<div class="add-category is-hidden">
if ( $user_can_assign_terms ) {
?>
- <button type="button" class="button-reset button-link tagcloud-link" id="link-post_tag"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
+ <button type="button" class="button-link tagcloud-link" id="link-post_tag"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
<?php
}
}
* @access public
*
* @param array $data The site's data.
- * @returns array Embeds selected to be available.
+ * @return array Embeds selected to be available.
*/
public function get_embeds( $data ) {
$selected_embeds = array();
+ // Make sure to add the Pressed page if it's a valid oembed itself
+ if ( ! empty ( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+ $data['_embeds'][] = $data['u'];
+ }
+
if ( ! empty( $data['_embeds'] ) ) {
- foreach( $data['_embeds'] as $src ) {
+ foreach ( $data['_embeds'] as $src ) {
$prot_relative_src = preg_replace( '/^https?:/', '', $src );
if ( in_array( $prot_relative_src, $this->embeds ) ) {
* @access public
*
* @param array $data The site's data.
- * @returns array
+ * @return array
*/
public function get_images( $data ) {
$selected_images = array();
if ( ! empty( $data['_images'] ) ) {
- foreach( $data['_images'] as $src ) {
+ foreach ( $data['_images'] as $src ) {
if ( false !== strpos( $src, 'gravatar.com' ) ) {
$src = preg_replace( '%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src );
}
* @access public
*
* @param array $data The site's data.
- * @returns string Discovered canonical URL, or empty
+ * @return string Discovered canonical URL, or empty
*/
public function get_canonical_link( $data ) {
$link = '';
* @access public
*
* @param array $data The site's data.
- * @returns string Discovered site name, or empty
+ * @return string Discovered site name, or empty
*/
public function get_source_site_name( $data ) {
$name = '';
* @access public
*
* @param array $data The site's data.
- * @returns string Discovered page title, or empty
+ * @return string Discovered page title, or empty
*/
public function get_suggested_title( $data ) {
$title = '';
if ( ! empty( $data['t'] ) ) {
$title = $data['t'];
- } elseif( ! empty( $data['_meta'] ) ) {
+ } elseif ( ! empty( $data['_meta'] ) ) {
if ( ! empty( $data['_meta']['twitter:title'] ) ) {
$title = $data['_meta']['twitter:title'];
} else if ( ! empty( $data['_meta']['og:title'] ) ) {
* @access public
*
* @param array $data The site's data.
- * @returns string Discovered content, or empty
+ * @return string Discovered content, or empty
*/
public function get_suggested_content( $data ) {
$content = $text = '';
$default_html = array( 'quote' => '', 'link' => '', 'embed' => '' );
- require_once( ABSPATH . WPINC . '/class-oembed.php' );
- $oembed = _wp_oembed_get_object();
-
- if ( ! empty( $data['u'] ) && $oembed->get_provider( $data['u'], array( 'discover' => false ) ) ) {
+ if ( ! empty( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
$default_html['embed'] = '<p>[embed]' . $data['u'] . '[/embed]</p>';
if ( ! empty( $data['s'] ) ) {
*
* @since 4.2.0
* @access public
+ *
+ * @global WP_Locale $wp_locale
+ * @global string $wp_version
+ * @global bool $is_IE
*/
public function html() {
global $wp_locale, $wp_version;
$post_title = $this->get_suggested_title( $data );
- if ( empty( $title ) ) {
- $title = __( 'New Post' );
- }
-
$post_content = $this->get_suggested_content( $data );
// Get site settings array/data.
<span class="current-site-name"><?php bloginfo( 'name' ); ?></span>
</a>
</h1>
- <button type="button" class="options button-subtle closed">
+ <button type="button" class="options button-link closed">
<span class="dashicons dashicons-tag on-closed"></span>
<span class="screen-reader-text on-closed"><?php _e( 'Show post options' ); ?></span>
<span aria-hidden="true" class="on-open"><?php _e( 'Done' ); ?></span>
<input type="hidden" name="post_status" id="post_status" value="draft" />
<input type="hidden" name="wp-preview" id="wp-preview" value="" />
<input type="hidden" name="post_title" id="post_title" value="" />
+ <input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
<?php
wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
'statusbar' => false,
'autoresize_min_height' => 600,
'wp_autoresize_on' => true,
- 'plugins' => 'lists,media,paste,tabfocus,fullscreen,wordpress,wpautoresize,wpeditimage,wpgallery,wplink,wpview',
+ 'plugins' => 'lists,media,paste,tabfocus,fullscreen,wordpress,wpautoresize,wpeditimage,wpgallery,wplink,wptextpattern,wpview',
'toolbar1' => 'bold,italic,bullist,numlist,blockquote,link,unlink',
'toolbar2' => 'undo,redo',
),
- 'quicktags' => false,
+ 'quicktags' => array(
+ 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
+ ),
) );
?>
<div class="post-options">
<?php if ( $supports_formats ) : ?>
- <button type="button" class="button-reset post-option">
+ <button type="button" class="button-link post-option">
<span class="dashicons dashicons-admin-post"></span>
<span class="post-option-title"><?php _ex( 'Format', 'post format' ); ?></span>
<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html( get_post_format_string( $post_format ) ); ?></span>
</button>
<?php endif; ?>
- <button type="button" class="button-reset post-option">
+ <button type="button" class="button-link post-option">
<span class="dashicons dashicons-category"></span>
<span class="post-option-title"><?php _e( 'Categories' ); ?></span>
<span class="dashicons post-option-forward"></span>
</button>
- <button type="button" class="button-reset post-option">
+ <button type="button" class="button-link post-option">
<span class="dashicons dashicons-tag"></span>
<span class="post-option-title"><?php _e( 'Tags' ); ?></span>
<span class="dashicons post-option-forward"></span>
<?php if ( $supports_formats ) : ?>
<div class="setting-modal is-off-screen is-hidden">
- <button type="button" class="button-reset modal-close">
+ <button type="button" class="button-link modal-close">
<span class="dashicons post-option-back"></span>
<span class="setting-title" aria-hidden="true"><?php _ex( 'Format', 'post format' ); ?></span>
<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
<?php endif; ?>
<div class="setting-modal is-off-screen is-hidden">
- <button type="button" class="button-reset modal-close">
+ <button type="button" class="button-link modal-close">
<span class="dashicons post-option-back"></span>
<span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
</div>
<div class="setting-modal tags is-off-screen is-hidden">
- <button type="button" class="button-reset modal-close">
+ <button type="button" class="button-link modal-close">
<span class="dashicons post-option-back"></span>
<span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
<div class="press-this-actions">
<div class="pressthis-media-buttons">
- <button type="button" class="insert-media button-subtle" data-editor="pressthis">
+ <button type="button" class="insert-media button-link" data-editor="pressthis">
<span class="dashicons dashicons-admin-media"></span>
<span class="screen-reader-text"><?php _e( 'Add Media' ); ?></span>
</button>
</div>
<div class="post-actions">
<span class="spinner"> </span>
- <button type="button" class="button-subtle draft-button" aria-live="polite">
- <span class="save-draft"><?php _e( 'Save Draft' ); ?></span>
- <span class="saving-draft"><?php _e( 'Saving...' ); ?></span>
- </button>
- <a href="<?php echo esc_url( get_edit_post_link( $post_ID ) ); ?>" class="edit-post-link" style="display: none;" target="_blank"><?php _e( 'Standard Editor' ); ?></a>
- <button type="button" class="button-subtle preview-button"><?php _e( 'Preview' ); ?></button>
- <button type="button" class="button-primary publish-button"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></button>
+ <div class="split-button">
+ <div class="split-button-head">
+ <button type="button" class="publish-button split-button-primary" aria-live="polite">
+ <span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
+ <span class="saving-draft"><?php _e( 'Saving…' ); ?></span>
+ </button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
+ <i class="dashicons dashicons-arrow-down-alt2"></i>
+ <span class="screen-reader-text"><?php _e('More actions'); ?></span>
+ </button>
+ </div>
+ <ul class="split-button-body">
+ <li><button type="button" class="button-link draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
+ <li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
+ <li><button type="button" class="button-link preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
+ </ul>
+ </div>
</div>
</div>
</form>
}
}
+/**
+ *
+ * @global WP_Press_This $wp_press_this
+ */
$GLOBALS['wp_press_this'] = new WP_Press_This;
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff