rtMedia for WordPress, BuddyPress and bbPress - Version 3.2.2

Version Description

  • Fixed header already sent issue
Download this release

Release Info

Developer faishal
Plugin Icon 128x128 rtMedia for WordPress, BuddyPress and bbPress
Version 3.2.2
Comparing to
See all releases

Code changes from version 3.2.1 to 3.2.2

Files changed (38) hide show
  1. app/admin/RTMediaAdmin.php +1 -2
  2. app/helper/RTMediaAddon.php +1 -2
  3. app/helper/RTMediaAdminWidget.php +1 -2
  4. app/helper/RTMediaCommentModel.php +0 -2
  5. app/helper/RTMediaFeed.php +1 -2
  6. app/helper/RTMediaInteractionModel.php +6 -8
  7. app/helper/RTMediaModel.php +0 -2
  8. app/helper/RTMediaSettings.php +1 -2
  9. app/helper/RTMediaSupport.php +1 -2
  10. app/helper/RTMediaUploadException.php +34 -36
  11. app/helper/db/rt_plugin_info.php +0 -2
  12. app/helper/rtDimensions.php +0 -2
  13. app/helper/rtFormInvalidArgumentsException.php +1 -3
  14. app/helper/rtPluginInfo.php +7 -9
  15. app/helper/rtPluginUpdate.php +12 -14
  16. app/helper/rtPluginUpdateChecker.php +0 -2
  17. app/helper/rtProgress.php +0 -2
  18. app/importers/BPMediaAlbumimporter.php +5 -7
  19. app/importers/BPMediaBPActivityPlusImporter.php +0 -2
  20. app/importers/BPMediaImporter.php +2 -4
  21. app/importers/RTMediaMigration.php +2 -3
  22. app/main/contexts/RTMediaContext.php +0 -2
  23. app/main/controllers/activity/RTMediaBuddyPressActivity.php +0 -3
  24. app/main/controllers/media/RTMediaLike.php +1 -2
  25. app/main/controllers/shortcodes/RTMediaGalleryShortcode.php +2 -4
  26. app/main/controllers/shortcodes/RTMediaUploadShortcode.php +1 -3
  27. app/main/controllers/template/RTMediaUploadTemplate.php +1 -2
  28. app/main/controllers/template/rt-template-functions.php +2 -2
  29. app/main/controllers/upload/RTMediaUpload.php +0 -2
  30. app/main/controllers/upload/RTMediaUploadHelper.php +1 -2
  31. app/main/controllers/upload/RTMediaUploadModel.php +0 -2
  32. app/main/controllers/upload/RTMediaUploadView.php +3 -5
  33. app/main/controllers/upload/processors/RTMediaUploadFile.php +0 -2
  34. app/main/interactions/RTMediaInteraction.php +0 -2
  35. app/main/routers/query/RTMediaQuery.php +0 -2
  36. app/services/RTMediaEncoding.php +1 -2
  37. index.php +1 -1
  38. readme.txt +8 -5
