vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified : ads android navigator issue fixed

Browse source
This commit is contained in:
Fahad Abbas 2017-05-08 14:28:26 +05:00
parent 8c2582598b
commit 657fabc5c5
5 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
upload/includes/classes/my_queries.class.php
View file

@ -691,6 +691,13 @@ class myquery {
$type='p';
}
break;
case "social":
case "s":
{
$type='s';
}
break;
case "topic":
case "t":

16
upload/includes/classes/pm.class.php
View file

@ -364,7 +364,7 @@ class cb_pm
/**
* Function used to get user inbox messages
*/
function get_user_messages($uid,$box='in',$count_only=false)
function get_user_messages($uid,$box='all',$count_only=false)
{
global $db;
@ -372,6 +372,19 @@ class cb_pm
$uid = userid();
switch ($box)
{
case 'all':
{
if($count_only)
{
$result = $db->count(tbl($this->tbl),'message_id'," message_to LIKE '%#$uid#%' AND message_type='pm' ");
}else{
$result = $db->select(tbl($this->tbl.',users'),tbl($this->tbl.'.*,users.username AS message_from_user '),
tbl($this->tbl).".message_to LIKE '%#$uid#%' AND ".tbl("users").".userid = ".tbl($this->tbl).".message_from
AND message_type='pm'",NULL," date_added DESC");
}
}
break;
case 'in':
{
@ -385,6 +398,7 @@ class cb_pm
}
}
break;
case 'out':

6
upload/player/CB_video_js/cb_video_js.html
View file

@ -108,8 +108,10 @@
var show_logo = true;
var autoplay = "{$player_config.autoplay}";
var default_res = "{$default_quality}";
if (autoplay == 'no'){
console.log("Fuck : "+navigator.userAgent);
if (autoplay == 'no' || navigator.userAgent.match(/Android/i) ){
autoplay = false;
}else{
autoplay = true;

2
upload/player/CB_video_js/js/cb_ultimate_ads.js
View file

@ -12,7 +12,7 @@ var Ads = function(player,settings){
Ads.prototype.init = function (){
var ads = this;
console.log("Fuck : "+navigator.userAgent);
var startEvent = 'click';
if (navigator.userAgent.match(/iPhone/i) || navigator.userAgent.match(/iPad/i) ||navigator.userAgent.match(/Android/i))
{

2
upload/styles/cb_28/layout/blocks/view_channel/channel_header.html
View file

@ -1,7 +1,7 @@
<div id="messageFav" class="channel-alert"></div>
<div class="cover" id="coverContainer">
<div class="cover-holder clearfix">
<img class="img-responsive cb-live-background" src="{if $coverPhoto != ''}{$coverPhoto}{else}{$theme}/images/cover_default.jpg {/if}" size='1140x276' alt="">
<img class="img-responsive cb-live-background" src="{if $coverPhoto != ''}{$coverPhoto}{else}{$baseurl}/images/cover_default.jpg {/if}" size='1140x276' alt="">
{if $user.userid == userid()}
<a href="#" class="btn btn-sm changeCover" id="changeCover">{lang code="update_cover"}<span class="icon-photo"></span></a>