WordPress.org
Get WordPress

Plugin Directory

Changeset 3283102


Ignore:
Timestamp:
04/28/2025 06:46:37 AM (11 months ago)
Author:
wpstream
Message:

Update to version 4.6.7 from GitHub

Location:
wpstream
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed

  • wpstream/tags/4.6.7/admin/class-wpstream-admin.php

    r3280871 r3283102  
    255255                            'Your account is now in BASIC STREAMING mode.' . PHP_EOL . PHP_EOL .
    256256                'Instead of offloading to the WpStream Cloud, this mode relies on WordPress and hosting resources to process and deliver video. In some WP environments, streaming may be unreliable.' . PHP_EOL .
    257                             'Certain features, such as recording, browser broadcasting, and content protection are unavailable.' . PHP_EOL . PHP_EOL .
     257                            'Certain features, such as recording, viewer count, browser broadcasting, and content protection are unavailable.' . PHP_EOL . PHP_EOL .
    258258                            '- To take advantage of all features, please choose Cancel and upgrade your plan.' . PHP_EOL .
    259259                            '- Otherwise, choose OK to start your channel with these limitations.' . PHP_EOL . PHP_EOL .

  • wpstream/tags/4.6.7/includes/class-wpstream-live-api-connection.php

    r3278949 r3283102  
    778778                $metadata_array['on_boarding']='yes';
    779779            }
    780 
     780            $permalink = get_permalink($schannel_id);
     781            if ($permalink !== false) {
     782                $metadata_array['permalink'] = $permalink;
     783            }
    781784           
    782785            $curl_post_fields=array(

  • wpstream/tags/4.6.7/includes/class-wpstream-player.php

    r3278949 r3283102  
    406406        echo '<div class="wpstream_live_player_wrapper function_wpstream_live_event_player" data-now="'.$now.'" data-me="'.esc_attr($usernamestream).'" data-product-id="'.$channel_id.'" id="wpstream_live_player_wrapper'.$now.'" > ';
    407407               
    408             if( ( isset($event_settings['view_count'] ) && intval($event_settings['view_count'])==1 ) || !isset($event_settings['view_count']) ){
    409                 echo '<div id="wpestream_live_counting" class="wpestream_live_counting"></div>';
    410             }
    411            
     408            $show_viewer_count = (
     409                ( isset($event_settings['view_count']) && intval($event_settings['view_count']) == 1 )
     410                || !isset($event_settings['view_count'])
     411            );
     412            $pack_details           =    $this->main->wpstream_live_connection->wpstream_request_pack_data_per_user();
     413            if( isset($pack_details['available_data_mb'])){
     414                if ($pack_details['available_data_mb'] <= 0){
     415                    $show_viewer_count = false;
     416                }
     417            }
     418
     419            echo '<div id="wpestream_live_counting" class="wpestream_live_counting" data-showviewercount="' . ($show_viewer_count ? '1' : '0') . '"></div>';
     420
    412421            $show_wpstream_not_live_mess=' style="display:none;" ';
    413422            if(trim($hls_playback_url) ==''){

  • wpstream/tags/4.6.7/public/js/wpstream-player.js

    r3225419 r3283102  
    239239  updateViewerCount(count) {
    240240    console.log("updateViewerCount: ", count);
    241     this.counter.show();
    242241    this.counter.setCount(count);
     242  }
     243
     244  updatePending(place){
     245    console.log("updatePending: ", place);
     246    this.counter.showPending(place);
    243247  }
    244248
    … …  
    502506        //     llhls: isLlHls(src)
    503507        // });
    504         owner.playContent(force);
     508        // owner.playContent(force);
    505509      },
    506510      force ? 1 : 2000
    … …  
    936940    this.element = wrapper.find(".wpestream_live_counting");
    937941    this.element.css("background-color", "rgb(174 69 69 / 90%)");
     942
     943    console.log("showviewercount: ", this.element.data().showviewercount);
     944    this.showCounter = this.element.data().showviewercount.toString() === "1";
     945    console.log("showCounter: ", this.showCounter);
     946
    938947    //var playerElement = wrapper.find('.wpstream-video' + id);
    939948    var playerElement = jQuery("#wpstream-video" + id);
    … …  
    950959    this.element.hide();
    951960  }
     961
    952962  setCount(count) {
    953     this.element.html(count + " Viewers");
     963    if (this.showCounter){
     964      this.element.html(count + " Viewers");
     965      this.show();
     966    }
     967    else {
     968      this.hide();
     969    }
     970  }
     971  showPending(place){
     972    this.element.html(`Max viewers reached. Please wait for ${place} to leave.`);
     973    this.show();
    954974  }
    955975}
    … …  
    10371057          this.master.updateViewerCount(json.data);
    10381058          break;
     1059        case "pending":
     1060          this.master.updatePending(json.data);
     1061          break;
    10391062        case "onair":
    10401063          if (json.info) {

  • wpstream/tags/4.6.7/readme.txt

    r3280871 r3283102  
    55Tested up to: 6.8
    66Requires PHP: 7.1
    7 Stable tag: 4.6.6.9
     7Stable tag: 4.6.7
    88License: GPL
    99License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
    … …  
    138138== Changelog ==
    139139
     140= 4.6.7 =
     141* Feature - Max viewers
     142
    140143= 4.6.6.9 =
    141144* Fix - WpStream shortcodes not working

  • wpstream/tags/4.6.7/wpstream.php

    r3280871 r3283102  
    44 * Plugin URI:        http://wpstream.net
    55 * 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.6.9
     6 * Version:           4.6.7
    77 * Author:            wpstream
    88 * Author URI:        http://wpstream.net
    … …  
    1515    die;
    1616}
    17 define('WPSTREAM_PLUGIN_VERSION', '4.6.6.9');
     17define('WPSTREAM_PLUGIN_VERSION', '4.6.7');
    1818define('WPSTREAM_CLUBLINK', 'wpstream.net');
    1919define('WPSTREAM_CLUBLINKSSL', 'https');

  • wpstream/trunk/admin/class-wpstream-admin.php

    r3280871 r3283102  
    255255                            'Your account is now in BASIC STREAMING mode.' . PHP_EOL . PHP_EOL .
    256256                'Instead of offloading to the WpStream Cloud, this mode relies on WordPress and hosting resources to process and deliver video. In some WP environments, streaming may be unreliable.' . PHP_EOL .
    257                             'Certain features, such as recording, browser broadcasting, and content protection are unavailable.' . PHP_EOL . PHP_EOL .
     257                            'Certain features, such as recording, viewer count, browser broadcasting, and content protection are unavailable.' . PHP_EOL . PHP_EOL .
    258258                            '- To take advantage of all features, please choose Cancel and upgrade your plan.' . PHP_EOL .
    259259                            '- Otherwise, choose OK to start your channel with these limitations.' . PHP_EOL . PHP_EOL .

  • wpstream/trunk/includes/class-wpstream-live-api-connection.php

    r3278949 r3283102  
    778778                $metadata_array['on_boarding']='yes';
    779779            }
    780 
     780            $permalink = get_permalink($schannel_id);
     781            if ($permalink !== false) {
     782                $metadata_array['permalink'] = $permalink;
     783            }
    781784           
    782785            $curl_post_fields=array(

  • wpstream/trunk/includes/class-wpstream-player.php

    r3278949 r3283102  
    406406        echo '<div class="wpstream_live_player_wrapper function_wpstream_live_event_player" data-now="'.$now.'" data-me="'.esc_attr($usernamestream).'" data-product-id="'.$channel_id.'" id="wpstream_live_player_wrapper'.$now.'" > ';
    407407               
    408             if( ( isset($event_settings['view_count'] ) && intval($event_settings['view_count'])==1 ) || !isset($event_settings['view_count']) ){
    409                 echo '<div id="wpestream_live_counting" class="wpestream_live_counting"></div>';
    410             }
    411            
     408            $show_viewer_count = (
     409                ( isset($event_settings['view_count']) && intval($event_settings['view_count']) == 1 )
     410                || !isset($event_settings['view_count'])
     411            );
     412            $pack_details           =    $this->main->wpstream_live_connection->wpstream_request_pack_data_per_user();
     413            if( isset($pack_details['available_data_mb'])){
     414                if ($pack_details['available_data_mb'] <= 0){
     415                    $show_viewer_count = false;
     416                }
     417            }
     418
     419            echo '<div id="wpestream_live_counting" class="wpestream_live_counting" data-showviewercount="' . ($show_viewer_count ? '1' : '0') . '"></div>';
     420
    412421            $show_wpstream_not_live_mess=' style="display:none;" ';
    413422            if(trim($hls_playback_url) ==''){

  • wpstream/trunk/public/js/wpstream-player.js

    r3225419 r3283102  
    239239  updateViewerCount(count) {
    240240    console.log("updateViewerCount: ", count);
    241     this.counter.show();
    242241    this.counter.setCount(count);
     242  }
     243
     244  updatePending(place){
     245    console.log("updatePending: ", place);
     246    this.counter.showPending(place);
    243247  }
    244248
    … …  
    502506        //     llhls: isLlHls(src)
    503507        // });
    504         owner.playContent(force);
     508        // owner.playContent(force);
    505509      },
    506510      force ? 1 : 2000
    … …  
    936940    this.element = wrapper.find(".wpestream_live_counting");
    937941    this.element.css("background-color", "rgb(174 69 69 / 90%)");
     942
     943    console.log("showviewercount: ", this.element.data().showviewercount);
     944    this.showCounter = this.element.data().showviewercount.toString() === "1";
     945    console.log("showCounter: ", this.showCounter);
     946
    938947    //var playerElement = wrapper.find('.wpstream-video' + id);
    939948    var playerElement = jQuery("#wpstream-video" + id);
    … …  
    950959    this.element.hide();
    951960  }
     961
    952962  setCount(count) {
    953     this.element.html(count + " Viewers");
     963    if (this.showCounter){
     964      this.element.html(count + " Viewers");
     965      this.show();
     966    }
     967    else {
     968      this.hide();
     969    }
     970  }
     971  showPending(place){
     972    this.element.html(`Max viewers reached. Please wait for ${place} to leave.`);
     973    this.show();
    954974  }
    955975}
    … …  
    10371057          this.master.updateViewerCount(json.data);
    10381058          break;
     1059        case "pending":
     1060          this.master.updatePending(json.data);
     1061          break;
    10391062        case "onair":
    10401063          if (json.info) {

  • wpstream/trunk/readme.txt

    r3280871 r3283102  
    55Tested up to: 6.8
    66Requires PHP: 7.1
    7 Stable tag: 4.6.6.9
     7Stable tag: 4.6.7
    88License: GPL
    99License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
    … …  
    138138== Changelog ==
    139139
     140= 4.6.7 =
     141* Feature - Max viewers
     142
    140143= 4.6.6.9 =
    141144* Fix - WpStream shortcodes not working

  • wpstream/trunk/wpstream.php

    r3280871 r3283102  
    44 * Plugin URI:        http://wpstream.net
    55 * 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.6.9
     6 * Version:           4.6.7
    77 * Author:            wpstream
    88 * Author URI:        http://wpstream.net
    … …  
    1515    die;
    1616}
    17 define('WPSTREAM_PLUGIN_VERSION', '4.6.6.9');
     17define('WPSTREAM_PLUGIN_VERSION', '4.6.7');
    1818define('WPSTREAM_CLUBLINK', 'wpstream.net');
    1919define('WPSTREAM_CLUBLINKSSL', 'https');
Note: See TracChangeset for help on using the changeset viewer.