Version update v4.5.10 (#1517)

Version update v4.5.10

.github/workflows/create.yml

@@ -0,0 +1,20 @@
+name: Deploy
+on:
+  push:
+    tags:
+      - '*'
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress Plugin Deploy
+      uses: rtCamp/action-wordpress-org-plugin-deploy@master
+      env:
+        ASSETS_DIR: assets
+        EXCLUDE_LIST: .bowerrc .gitattributes .gitignore .jshintrc .travis.yml CONTRIBUTING.md
+          Gruntfile.js README.md bin deploy.sh package-lock.json package.json phpcs.xml phpunit.xml
+          tests
+        SLUG: buddypress-media
+        WORDPRESS_PASSWORD: ${{ secrets.WORDPRESS_PASSWORD }}
+        WORDPRESS_USERNAME: ${{ secrets.WORDPRESS_USERNAME }}

README.md

@@ -147,6 +147,16 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
+### 4.5.10 [December 26, 2019] ###
+
+* Enhancement
+	* Add better styling for albums
+
+* FIXED
+	* Warnings on Support page of rtMedia Settings
+	* Issue with rtMedia Update filter on BuddyPress activity wall
+	* Redirection popup on Media upload in Activity stream
+
 ### 4.5.9 [October 29, 2019] ###
 
 * Enhancement
@@ -1634,8 +1644,8 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 * HTML5 Audio Tag Support (with fallback)
 * HTML5 Video Tag Support (with fallback)
 
-#### 4.3 ####
-Now upload media in comment & fixed rtMedia shortcode pagination along with several other bugs. Please update/re-save the permalinks after the plugin update.
+#### 4.5.10 ####
+rtMedia 4.5.10, with improved styling for albums and improved UX on BuddyPress Activity Wall.
 
 ## Sponsors ##
 

app/assets/css/rtmedia.css

@@ -865,7 +865,7 @@ button::-moz-focus-inner {
   padding: 0;
   width: 90px;
   height: 110px;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: transparent;
   opacity: 0;
   z-index: 10;
   -webkit-transition: all 300ms ease-out;
@@ -1915,6 +1915,12 @@ a.rtmedia-comment-link.rtmedia-comments-link {
   width: 100%;
 }
 
+#buddypress ul.rtmedia-album-list li.rtmedia-list-item {
+  border: 1px solid #ddd;
+  padding: 5px;
+  border-radius: 5px;
+}
+
 /*------------------------------------------------------------------------------
   14.0 - Media Screen
 ------------------------------------------------------------------------------*/
@@ -2969,7 +2975,7 @@ a.rtmedia-upload-media-link {
 #buddypress .mejs-controls button {
   padding: 4px 8px;
   border: none;
-  background: rgba(0, 0, 0, 0) url("../../../lib/media-element/mejs-controls.png") no-repeat;
+  background: transparent url("../../../lib/media-element/mejs-controls.png") no-repeat;
 }
 #buddypress .mejs-controls .mejs-play > button {
   background-position: 0 0;

app/assets/css/sass/_album.scss

@@ -27,4 +27,14 @@
 	.rtmedia-media {
 		width: 100%;
 	}
-}
+}
+
+#buddypress {
+    ul.rtmedia-album-list {
+        li.rtmedia-list-item {
+			border: 1px solid #ddd;
+			padding: 5px;
+			border-radius: 5px;
+		}
+	}
+}

app/assets/js/rtMedia.backbone.js

