rtMedia for WordPress, BuddyPress and bbPress

Version Description

Remove Unused file, remove wp_load and add admin_ajax

Release Info

Developer	faishal
Plugin	rtMedia for WordPress, BuddyPress and bbPress
Version	3.2.10.2
Comparing to
See all releases

Code changes from version 3.2.10.1 to 3.2.10.2

Files changed (12) hide show

app/admin/RTMediaAdmin.php +4 -4
app/assets/js/admin.js +9 -9
app/helper/RTMediaFeed.php +2 -1
app/importers/BPMediaAlbumimporter.php +1 -1
app/importers/RTMediaMigration.php +1 -1
app/main/RTMedia.php +9 -5
app/main/controllers/media/RTMediaViewCount.php +6 -6
app/main/controllers/shortcodes/RTMediaGalleryShortcode.php +15 -6
index.php +8 -1
readme.txt +6 -3
templates/media/album-gallery-item.php +1 -18
templates/media/media-gallery-item.php +0 -17

app/admin/RTMediaAdmin.php CHANGED Viewed

	@@ -24,14 +24,14 @@ if ( ! class_exists ( 'RTMediaAdmin' ) ) {
24	add_action ( 'network_admin_notices', array( $this, 'upload_filetypes_error' ) );
25	add_action ( 'admin_notices', array( $this, 'upload_filetypes_error' ) );
26	}
27	- $rtmedia_feed = new RTMediaFeed();
28	add_filter ( "plugin_action_links_" . RTMEDIA_BASE_NAME, array( &$this, 'plugin_add_settings_link' ) );
29	- add_action ( 'wp_ajax_rtmedia_fetch_feed', array( $rtmedia_feed, 'fetch_feed' ), 1 );
30	$this->rtmedia_support = new RTMediaSupport();
31	add_action ( 'wp_ajax_rtmedia_select_request', array( $this->rtmedia_support, 'get_form' ), 1 );
32	add_action ( 'wp_ajax_rtmedia_cancel_request', create_function ( '', 'do_settings_sections("rtmedia-support"); die();' ), 1 );
33	add_action ( 'wp_ajax_rtmedia_submit_request', array( $this->rtmedia_support, 'submit_request' ), 1 );
34	- add_action ( 'wp_ajax_rtmedia_fetch_feed', array( $rtmedia_feed, 'fetch_feed' ), 1 );
35	add_action ( 'wp_ajax_rtmedia_linkback', array( $this, 'linkback' ), 1 );
36	add_action ( 'wp_ajax_rtmedia_rt_album_deactivate', 'BPMediaAlbumimporter::bp_album_deactivate', 1 );
37	add_action ( 'wp_ajax_rtmedia_rt_album_import', 'BPMediaAlbumimporter::bpmedia_ajax_import_callback', 1 );
	@@ -953,7 +953,7 @@ if ( ! class_exists ( 'RTMediaAdmin' ) ) {
953	new RTMediaAdminWidget ( 'branding', __( 'Subscribe', 'rtmedia' ), $branding );
954
955	$news = '<img src ="' . admin_url ( '/images/wpspin_light.gif' ) . '" /> Loading...';
956	- new RTMediaAdminWidget ( 'latest-news', __( 'Latest News', 'rtmedia' ), $news );
957	do_action ( 'rtmedia_after_default_admin_widgets' );
958	}
959


