Changeset 3753

Timestamp:

02/22/2012 07:32:48 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Add autoembed to topics and replies.

• Includes admin setting to toggle on/off (default on)
• Introduce option function to get the setting globally
• Hooked into bbp_init so can be overridden as needed
• Fixes #1752
• Props jaredatch for original patch

Location:

branches/plugin

Files:

• bbp-admin/bbp-admin.php (modified) (1 diff)
• bbp-admin/bbp-settings.php (modified) (2 diffs)
• bbp-includes/bbp-core-hooks.php (modified) (1 diff)
• bbp-includes/bbp-core-options.php (modified) (2 diffs)
• bbp-includes/bbp-reply-functions.php (modified) (1 diff)
• bbp-includes/bbp-topic-functions.php (modified) (1 diff)

branches/plugin/bbp-admin/bbp-admin.php

@@ -268 +268 @@
         }
 
-        // Allow global access setting
-        add_settings_field( '_bbp_use_wp_editor', __( 'Fancy Editor',  'bbpress' ), 'bbp_admin_setting_callback_use_wp_editor', 'bbpress', 'bbp_main' );
-        register_setting  ( 'bbpress',            '_bbp_use_wp_editor',             'intval'                                                          );
+        // Allow Fancy editor setting
+        add_settings_field( '_bbp_use_wp_editor', __( 'Fancy Editor',     'bbpress' ), 'bbp_admin_setting_callback_use_wp_editor', 'bbpress', 'bbp_main' );
+        register_setting  ( 'bbpress',            '_bbp_use_wp_editor',                'intval'                                                          );
+        
+        // Allow oEmbeds setting
+        add_settings_field( '_bbp_use_autoembed', __( 'Auto-embed Links', 'bbpress' ), 'bbp_admin_setting_callback_use_autoembed', 'bbpress', 'bbp_main' );
+        register_setting  ( 'bbpress',           '_bbp_use_autoembed',                 'intval'                                                          );
 
         /** Per Page Section **************************************************/

branches/plugin/bbp-admin/bbp-settings.php

@@ -150 +150 @@
     <input id="_bbp_use_wp_editor" name="_bbp_use_wp_editor" type="checkbox" id="_bbp_use_wp_editor" value="1" <?php checked( bbp_use_wp_editor( true ) ); ?> />
     <label for="_bbp_use_wp_editor"><?php _e( 'Use the fancy WordPress editor to create and edit topics and replies', 'bbpress' ); ?></label>
