Skip to content

Commit 3c233da

Browse files
authored
Merge pull request #73 from rtMediaWP/develop
Version update v1.2.2
2 parents bc05645 + d7b6bf2 commit 3c233da

File tree

5 files changed

+49
-68
lines changed

5 files changed

+49
-68
lines changed

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Transcoder #
44

5-
* **Contributors:** [rtcamp] (http://profiles.wordpress.org/rtcamp), [mangeshp] (http://profiles.wordpress.org/mangeshp), [chandrapatel] (http://profiles.wordpress.org/chandrapatel), [manishsongirkar36] (http://profiles.wordpress.org/manishsongirkar36), [bhargavbhandari90] (http://profiles.wordpress.org/bhargavbhandari90), [kiranpotphode] (http://profiles.wordpress.org/kiranpotphode), [thrijith] (http://profiles.wordpress.org/thrijith), [devikvekariya] (http://profiles.wordpress.org/devikvekariya), [sagarnasit] (http://profiles.wordpress.org/sagarnasit),
5+
* **Contributors:** [rtcamp](http://profiles.wordpress.org/rtcamp), [mangeshp](http://profiles.wordpress.org/mangeshp), [chandrapatel](http://profiles.wordpress.org/chandrapatel), [manishsongirkar36](http://profiles.wordpress.org/manishsongirkar36), [bhargavbhandari90](http://profiles.wordpress.org/bhargavbhandari90), [kiranpotphode](http://profiles.wordpress.org/kiranpotphode), [thrijith](http://profiles.wordpress.org/thrijith), [devikvekariya](http://profiles.wordpress.org/devikvekariya), [sagarnasit](http://profiles.wordpress.org/sagarnasit),[sudhiryadav](http://profiles.wordpress.org/sudhiryadav)
66

77
* **License:** [GPL v2 or later] ( http://www.gnu.org/licenses/gpl-2.0.html)
88

@@ -60,15 +60,20 @@ Read [Documentation](https://rtmedia.io/docs/transcoder/?utm_source=readme&utm_m
6060
1. Transcoder Settings
6161

6262
## Changelog ##
63+
#### 1.2.2 [July 12, 2018] ####
64+
65+
* FIXED
66+
67+
* Issue with Transcoding service on load balancing server
68+
6369
#### 1.2.1 [June 26, 2018] ####
6470
* ENHANCEMENTS
6571

66-
* Updated usage of existing filter 'rtt_transcoder_status_message' [Documentation](https://rtmedia.io/docs/transcoder/developers-documentation/filters/#rtttranscoderstatusmessage)
72+
* Updated usage of existing filter 'rtt_transcoder_status_message' [Documentation](https://rtmedia.io/docs/transcoder/developers-documentation/filters/#rtttranscoderstatusmessage)
6773

6874
* FIXED
69-
70-
* Issue with Transcoding service usage update
71-
* Issue with Transcoding process callback
75+
* Issue with Transcoding service usage update
76+
* Issue with Transcoding process callback
7277

7378
#### 1.2 [April 24, 2018] ####
7479
* NEW FEATURES

admin/rt-transcoder-handler.php

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -991,39 +991,9 @@ public function handle_callback() {
991991
$thumbnail = filter_input( INPUT_POST, 'thumbnail', FILTER_SANITIZE_STRING );
992992
$format = filter_input( INPUT_POST, 'format', FILTER_SANITIZE_STRING );
993993

994-
$ignore_cache = filter_input( INPUT_POST, 'ignore_cache', FILTER_SANITIZE_STRING );
995-
996-
if ( ! empty( $job_id ) ) {
997-
998-
// It returns false if transient is not set.
999-
$server_addr = get_transient( 'rtt_server_addr' );
1000-
if ( ! empty( $ignore_cache ) || false === $server_addr ) {
1001-
1002-
$path = str_replace( 'http://', '', $this->transcoding_api_url );
1003-
$path_arr = explode( '/', $path );
1004-
$server_addr = gethostbyname( $path_arr[0] );
1005-
set_transient( 'rtt_server_addr', $server_addr, WEEK_IN_SECONDS );
1006-
1007-
}
1008-
1009-
$incomming_addr = filter_input( INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP );
1010-
1011-
// Added fallback if FILTER_VALIDATE_IP is returning null value after Sanitization.
1012-
if ( empty( $incomming_addr ) ) {
1013-
// Used $_server because filter_input returning null values because for INPUT_SERVER.
1014-
$incomming_addr = sanitize_text_field( $_SERVER['REMOTE_ADDR'] ); // @codingStandardsIgnoreLine
1015-
}
1016-
1017-
if ( empty( $server_addr ) || empty( $incomming_addr ) || $incomming_addr !== $server_addr ) {
1018-
1019-
echo esc_html__( 'Something went wrong. Invalid post request.', 'transcoder' );
1020-
die();
1021-
1022-
}
1023-
}
1024-
1025994
if ( ! empty( $job_id ) && ! empty( $file_status ) && ( 'error' === $file_status ) ) {
1026995
$send_alert = $this->nofity_transcoding_failed( $job_id, $error_msg );
996+
echo esc_html__( 'Something went wrong. Invalid post request.', 'transcoder' );
1027997
die();
1028998
}
1029999

languages/transcoder.pot

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ msgid ""
44
msgstr ""
55
"Project-Id-Version: \n"
66
"Report-Msgid-Bugs-To: http://community.rtcamp.com/\n"
7-
"POT-Creation-Date: 2018-06-26 06:24:37+00:00\n"
7+
"POT-Creation-Date: 2018-07-12 06:51:33+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -532,18 +532,18 @@ msgstr ""
532532
msgid "Could not read file."
533533
msgstr ""
534534

535-
#: admin/rt-transcoder-handler.php:890 admin/rt-transcoder-handler.php:1067
536-
#: admin/rt-transcoder-handler.php:1129
535+
#: admin/rt-transcoder-handler.php:890 admin/rt-transcoder-handler.php:1037
536+
#: admin/rt-transcoder-handler.php:1099
537537
msgid "Transcoding: Download Failed"
538538
msgstr ""
539539

540-
#: admin/rt-transcoder-handler.php:891 admin/rt-transcoder-handler.php:1068
541-
#: admin/rt-transcoder-handler.php:1130 admin/rt-transcoder-handler.php:1325
542-
#: admin/rt-transcoder-handler.php:1328
540+
#: admin/rt-transcoder-handler.php:891 admin/rt-transcoder-handler.php:1038
541+
#: admin/rt-transcoder-handler.php:1100 admin/rt-transcoder-handler.php:1295
542+
#: admin/rt-transcoder-handler.php:1298
543543
msgid "Media"
544544
msgstr ""
545545

546-
#: admin/rt-transcoder-handler.php:892 admin/rt-transcoder-handler.php:1069
546+
#: admin/rt-transcoder-handler.php:892 admin/rt-transcoder-handler.php:1039
547547
msgid " was successfully encoded but there was an error while downloading:"
548548
msgstr ""
549549

@@ -555,76 +555,76 @@ msgstr ""
555555
msgid "retry the download"
556556
msgstr ""
557557

558-
#: admin/rt-transcoder-handler.php:906 admin/rt-transcoder-handler.php:1082
559-
#: admin/rt-transcoder-handler.php:1144
558+
#: admin/rt-transcoder-handler.php:906 admin/rt-transcoder-handler.php:1052
559+
#: admin/rt-transcoder-handler.php:1114
560560
msgid "Done"
561561
msgstr ""
562562

563-
#: admin/rt-transcoder-handler.php:1019
563+
#: admin/rt-transcoder-handler.php:996
564564
msgid "Something went wrong. Invalid post request."
565565
msgstr ""
566566

567-
#: admin/rt-transcoder-handler.php:1061 admin/rt-transcoder-handler.php:1123
567+
#: admin/rt-transcoder-handler.php:1031 admin/rt-transcoder-handler.php:1093
568568
msgid ""
569569
"Something went wrong. The required attachment id does not exists. It must "
570570
"have been deleted."
571571
msgstr ""
572572

573-
#: admin/rt-transcoder-handler.php:1131
573+
#: admin/rt-transcoder-handler.php:1101
574574
msgid " was successfully transcoded but there was an error while downloading:"
575575
msgstr ""
576576

577-
#: admin/rt-transcoder-handler.php:1185
577+
#: admin/rt-transcoder-handler.php:1155
578578
msgid "Please enter the license key."
579579
msgstr ""
580580

581-
#: admin/rt-transcoder-handler.php:1197
581+
#: admin/rt-transcoder-handler.php:1167
582582
msgid "Transcoding disabled successfully."
583583
msgstr ""
584584

585-
#: admin/rt-transcoder-handler.php:1208
585+
#: admin/rt-transcoder-handler.php:1178
586586
msgid "Transcoding enabled successfully."
587587
msgstr ""
588588

589-
#: admin/rt-transcoder-handler.php:1321
589+
#: admin/rt-transcoder-handler.php:1291
590590
msgid "Transcoding: Something went wrong."
591591
msgstr ""
592592

593-
#: admin/rt-transcoder-handler.php:1324
593+
#: admin/rt-transcoder-handler.php:1294
594594
msgid " There was unexpected error occurred while transcoding this following media."
595595
msgstr ""
596596

597-
#: admin/rt-transcoder-handler.php:1329
597+
#: admin/rt-transcoder-handler.php:1299
598598
msgid " there was unexpected error occurred while transcoding this media."
599599
msgstr ""
600600

601-
#: admin/rt-transcoder-handler.php:1361
601+
#: admin/rt-transcoder-handler.php:1331
602602
msgid "Something went wrong. Please try again!"
603603
msgstr ""
604604

605-
#: admin/rt-transcoder-handler.php:1378 admin/rt-transcoder-handler.php:1409
605+
#: admin/rt-transcoder-handler.php:1348 admin/rt-transcoder-handler.php:1379
606606
msgid "Your file is transcoded successfully. Please refresh the page."
607607
msgstr ""
608608

609-
#: admin/rt-transcoder-handler.php:1404
609+
#: admin/rt-transcoder-handler.php:1374
610610
msgid ""
611611
"Looks like the server is taking too long to respond, Please try again in "
612612
"sometime."
613613
msgstr ""
614614

615-
#: admin/rt-transcoder-handler.php:1405
615+
#: admin/rt-transcoder-handler.php:1375
616616
msgid "Unfortunately, Transcoder failed to transcode this file."
617617
msgstr ""
618618

619-
#: admin/rt-transcoder-handler.php:1406
619+
#: admin/rt-transcoder-handler.php:1376
620620
msgid "Your file is getting transcoded. Please refresh after some time."
621621
msgstr ""
622622

623-
#: admin/rt-transcoder-handler.php:1407
623+
#: admin/rt-transcoder-handler.php:1377
624624
msgid "This file is still in the queue. Please refresh after some time."
625625
msgstr ""
626626

627-
#: admin/rt-transcoder-handler.php:1408
627+
#: admin/rt-transcoder-handler.php:1378
628628
msgid "Your server should be ready to receive the transcoded file."
629629
msgstr ""
630630

readme.txt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
=== Transcoder ===
2-
Contributors: rtcamp, mangeshp, chandrapatel, manishsongirkar36, bhargavbhandari90, kiranpotphode, thrijith, devikvekariya, sagarnasit
2+
Contributors: rtcamp, mangeshp, chandrapatel, manishsongirkar36, bhargavbhandari90, kiranpotphode, thrijith, devikvekariya, sagarnasit, sudhiryadav
33
Tags: media, multimedia, audio, songs, music, video, ffmpeg, media-node, rtMedia, WordPress, kaltura, transcode, transcoder, encoding, encode
44
Donate link: https://rtcamp.com/donate/
55
Requires at least: 4.1
6-
Tested up to: 4.9.6
7-
Stable tag: 1.2.1
6+
Tested up to: 4.9.7
7+
Stable tag: 1.2.2
88
License: GPLv2 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010

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

6464
== Changelog ==
65+
= 1.2.2 [July 12, 2018] =
66+
67+
* FIXED
68+
69+
* Issue with Transcoding service on load balancing server
70+
6571
= 1.2.1 [June 26, 2018] =
6672
* ENHANCEMENTS
6773

@@ -164,5 +170,5 @@ Read [Documentation](https://rtmedia.io/docs/transcoder/?utm_source=readme&utm_m
164170
Initial release
165171

166172
== Upgrade Notice ==
167-
= 1.2.1 =
168-
Transcoder 1.2.1, with transcoding status filter update and bug fixes.
173+
= 1.2.2 =
174+
Transcoder 1.2.2, with support for load balancing server.

rt-transcoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Transcoder
44
* Plugin URI: https://rtmedia.io/transcoder/?utm_source=dashboard&utm_medium=plugin&utm_campaign=transcoder
55
* 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).
6-
* Version: 1.2.1
6+
* Version: 1.2.2
77
* Text Domain: transcoder
88
* Author: rtCamp
99
* Author URI: https://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=transcoder
@@ -39,7 +39,7 @@
3939
/**
4040
* The version of the plugin
4141
*/
42-
define( 'RT_TRANSCODER_VERSION', '1.2.1' );
42+
define( 'RT_TRANSCODER_VERSION', '1.2.2' );
4343
}
4444

4545
require_once RT_TRANSCODER_PATH . 'admin/rt-transcoder-functions.php';

0 commit comments

Comments
 (0)