24	add_action ( 'network_admin_notices', array( $this, 'upload_filetypes_error' ) );
25	add_action ( 'admin_notices', array( $this, 'upload_filetypes_error' ) );
26	}
27	+ //$rtmedia_feed = new RTMediaFeed();
28	add_filter ( "plugin_action_links_" . RTMEDIA_BASE_NAME, array( &$this, 'plugin_add_settings_link' ) );
29	+ //add_action ( 'wp_ajax_rtmedia_fetch_feed', array( $rtmedia_feed, 'fetch_feed' ), 1 );
30	$this->rtmedia_support = new RTMediaSupport();
31	add_action ( 'wp_ajax_rtmedia_select_request', array( $this->rtmedia_support, 'get_form' ), 1 );
32	add_action ( 'wp_ajax_rtmedia_cancel_request', create_function ( '', 'do_settings_sections("rtmedia-support"); die();' ), 1 );
33	add_action ( 'wp_ajax_rtmedia_submit_request', array( $this->rtmedia_support, 'submit_request' ), 1 );
34	+ //add_action ( 'wp_ajax_rtmedia_fetch_feed', array( $rtmedia_feed, 'fetch_feed' ), 1 );
35	add_action ( 'wp_ajax_rtmedia_linkback', array( $this, 'linkback' ), 1 );
36	add_action ( 'wp_ajax_rtmedia_rt_album_deactivate', 'BPMediaAlbumimporter::bp_album_deactivate', 1 );
37	add_action ( 'wp_ajax_rtmedia_rt_album_import', 'BPMediaAlbumimporter::bpmedia_ajax_import_callback', 1 );

953	new RTMediaAdminWidget ( 'branding', __( 'Subscribe', 'rtmedia' ), $branding );
954
955	$news = '<img src ="' . admin_url ( '/images/wpspin_light.gif' ) . '" /> Loading...';
956	+ //new RTMediaAdminWidget ( 'latest-news', __( 'Latest News', 'rtmedia' ), $news );
957	do_action ( 'rtmedia_after_default_admin_widgets' );
958	}
959

