Changeset 3346758
- Timestamp:
- 08/19/2025 05:39:08 AM (7 months ago)
- Location:
- wpstream
- Files:
-
- 12 edited
- 1 copied
-
tags/4.6.7.9 (copied) (copied from wpstream/trunk)
-
tags/4.6.7.9/admin/css/wpstream-admin.css (modified) (2 diffs)
-
tags/4.6.7.9/hello-wpstream/framework/wpstream-video-functions.php (modified) (1 diff)
-
tags/4.6.7.9/includes/class-wpstream-live-api-connection.php (modified) (1 diff)
-
tags/4.6.7.9/public/css/videojs-wpstream.css (modified) (1 diff)
-
tags/4.6.7.9/readme.txt (modified) (2 diffs)
-
tags/4.6.7.9/wpstream.php (modified) (2 diffs)
-
trunk/admin/css/wpstream-admin.css (modified) (2 diffs)
-
trunk/hello-wpstream/framework/wpstream-video-functions.php (modified) (1 diff)
-
trunk/includes/class-wpstream-live-api-connection.php (modified) (1 diff)
-
trunk/public/css/videojs-wpstream.css (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/wpstream.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wpstream/tags/4.6.7.9/admin/css/wpstream-admin.css
r3316678 r3346758 1113 1113 -webkit-transition: .4s; 1114 1114 transition: .4s; 1115 text-align: center; 1116 line-height: 25px; 1117 font-size: 11px; 1118 font-weight: 500; 1119 color: #666; 1115 1120 } 1116 1121 … … 1125 1130 -webkit-transition: .4s; 1126 1131 transition: .4s; 1132 z-index: 1; 1133 } 1134 1135 .wpstream_slider:after { 1136 content: "OFF"; 1137 position: absolute; 1138 left: 0; 1139 right: 0; 1140 top: 0; 1141 bottom: 0; 1142 line-height: 25px; 1143 z-index: 0; 1144 text-align: right; 1145 margin-right: 8px; 1127 1146 } 1128 1147 1129 1148 input:checked + .wpstream_slider { 1130 1149 background-color: #2196F3; 1150 color: #fff; 1151 } 1152 1153 input:checked + .wpstream_slider:after { 1154 content: "ON"; 1155 text-align: left; 1156 margin-left: 8px; 1131 1157 } 1132 1158 -
wpstream/tags/4.6.7.9/hello-wpstream/framework/wpstream-video-functions.php
r3335660 r3346758 331 331 */ 332 332 function wpstream_theme_not_live_section( $channel_id ) { 333 $transient_name = 'event_data_to_return_'. $channel_id; 334 $event_data = get_transient( $transient_name ); 335 333 336 $return_string = '<div class="wpstream_not_live_mess wpstream_theme_not_live_section "><div class="wpstream_not_live_mess_back"></div>'; 334 337 $return_string .= '<div class="wpstream_not_live_mess_mess">'; 335 $message_show = esc_html( get_option( 'wpstream_you_are_not_live', 'We are not live at this moment' ) ); 336 337 $return_string .= $message_show; 338 if ( isset($event_data['status']) && $event_data['status'] === 'stopped' ) { 339 $return_string .= esc_html( get_option( 'wpstream_you_are_not_live', 'We are not live at this moment' ) );; 340 } 338 341 339 342 $return_string .= '</div>'; -
wpstream/tags/4.6.7.9/includes/class-wpstream-live-api-connection.php
r3335660 r3346758 734 734 } 735 735 736 737 // set encrypt option 738 $is_autostart="false"; 739 if( intval( $local_event_options['autostart']) ==1 ){ 740 $is_autostart="true"; 741 } 742 743 744 // set encrypt option 745 $is_encrypt="false"; 746 if( intval( $local_event_options['encrypt']) ==1 ){ 747 $is_encrypt="true"; 748 } 749 750 $low_latency="false"; 751 if( intval( $local_event_options['low_latency']) ==1 ){ 752 $low_latency="true"; 753 } 754 755 $adaptive_bitrate="false"; 756 if( intval( $local_event_options['adaptive_bitrate']) ==1 ){ 757 $adaptive_bitrate="true"; 758 } 759 760 if($adaptive_bitrate=="true" || $low_latency=="true" ){ 761 $is_encrypt="false"; 762 } 763 764 if( $is_encrypt=="true"){ 765 $adaptive_bitrate="false"; 766 $low_latency="false"; 767 } 768 769 770 771 // set record option 772 $is_record="false"; 773 if( intval( $local_event_options['record']) ==1 ){ 774 $is_record="true"; 775 } 776 777 $corsorigin=''; 778 if( !isset($local_event_options['domain_lock'])){ 779 $corsorigin='*'; 780 } 781 else if(intval( $local_event_options['domain_lock']) ==0 ){ 782 $corsorigin='*'; 783 } 784 785 786 $event_data = $this->wpstream_request_live_stream_uri($channel_id,$is_autostart,$is_record,$is_encrypt,$low_latency,$adaptive_bitrate,$userID,$corsorigin,$on_boarding, $basic_streaming); 736 $is_autostart="false"; 737 $is_encrypt="false"; 738 $low_latency="false"; 739 $adaptive_bitrate="false"; 740 $is_record="false"; 741 $corsorigin='*'; 742 743 if ( is_array($local_event_options) ) { 744 if ( isset($local_event_options['autostart']) && 745 intval( $local_event_options['autostart']) == 1 ) { 746 $is_autostart = "true"; 747 } 748 749 if ( isset($local_event_options['encrypt']) && 750 intval( $local_event_options['encrypt']) == 1 ) { 751 $is_encrypt = "true"; 752 } 753 754 if ( isset($local_event_options['low_latency']) && 755 intval( $local_event_options['low_latency']) == 1 ) { 756 $low_latency = "true"; 757 } 758 759 if ( isset($local_event_options['adaptive_bitrate']) && 760 intval( $local_event_options['adaptive_bitrate']) == 1 ) { 761 $adaptive_bitrate = "true"; 762 } 763 764 if ( isset($local_event_options['record']) && 765 intval( $local_event_options['record']) == 1 ) { 766 $is_record = "true"; 767 } 768 769 if ( !isset($local_event_options['domain_lock']) || intval( $local_event_options['domain_lock']) == 0 ) { 770 $corsorigin = '*'; 771 } 772 } 773 774 if( $adaptive_bitrate=="true" || $low_latency=="true" ) { 775 $is_encrypt="false"; 776 } 777 778 if( $is_encrypt=="true" ) { 779 $adaptive_bitrate="false"; 780 $low_latency="false"; 781 } 782 783 $event_data = $this->wpstream_request_live_stream_uri( 784 $channel_id, 785 $is_autostart, 786 $is_record, 787 $is_encrypt, 788 $low_latency, 789 $adaptive_bitrate, 790 $userID, 791 $corsorigin, 792 $on_boarding, 793 $basic_streaming 794 ); 787 795 788 796 -
wpstream/tags/4.6.7.9/public/css/videojs-wpstream.css
r3312871 r3346758 43 43 line-height: 3em; 44 44 height: 4em; 45 align-items: center; 45 46 } 46 47 48 .vjs-wpstream .vjs-live-control .vjs-live-display { 49 width: 4em; 50 } 51 52 .wpstream-featured-player-wrapper .vjs-live-display { 53 margin-top: 0; 54 } 47 55 48 56 .vjs-wpstream .vjs-volume-panel .vjs-volume-control { -
wpstream/tags/4.6.7.9/readme.txt
r3337309 r3346758 5 5 Tested up to: 6.8 6 6 Requires PHP: 7.1 7 Stable tag: 4.6.7. 87 Stable tag: 4.6.7.9 8 8 License: GPL 9 9 License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html … … 138 138 == Changelog == 139 139 140 = 4.6.7.9 = 141 * Fix - Fix default value for channel settings 142 * Fix - Initial Video Player message when the streaming has started 143 140 144 = 4.6.7.8 = 141 145 * Improvement - Decrease number of remote requests -
wpstream/tags/4.6.7.9/wpstream.php
r3337309 r3346758 4 4 * Plugin URI: http://wpstream.net 5 5 * Description: WpStream is a platform that allows you to live stream, create Video-on-Demand, and offer Pay-Per-View videos. We provide an affordable and user-friendly way for businesses, non-profits, and public institutions to broadcast their content and monetize their work. 6 * Version: 4.6.7. 86 * Version: 4.6.7.9 7 7 * Author: wpstream 8 8 * Author URI: http://wpstream.net … … 15 15 die; 16 16 } 17 define('WPSTREAM_PLUGIN_VERSION', '4.6.7. 8');17 define('WPSTREAM_PLUGIN_VERSION', '4.6.7.9'); 18 18 define('WPSTREAM_CLUBLINK', 'wpstream.net'); 19 19 define('WPSTREAM_CLUBLINKSSL', 'https'); -
wpstream/trunk/admin/css/wpstream-admin.css
r3316678 r3346758 1113 1113 -webkit-transition: .4s; 1114 1114 transition: .4s; 1115 text-align: center; 1116 line-height: 25px; 1117 font-size: 11px; 1118 font-weight: 500; 1119 color: #666; 1115 1120 } 1116 1121 … … 1125 1130 -webkit-transition: .4s; 1126 1131 transition: .4s; 1132 z-index: 1; 1133 } 1134 1135 .wpstream_slider:after { 1136 content: "OFF"; 1137 position: absolute; 1138 left: 0; 1139 right: 0; 1140 top: 0; 1141 bottom: 0; 1142 line-height: 25px; 1143 z-index: 0; 1144 text-align: right; 1145 margin-right: 8px; 1127 1146 } 1128 1147 1129 1148 input:checked + .wpstream_slider { 1130 1149 background-color: #2196F3; 1150 color: #fff; 1151 } 1152 1153 input:checked + .wpstream_slider:after { 1154 content: "ON"; 1155 text-align: left; 1156 margin-left: 8px; 1131 1157 } 1132 1158 -
wpstream/trunk/hello-wpstream/framework/wpstream-video-functions.php
r3335660 r3346758 331 331 */ 332 332 function wpstream_theme_not_live_section( $channel_id ) { 333 $transient_name = 'event_data_to_return_'. $channel_id; 334 $event_data = get_transient( $transient_name ); 335 333 336 $return_string = '<div class="wpstream_not_live_mess wpstream_theme_not_live_section "><div class="wpstream_not_live_mess_back"></div>'; 334 337 $return_string .= '<div class="wpstream_not_live_mess_mess">'; 335 $message_show = esc_html( get_option( 'wpstream_you_are_not_live', 'We are not live at this moment' ) ); 336 337 $return_string .= $message_show; 338 if ( isset($event_data['status']) && $event_data['status'] === 'stopped' ) { 339 $return_string .= esc_html( get_option( 'wpstream_you_are_not_live', 'We are not live at this moment' ) );; 340 } 338 341 339 342 $return_string .= '</div>'; -
wpstream/trunk/includes/class-wpstream-live-api-connection.php
r3335660 r3346758 734 734 } 735 735 736 737 // set encrypt option 738 $is_autostart="false"; 739 if( intval( $local_event_options['autostart']) ==1 ){ 740 $is_autostart="true"; 741 } 742 743 744 // set encrypt option 745 $is_encrypt="false"; 746 if( intval( $local_event_options['encrypt']) ==1 ){ 747 $is_encrypt="true"; 748 } 749 750 $low_latency="false"; 751 if( intval( $local_event_options['low_latency']) ==1 ){ 752 $low_latency="true"; 753 } 754 755 $adaptive_bitrate="false"; 756 if( intval( $local_event_options['adaptive_bitrate']) ==1 ){ 757 $adaptive_bitrate="true"; 758 } 759 760 if($adaptive_bitrate=="true" || $low_latency=="true" ){ 761 $is_encrypt="false"; 762 } 763 764 if( $is_encrypt=="true"){ 765 $adaptive_bitrate="false"; 766 $low_latency="false"; 767 } 768 769 770 771 // set record option 772 $is_record="false"; 773 if( intval( $local_event_options['record']) ==1 ){ 774 $is_record="true"; 775 } 776 777 $corsorigin=''; 778 if( !isset($local_event_options['domain_lock'])){ 779 $corsorigin='*'; 780 } 781 else if(intval( $local_event_options['domain_lock']) ==0 ){ 782 $corsorigin='*'; 783 } 784 785 786 $event_data = $this->wpstream_request_live_stream_uri($channel_id,$is_autostart,$is_record,$is_encrypt,$low_latency,$adaptive_bitrate,$userID,$corsorigin,$on_boarding, $basic_streaming); 736 $is_autostart="false"; 737 $is_encrypt="false"; 738 $low_latency="false"; 739 $adaptive_bitrate="false"; 740 $is_record="false"; 741 $corsorigin='*'; 742 743 if ( is_array($local_event_options) ) { 744 if ( isset($local_event_options['autostart']) && 745 intval( $local_event_options['autostart']) == 1 ) { 746 $is_autostart = "true"; 747 } 748 749 if ( isset($local_event_options['encrypt']) && 750 intval( $local_event_options['encrypt']) == 1 ) { 751 $is_encrypt = "true"; 752 } 753 754 if ( isset($local_event_options['low_latency']) && 755 intval( $local_event_options['low_latency']) == 1 ) { 756 $low_latency = "true"; 757 } 758 759 if ( isset($local_event_options['adaptive_bitrate']) && 760 intval( $local_event_options['adaptive_bitrate']) == 1 ) { 761 $adaptive_bitrate = "true"; 762 } 763 764 if ( isset($local_event_options['record']) && 765 intval( $local_event_options['record']) == 1 ) { 766 $is_record = "true"; 767 } 768 769 if ( !isset($local_event_options['domain_lock']) || intval( $local_event_options['domain_lock']) == 0 ) { 770 $corsorigin = '*'; 771 } 772 } 773 774 if( $adaptive_bitrate=="true" || $low_latency=="true" ) { 775 $is_encrypt="false"; 776 } 777 778 if( $is_encrypt=="true" ) { 779 $adaptive_bitrate="false"; 780 $low_latency="false"; 781 } 782 783 $event_data = $this->wpstream_request_live_stream_uri( 784 $channel_id, 785 $is_autostart, 786 $is_record, 787 $is_encrypt, 788 $low_latency, 789 $adaptive_bitrate, 790 $userID, 791 $corsorigin, 792 $on_boarding, 793 $basic_streaming 794 ); 787 795 788 796 -
wpstream/trunk/public/css/videojs-wpstream.css
r3312871 r3346758 43 43 line-height: 3em; 44 44 height: 4em; 45 align-items: center; 45 46 } 46 47 48 .vjs-wpstream .vjs-live-control .vjs-live-display { 49 width: 4em; 50 } 51 52 .wpstream-featured-player-wrapper .vjs-live-display { 53 margin-top: 0; 54 } 47 55 48 56 .vjs-wpstream .vjs-volume-panel .vjs-volume-control { -
wpstream/trunk/readme.txt
r3337309 r3346758 5 5 Tested up to: 6.8 6 6 Requires PHP: 7.1 7 Stable tag: 4.6.7. 87 Stable tag: 4.6.7.9 8 8 License: GPL 9 9 License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html … … 138 138 == Changelog == 139 139 140 = 4.6.7.9 = 141 * Fix - Fix default value for channel settings 142 * Fix - Initial Video Player message when the streaming has started 143 140 144 = 4.6.7.8 = 141 145 * Improvement - Decrease number of remote requests -
wpstream/trunk/wpstream.php
r3337309 r3346758 4 4 * Plugin URI: http://wpstream.net 5 5 * Description: WpStream is a platform that allows you to live stream, create Video-on-Demand, and offer Pay-Per-View videos. We provide an affordable and user-friendly way for businesses, non-profits, and public institutions to broadcast their content and monetize their work. 6 * Version: 4.6.7. 86 * Version: 4.6.7.9 7 7 * Author: wpstream 8 8 * Author URI: http://wpstream.net … … 15 15 die; 16 16 } 17 define('WPSTREAM_PLUGIN_VERSION', '4.6.7. 8');17 define('WPSTREAM_PLUGIN_VERSION', '4.6.7.9'); 18 18 define('WPSTREAM_CLUBLINK', 'wpstream.net'); 19 19 define('WPSTREAM_CLUBLINKSSL', 'https');
Note: See TracChangeset
for help on using the changeset viewer.