app/admin/RTMediaAdmin.php CHANGED
@@ -1135,5 +1135,4 @@ if ( ! class_exists ( 'RTMediaAdmin' ) ) {
1135
}
1136
}
1137
1138
- }
1139
- ?>
1135
}
1136
}
1137
1138
+ }
app/helper/RTMediaAddon.php CHANGED
@@ -206,5 +206,4 @@ if (!class_exists('RTMediaAddon')) {
206
207
}
208
209
- }
210
- ?>
206
207
}
208
209
+ }
app/helper/RTMediaAdminWidget.php CHANGED
@@ -32,5 +32,4 @@ if (!class_exists('RTMediaAdminWidget')) {
32
33
}
34
35
- }
36
- ?>
32
33
}
34
35
+ }
app/helper/RTMediaCommentModel.php CHANGED
@@ -40,5 +40,3 @@ class RTMediaCommentModel {
40
return wp_delete_comment($id, true);
41
}
42
}
43
-
44
- ?>
40
return wp_delete_comment($id, true);
41
}
42
}
app/helper/RTMediaFeed.php CHANGED
@@ -58,5 +58,4 @@ class RTMediaFeed {
58
}
59
}
60
61
- }
62
- ?>
58
}
59
}
60
61
+ }
app/helper/RTMediaInteractionModel.php CHANGED
@@ -11,11 +11,11 @@
11
* @author ritz
12
*/
13
class RTMediaInteractionModel extends RTDBModel {
14
-
15
function __construct () {
16
- parent::__construct ( 'rtm_media_interaction' );
17
}
18
-
19
function check($user_id = "", $media_id = "", $action = "") {
20
if($user_id == "" || $media_id == "" || $action == "")
21
return false;
@@ -24,13 +24,13 @@ class RTMediaInteractionModel extends RTDBModel {
24
'media_id' => $media_id,
25
'action' => $action
26
);
27
- $results = $this->get($columns);
28
if($results)
29
return true;
30
else
31
return false;
32
}
33
-
34
function get_row($user_id = "", $media_id = "", $action = "") {
35
if($user_id == "" || $media_id == "" || $action == "")
36
return false;
@@ -39,9 +39,7 @@ class RTMediaInteractionModel extends RTDBModel {
39
'media_id' => $media_id,
40
'action' => $action
41
);
42
- $results = $this->get($columns);
43
return $results;
44
}
45
}
46
-
47
- ?>
11
* @author ritz
12
*/
13
class RTMediaInteractionModel extends RTDBModel {
14
+
15
function __construct () {
16
+ parent::__construct ( 'rtm_media_interaction' );
17
}
18
+
19
function check($user_id = "", $media_id = "", $action = "") {
20
if($user_id == "" || $media_id == "" || $action == "")
21
return false;
24
'media_id' => $media_id,
25
'action' => $action
26
);
27
+ $results = $this->get($columns);
28
if($results)
29
return true;
30
else
31
return false;
32
}
33
+
34
function get_row($user_id = "", $media_id = "", $action = "") {
35
if($user_id == "" || $media_id == "" || $action == "")
36
return false;
39
'media_id' => $media_id,
40
'action' => $action
41
);
42
+ $results = $this->get($columns);
43
return $results;
44
}
45
}
app/helper/RTMediaModel.php CHANGED
@@ -263,5 +263,3 @@ class RTMediaModel extends RTDBModel {
263
}
264
265
}
266
-
267
- ?>
263
}
264
265
}
app/helper/RTMediaSettings.php CHANGED
@@ -252,5 +252,4 @@ if (!class_exists('RTMediaSettings')) {
252
253
}
254
255
- }
256
- ?>
252
253
}
254
255
+ }
app/helper/RTMediaSupport.php CHANGED
@@ -421,5 +421,4 @@ if (!class_exists('RTMediaSupport')) {
421
422
}
423
424
- }
425
- ?>
421
422
}
423
424
+ }
app/helper/RTMediaUploadException.php CHANGED
@@ -5,62 +5,60 @@
5
*
6
* @author joshua
7
*/
8
- class RTMediaUploadException extends Exception
9
- {
10
/**
11
*
12
* @var type
13
- *
14
* Exception for Invalid context while uploading any media
15
*/
16
var $upload_err_invalid_context = 9;
17
-
18
/**
19
- *
20
* @param type $code
21
* @param type $msg
22
*/
23
- public function __construct($code,$msg=false) {
24
- $message = $this->codeToMessage($code,$msg);
25
- parent::__construct($message, $code);
26
- }
27
28
/**
29
* Error specific Message generated for the exception depending upon the code passed.
30
* Native Error Codes defined in PHP core module are used for uploading a standard file
31
- *
32
* @param type $code
33
* @param type $msg
34
* @return type
35
*/
36
private function codeToMessage($code,$msg)
37
- {
38
- switch ($code) {
39
case UPLOAD_ERR_INI_SIZE:
40
- case UPLOAD_ERR_FORM_SIZE:
41
- $message = apply_filters('bp_media_file_size_error', __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form','rtmedia'));
42
- break;
43
- case UPLOAD_ERR_NO_FILE:
44
- $message = apply_filters('bp_media_file_null_error', __('No file was uploaded','rtmedia'));
45
- break;
46
- case UPLOAD_ERR_PARTIAL:
47
- case UPLOAD_ERR_NO_TMP_DIR:
48
- case UPLOAD_ERR_CANT_WRITE: $message = apply_filters('bp_media_file_internal_error', __('Uploade failed due to internal server error.','rtmedia'));
49
- break;
50
- case UPLOAD_ERR_EXTENSION:
51
- $message = apply_filters('bp_media_file_extension_error', __('File type not allowed.','rtmedia'));
52
- break;
53
-
54
case $this->upload_err_invalid_context:
55
- $message = apply_filters('rtmedia_invalid_context_error', __('Invalid Context for upload.','rtmedia'));
56
break;
57
- default:
58
$msg = $msg ? $msg : __('Unknown file upload error.','rtmedia');
59
- $message = apply_filters('bp_media_file_unknown_error', $msg);
60
- break;
61
- }
62
- return $message;
63
- }
64
- }
65
-
66
- ?>
5
*
6
* @author joshua
7
*/
8
+ class RTMediaUploadException extends Exception
9
+ {
10
/**
11
*
12
* @var type
13
+ *
14
* Exception for Invalid context while uploading any media
15
*/
16
var $upload_err_invalid_context = 9;
17
+
18
/**
19
+ *
20
* @param type $code
21
* @param type $msg
22
*/
23
+ public function __construct($code,$msg=false) {
24
+ $message = $this->codeToMessage($code,$msg);
25
+ parent::__construct($message, $code);
26
+ }
27
28
/**
29
* Error specific Message generated for the exception depending upon the code passed.
30
* Native Error Codes defined in PHP core module are used for uploading a standard file
31
+ *
32
* @param type $code
33
* @param type $msg
34
* @return type
35
*/
36
private function codeToMessage($code,$msg)
37
+ {
38
+ switch ($code) {
39
case UPLOAD_ERR_INI_SIZE:
40
+ case UPLOAD_ERR_FORM_SIZE:
41
+ $message = apply_filters('bp_media_file_size_error', __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form','rtmedia'));
42
+ break;
43
+ case UPLOAD_ERR_NO_FILE:
44
+ $message = apply_filters('bp_media_file_null_error', __('No file was uploaded','rtmedia'));
45
+ break;
46
+ case UPLOAD_ERR_PARTIAL:
47
+ case UPLOAD_ERR_NO_TMP_DIR:
48
+ case UPLOAD_ERR_CANT_WRITE: $message = apply_filters('bp_media_file_internal_error', __('Uploade failed due to internal server error.','rtmedia'));
49
+ break;
50
+ case UPLOAD_ERR_EXTENSION:
51
+ $message = apply_filters('bp_media_file_extension_error', __('File type not allowed.','rtmedia'));
52
+ break;
53
+
54
case $this->upload_err_invalid_context:
55
+ $message = apply_filters('rtmedia_invalid_context_error', __('Invalid Context for upload.','rtmedia'));
56
break;
57
+ default:
58
$msg = $msg ? $msg : __('Unknown file upload error.','rtmedia');
59
+ $message = apply_filters('bp_media_file_unknown_error', $msg);
60
+ break;
61
+ }
62
+ return $message;
63
+ }
64
+ }
app/helper/db/rt_plugin_info.php CHANGED
@@ -53,5 +53,3 @@ class rt_plugin_info {
53
}
54
55
}
56
-
57
- ?>
53
}
54
55
}
app/helper/rtDimensions.php CHANGED
@@ -116,5 +116,3 @@ class rtDimensions extends rtForm {
116
}
117
118
}
119
-
120
- ?>
116
}
117
118
}
app/helper/rtFormInvalidArgumentsException.php CHANGED
@@ -24,6 +24,4 @@ if(!class_exists("rtFormsInvalidArgumentsException")) {
24
echo $errorMsg;
25
}
26
}
27
- }
28
-
29
- ?>
24
echo $errorMsg;
25
}
26
}
27
+ }
app/helper/rtPluginInfo.php CHANGED
@@ -8,7 +8,7 @@
8
class rtPluginInfo {
9
10
//Most fields map directly to the contents of the plugin's info.json file.
11
- //See the relevant docs for a description of their meaning.
12
public $name;
13
public $slug;
14
public $version;
@@ -27,16 +27,16 @@ class rtPluginInfo {
27
public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
28
29
/**
30
- * Create a new instance of PluginInfo from JSON-encoded plugin info
31
* returned by an external update API.
32
- *
33
* @param string $json Valid JSON string representing plugin info.
34
* @param bool $triggerErrors
35
* @return PluginInfo|null New instance of PluginInfo, or NULL on error.
36
*/
37
38
/**
39
- *
40
* @param type $json
41
* @param type $triggerErrors
42
* @return null|\self
@@ -74,19 +74,19 @@ class rtPluginInfo {
74
75
/**
76
* Transform plugin info into the format used by the native WordPress.org API
77
- *
78
* @return object
79
*/
80
81
/**
82
- *
83
* @return \StdClass
84
*/
85
public function toWpFormat() {
86
$info = new StdClass;
87
88
//The custom update API is built so that many fields have the same name and format
89
- //as those returned by the native WordPress.org API. These can be assigned directly.
90
$sameFormat = array(
91
'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
92
'num_ratings', 'downloaded', 'homepage', 'last_updated',
@@ -120,5 +120,3 @@ class rtPluginInfo {
120
}
121
122
}
123
-
124
- ?>
8
class rtPluginInfo {
9
10
//Most fields map directly to the contents of the plugin's info.json file.
11
+ //See the relevant docs for a description of their meaning.
12
public $name;
13
public $slug;
14
public $version;
27
public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
28
29
/**
30
+ * Create a new instance of PluginInfo from JSON-encoded plugin info
31
* returned by an external update API.
32
+ *
33
* @param string $json Valid JSON string representing plugin info.
34
* @param bool $triggerErrors
35
* @return PluginInfo|null New instance of PluginInfo, or NULL on error.
36
*/
37
38
/**
39
+ *
40
* @param type $json
41
* @param type $triggerErrors
42
* @return null|\self
74
75
/**
76
* Transform plugin info into the format used by the native WordPress.org API
77
+ *
78
* @return object
79
*/
80
81
/**
82
+ *
83
* @return \StdClass
84
*/
85
public function toWpFormat() {
86
$info = new StdClass;
87
88
//The custom update API is built so that many fields have the same name and format
89
+ //as those returned by the native WordPress.org API. These can be assigned directly.
90
$sameFormat = array(
91
'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
92
'num_ratings', 'downloaded', 'homepage', 'last_updated',
120
}
121
122
}
app/helper/rtPluginUpdate.php CHANGED
@@ -17,14 +17,14 @@ class rtPluginUpdate {
17
18
/**
19
* Create a new instance of PluginUpdate from its JSON-encoded representation.
20
- *
21
* @param string $json
22
* @param bool $triggerErrors
23
* @return PluginUpdate|null
24
*/
25
26
/**
27
- *
28
* @param type $json
29
* @param type $triggerErrors
30
* @return null
@@ -44,13 +44,13 @@ class rtPluginUpdate {
44
/**
45
* Create a new instance of PluginUpdate based on an instance of PluginInfo.
46
* Basically, this just copies a subset of fields from one object to another.
47
- *
48
* @param PluginInfo $info
49
* @return PluginUpdate
50
*/
51
52
/**
53
- *
54
* @param type $info
55
* @return type
56
*/
@@ -59,15 +59,15 @@ class rtPluginUpdate {
59
}
60
61
/**
62
- * Create a new instance of PluginUpdate by copying the necessary fields from
63
* another object.
64
- *
65
* @param StdClass|PluginInfo|PluginUpdate $object The source object.
66
* @return PluginUpdate The new copy.
67
*/
68
69
/**
70
- *
71
* @param type $object
72
* @return \self
73
*/
@@ -80,16 +80,16 @@ class rtPluginUpdate {
80
}
81
82
/**
83
- * Create an instance of StdClass that can later be converted back to
84
* a PluginUpdate. Useful for serialization and caching, as it avoids
85
* the "incomplete object" problem if the cached value is loaded before
86
* this class.
87
- *
88
* @return StdClass
89
*/
90
91
/**
92
- *
93
* @return \StdClass
94
*/
95
public function toStdClass() {
@@ -102,12 +102,12 @@ class rtPluginUpdate {
102
103
/**
104
* Transform the update into the format used by WordPress native plugin API.
105
- *
106
* @return object
107
*/
108
109
/**
110
- *
111
* @return \StdClass
112
*/
113
public function toWpFormat() {
@@ -126,5 +126,3 @@ class rtPluginUpdate {
126
}
127
128
}
129
-
130
- ?>
17
18
/**
19
* Create a new instance of PluginUpdate from its JSON-encoded representation.
20
+ *
21
* @param string $json
22
* @param bool $triggerErrors
23
* @return PluginUpdate|null
24
*/
25
26
/**
27
+ *
28
* @param type $json
29
* @param type $triggerErrors
30
* @return null
44
/**
45
* Create a new instance of PluginUpdate based on an instance of PluginInfo.
46
* Basically, this just copies a subset of fields from one object to another.
47
+ *
48
* @param PluginInfo $info
49
* @return PluginUpdate
50
*/
51
52
/**
53
+ *
54
* @param type $info
55
* @return type
56
*/
59
}
60
61
/**
62
+ * Create a new instance of PluginUpdate by copying the necessary fields from
63
* another object.
64
+ *
65
* @param StdClass|PluginInfo|PluginUpdate $object The source object.
66
* @return PluginUpdate The new copy.
67
*/
68
69
/**
70
+ *
71
* @param type $object
72
* @return \self
73
*/
80
}
81
82
/**
83
+ * Create an instance of StdClass that can later be converted back to
84
* a PluginUpdate. Useful for serialization and caching, as it avoids
85
* the "incomplete object" problem if the cached value is loaded before
86
* this class.
87
+ *
88
* @return StdClass
89
*/
90
91
/**
92
+ *
93
* @return \StdClass
94
*/
95
public function toStdClass() {
102
103
/**
104
* Transform the update into the format used by WordPress native plugin API.
105
+ *
106
* @return object
107
*/
108
109
/**
110
+ *
111
* @return \StdClass
112
*/
113
public function toWpFormat() {
126
}
127
128
}
app/helper/rtPluginUpdateChecker.php CHANGED
@@ -665,5 +665,3 @@ class rtPluginUpdateChecker {
665
}
666
667
}
668
-
669
- ?>
665
}
666
667
}
app/helper/rtProgress.php CHANGED
@@ -38,5 +38,3 @@ class rtProgress {
38
}
39
40
}
41
-
42
- ?>
38
}
39
40
}
app/importers/BPMediaAlbumimporter.php CHANGED
@@ -26,7 +26,7 @@ class BPMediaAlbumimporter extends BPMediaImporter {
26
return;
27
global $wpdb;
28
return $wpdb->query(
29
- "ALTER TABLE {$wpdb->base_prefix}bp_album
30
ADD COLUMN import_status BIGINT (20) NOT NULL DEFAULT 0,
31
ADD COLUMN old_activity_id BIGINT (20) NOT NULL DEFAULT 0,
32
ADD COLUMN new_activity_id BIGINT (20) NOT NULL DEFAULT 0,
@@ -229,14 +229,14 @@ class BPMediaAlbumimporter extends BPMediaImporter {
229
return $wpdb->get_var("SELECT SUM( b.count ) AS total
230
FROM (
231
SELECT (
232
- SELECT COUNT( a.id )
233
FROM $activity_table a
234
WHERE a.item_id = activity.id
235
AND a.component = 'activity'
236
AND a.type = 'activity_comment'
237
) AS count
238
FROM $activity_table AS activity
239
- INNER JOIN $bp_album_table AS album ON ( album.id = activity.item_id )
240
WHERE activity.component = 'album'
241
AND activity.type = 'bp_album_picture'
242
AND album.import_status =0
@@ -252,7 +252,7 @@ class BPMediaAlbumimporter extends BPMediaImporter {
252
if ($this->table_exists($bp_album_table)) {
253
return $wpdb->get_var("SELECT COUNT( activity.id ) AS count
254
FROM $activity_table AS activity
255
- INNER JOIN $bp_album_table AS album ON ( activity.item_id = album.import_status )
256
WHERE activity.component = 'activity'
257
AND activity.type = 'activity_comment'");
258
}
@@ -265,7 +265,7 @@ class BPMediaAlbumimporter extends BPMediaImporter {
265
if (BPMediaAlbumimporter::table_exists($table)) {
266
return $wpdb->get_results("SELECT COUNT( DISTINCT owner_id ) AS users
267
FROM $table
268
- WHERE owner_id NOT
269
IN (
270
SELECT a.owner_id
271
FROM $table a
@@ -422,5 +422,3 @@ class BPMediaAlbumimporter extends BPMediaImporter {
422
}
423
424
}
425
-
426
- ?>
26
return;
27
global $wpdb;
28
return $wpdb->query(
29
+ "ALTER TABLE {$wpdb->base_prefix}bp_album
30
ADD COLUMN import_status BIGINT (20) NOT NULL DEFAULT 0,
31
ADD COLUMN old_activity_id BIGINT (20) NOT NULL DEFAULT 0,
32
ADD COLUMN new_activity_id BIGINT (20) NOT NULL DEFAULT 0,
229
return $wpdb->get_var("SELECT SUM( b.count ) AS total
230
FROM (
231
SELECT (
232
+ SELECT COUNT( a.id )
233
FROM $activity_table a
234
WHERE a.item_id = activity.id
235
AND a.component = 'activity'
236
AND a.type = 'activity_comment'
237
) AS count
238
FROM $activity_table AS activity
239
+ INNER JOIN $bp_album_table AS album ON ( album.id = activity.item_id )
240
WHERE activity.component = 'album'
241
AND activity.type = 'bp_album_picture'
242
AND album.import_status =0
252
if ($this->table_exists($bp_album_table)) {
253
return $wpdb->get_var("SELECT COUNT( activity.id ) AS count
254
FROM $activity_table AS activity
255
+ INNER JOIN $bp_album_table AS album ON ( activity.item_id = album.import_status )
256
WHERE activity.component = 'activity'
257
AND activity.type = 'activity_comment'");
258
}
265
if (BPMediaAlbumimporter::table_exists($table)) {
266
return $wpdb->get_results("SELECT COUNT( DISTINCT owner_id ) AS users
267
FROM $table
268
+ WHERE owner_id NOT
269
IN (
270
SELECT a.owner_id
271
FROM $table a
422
}
423
424
}
app/importers/BPMediaBPActivityPlusImporter.php CHANGED
@@ -21,5 +21,3 @@ class BPMediaBPActivityPlusImporter extends BPMediaImporter {
21
}
22
23
}
24
-
25
- ?>
21
}
22
23
}
app/importers/BPMediaImporter.php CHANGED
@@ -105,9 +105,9 @@ class BPMediaImporter {
105
$bp_imported_media = new BPMediaHostWordpress();
106
// add_filter('bp_media_force_hide_activity', create_function('', 'return true;'));
107
$imported_media_id = $bp_imported_media->insertmedia($title, $description, $album_id, 0, false, false, $files, $author_id, $album_name);
108
-
109
wp_update_post($args = array('ID' => $imported_media_id, 'post_author' => $author_id));
110
-
111
$bp_album_privacy = $privacy;
112
if ($bp_album_privacy == 10)
113
$bp_album_privacy = 6;
@@ -152,5 +152,3 @@ class BPMediaImporter {
152
}
153
154
}
155
-
156
- ?>
105
$bp_imported_media = new BPMediaHostWordpress();
106
// add_filter('bp_media_force_hide_activity', create_function('', 'return true;'));
107
$imported_media_id = $bp_imported_media->insertmedia($title, $description, $album_id, 0, false, false, $files, $author_id, $album_name);
108
+
109
wp_update_post($args = array('ID' => $imported_media_id, 'post_author' => $author_id));
110
+
111
$bp_album_privacy = $privacy;
112
if ($bp_album_privacy == 10)
113
$bp_album_privacy = 6;
152
}
153
154
}
app/importers/RTMediaMigration.php CHANGED
@@ -111,7 +111,7 @@ class RTMediaMigration {
111
on wp_bp_activity.item_id = p.meta_value
112
where
113
type = 'activity_comment'
114
- and is_spam <>1 and
115
not p.meta_value is NULL";
116
117
@@ -135,7 +135,7 @@ class RTMediaMigration {
135
where
136
a.post_id > 0 and (NOT p.ID IS NULL)
137
and a.meta_key = 'bp-media-key'";
138
-
139
140
$_SESSION[ "migration_media" ] = $wpdb->get_var ( $sql );
141
$count += intval ( $_SESSION[ "migration_media" ] );
@@ -1046,4 +1046,3 @@ class RTMediaMigration {
1046
}
1047
1048
}
1049
- ?>
111
on wp_bp_activity.item_id = p.meta_value
112
where
113
type = 'activity_comment'
114
+ and is_spam <>1 and
115
not p.meta_value is NULL";
116
117
135
where
136
a.post_id > 0 and (NOT p.ID IS NULL)
137
and a.meta_key = 'bp-media-key'";
138
+
139
140
$_SESSION[ "migration_media" ] = $wpdb->get_var ( $sql );
141
$count += intval ( $_SESSION[ "migration_media" ] );
1046
}
1047
1048
}
app/main/contexts/RTMediaContext.php CHANGED
@@ -109,5 +109,3 @@ class RTMediaContext {
109
}
110
111
}
112
-
113
- ?>
109
}
110
111
}
app/main/controllers/activity/RTMediaBuddyPressActivity.php CHANGED
@@ -150,9 +150,6 @@ class RTMediaBuddyPressActivity {
150
151
152
$uploadView = new RTMediaUploadView ( array( 'activity' => true ) );
153
- global $rtmedia_query;
154
- if(isset($rtmedia_query))
155
- $rtmedia_query->is_upload_shortcode = false;
156
$uploadView->render ( 'uploader' );
157
}
158
150
151
152
$uploadView = new RTMediaUploadView ( array( 'activity' => true ) );
153
$uploadView->render ( 'uploader' );
154
}
155
app/main/controllers/media/RTMediaLike.php CHANGED
@@ -168,5 +168,4 @@ class RTMediaLike extends RTMediaUserInteraction {
168
}
169
$this->label = "<span>" .$actions ."</span>" . $this->label;
170
}
171
- }
172
- ?>
168
}
169
$this->label = "<span>" .$actions ."</span>" . $this->label;
170
}
171
+ }
app/main/controllers/shortcodes/RTMediaGalleryShortcode.php CHANGED
@@ -29,7 +29,7 @@ class RTMediaGalleryShortcode {
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{
@@ -110,7 +110,7 @@ class RTMediaGalleryShortcode {
110
$attr[ "attr" ][ "context" ] = $post->post_type;
111
}
112
}
113
-
114
global $rtmedia_query;
115
$rtmedia_query->is_gallery_shortcode = true;// to check if gallery shortcode is executed to display the gallery.
116
@@ -131,5 +131,3 @@ class RTMediaGalleryShortcode {
131
}
132
133
}
134
-
135
- ?>
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{
110
$attr[ "attr" ][ "context" ] = $post->post_type;
111
}
112
}
113
+
114
global $rtmedia_query;
115
$rtmedia_query->is_gallery_shortcode = true;// to check if gallery shortcode is executed to display the gallery.
116
131
}
132
133
}
app/main/controllers/shortcodes/RTMediaUploadShortcode.php CHANGED
@@ -71,7 +71,7 @@ class RTMediaUploadShortcode {
71
return;
72
}
73
ob_start ();
74
-
75
self::$add_sc_script = true;
76
RTMediaUploadTemplate::render ( $attr );
77
@@ -81,5 +81,3 @@ class RTMediaUploadShortcode {
81
}
82
83
}
84
-
85
- ?>
71
return;
72
}
73
ob_start ();
74
+
75
self::$add_sc_script = true;
76
RTMediaUploadTemplate::render ( $attr );
77
81
}
82
83
}
app/main/controllers/template/RTMediaUploadTemplate.php CHANGED
@@ -61,5 +61,4 @@ class RTMediaUploadTemplate {
61
wp_print_scripts ( 'bpm-plupload' );
62
}
63
64
- }
65
- ?>
61
wp_print_scripts ( 'bpm-plupload' );
62
}
63
64
+ }
app/main/controllers/template/rt-template-functions.php CHANGED
@@ -1,4 +1,4 @@
1
- <?php
2
3
/**
4
* Checks at any point of time any media is left to be processed in the db pool
@@ -53,7 +53,7 @@ function get_rtmedia_gallery_title () {
53
global $rtmedia_query;
54
$title = '';
55
if( isset( $rtmedia_query->media_query['media_type'] ) && !is_array( $rtmedia_query->media_query['media_type']) && $rtmedia_query->media_query['media_type'] != "") {
56
-
57
if($rtmedia_query->media_query['media_type'] == "music") {
58
$title = __('All '. $rtmedia_query->media_query['media_type'] , 'rtmedia');
59
} else {
1
+ <?php
2
3
/**
4
* Checks at any point of time any media is left to be processed in the db pool
53
global $rtmedia_query;
54
$title = '';
55
if( isset( $rtmedia_query->media_query['media_type'] ) && !is_array( $rtmedia_query->media_query['media_type']) && $rtmedia_query->media_query['media_type'] != "") {
56
+
57
if($rtmedia_query->media_query['media_type'] == "music") {
58
$title = __('All '. $rtmedia_query->media_query['media_type'] , 'rtmedia');
59
} else {
app/main/controllers/upload/RTMediaUpload.php CHANGED
@@ -71,5 +71,3 @@ class RTMediaUpload {
71
}
72
73
}
74
-
75
- ?>
71
}
72
73
}
app/main/controllers/upload/RTMediaUploadHelper.php CHANGED
@@ -24,5 +24,4 @@ class RTMediaUploadHelper {
24
$end_point = new RTMediaUploadEndpoint();
25
$end_point->template_redirect();
26
}
27
- }
28
- ?>
24
$end_point = new RTMediaUploadEndpoint();
25
$end_point->template_redirect();
26
}
27
+ }
app/main/controllers/upload/RTMediaUploadModel.php CHANGED
@@ -167,5 +167,3 @@ class RTMediaUploadModel {
167
}
168
169
}
170
-
171
- ?>
167
}
168
169
}
app/main/controllers/upload/RTMediaUploadView.php CHANGED
@@ -41,7 +41,7 @@ class RTMediaUploadView {
41
public function render ( $template_name ) {
42
43
global $rtmedia_query;
44
- $album = '';
45
if ( $rtmedia_query && is_rtmedia_album () ) {
46
$album = '<input class="rtmedia-current-album" type="hidden" name="rtmedia-current-album" value="' . $rtmedia_query->media_query[ 'album_id' ] . '" />';
47
} elseif ( is_rtmedia_album_enable () && $rtmedia_query && is_rtmedia_gallery () ) {
@@ -53,9 +53,8 @@ class RTMediaUploadView {
53
$album = '<label>Album: </label><select name="album" class="rtmedia-user-album-list">' . rtmedia_group_album_list () . '</select>';
54
}
55
}
56
- global $rtmedia_query;
57
- $up_privacy = ""; //uploader privacy dropdown for uploader under rtMedia Media tab.
58
- if( is_rtmedia_privacy_enable () && isset( $rtmedia_query->is_upload_shortcode ) && $rtmedia_query->is_upload_shortcode === false) {
59
$up_privacy = new RTMediaPrivacy();
60
$up_privacy = $up_privacy->select_privacy_ui( false, 'rtSelectPrivacy') ;
61
}
@@ -114,4 +113,3 @@ class RTMediaUploadView {
114
}
115
116
}
117
- ?>
41
public function render ( $template_name ) {
42
43
global $rtmedia_query;
44
+ $album = '';
45
if ( $rtmedia_query && is_rtmedia_album () ) {
46
$album = '<input class="rtmedia-current-album" type="hidden" name="rtmedia-current-album" value="' . $rtmedia_query->media_query[ 'album_id' ] . '" />';
47
} elseif ( is_rtmedia_album_enable () && $rtmedia_query && is_rtmedia_gallery () ) {
53
$album = '<label>Album: </label><select name="album" class="rtmedia-user-album-list">' . rtmedia_group_album_list () . '</select>';
54
}
55
}
56
+ $up_privacy = ""; //uploader privacy dropdown for uploader under rtMedia Media tab.
57
+ if( is_rtmedia_privacy_enable () && ( ! isset( $rtmedia_query->is_upload_shortcode ) || $rtmedia_query->is_upload_shortcode === false) ) {
58
$up_privacy = new RTMediaPrivacy();
59
$up_privacy = $up_privacy->select_privacy_ui( false, 'rtSelectPrivacy') ;
60
}
113
}
114
115
}
app/main/controllers/upload/processors/RTMediaUploadFile.php CHANGED
@@ -325,5 +325,3 @@ class RTMediaUploadFile {
325
}
326
327
}
328
-
329
- ?>
325
}
326
327
}
app/main/interactions/RTMediaInteraction.php CHANGED
@@ -242,5 +242,3 @@ class RTMediaInteraction {
242
}
243
244
}
245
-
246
- ?>
242
}
243
244
}
app/main/routers/query/RTMediaQuery.php CHANGED
@@ -833,5 +833,3 @@ class RTMediaQuery {
833
}
834
835
}
836
-
837
- ?>
833
}
834
835
}
app/services/RTMediaEncoding.php CHANGED
@@ -715,5 +715,4 @@ class RTMediaEncoding {
715
if (isset($_REQUEST['rtreencoding'])) {
716
$objRTMediaEncoding = new RTMediaEncoding(true);
717
$objRTMediaEncoding->reencoding(intval($_REQUEST['rtreencoding']));
718
- }
719
- ?>
715
if (isset($_REQUEST['rtreencoding'])) {
716
$objRTMediaEncoding = new RTMediaEncoding(true);
717
$objRTMediaEncoding->reencoding(intval($_REQUEST['rtreencoding']));
718
+ }
index.php CHANGED
@@ -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.1
8
Author: rtCamp
9
Text Domain: rtmedia
10
Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
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.2
8
Author: rtCamp
9
Text Domain: rtmedia
10
Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
readme.txt CHANGED
@@ -6,19 +6,19 @@ 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.6.1 + BuddyPress 1.8.1
9
- Stable tag: 3.2.1
10
11
Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices.
12
13
== Description ==
14
15
> **Important Update**
16
- >
17
> If you are looking for more features, 1-on-1 support, please consider [rtMedia-PRO](https://rtcamp.com/store/rtmedia-pro/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media).
18
>
19
> [rtMedia-PRO](https://rtcamp.com/store/rtmedia-pro/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media) is premiun & open-source (and of-course GPL too).
20
21
- rtMedia is **only** complete media solution for WordPress, BuddyPress and bbPress.
22
23
Built with a mobile-first approach, it works on mobile/tablet devices (like iPhone/iPad, Android).
24
@@ -33,7 +33,7 @@ In case you are in hurry, you can skip the long list of features in subsequent s
33
34
= rtMedia Features =
35
36
- * **[Free Audio/Video conversion](http://rtcamp.com/rtmedia/addons/audio-video-encoding-service/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "rtMedia FFMPEG Addon")** - rtCamp (company behind rtMedia) has setup dedicated serves to provide free audio/video encoding services for all sites running rtMedia.
37
* **WordPress Integration** - Display media on WordPress author pages (eg: http://demo.rtcamp.com/rtmedia/author/admin/media/)
38
* **BuddyPress Integration** - Adds media tab under to BuddyPress Profiles & Groups.
39
* **BuddyPress Activity Stream** - Attach media to activity status updates like you do it on Facebook.
@@ -51,7 +51,7 @@ In case you are in hurry, you can skip the long list of features in subsequent s
51
52
* **Sidebar Widgets** - Add sidebar widgets for recent, most popular media gallery and quick-upload.
53
* **Post-editor Button** - Add tinymce button to make it easy to insert gallery and uploader on any wordpress page.
54
- * **Star-Rating Option** - Classic 5-star rating option. You can choose between facebook-style "like" or "star-rating".
55
* **Global Albums** - Create list of predefined albums. Optionally disable new album-creation by user.
56
* **Premium 1-on-1 support** - From backend of your WordPress, you can send raise direct support requests, feature requests, report bugs.
57
* **Automatic Updates** - rtMedia-PRO will see more than one weekly release on average. So automatic-updates is must and its already there.
@@ -119,6 +119,9 @@ Please visit [rtMedia's Features page](http://rtcamp.com/rtmedia/?utm_source=rea
119
120
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.
121
122
= 3.2.1 =
123
* Fixed activity issue
124
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.6.1 + BuddyPress 1.8.1
9
+ Stable tag: 3.2.2
10
11
Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices.
12
13
== Description ==
14
15
> **Important Update**
16
+ >
17
> If you are looking for more features, 1-on-1 support, please consider [rtMedia-PRO](https://rtcamp.com/store/rtmedia-pro/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media).
18
>
19
> [rtMedia-PRO](https://rtcamp.com/store/rtmedia-pro/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media) is premiun & open-source (and of-course GPL too).
20
21
+ rtMedia is **only** complete media solution for WordPress, BuddyPress and bbPress.
22
23
Built with a mobile-first approach, it works on mobile/tablet devices (like iPhone/iPad, Android).
24
33
34
= rtMedia Features =
35
36
+ * **[Free Audio/Video conversion](http://rtcamp.com/rtmedia/addons/audio-video-encoding-service/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "rtMedia FFMPEG Addon")** - rtCamp (company behind rtMedia) has setup dedicated serves to provide free audio/video encoding services for all sites running rtMedia.
37
* **WordPress Integration** - Display media on WordPress author pages (eg: http://demo.rtcamp.com/rtmedia/author/admin/media/)
38
* **BuddyPress Integration** - Adds media tab under to BuddyPress Profiles & Groups.
39
* **BuddyPress Activity Stream** - Attach media to activity status updates like you do it on Facebook.
51
52
* **Sidebar Widgets** - Add sidebar widgets for recent, most popular media gallery and quick-upload.
53
* **Post-editor Button** - Add tinymce button to make it easy to insert gallery and uploader on any wordpress page.
54
+ * **Star-Rating Option** - Classic 5-star rating option. You can choose between facebook-style "like" or "star-rating".
55
* **Global Albums** - Create list of predefined albums. Optionally disable new album-creation by user.
56
* **Premium 1-on-1 support** - From backend of your WordPress, you can send raise direct support requests, feature requests, report bugs.
57
* **Automatic Updates** - rtMedia-PRO will see more than one weekly release on average. So automatic-updates is must and its already there.
119
120
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.
121
122
+ = 3.2.2 =
123
+ * Fixed header already sent issue
124
+
125
= 3.2.1 =
126
* Fixed activity issue
127