app/assets/js/admin.js CHANGED Viewed

	@@ -11,15 +11,15 @@ jQuery(document).ready(function($) {
11	})
12
13	/* Fetch Feed */
14	- var rtmedia_news_section = jQuery('#latest-news');
15	- if (rtmedia_news_section.length > 0) {
16	- var data = {
17	- action: 'rtmedia_fetch_feed'
18	- };
19	- jQuery.post(rtmedia_admin_ajax, data, function(response) {
20	- rtmedia_news_section.find('.inside').html(response);
21	- });
22	- }
23
24	/* Select Request */
25	jQuery('#bp-media-settings-boxes').on('change', '#select-request', function() {


11	})
12
13	/* Fetch Feed */
14	+ // var rtmedia_news_section = jQuery('#latest-news');
15	+ // if (rtmedia_news_section.length > 0) {
16	+ // var data = {
17	+ // action: 'rtmedia_fetch_feed'
18	+ // };
19	+ // jQuery.post(rtmedia_admin_ajax, data, function(response) {
20	+ // rtmedia_news_section.find('.inside').html(response);
21	+ // });
22	+ // }
23
24	/* Select Request */
25	jQuery('#bp-media-settings-boxes').on('change', '#select-request', function() {

app/helper/RTMediaFeed.php CHANGED Viewed

	@@ -8,7 +8,8 @@
8	*/
9	class RTMediaFeed {
10
11	- public $feed_url = 'http://rtcamp.com/tag/buddypress/feed/';

12
13	public function __construct($feed_url = '') {
14	if ($feed_url)


8	*/
9	class RTMediaFeed {
10
11	+ //public $feed_url = 'http://rtcamp.com/tag/buddypress/feed/';
12	+ public $feed_url = '';
13
14	public function __construct($feed_url = '') {
15	if ($feed_url)

app/importers/BPMediaAlbumimporter.php CHANGED Viewed

	@@ -169,7 +169,7 @@ class BPMediaAlbumimporter extends BPMediaImporter {
169	echo '<strong>' . __('Why don\'t you try adding some instagram like effects to your images?', 'rtmedia') . '</strong>';
170	echo '<div class="bp-media-addon">
171	<a href="http://rtcamp.com/store/buddypress-media-instagram/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media&utm_content=bp-album-importer" title="BuddyPress-Media Instagram" target="_blank">
172	- <img width="240" height="184" title="BuddyPress-Media Instagram" alt="BuddyPress-Media Instagram" src="~~http://rtcamp~~.~~com/wp-content/uploads/2013/03/~~BuddyPressMedia-Instagram.png?ref=bp-album-importer">
173	</a>
174	<h4><a href="http://rtcamp.com/store/buddypress-media-instagram/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media&utm_content=bp-album-importer" title="BuddyPress-Media Instagram" target="_blank">BuddyPress-Media Instagram</a></h4>
175	<div class="product_desc">


169	echo '<strong>' . __('Why don\'t you try adding some instagram like effects to your images?', 'rtmedia') . '</strong>';
170	echo '<div class="bp-media-addon">
171	<a href="http://rtcamp.com/store/buddypress-media-instagram/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media&utm_content=bp-album-importer" title="BuddyPress-Media Instagram" target="_blank">
172	+ <img width="240" height="184" title="BuddyPress-Media Instagram" alt="BuddyPress-Media Instagram" src="'.$img_src.'BuddyPressMedia-Instagram.png?ref=bp-album-importer">
173	</a>
174	<h4><a href="http://rtcamp.com/store/buddypress-media-instagram/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media&utm_content=bp-album-importer" title="BuddyPress-Media Instagram" target="_blank">BuddyPress-Media Instagram</a></h4>
175	<div class="product_desc">

app/importers/RTMediaMigration.php CHANGED Viewed

	@@ -209,7 +209,7 @@ class RTMediaMigration {
209	$album_count = 0;
210	}
211	}
212	- if ( intval ( $_SESSION[ "migration_media" ] ) == intval ( $media_count ) ) {
213	$comment_sql = $_SESSION[ "migration_activity" ];
214	} else {
215	$comment_sql = $wpdb->get_var ( "select count(*)


209	$album_count = 0;
210	}
211	}
212	+ if ( isset($_SESSION[ "migration_activity" ]) && intval ( $_SESSION[ "migration_media" ] ) == intval ( $media_count ) ) {
213	$comment_sql = $_SESSION[ "migration_activity" ];
214	} else {
215	$comment_sql = $wpdb->get_var ( "select count(*)

app/main/RTMedia.php CHANGED Viewed

	@@ -83,6 +83,11 @@ class RTMedia
83	* @global int $bp_media_counter Media counter
84	*/
85	public function __construct() {





86	$this->default_thumbnail = apply_filters('rtmedia_default_thumbnail', RTMEDIA_URL . 'assets/thumb_default.png');
87	add_action('init', array($this, 'check_global_album'));
88	add_action('plugins_loaded', array($this, 'init'), 20);
	@@ -559,11 +564,6 @@ class RTMedia
559	*/
560	$this->set_site_options();
561
562	- /**
563	- *
564	- * Buddypress Media Auto Upgradation
565	- */
566	- $this->update_db();
567
568	/**
569	* Add a settings link to the Plugin list screen
	@@ -712,6 +712,10 @@ class RTMedia
712	if ($update->check_upgrade()) {
713	$update->do_upgrade();
714	}




715	}
716
717	function create_table_error_notice() {


83	* @global int $bp_media_counter Media counter
84	*/
85	public function __construct() {
86	+ /**
87	+ *
88	+ * Buddypress Media Auto Upgradation
89	+ */
90	+ $this->update_db();
91	$this->default_thumbnail = apply_filters('rtmedia_default_thumbnail', RTMEDIA_URL . 'assets/thumb_default.png');
92	add_action('init', array($this, 'check_global_album'));
93	add_action('plugins_loaded', array($this, 'init'), 20);

564	*/
565	$this->set_site_options();
566





567
568	/**
569	* Add a settings link to the Plugin list screen

712	if ($update->check_upgrade()) {
713	$update->do_upgrade();
714	}
715	+ if(! $update-> table_exists ( $update-> genrate_table_name ( "rtm_media" ) )){
716	+ delete_site_option($update->get_db_version_option_name());
717	+ $update->do_upgrade();
718	+ }
719	}
720
721	function create_table_error_notice() {

app/main/controllers/media/RTMediaViewCount.php CHANGED Viewed

	@@ -17,17 +17,17 @@ class RTMediaViewCount extends RTMediaUserInteraction {
17	'label' => 'view',
18	'privacy' => 0
19	);
20	- add_action( 'init', array( $this,'register_session' ) );
21	parent::__construct ($args);
22	remove_filter('rtmedia_action_buttons_before_delete', array($this,'button_filter'));
23	add_filter ( 'rtmedia_action_buttons_after_delete', array( $this, 'button_filter' ), 99 );
24	}
25
26	- function register_session(){
27	- if( !session_id() ) {
28	- session_start();
29	- }
30	- }
31
32	function render () {
33	if(isset($_SESSION['rtmedia_media_view']) && $_SESSION['rtmedia_media_view'] != "" && sizeof($_SESSION['rtmedia_media_view'] > 0)) {


17	'label' => 'view',
18	'privacy' => 0
19	);
20	+ //add_action( 'init', array( $this,'register_session' ) );
21	parent::__construct ($args);
22	remove_filter('rtmedia_action_buttons_before_delete', array($this,'button_filter'));
23	add_filter ( 'rtmedia_action_buttons_after_delete', array( $this, 'button_filter' ), 99 );
24	}
25
26	+ // function register_session(){
27	+ // if( !session_id() ) {
28	+ // session_start();
29	+ // }
30	+ // }
31
32	function render () {
33	if(isset($_SESSION['rtmedia_media_view']) && $_SESSION['rtmedia_media_view'] != "" && sizeof($_SESSION['rtmedia_media_view'] > 0)) {

app/main/controllers/shortcodes/RTMediaGalleryShortcode.php CHANGED Viewed

	@@ -22,21 +22,30 @@ class RTMediaGalleryShortcode {
22	public function __construct () {
23
24	add_shortcode ( 'rtmedia_gallery', array( 'RTMediaGalleryShortcode', 'render' ) );


25	//add_action('init', array($this, 'register_scripts'));
26	//add_action('wp_footer', array($this, 'print_script'));
27	}
28	-







29	static function register_scripts () {
30	wp_enqueue_script ( 'plupload-all' );
31	wp_enqueue_script ( 'rtmedia-backbone', RTMEDIA_URL . 'app/assets/js/rtMedia.backbone.js', array( 'plupload', 'backbone' ), false, true );
32
33	- if(is_rtmedia_album_gallery()) {
34	- $template_url = ~~RTMediaTemplate::locate_template~~ ( "album-gallery-item", "~~media/~~"~~, true~~ );
35	}else{
36	- $template_url = ~~RTMediaTemplate::locate_template~~ ( apply_filters('rtmedia_backbone_template_filter',"media-gallery-item"), "~~media/~~"~~, true~~ );
37	}
38	wp_localize_script ( 'rtmedia-backbone', 'template_url', $template_url );
39	- $url = trailingslashit ( $_SERVER[ "REQUEST_URI" ] );
40
41	if ( strpos ( $url, "/media" ) !== false ) {
42	$url_array = explode ( "/media", $url );
	@@ -64,7 +73,7 @@ class RTMediaGalleryShortcode {
64	if ( wp_is_mobile () )
65	$params[ 'multi_selection' ] = false;
66
67	- $params = apply_filters("rtmedia_modify_upload_params",$params);
68
69	wp_localize_script ( 'rtmedia-backbone', 'rtMedia_plupload_config', $params );
70	wp_localize_script ( 'rtmedia-backbone', 'rMedia_loading_file', admin_url ( "/images/loading.gif" ) );


22	public function __construct () {
23
24	add_shortcode ( 'rtmedia_gallery', array( 'RTMediaGalleryShortcode', 'render' ) );
25	+ add_action( 'wp_ajax_rtmedia_get_template',array(&$this,'ajax_rtmedia_get_template' ));
26	+ add_action( 'wp_ajax_nopriv_rtmedia_get_template', array(&$this,'ajax_rtmedia_get_template' ));
27	//add_action('init', array($this, 'register_scripts'));
28	//add_action('wp_footer', array($this, 'print_script'));
29	}
30	+
31	+ function ajax_rtmedia_get_template(){
32	+ if(isset($_REQUEST["template"])){
33	+ $template_url = RTMediaTemplate::locate_template( $_REQUEST["template"], "media/", false );
34	+ require_once $template_url ;
35	+ }
36	+ die();
37	+ }
38	static function register_scripts () {
39	wp_enqueue_script ( 'plupload-all' );
40	wp_enqueue_script ( 'rtmedia-backbone', RTMEDIA_URL . 'app/assets/js/rtMedia.backbone.js', array( 'plupload', 'backbone' ), false, true );
41
42	+ if(is_rtmedia_album_gallery()) {
43	+ $template_url = add_query_arg(array("action" => 'rtmedia_get_template', "template" => "album-gallery-item"),admin_url("admin-ajax.php"));
44	}else{
45	+ $template_url = add_query_arg(array("action" => 'rtmedia_get_template', "template" => apply_filters('rtmedia_backbone_template_filter',"media-gallery-item")),admin_url("admin-ajax.php"));
46	}
47	wp_localize_script ( 'rtmedia-backbone', 'template_url', $template_url );
48	+ $url = trailingslashit ( $_SERVER[ "REQUEST_URI" ] );
49
50	if ( strpos ( $url, "/media" ) !== false ) {
51	$url_array = explode ( "/media", $url );

73	if ( wp_is_mobile () )
74	$params[ 'multi_selection' ] = false;
75
76	+ $params = apply_filters("rtmedia_modify_upload_params",$params);
77
78	wp_localize_script ( 'rtmedia-backbone', 'rtMedia_plupload_config', $params );
79	wp_localize_script ( 'rtmedia-backbone', 'rMedia_loading_file', admin_url ( "/images/loading.gif" ) );

index.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	Plugin Name: rtMedia for WordPress, BuddyPress and bbPress
5	Plugin URI: http://rtcamp.com/buddypress-media/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
6	Description: This plugin adds missing media rich features like photos, videos and audio uploading to BuddyPress which are essential if you are building social network, seriously!
7	- Version: 3.2.10.1
8	Author: rtCamp
9	Text Domain: rtmedia
10	Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
	@@ -53,6 +53,13 @@ if ( ! defined ( 'RTMEDIA_BASE_NAME' ) ) {
53	define ( 'RTMEDIA_BASE_NAME', plugin_basename ( __FILE__ ) );
54	}
55







56	/**
57	* Auto Loader Function
58	*


4	Plugin Name: rtMedia for WordPress, BuddyPress and bbPress
5	Plugin URI: http://rtcamp.com/buddypress-media/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
6	Description: This plugin adds missing media rich features like photos, videos and audio uploading to BuddyPress which are essential if you are building social network, seriously!
7	+ Version: 3.2.10.2
8	Author: rtCamp
9	Text Domain: rtmedia
10	Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media

53	define ( 'RTMEDIA_BASE_NAME', plugin_basename ( __FILE__ ) );
54	}
55
56	+ /**
57	+ * Start session here to avoid header notice
58	+ */
59	+ if( !session_id() ) {
60	+ session_start();
61	+ }
62	+
63	/**
64	* Auto Loader Function
65	*

readme.txt CHANGED Viewed

	@@ -6,7 +6,7 @@ License: GPLv2 or later
6	License URI: http://www.gnu.org/licenses/gpl-2.0.html
7	Requires at least: WordPress 3.6
8	Tested up to: WordPress 3.7 + BuddyPress 1.8.1
9	- Stable tag: 3.2.10.1
10
11	Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices.
12
	@@ -131,6 +131,9 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
131
132	Please visit [rtMedia's Roadmap page](http://rtcamp.com/rtmedia/roadmap/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "Visit rtMedia's Features page") to get some details about future releases.
133



134	= 3.2.10.1 =
135	* Remove notices and update js libs
136
	@@ -617,8 +620,8 @@ Please visit [rtMedia's Roadmap page](http://rtcamp.com/rtmedia/roadmap/?utm_sou
617
618	== Upgrade Notice ==
619
620	- = 3.2.10.1 =
621	- Requires BuddyPress 1.7 or higher, if using BuddyPress. Remove ~~notices~~ and ~~update~~ ~~js libs.~~
622
623	== Sponsors ==
624


6	License URI: http://www.gnu.org/licenses/gpl-2.0.html
7	Requires at least: WordPress 3.6
8	Tested up to: WordPress 3.7 + BuddyPress 1.8.1
9	+ Stable tag: 3.2.10.2
10
11	Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices.
12

131
132	Please visit [rtMedia's Roadmap page](http://rtcamp.com/rtmedia/roadmap/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "Visit rtMedia's Features page") to get some details about future releases.
133
134	+ = 3.2.10.2 =
135	+ * Remove Unused file, remove wp_load and add admin_ajax
136	+
137	= 3.2.10.1 =
138	* Remove notices and update js libs
139

620
621	== Upgrade Notice ==
622
623	+ = 3.2.10.2 =
624	+ Requires BuddyPress 1.7 or higher, if using BuddyPress.Remove Unused file, remove wp_load and add admin_ajax
625
626	== Sponsors ==
627

templates/media/album-gallery-item.php CHANGED Viewed

@@ -1,22 +1,5 @@
             <?php
-            -
            /** That's all, stop editing from here * */
-            -
            if ( ! defined( 'WP_LOAD_PATH' ) ) {
-            -
            	/** classic root path if wp-content and plugins is below wp-config.php */
-            -
            	$classic_root = dirname( dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) ) . '/';
-            -
-            -
            	//$classic_root = dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . '/' ;
-            -
            	if ( file_exists( $classic_root . 'wp-load.php' ) )
-            -
            		define( 'WP_LOAD_PATH', $classic_root );
-            -
            	else
-            -
            	if ( file_exists( $path . 'wp-load.php' ) )
-            -
            		define( 'WP_LOAD_PATH', $path );
-            -
            	else
-            -
            		exit( "Could not find wp-load.php" );
-            -
-            -
            	// let's load WordPress
-            -
            	require_once( WP_LOAD_PATH . 'wp-load.php');
-            -
            }
-            -
             global $rtmedia_backbone;
             $rtmedia_backbone = array(
             	'backbone' => false,

             <?php
+            +
            /** That's all, stop editing from here **/
             global $rtmedia_backbone;
             $rtmedia_backbone = array(
             	'backbone' => false,

templates/media/media-gallery-item.php CHANGED Viewed

@@ -1,22 +1,5 @@
             <?php
             /** That's all, stop editing from here * */
-            -
            if ( ! defined( 'WP_LOAD_PATH' ) ) {
-            -
            	/** classic root path if wp-content and plugins is below wp-config.php */
-            -
            	$classic_root = dirname( dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) ) . '/';
-            -
-            -
            	//$classic_root = dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . '/' ;
-            -
            	if ( file_exists( $classic_root . 'wp-load.php' ) )
-            -
            		define( 'WP_LOAD_PATH', $classic_root );
-            -
            	else
-            -
            	if ( file_exists( $path . 'wp-load.php' ) )
-            -
            		define( 'WP_LOAD_PATH', $path );
-            -
            	else
-            -
            		exit( "Could not find wp-load.php" );
-            -
-            -
            	// let's load WordPress
-            -
            	require_once( WP_LOAD_PATH . 'wp-load.php');
-            -
            }
-            -
             global $rtmedia_backbone;
             $rtmedia_backbone = array(
             	'backbone' => false,

             <?php
             /** That's all, stop editing from here * */
             global $rtmedia_backbone;
             $rtmedia_backbone = array(
             	'backbone' => false,

rtMedia for WordPress, BuddyPress and bbPress - Version 3.2.10.2

Version Description

Release Info

Code changes from version 3.2.10.1 to 3.2.10.2