@@ -1030,6 +1030,7 @@ jQuery( document ).ready( function( $ ) {
 		} );
 
 		whats_new_form.bind( 'submit', function () {
+			window.onbeforeunload = null;
 			setTimeout( function () {
 				whats_new_form.find( '.rtmedia-uploader-div' ).hide();
 			}, 2000 );

app/helper/RTMediaSupport.php

@@ -251,7 +251,7 @@ public function rtmedia_scan_template_files( $template_path ) {
 						if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
 							$sub_files = $this->rtmedia_scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
 							foreach ( $sub_files as $sub_file ) {
-								$rt_to_dir_paths	= RTMediaTemplate::locate_template( substr( $sub_file, 0, ( count( $sub_file ) - 5 ) ) );
+								$rt_to_dir_paths	= RTMediaTemplate::locate_template( str_replace( '.php', '', $sub_file ) );
 								$rt_to_dir_path		= str_replace( '//', '/', $rt_to_dir_paths );
 								$result[]			= str_replace( ABSPATH . 'wp-content/', '', $rt_to_dir_path );
 							}

app/main/controllers/activity/RTMediaBuddyPressActivity.php

@@ -28,6 +28,7 @@ function __construct() {
 		add_filter( 'bp_activity_allowed_tags', array( &$this, 'override_allowed_tags' ) );
 		add_filter( 'bp_get_activity_parent_content', array( &$this, 'bp_get_activity_parent_content' ) );
 		add_filter( 'bp_activity_content_before_save', array( $this, 'bp_activity_content_before_save' ) );
+		add_filter( 'bp_activity_type_before_save', array( $this, 'bp_activity_type_before_save' ) );
 		add_action( 'bp_activity_deleted_activities', array( &$this, 'bp_activity_deleted_activities' ) );
 
 		// Filter bp_activity_prefetch_object_data for translatable activity actions
@@ -271,6 +272,21 @@ public function bp_activity_content_before_save( $content ) {
 		return $content;
 	}
 
+	/**
+	 * This function will check for the media file attached to the actitvity and accordingly will set type.
+	 *
+	 * @param string $type Type of the Activity.
+	 *
+	 * @return string Filtered value of the activity type.
+	 */
+	public function bp_activity_type_before_save( $type ) {
+		$rtmedia_attached_files = filter_input( INPUT_POST, 'rtMedia_attached_files', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+		if ( ( ! empty( $rtmedia_attached_files ) ) && is_array( $rtmedia_attached_files ) && 'activity_update' === $type ) {
+			$type = 'rtmedia_update';
+		}
+		return $type;
+	}
+
 	function delete_comment_sync( $activity_id, $comment_id ) {
 		global $wpdb;
 		$comment_id = $wpdb->get_var( $wpdb->prepare( "select comment_id from {$wpdb->commentmeta} where meta_key = 'activity_id' and meta_value = %s", $comment_id ) );

app/main/controllers/template/rtmedia-actions.php

@@ -538,7 +538,7 @@ function rtmedia_admin_pages_content( $page ) {
 				<li><?php esc_html_e( 'WordPress/BuddyPress Plugin Development', 'buddypress-media' ); ?></li>
 			</ol>
 			<div class="clearfix">
-				<a href="https://rtmedia.io/contact" class="rtm-button rtm-success" target="_blank"><?php esc_html_e( 'Contact Us', 'buddypress-media' ); ?></a>
+				<a href="https://rtmedia.io/enterprise-plan" class="rtm-button rtm-success" target="_blank"><?php esc_html_e( 'Contact Us', 'buddypress-media' ); ?></a>
 			</div>
 		</div>
 		<?php

bin/.travis.yml

@@ -2,7 +2,7 @@ dist: xenial
 language: php
 sudo: required
 php:
-  - 7.1
+  - 7.2
 branches:
   only:
     - develop
@@ -43,8 +43,9 @@ before_script:
   - cd $PLUGIN_DIR
   - cp -Rf * /var/www/automation.rtmedia.me/htdocs/wp-content/plugins/rtMedia/
   - cd /var/www/automation.rtmedia.me/htdocs/
-  - wp --allow-root plugin install https://downloads.wordpress.org/plugin/buddypress.5.0.0.zip
+  - wp --allow-root plugin install https://downloads.wordpress.org/plugin/buddypress.5.1.1.zip
   - wp plugin activate --all
+  - wp theme activate twentynineteen
   - cd $PLUGIN_DIR
   - cd tests/codeception/tests/_data
   - git clone --depth=1 https://github.com/rtCamp/rtmedia-test-data.git test-data

index.php

@@ -3,7 +3,7 @@
   Plugin Name: rtMedia for WordPress, BuddyPress and bbPress
   Plugin URI: https://rtmedia.io/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
   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!
-  Version: 4.5.9
+  Version: 4.5.10
   Author: rtCamp
   Text Domain: buddypress-media
   Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
@@ -22,7 +22,7 @@
 	 * The version of the plugin
 	 *
 	 */
-	define( 'RTMEDIA_VERSION', '4.5.9' );
+	define( 'RTMEDIA_VERSION', '4.5.10' );
 }
 
 if ( ! defined( 'RTMEDIA_PATH' ) ) {

languages/buddypress-media.po

@@ -2,9 +2,9 @@
 # This file is distributed under the same license as the rtMedia for WordPress, BuddyPress and bbPress package.
 msgid ""
 msgstr ""
-"Project-Id-Version: rtMedia for WordPress, BuddyPress and bbPress 4.5.9\n"
+"Project-Id-Version: rtMedia for WordPress, BuddyPress and bbPress 4.5.10\n"
 "Report-Msgid-Bugs-To: https://rtmedia.io/support/\n"
-"POT-Creation-Date: 2019-10-29 08:18:31+00:00\n"
+"POT-Creation-Date: 2019-12-20 10:04:47+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2519,48 +2519,48 @@ msgstr ""
 msgid "I agree to"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:463
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:479
 msgid "Media Files"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:501
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:517
 #: app/main/controllers/media/RTMediaComment.php:175
 #: app/main/controllers/shortcodes/RTMediaUploadShortcode.php:102
 #: app/main/controllers/template/rtmedia-functions.php:2132
 msgid "You are not allowed to upload/attach media."
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:636
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:652
 msgid "%s added a %s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:643
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:645
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:659
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:661
 #: app/main/controllers/upload/RTMediaUploadEndpoint.php:229
 msgid "%s added %d %s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:698
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:714
 msgid "%1$s liked a %2$s in the group %3$s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:701
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:717
 msgid "%1$s liked their %2$s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:705
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:721
 msgid "%1$s liked %2$s's %3$s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:795
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:811
 msgid "%1$s commented on a %2$s in the group %3$s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:798
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:814
 msgid "%1$s commented on their %2$s"
 msgstr ""
 
-#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:802
+#: app/main/controllers/activity/RTMediaBuddyPressActivity.php:818
 msgid "%1$s commented on %2$s's %3$s"
 msgstr ""
 

phpcs.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<ruleset name="">
+	<description>Generally-applicable sniffs for WordPress plugins</description>
+
+	<rule ref="WordPress-Core">
+		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
+	</rule>
+
+	<rule ref="WordPress-Extra" />
+
+	<rule ref="WordPress-Docs" />
+
+	<rule ref="PHPCompatibility"/>
+	<config name="testVersion" value="5.3-"/>
+
+	<arg name="extensions" value="php"/>
+	<arg value="s"/>
+
+	<exclude-pattern>*/bin/*</exclude-pattern>
+	<exclude-pattern>*/lib/*</exclude-pattern>
+	<exclude-pattern>*/tests/*</exclude-pattern>
+	<exclude-pattern>*/vendor/*</exclude-pattern>
+	<exclude-pattern>*/node_modules/*</exclude-pattern>
+	<exclude-pattern>.github/</exclude-pattern>
+</ruleset>

readme.txt

@@ -4,8 +4,8 @@ Tags: BuddyPress, media, multimedia, album, audio, songs, music, video, photo, i
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Requires at least: WordPress 4.1
-Tested up to: 5.3
-Stable tag: 4.5.9
+Tested up to: 5.3.2
+Stable tag: 4.5.10
 
 Add albums, photo, audio/video upload, privacy, sharing, front-end uploads & more. All this works on mobile/tablets devices.
 
@@ -134,6 +134,18 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 == Changelog ==
 
+= 4.5.10 [December 26, 2019] =
+
+* Enhancement
+
+ * Add better styling for albums
+
+* FIXED
+
+ * Warnings on Support page of rtMedia Settings
+ * Issue with rtMedia Update filter on BuddyPress activity wall
+ * Redirection popup on Media upload in Activity stream
+
 = 4.5.9 [October 29, 2019] =
 
 * Enhancement
@@ -142,8 +154,8 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 * FIXED
 
- * Post Update button issue with BuddyPress Nouveau template 
- * Issue when user uploads the media with link in comment on buddypress activity 
+ * Post Update button issue with BuddyPress Nouveau template
+ * Issue when user uploads the media with link in comment on buddypress activity
 
 = 4.5.8 [August 6, 2019] =
 
@@ -171,8 +183,8 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
  * Issue of entering text in text area when Direct Upload and Upload terms enabled together
  * UI of pagination button height and text field
  * Export/Import button issue in Firefox browser
- * Issue of direct upload and media was not opening in lightbox with TwentySeventeen theme v2.1 
- * Empty space issue for generated activity when media is uploaded without adding text 
+ * Issue of direct upload and media was not opening in lightbox with TwentySeventeen theme v2.1
+ * Empty space issue for generated activity when media is uploaded without adding text
  * Other Errors, Warnings and notices
  * Group Activity media are not shown in Group Media tab with BuddyPress Nouveau Template
  * User’s name autosuggestion
@@ -1625,8 +1637,8 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 == Upgrade Notice ==
 
-= 4.5.9 =
-rtMedia 4.5.9, with an addition of new classes in BuddPress Activity based on the uploaded media type, and other minor fixes around BuddPress Activity.
+= 4.5.10 =
+rtMedia 4.5.10, with improved styling for albums and improved UX on BuddyPress Activity Wall.
 
 == Sponsors ==
 

tests/codeception/codeception.yml

@@ -4,8 +4,8 @@ paths:
     log: tests/_output
     data: tests/_data
     helpers: tests/_support
+bootstrap: _bootstrap.php
 settings:
-    bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
 params: