Skip to content

Commit

Permalink
Merge pull request #243 from rtCamp/develop
Browse files Browse the repository at this point in the history
Version update v1.3.4
  • Loading branch information
SID177 authored Aug 17, 2021
2 parents aed8bbf + 9ab80cf commit 4b50995
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 64 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ Read [Documentation](https://rtmedia.io/docs/transcoder/?utm_source=readme&utm_m
1. Transcoder Settings

## Changelog ##
#### 1.3.4 [August 17, 2021] ####

* FIXED

* Transcoder plugin preventing read more from expanding
* Compatibility with WordPress 5.8 and PHP 8.0

#### 1.3.3 [April 13, 2021] ####

* FIXED
Expand Down
7 changes: 3 additions & 4 deletions admin/rt-retranscode-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,9 @@ public function add_bulk_actions_via_javascript() {
* @return void
*/
public function bulk_action_handler() {

$action = transcoder_filter_input( INPUT_REQUEST, 'action', FILTER_SANITIZE_STRING );
$action2 = transcoder_filter_input( INPUT_REQUEST, 'action2', FILTER_SANITIZE_STRING );
$media = transcoder_filter_input( INPUT_REQUEST, 'media', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY );
$action = transcoder_filter_input( INPUT_GET, 'action', FILTER_SANITIZE_STRING );
$action2 = transcoder_filter_input( INPUT_GET, 'action2', FILTER_SANITIZE_STRING );
$media = transcoder_filter_input( INPUT_GET, 'media', FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY );

if ( empty( $action ) || empty( $media ) || ! is_array( $media ) ||
( 'bulk_retranscode_media' !== $action && 'bulk_retranscode_media' !== $action2 )
Expand Down
6 changes: 3 additions & 3 deletions admin/rt-transcoder-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,12 @@ function rtt_generate_video_shortcode( $html, $send_id, $attachment ) {
*
* @since 1.0.1
*
* @param string $content HTML contents of the activity.
* @param object $activity Activity object.
* @param string $content HTML contents of the activity.
* @param object|null $activity Activity object.
*
* @return string
*/
function rtt_bp_get_activity_content( $content, $activity ) {
function rtt_bp_get_activity_content( $content, $activity = null ) {

if ( empty( $activity ) || empty( $content ) ) {
return $content;
Expand Down
18 changes: 1 addition & 17 deletions inc/helpers/custom-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
/**
* This method is an improved version of PHP's filter_input() and
* works well on PHP CLI as well which PHP default method does not.
* Also Provide support INPUT_REQUEST.
*
* Reference:
* - https://bugs.php.net/bug.php?id=49184
* - https://bugs.php.net/bug.php?id=54672
*
* @param int $type One of INPUT_GET, INPUT_POST, INPUT_REQUEST, INPUT_COOKIE, INPUT_SERVER, or INPUT_ENV.
* @param int $type One of INPUT_GET, INPUT_POST, INPUT_COOKIE, INPUT_SERVER, or INPUT_ENV.
* @param string $variable_name Name of a variable to get.
* @param int $filter The ID of the filter to apply.
* @param mixed $options filter to apply.
Expand All @@ -24,21 +23,6 @@
*/
function transcoder_filter_input( $type, $variable_name, $filter = FILTER_DEFAULT, $options = null ) {

/**
* Provide support of INPUT_REQUEST
*
* Reference: https://bugs.php.net/bug.php?id=54672
*/
if ( INPUT_REQUEST === $type ) {
if ( isset( $_POST[ $variable_name ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
$type = INPUT_POST;
} elseif ( isset( $_GET[ $variable_name ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
$type = INPUT_GET;
} else {
return null;
}
}

if ( php_sapi_name() !== 'cli' ) {

/**
Expand Down
70 changes: 35 additions & 35 deletions languages/transcoder.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://community.rtcamp.com/\n"
"POT-Creation-Date: 2021-04-13 11:35:10+00:00\n"
"POT-Creation-Date: 2021-08-17 07:53:36+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -207,64 +207,64 @@ msgstr ""

#: admin/rt-retranscode-admin.php:119 admin/rt-retranscode-admin.php:120
#: admin/rt-retranscode-admin.php:192 admin/rt-retranscode-admin.php:213
#: admin/rt-retranscode-admin.php:233 admin/rt-retranscode-admin.php:285
#: admin/rt-retranscode-admin.php:233 admin/rt-retranscode-admin.php:284
msgid "Retranscode Media"
msgstr ""

#: admin/rt-retranscode-admin.php:191
msgid "Retranscode this single media"
msgstr ""

#: admin/rt-retranscode-admin.php:293
#: admin/rt-retranscode-admin.php:292
msgid "Cheatin’ uh?"
msgstr ""

#: admin/rt-retranscode-admin.php:327
#: admin/rt-retranscode-admin.php:326
#. translators: Link to the media page.
msgid "Unable to find any media. Are you sure <a href='%s'>some exist</a>?"
msgstr ""

#: admin/rt-retranscode-admin.php:353
#: admin/rt-retranscode-admin.php:352
msgid "There are no media available to send for transcoding."
msgstr ""

#: admin/rt-retranscode-admin.php:363
#: admin/rt-retranscode-admin.php:362
msgid "You do not have sufficient bandwidth remaining to perform the transcoding."
msgstr ""

#: admin/rt-retranscode-admin.php:364
#: admin/rt-retranscode-admin.php:363
msgid "Your remaining bandwidth is : "
msgstr ""

#: admin/rt-retranscode-admin.php:365
#: admin/rt-retranscode-admin.php:364
msgid "Required bandwidth is: "
msgstr ""

#: admin/rt-retranscode-admin.php:369
#: admin/rt-retranscode-admin.php:368
msgid "You can select the files manually and try again."
msgstr ""

#: admin/rt-retranscode-admin.php:376 admin/rt-retranscode-admin.php:390
#: admin/rt-retranscode-admin.php:375 admin/rt-retranscode-admin.php:389
msgid "Proceed with retranscoding"
msgstr ""

#: admin/rt-retranscode-admin.php:404
#: admin/rt-retranscode-admin.php:403
msgid ""
"Your files are being re-transcoded. Do not navigate away from this page "
"until the process is completed, as doing so will prematurely abort the "
"script. Retranscoding can take a while, especially for larger files. You "
"can view the progress below."
msgstr ""

#: admin/rt-retranscode-admin.php:411
#: admin/rt-retranscode-admin.php:410
#. translators: Count of media which were successfully transcoded with the time
#. in seconds.
msgid ""
"To go back to the previous page, <a id=\"retranscode-goback\" "
"href=\"#\">click here</a>."
msgstr ""

#: admin/rt-retranscode-admin.php:414
#: admin/rt-retranscode-admin.php:413
#. translators: Count of media which were successfully and media which were
#. failed transcoded with the time in seconds and previout page link.
msgid ""
Expand All @@ -273,118 +273,118 @@ msgid ""
"again, <a href=\"%4$s\">click here</a>. %5$s"
msgstr ""

#: admin/rt-retranscode-admin.php:416
#: admin/rt-retranscode-admin.php:415
#. translators: Count of media which were successfully transcoded with the time
#. in seconds and previout page link.
msgid ""
"All done! %1$s media file(s) were successfully sent for transcoding in %2$s "
"seconds and there were 0 failures. %3$s"
msgstr ""

#: admin/rt-retranscode-admin.php:420 admin/rt-retranscode-admin.php:600
#: admin/rt-retranscode-admin.php:419 admin/rt-retranscode-admin.php:599
msgid "You must enable Javascript in order to proceed!"
msgstr ""

#: admin/rt-retranscode-admin.php:426
#: admin/rt-retranscode-admin.php:425
msgid "Abort the Operation"
msgstr ""

#: admin/rt-retranscode-admin.php:428
#: admin/rt-retranscode-admin.php:427
msgid "Debugging Information"
msgstr ""

#: admin/rt-retranscode-admin.php:433
#: admin/rt-retranscode-admin.php:432
#. translators: Total count of the media.
msgid "Total Media: %s"
msgstr ""

#: admin/rt-retranscode-admin.php:438
#: admin/rt-retranscode-admin.php:437
#. translators: Count of media which were successfully sent to the transcoder
#. server.
msgid "Media Sent for Retranscoding: %s"
msgstr ""

#: admin/rt-retranscode-admin.php:443
#: admin/rt-retranscode-admin.php:442
#. translators: Count of media which were failed while sending to the
#. transcoder server.
msgid "Failed While Sending: %s"
msgstr ""

#: admin/rt-retranscode-admin.php:475
#: admin/rt-retranscode-admin.php:474
msgid "Stopping..."
msgstr ""

#: admin/rt-retranscode-admin.php:532
#: admin/rt-retranscode-admin.php:531
#. translators: Media ID.
msgid ""
"The resize request was abnormally terminated (ID %s). This is likely due to "
"the media exceeding available memory or some other type of fatal error."
msgstr ""

#: admin/rt-retranscode-admin.php:585
#: admin/rt-retranscode-admin.php:584
msgid ""
"This tool will retranscode ALL audio/video media uploaded to your website. "
"This can be handy if you need to transcode media files uploaded in the past."
msgstr ""

#: admin/rt-retranscode-admin.php:587
#: admin/rt-retranscode-admin.php:586
msgid ""
"Sending your entire media library for retranscoding can consume a lot of "
"your bandwidth allowance, so use this tool with care."
msgstr ""

#: admin/rt-retranscode-admin.php:592
#: admin/rt-retranscode-admin.php:591
#. translators: Placeholder is for admin media section link.
msgid ""
"You can retranscode specific media files (rather than ALL media) from the "
"<a href='%s'>Media</a> page using Bulk Action via drop down or mouse hover "
"a specific media (audio/video) file."
msgstr ""

#: admin/rt-retranscode-admin.php:596
#: admin/rt-retranscode-admin.php:595
msgid "To begin, just press the button below."
msgstr ""

#: admin/rt-retranscode-admin.php:598
#: admin/rt-retranscode-admin.php:597
msgid "Retranscode All Media"
msgstr ""

#: admin/rt-retranscode-admin.php:635
#: admin/rt-retranscode-admin.php:634
#. translators: Media id of the invalid media type.
msgid "Sending Failed: %d is an invalid media ID/type."
msgstr ""

#: admin/rt-retranscode-admin.php:640
#: admin/rt-retranscode-admin.php:639
#. translators: Placeholder is for Media Name and ID of media.
msgid ""
"&quot;%1$s&quot; (ID %2$s) is MP3 file already. No need to send for "
"transcoding"
msgstr ""

#: admin/rt-retranscode-admin.php:644
#: admin/rt-retranscode-admin.php:643
msgid "Your user account doesn't have permission to transcode"
msgstr ""

#: admin/rt-retranscode-admin.php:649
#: admin/rt-retranscode-admin.php:648
msgid "The media is already being transcoded"
msgstr ""

#: admin/rt-retranscode-admin.php:696
#: admin/rt-retranscode-admin.php:695
msgid "Unknown failure reason."
msgstr ""

#: admin/rt-retranscode-admin.php:702
#: admin/rt-retranscode-admin.php:701
#. translators: Media name, Media id and success message for successfull
#. transcode.
msgid "&quot;%1$s&quot; (ID %2$s) was successfully sent in %3$s seconds."
msgstr ""

#: admin/rt-retranscode-admin.php:714
#: admin/rt-retranscode-admin.php:713
#. translators: Media name, Media ID and message for failed transcode.
msgid "&quot;%1$s&quot; (ID %2$s) failed to sent. The error message was: %3$s"
msgstr ""

#: admin/rt-retranscode-admin.php:736
#: admin/rt-retranscode-admin.php:735
msgid "Insufficient bandwidth!"
msgstr ""

Expand Down
16 changes: 13 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
=== Transcoder ===
Contributors: rtcamp, mangeshp, chandrapatel, manishsongirkar36, bhargavbhandari90, kiranpotphode, thrijith, devikvekariya, sagarnasit, sudhiryadav, sid177, pooja1210, vaishu.agola27, ravatparmar, tremidkhar
Contributors: rtcamp, mangeshp, chandrapatel, manishsongirkar36, bhargavbhandari90, kiranpotphode, thrijith, devikvekariya, sagarnasit, sudhiryadav, sid177, pooja1210, vaishu.agola27, ravatparmar, tremidkhar, kapilpaul
Tags: media, multimedia, audio, songs, music, video, ffmpeg, media-node, rtMedia, WordPress, kaltura, transcode, transcoder, encoding, encode
Donate link: https://rtcamp.com/donate/
Requires at least: 4.1
Tested up to: 5.7
Stable tag: 1.3.3
Tested up to: 5.8
Stable tag: 1.3.4
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -62,6 +62,13 @@ Read [Documentation](https://rtmedia.io/docs/transcoder/?utm_source=readme&utm_m
1. Transcoder Settings

== Changelog ==
= 1.3.4 [August 17, 2021] =

* FIXED

* Transcoder plugin preventing read more from expanding
* Compatibility with WordPress 5.8 and PHP 8.0

= 1.3.3 [April 13, 2021] =

* FIXED
Expand Down Expand Up @@ -203,5 +210,8 @@ Read [Documentation](https://rtmedia.io/docs/transcoder/?utm_source=readme&utm_m
Initial release

== Upgrade Notice ==
= 1.3.4 =
Transcoder 1.3.4, with added fix for plugin preventing read more from expanding in activity page and WordPress 5.8 and PHP 8.0 compatibility.

= 1.3.3 =
Transcoder 1.3.3, with WordPress 5.7 compatibility and fix for license key not getting saved for WordPress installed in sub-directory.
4 changes: 2 additions & 2 deletions rt-transcoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Transcoder
* Plugin URI: https://rtmedia.io/transcoder/?utm_source=dashboard&utm_medium=plugin&utm_campaign=transcoder
* Description: Audio & video transcoding services for ANY WordPress website. Allows you to convert audio/video files of any format to a web-friendly format (mp3/mp4).
* Version: 1.3.3
* Version: 1.3.4
* Text Domain: transcoder
* Author: rtCamp
* Author URI: https://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=transcoder
Expand Down Expand Up @@ -39,7 +39,7 @@
/**
* The version of the plugin
*/
define( 'RT_TRANSCODER_VERSION', '1.3.3' );
define( 'RT_TRANSCODER_VERSION', '1.3.4' );
}

if ( ! defined( 'RT_TRANSCODER_NO_MAIL' ) && defined( 'VIP_GO_APP_ENVIRONMENT' ) ) {
Expand Down

0 comments on commit 4b50995

Please sign in to comment.