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

Fixed : get_videos function in video.class.php

Browse source 
Fixed : get_groups function in groups.class.php
This commit is contained in:
Arslan Hassan 2010-02-06 14:27:00 +00:00
parent 33aa910508
commit 2e332dd111
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
upload/includes/classes/groups.class.php
View file

@ -1741,11 +1741,11 @@ class CBGroups extends CBCategory
$cond = ""; $cond = "";
if(!has_access('admin_access',TRUE) && !$force_admin) if(!has_access('admin_access',TRUE) && !$force_admin)
$cond .= " groups.active='yes' "; $cond .= " ".tbl("groups.active")."='yes' ";
else else
{ {
if($params['active']) if($params['active'])
$cond .= " groups.active='".$params['active']."'"; $cond .= " ".tbl("groups.active")."='".$params['active']."'";
} }
//Setting Category Condition //Setting Category Condition

8
upload/includes/classes/video.class.php
View file

@ -383,17 +383,17 @@ class CBvideo extends CBCategory
$cond = ""; $cond = "";
if(!has_access('admin_access',TRUE)) if(!has_access('admin_access',TRUE))
$cond .= " video.status='Successful' AND video.active='yes' "; $cond .= " ".tbl("video.status")."='Successful' AND ".tbl("video.active")."='yes' ";
else else
{ {
if($params['active']) if($params['active'])
$cond .= " video.active='".$params['active']."'"; $cond .= " ".tbl("video.active")."='".$params['active']."'";
if($params['status']) if($params['status'])
{ {
if($cond!='') if($cond!='')
$cond .=" AND "; $cond .=" AND ";
$cond .= " video.status='".$params['status']."'"; $cond .= " ".tbl("video.status")."='".$params['status']."'";
} }
@ -505,12 +505,14 @@ class CBvideo extends CBCategory
$cond .= " video.videoid <> '".$params['exclude']."' "; $cond .= " video.videoid <> '".$params['exclude']."' ";
} }
if(!$params['count_only']) if(!$params['count_only'])
{ {
if(!empty($cond)) if(!empty($cond))
$cond .= " AND "; $cond .= " AND ";
$result = $db->select(tbl('video,users'),tbl('video.*,users.userid,users.username'),$cond." ".tbl("video.userid")." = ".tbl("users.userid"),$limit,$order); $result = $db->select(tbl('video,users'),tbl('video.*,users.userid,users.username'),$cond." ".tbl("video.userid")." = ".tbl("users.userid"),$limit,$order);
} }
if($params['count_only']) if($params['count_only'])
return $result = $db->count(tbl('video'),'*',$cond); return $result = $db->count(tbl('video'),'*',$cond);
if($params['assign']) if($params['assign'])