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

Fixed : pagination

Browse source 
Added : Auto Video Activation after processing
Moved : db functions from functions.php to adodb-mysql.inc.php
Fixed : Default template
Added : Database so can us multple database
Fixed : Irelevant "You are not logged in" msg on login page
Added : Signup page and logout and login functions
Added : if there is HTTP in url then do not add BASEURL before the link
Added : ClipBucket Functions
Added : Video data Anchors
This commit is contained in:
Arslan Hassan 2010-02-21 20:40:26 +00:00
parent a0293ae8c1
commit 244d3069b5
13 changed files with 262 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
upload/.htaccess
View file

@ -4,7 +4,7 @@ RewriteEngine on
#
#URL Rewriting for Videos
RewriteRule ^videos/([0-9A-Za-z]+)/(.*)/(.*)/(.*)/(.*) videos.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L]
RewriteRule ^videos videos.php [L]
RewriteRule ^videos videos.php?%{QUERY_STRING} [L]
RewriteRule ^video/(.*)/(.*) watch_video.php?v=$1&%{QUERY_STRING} [L]
#
#Users, Channel & Management
@ -47,6 +47,6 @@ ErrorDocument 403 /view_page.php?pid=5
########## End - Rewrite rules For SEO urls ######################
RewriteRule ^rss$ rss.php [nc]
RewriteRule ^rss/([a-zA-Z0-9].+)$ rss.php?mode=$1 [nc]
RewriteRule ^rss/([a-zA-Z0-9].+)$ rss.php?mode=$1&%{QUERY_STRING} [nc]
########## End - Rewrite rules For SEO urls ######################

2
upload/actions/video_convert.php
View file

@ -82,7 +82,7 @@ $orig_file = CON_DIR.'/'.$tmp_file.'.'.$ext;
$ffmpeg->convert_to_hd();
unlink($ffmpeg->input_file);
//exec(php_path()." -q ".BASEDIR."/actions/verify_converted_videos.php &> /dev/null &");
exec(php_path()." -q ".BASEDIR."/actions/verify_converted_videos.php &> /dev/null &");
}

144
upload/includes/adodb/drivers/adodb-mysql.inc.php
View file