+
+<?php
+}
+
+/**
+ * Allow oEmbed in replies
+ *
+ * @since bbPress (r3752)
+ *
+ * @uses checked() To display the checked attribute
+ */
+function bbp_admin_setting_callback_use_autoembed() {
+?>
+
+    <input id="_bbp_use_autoembed" name="bbp_use_autoembed" type="checkbox" id="_bbp_use_autoembed" value="1" <?php checked( bbp_use_autoembed( true ) ); ?> />
+    <label for="_bbp_use_autoembed"><?php _e( 'Embed media (YouTube, Twitter, Flickr, etc...) directly into topics and replies.', 'bbpress' ); ?></label>
 
 <?php
@@ -594 +610 @@
                             '<li>' . __( '"Anonymous Posting" allows guest users who do not have accounts on your site to both create topics as well as replies.',                                                             'bbpress' ) . '</li>' .
                             '<li>' . __( 'The Fancy Editor brings the luxury of the Visual editor and HTML editor from the traditional WordPress dashboard into your theme.',                                                  'bbpress' ) . '</li>' .
+                            '<li>' . __( 'Auto-embed will embed the media content from a URL directly into the replies. For example: links to Flickr and YouTube.',                                                            'bbpress' ) . '</li>' .
                         '</ul>' .
                     '</p>' .

branches/plugin/bbp-includes/bbp-core-hooks.php

@@ -71 +71 @@
  *                                                    v---Load order
  */
-add_action( 'bbp_init', 'bbp_load_textdomain',        2   );
-add_action( 'bbp_init', 'bbp_setup_option_filters',   4   );
-add_action( 'bbp_init', 'bbp_register_post_types',    10  );
-add_action( 'bbp_init', 'bbp_register_post_statuses', 12  );
-add_action( 'bbp_init', 'bbp_register_taxonomies',    14  );
-add_action( 'bbp_init', 'bbp_register_views',         16  );
-add_action( 'bbp_init', 'bbp_register_shortcodes',    18  );
-add_action( 'bbp_init', 'bbp_add_rewrite_tags',       20  );
-add_action( 'bbp_init', 'bbp_ready',                  999 );
+add_action( 'bbp_init', 'bbp_load_textdomain',         2   );
+add_action( 'bbp_init', 'bbp_setup_option_filters',    4   );
+add_action( 'bbp_init', 'bbp_register_post_types',     10  );
+add_action( 'bbp_init', 'bbp_register_post_statuses',  12  );
+add_action( 'bbp_init', 'bbp_register_taxonomies',     14  );
+add_action( 'bbp_init', 'bbp_register_views',          16  );
+add_action( 'bbp_init', 'bbp_register_shortcodes',     18  );
+add_action( 'bbp_init', 'bbp_add_rewrite_tags',        20  );
+add_action( 'bbp_init', 'bbp_ready',                   999 );
+
+// Autoembeds
+add_filter( 'bbp_init', 'bbp_reply_content_autoembed', 8   );
+add_filter( 'bbp_init', 'bbp_topic_content_autoembed', 8   );
 
 /**

branches/plugin/bbp-includes/bbp-core-options.php

@@ -49 +49 @@
         // Use the WordPress editor if available
         '_bbp_use_wp_editor'        => true,
+        
+        // Use the WordPress editor if available
+        '_bbp_use_wp_editor'        => true,
+        
+        // Allow oEmbed in topics and replies
+        '_bbp_allow_oembed'         => false,
 
         /** Per Page **********************************************************/
@@ -329 +335 @@
 function bbp_use_wp_editor( $default = true ) {
     return (bool) apply_filters( 'bbp_use_wp_editor', (bool) get_option( '_bbp_use_wp_editor', $default ) );
+}
+
+/**
+ * Use WordPress's oEmbed API
+ *
+ * @since bbPress (r3752)
+ *
+ * @param $default bool Optional. Default value true
+ *
+ * @uses get_option() To get the oEmbed option
+ * @return bool Use oEmbed?
+ */
+function bbp_use_autoembed( $default = true ) {
+    return (bool) apply_filters( 'bbp_use_autoembed', (bool) get_option( '_bbp_use_autoembed', $default ) );
 }
 

branches/plugin/bbp-includes/bbp-reply-functions.php

@@ -1341 +1341 @@
 }
 
+/** Autoembed *****************************************************************/
+
+/**
+ * Check if autoembeds are enabled and hook them in if so
+ *
+ * @since bbPress (r3752)
+ * @global WP_Embed $wp_embed
+ */
+function bbp_reply_content_autoembed() {
+    global $wp_embed;
+
+    if ( bbp_use_autoembed() && is_a( $wp_embed, 'WP_Embed' ) ) {
+        add_filter( 'bbp_get_reply_content', array( $wp_embed, 'autoembed' ), 8 );      
+    }
+}
+
 /** Feeds *********************************************************************/
 

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -2960 +2960 @@
 }
 
+/** Autoembed *****************************************************************/
+
+/**
+ * Check if autoembeds are enabled and hook them in if so
+ *
+ * @since bbPress (r3752)
+ * @global WP_Embed $wp_embed
+ */
+function bbp_topic_content_autoembed() {
+    global $wp_embed;
+
+    if ( bbp_use_autoembed() && is_a( $wp_embed, 'WP_Embed' ) ) {
+        add_filter( 'bbp_get_topic_content', array( $wp_embed, 'autoembed' ), 8 );      
+    }
+}
+
 /** Feeds *********************************************************************/