@ -47,7 +47,52 @@ class ADODB_mysql extends ADOConnection {
*/
function insert($tbl,$flds,$vls,$ep=NULL)
{
dbInsert($tbl,$flds,$vls,$ep);
//dbInsert($tbl,$flds,$vls,$ep);
$total_fields = count($flds);
$count = 0;
foreach($flds as $field)
{
$count++;
$fields_query .= $field;
if($total_fields!=$count)
$fields_query .= ',';
}
$total_values = count($vls);
$count = 0;
foreach($vls as $value)
{
$count++;
preg_match('/\|no_mc\|/',$value,$matches);
//pr($matches);
if($matches[0]!='')
$val = preg_replace('/\|no_mc\|/','',$value);
else
$val = mysql_clean($value);
$needle = substr($val,0,3);
if($needle != '|f|')
$values_query .= "'".$val."'";
else
{
$val = substr($val,3,strlen($val));
$values_query .= "'".$val."'";
}
$val ;
if($total_values!=$count)
$values_query .= ',';
}
//Complete Query
$query = "INSERT INTO $tbl ($fields_query) VALUES ($values_query) $ep";
$this->total_queries_sql[] = $query;
//if(!mysql_query($query)) die(mysql_error());
$this->total_queries++;
$this->Execute($query);
if(mysql_error()) die ($this->db_query.'<br>'.mysql_error());
return $this->insert_id();
}
/**
@ -60,8 +105,41 @@ class ADODB_mysql extends ADOConnection {
*/
function update($tbl,$flds,$vls,$cond,$ep=NULL)
{
$total_fields = count($flds);
$count = 0;
for($i=0;$i<$total_fields;$i++)
{
$count++;
//$val = mysql_clean($vls[$i]);
$val = ($vls[$i]);
preg_match('/\|no_mc\|/',$val,$matches);
//pr($matches);
if($matches[0]!='')
$val = preg_replace('/\|no_mc\|/','',$val);
else
$val = mysql_clean($val);
$needle = substr($val,0,3);
if($needle != '|f|')
$fields_query .= $flds[$i]."='".$val."'";
else
{
$val = substr($val,3,strlen($val));
$fields_query .= $flds[$i]."=".$val."";
}
if($total_fields!=$count)
$fields_query .= ',';
}
//Complete Query
$query = "UPDATE $tbl SET $fields_query WHERE $cond $ep";
//if(!mysql_query($query)) die($query.'<br>'.mysql_error());
$this->total_queries++;
$this->total_queries_sql[] = $query;
$this->Execute($query);
if(mysql_error()) die ($this->db_query.'<br>'.mysql_error());
return $query;
return dbUpdate($tbl,$flds,$vls,$cond,$ep);
}
@ -74,7 +152,35 @@ class ADODB_mysql extends ADOConnection {
*/
function delete($tbl,$flds,$vls,$ep=NULL)
{
dbDelete($tbl,$flds,$vls,$ep);
//dbDelete($tbl,$flds,$vls,$ep);
global $db ;
$total_fields = count($flds);
$count = 0;
for($i=0;$i<$total_fields;$i++)
{
$count++;
$val = mysql_clean($vls[$i]);
$needle = substr($val,0,3);
if($needle != '|f|')
$fields_query .= $flds[$i]."='".$val."'";
else
{
$val = substr($val,3,strlen($val));
$fields_query .= $flds[$i]."=".$val."";
}
if($total_fields!=$count)
$fields_query .= ' AND ';
}
//Complete Query
$query = "DELETE FROM $tbl WHERE $fields_query $ep";
//if(!mysql_query($query)) die(mysql_error());
$this->total_queries++;
$this->total_queries_sql[] = $query;
$this->Execute($query);
if(mysql_error()) die ($this->db_query.'<br>'.mysql_error());
}
/**
@ -86,7 +192,37 @@ class ADODB_mysql extends ADOConnection {
*/
function select($tbl,$fields='*',$cond=false,$limit=false,$order=false)
{
return dbselect($tbl,$fields,$cond,$limit,$order);
//return dbselect($tbl,$fields,$cond,$limit,$order);
$query_params = '';
//Making Condition possible
if($cond)
$where = " WHERE ";
else
$where = false;
$query_params .= $where;
if($where)
{
$query_params .= $cond;
}
if($order)
$query_params .= " ORDER BY $order ";
if($limit)
$query_params .= " LIMIT $limit ";
$query = " SELECT $fields FROM $tbl $query_params ";
//Finally Executing
$data = $this->Execute($query);
$this->num_rows = $data->_numOfRows;
$this->total_queries++;
$this->total_queries_sql[] = $query;
//Now Get Rows and return that data
if($this->num_rows > 0)
return $data->getrows();
else
return false;
}

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

@ -30,7 +30,7 @@ class ClipBucket
var $links = array();
var $captchas = array();
var $clipbucket_footer = array('the_end');
var $clipbucket_functions = array();
var $head_menu = array();
var $foot_menu = array();
@ -371,13 +371,17 @@ class ClipBucket
global $cbtpl,$myquery;
$template = $this->template;
if(isset($_SESSION['the_template']) && $cbtpl->is_template($_SESSION['the_template']))
$template = $_SESSION['the_template'];
if($_GET['template'])
{
if(is_dir(STYLES_DIR.'/'.$_GET['template']) && $_GET['template'])
$template = $_GET['template'];
}
if(isset($_GET['set_the_template']) && $cbtpl->is_template($_GET['set_the_template']))
$template = $_SESSION['the_template'] = $_GET['set_the_template'];
if(!is_dir(STYLES_DIR.'/'.$template) || !$template)
$template = 'clipbucketblue';
$template = 'cbv2new';
if(!is_dir(STYLES_DIR.'/'.$template) || !$template)
{
$template = $cbtpl->get_any_template();

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

@ -38,6 +38,7 @@
*/
function tbl($tbl)
{
global $DBNAME;
$prefix = TABLE_PREFIX;
$tbls = explode(",",$tbl);
$new_tbls = "";
@ -45,7 +46,7 @@ function tbl($tbl)
{
if(!empty($new_tbls))
$new_tbls .= ",";
$new_tbls .= $prefix.$ntbl;
$new_tbls .= $DBNAME.".".$prefix.$ntbl;
}
return $new_tbls;

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

@ -150,7 +150,7 @@ class pages{
$param_pattern = '#params#';
$page_url_param = $this->url_page_var;
$page_link_pattern = $page_url_param.'='.$page_pattern;
$link = preg_replace(array('/(\?page=[0-9+])+/','/(&page=[0-9+])+/','/(page=[0-9+])+/'),'',$link);
$link = preg_replace(array('/(\?page=[0-9]+)/','/(&page=[0-9]+)/','/(page=[0-9+])+/'),'',$link);
preg_match('/\?/',$link,$matches);
@ -217,7 +217,7 @@ class pages{
if($page<=0||$page==''||!is_numeric($page))
$page = 1;
$total_pages = $total;
$pagination_start = 10;
$pagination_start = 14;
$display_page = 7;
$this->selected = $selected = $page;
$hellip = '&hellip;';

41
upload/includes/classes/user.class.php
View file

@ -28,6 +28,8 @@ class userquery extends CBCategory{
var $custom_signup_fields = array();
var $delete_user_functions = array();
var $user_manager_functions = array();
var $logout_functions = array();
var $init_login_functons = array();
var $user_exist = '';
var $user_sessions = array();
@ -80,11 +82,26 @@ class userquery extends CBCategory{
}
if(user_id())
{
{
$this->udetails = $this->get_user_details(userid());
$this->permission = $this->get_user_level(userid());
//exit();
//Calling Logout Functions
$funcs = $this->init_login_functions;
if(is_array($funcs) && count($funcs)>0)
{
foreach($funcs as $func)
{
if(function_exists($func))
{
$func();
}
}
}
if($sess->get("dummy_username")=="")
$this->UpdateLastActive(userid());
}else
@ -139,7 +156,7 @@ class userquery extends CBCategory{
$log_array = array('username'=>$username);
//First we will check weather user is already logged in or not
if($this->login_check())
if($this->login_check(NULL,true))
$msg[] = e(lang('you_already_logged'));
elseif(!$this->user_exists($username))
$msg[] = e(lang('user_doesnt_exist'));
@ -386,7 +403,19 @@ class userquery extends CBCategory{
function logout($page='login.php')
{
global $sess;
//Calling Logout Functions
$funcs = $this->logout_functions;
if(is_array($funcs) && count($funcs)>0)
{
foreach($funcs as $func)
{
if(function_exists($func))
{
$func();
}
}
}
$sess->un_set('username');
$sess->un_set('level');
$sess->un_set('userid');
@ -3059,7 +3088,7 @@ class userquery extends CBCategory{
/**
* Function used to validate signup form
*/
function signup_user($array=NULL)
function signup_user($array=NULL,$send_signup_email=true)
{
global $LANG,$db,$userquery;
if($array==NULL)
@ -3212,7 +3241,7 @@ class userquery extends CBCategory{
$insert_id = $db->insert_id();
$db->insert(tbl($userquery->dbtbl['user_profile']),array("userid"),array($insert_id));
if(!has_access('admin_access',true) && EMAIL_VERIFICATION)
if(!has_access('admin_access',true) && EMAIL_VERIFICATION && $send_signup_email)
{
global $cbemail;
$tpl = $cbemail->get_template('email_verify_template');
@ -3231,7 +3260,7 @@ class userquery extends CBCategory{
//Now Finally Sending Email
cbmail(array('to'=>post('email'),'from'=>WEBSITE_EMAIL,'subject'=>$subj,'content'=>$msg));
}
elseif(!has_access('admin_access',true))
elseif(!has_access('admin_access',true) && $send_signup_email)
{
$this->send_welcome_email($insert_id);
}

147
upload/includes/functions.php
View file

@ -933,50 +933,7 @@
function dbInsert($tbl,$flds,$vls,$ep=NULL)
{
global $db ;
$total_fields = count($flds);
$count = 0;
foreach($flds as $field)
{
$count++;
$fields_query .= $field;
if($total_fields!=$count)
$fields_query .= ',';
}
$total_values = count($vls);
$count = 0;
foreach($vls as $value)
{
$count++;
preg_match('/\|no_mc\|/',$value,$matches);
//pr($matches);
if($matches[0]!='')
$val = preg_replace('/\|no_mc\|/','',$value);
else
$val = mysql_clean($value);
$needle = substr($val,0,3);
if($needle != '|f|')
$values_query .= "'".$val."'";
else
{
$val = substr($val,3,strlen($val));
$values_query .= "'".$val."'";
}
$val ;
if($total_values!=$count)
$values_query .= ',';
}
//Complete Query
$query = "INSERT INTO $tbl ($fields_query) VALUES ($values_query) $ep";
$db->total_queries_sql[] = $query;
//if(!mysql_query($query)) die(mysql_error());
$db->total_queries++;
$db->Execute($query);
if(mysql_error()) die ($db->db_query.'<br>'.mysql_error());
return $db->insert_id();
$db->insert($tbl,$flds,$vls,$ep);
}
/**
@ -990,33 +947,7 @@
function dbUpdate($tbl,$flds,$vls,$cond,$ep=NULL)
{
global $db ;
$total_fields = count($flds);
$count = 0;
for($i=0;$i<$total_fields;$i++)
{
$count++;
//$val = mysql_clean($vls[$i]);
$val = ($vls[$i]);
$needle = substr($val,0,3);
if($needle != '|f|')
$fields_query .= $flds[$i]."='".$val."'";
else
{
$val = substr($val,3,strlen($val));
$fields_query .= $flds[$i]."=".$val."";
}
if($total_fields!=$count)
$fields_query .= ',';
}
//Complete Query
$query = "UPDATE $tbl SET $fields_query WHERE $cond $ep";
//if(!mysql_query($query)) die($query.'<br>'.mysql_error());
$db->total_queries++;
$db->total_queries_sql[] = $query;
$db->Execute($query);
if(mysql_error()) die ($db->db_query.'<br>'.mysql_error());
return $query;
return $db->update($tbl,$flds,$vls,$cond,$ep);
}
@ -1031,30 +962,7 @@
function dbDelete($tbl,$flds,$vls,$ep=NULL)
{
global $db ;
$total_fields = count($flds);
$count = 0;
for($i=0;$i<$total_fields;$i++)
{
$count++;
$val = mysql_clean($vls[$i]);
$needle = substr($val,0,3);
if($needle != '|f|')
$fields_query .= $flds[$i]."='".$val."'";
else
{
$val = substr($val,3,strlen($val));
$fields_query .= $flds[$i]."=".$val."";
}
if($total_fields!=$count)
$fields_query .= ' AND ';
}
//Complete Query
$query = "DELETE FROM $tbl WHERE $fields_query $ep";
//if(!mysql_query($query)) die(mysql_error());
$db->total_queries++;
$db->total_queries_sql[] = $query;
$db->Execute($query);
if(mysql_error()) die ($db->db_query.'<br>'.mysql_error());
return $db->delete($tbl,$flds,$vls,$ep);
}
@ -1086,36 +994,7 @@
function dbselect($tbl,$fields='*',$cond=false,$limit=false,$order=false)
{
global $db;
$query_params = '';
//Making Condition possible
if($cond)
$where = " WHERE ";
else
$where = false;
$query_params .= $where;
if($where)
{
$query_params .= $cond;
}
if($order)
$query_params .= " ORDER BY $order ";
if($limit)
$query_params .= " LIMIT $limit ";
$query = " SELECT $fields FROM $tbl $query_params ";
//Finally Executing
$data = $db->Execute($query);
$db->num_rows = $data->_numOfRows;
$db->total_queries++;
$db->total_queries_sql[] = $query;
//Now Get Rows and return that data
if($db->num_rows > 0)
return $data->getrows();
else
return false;
return $db->dbselect($tbl,$fields,$cond,$limit,$order);
}
@ -2306,10 +2185,22 @@
return BASEURL.'/search_result.php?category[]='.$params['category'].'&type='.$params['type'];
}
if(SEO!='yes')
$link = BASEURL.'/'.$ClipBucket->links[$name][0];
else
$link = BASEURL.'/'.$ClipBucket->links[$name][1];
{
preg_match('/http:\/\//',$ClipBucket->links[$name][0],$matches);
if($matches)
$link = $ClipBucket->links[$name][0];
else
$link = BASEURL.'/'.$ClipBucket->links[$name][0];
}else
{
preg_match('/http:\/\//',$ClipBucket->links[$name][1],$matches);
if($matches)
$link = $ClipBucket->links[$name][1];
else
$link = BASEURL.'/'.$ClipBucket->links[$name][1];
}
$param_link = "";
if(!empty($params['extra_params']))

49
upload/includes/plugin.functions.php
View file

@ -32,10 +32,6 @@
}
}
/**
* FUNCTION USED TO CREATE ANCHOR PLACEMENT
* these are the placement where we can add plugin's or widget's code,
@ -293,4 +289,49 @@
}register_anchor_function('cb_footer','the_footer');
/**
* FUnction used to register ClipBucket php functions
*/
function cb_register_function($func_name,$place,$params=NULL)
{
global $Cbucket;
if(function_exists($func_name))
{
$Cbucket->clipbucket_functions[$place][] = array('func'=>$func_name,'params'=>$params);
}
}
/**
* function used to check weather specific place has function or not
*/
function cb_get_functions($place)
{
global $Cbucket;
if(count($Cbucket->clipbucket_functions[$place])>0)
{
return $Cbucket->clipbucket_functions[$place];
}else
return false;
}
/**
* Function used to call functions
*/
function cb_call_functions($place)
{
$funcs = cb_get_functions($place);
foreach($funcs as $func)
{
$func_name = $func['func'];
$params = $func['params'];
if(function_exists($func_name))
{
if($params)
$func_name($params);
else
$func_name();
}
}
}
?>

6
upload/signup.php
View file

@ -16,6 +16,12 @@ if($userquery->login_check('',true)){
redirect_to(BASEURL);
}
/**
* Function used to call all signup functions
*/
if(cb_get_functions('signup_page')) cb_call_functions('signup_page');
/**
* Signing up new user
*/

2
upload/styles/cbv2new/layout/blocks/editor_pick/index_featured_video.html
View file

@ -1,6 +1,6 @@
<div onclick="get_ep_video('{$video.videoid}')" class="featured_vid_con">
<div class="video_thumb">
<img src="{getThumb vdetails=$video}" width="64" height="42" border="0" {ANCHOR place="video_thumb"} />
<img src="{getThumb vdetails=$video}" width="64" height="42" border="0" {ANCHOR place="video_thumb" data=$video} />
</div> <!--VIDEO_THUMB END-->
<div class="details_block">
<div class="title"><a href="#">{$video.title|truncate:19}</a><br />{$video.description|description|truncate:30}</div>

4
upload/styles/cbv2new/layout/blocks/video.html
View file

@ -7,7 +7,7 @@
<div id="vid_wrap_{$video.videoid}" class="grid_view {if $cur_class == 'grid_view'}{else}{$cur_class}{/if}">
<div class="vid_thumb">
<a href="{videoLink vdetails=$video}"><img src="{getThumb vdetails=$video}" alt="{$video.title}" {ANCHOR place="video_thumb"} /></a>
<a href="{videoLink vdetails=$video}"><img src="{getThumb vdetails=$video}" alt="{$video.title}" {ANCHOR place="video_thumb" data=$video} /></a>
<span class="vid_time">{$video.duration|SetTime}</span>
<img src="{$imageurl}/dot.gif" class="add_icon" onclick="add_quicklist(this,'{$video.videoid}')" title="Add {$video.title} to Quicklist" alt="Quicklist" />
</div> <!--VID_THUMB END-->
@ -33,7 +33,7 @@
<div class="vertical">
<div class="the_vid_container">
<div class="video_thumb">
<label for="check_video_{$video.videoid}"><img src="{getThumb vdetails=$video}" width="110" height="66" border="0" /></label>
<label for="check_video_{$video.videoid}"><img src="{getThumb vdetails=$video}" width="110" height="66" border="0" /></label>
{if $check_type=='array'}
<input type="checkbox" name="check_video[]" id="check_video_{$video.videoid}" style="position:absolute; bottom:0px; left:0px" {if $check_this} checked="checked"{/if} value="{$video.videoid}" />
{else}

2
upload/styles/cbv2new/layout/blocks/watch_video/video_box.html
View file

@ -3,7 +3,7 @@
{if $display_type =='normal' || $display_type==''}
<div class="watch_video_box">
<div class="watch_video_box_thumb" align="center">
<a href="{videoLink vdetails=$video}"><img src="{getThumb vdetails=$video}" width="82" height="48" border="0" {ANCHOR place="video_thumb"} /></a>
<a href="{videoLink vdetails=$video}"><img src="{getThumb vdetails=$video}" width="82" height="48" border="0" {ANCHOR place="video_thumb" data=$video} /></a>
<div class="duration">{$video.duration|SetTime}</div>
<img src="{$imageurl}/dot.gif" class="add_icon" onclick="add_quicklist(this,'{$video.videoid}')" title="add {$video.title} to qucklist" alt="quicklist">
</div>