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

Revert "Too many things for one title Vol. 2"

Browse source
This commit is contained in:
Saqib Razzaq 2017-01-13 18:04:22 +05:00 • committed by GitHub
parent 59455d2c28
commit 64e828d173
44 changed files with 674 additions and 706 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
upload/actions/file_uploader.php
View file

@ -105,18 +105,21 @@ switch($mode)
$vidDetails = array
(
'title' => $title,
'description' => $desc,
'tags' => $tags,
'category' => array($cbvid->get_default_cid()),
'title' => $title,
'description' => $desc,
'tags' => $tags,
'category' => array($cbvid->get_default_cid()),
);
assign("objId",$_POST['objId']);
assign('input',$vidDetails);
$vid = $_POST['vid'];
assign('videoid',$vid);
$videoFields = $Upload->load_video_fields($vidDetails);
//$requiredFields = array_shift($videoFields);
// echo "<pre>";
@ -199,14 +202,14 @@ switch($mode)
//Checking uploading errors
$uploadErrors = array(
0=>"There is no error, the file uploaded with success",
1=>"The uploaded file exceeds the upload_max_filesize directive in php.ini",
2=>"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
3=>"The uploaded file was only partially uploaded",
4=>"No file was uploaded",
6=>"Missing a temporary folder",
7=>"Failed to write file to disk",
8=>"A PHP extension stopped the file upload. PHP does not provide a way to ascertain which extension caused the file upload to stop; examining the list of loaded extensions with phpinfo() may help"
0=>"There is no error, the file uploaded with success",
1=>"The uploaded file exceeds the upload_max_filesize directive in php.ini",
2=>"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
3=>"The uploaded file was only partially uploaded",
4=>"No file was uploaded",
6=>"Missing a temporary folder",
7=>"Failed to write file to disk",
8=>"A PHP extension stopped the file upload. PHP does not provide a way to ascertain which extension caused the file upload to stop; examining the list of loaded extensions with phpinfo() may help"
);
if (!isset($_FILES['Filedata'])) {
upload_error("No file was selected");
@ -342,9 +345,9 @@ switch($mode)
}
$_POST['videoid'] = trim($_POST['videoid']);
$_POST['title'] = mysql_clean($_POST['title']);
$_POST['description'] = mysql_clean($_POST['description']);
$_POST['duration'] = mysql_clean($_POST['duration']);
$_POST['title'] = addslashes($_POST['title']);
$_POST['description'] = addslashes($_POST['description']);
$_POST['duration'] = addslashes($_POST['duration']);
if(empty($eh->error_list))
{

14
upload/actions/video_convert.php
View file

@ -60,8 +60,8 @@
else{
$fileDir = $file_directory;
}
$dateAdded = explode(" ", $fileDir);
$dateAdded = array_shift($dateAdded);
$dateAdded = explode(" ", $fileDir);
$dateAdded = array_shift($dateAdded);
$file_directory = implode("/", explode("-", $dateAdded));
//logData($fileDir);
@ -69,14 +69,14 @@
Getting the file information from the queue for conversion
*/
$tmp_file = $queue_details['cqueue_name'];
$tmp_ext = $queue_details['cqueue_tmp_ext'];
$ext = $queue_details['cqueue_ext'];
$tmp_file = $queue_details['cqueue_name'];
$tmp_ext = $queue_details['cqueue_tmp_ext'];
$ext = $queue_details['cqueue_ext'];
$outputFileName = $tmp_file;
if(!empty($tmp_file)){
$temp_file = TEMP_DIR.'/'.$tmp_file.'.'.$tmp_ext;
$orig_file = CON_DIR.'/'.$tmp_file.'.'.$ext;
$temp_file = TEMP_DIR.'/'.$tmp_file.'.'.$tmp_ext;
$orig_file = CON_DIR.'/'.$tmp_file.'.'.$ext;
/*
Delete the uploaded file from temp directory

2
upload/admin_area/mass_uploader.php
View file

@ -41,7 +41,7 @@ if(isset($_POST['mass_upload_video']))
$total = count($_POST['mass_up']);
for($i=0;$i<$total;$i++)
{
if( !isset($_POST['filesToImport_'.$i]) ) // Check if file is checked for import
if( !isset($_POST['filesToImport'][$i]) ) // Check if file is checked for import
continue;
$file_key = time().RandomString(5);

1
upload/admin_area/styles/cb_2014/layout/global_header.html
View file

@ -91,7 +91,6 @@
$(document).ready(function() {
$('#desc').summernote();
$('.desc').summernote();
});
$(function()

10
upload/admin_area/styles/cb_2014/layout/mass_uploader.html
View file

@ -13,13 +13,12 @@
</div>
<div id="massUploadCategoriesSelection">
<h3>Mass Category Selection</h3>
{foreach $cats as $cat}
{foreach $cats as $cat}
<label><input type="checkbox" class="checkall" value='{$cat['category_id']}'/> {$cat['category_name']}</label>
{$i = $i+1}
{/foreach}
</div>
<form name="mass_upload" method="post" class="cbform">
{assign var = i value = 0}
{foreach from=$vid_files item=file name=mass_files}
{assign var='requiredFields' value=$Upload->loadRequiredFields($file)}
{assign var='optionFields' value=$Upload->loadOptionFields($file)}
@ -28,9 +27,9 @@
<input class="lead" type="hidden" name="mass_up[]" value="{$file.title}" />
<div class="well">
<input type="checkbox" name="filesToImport_{$i}[]" class="checkboxMassImport"/>
<input type="checkbox" name="filesToImport[]" class="checkboxMassImport"/>
<span class="label label-danger" style="cursor: pointer;" onclick="$(this).next().toggle();return false;"><b>{$file.title}</b>{$smarty.foreach.mass_files}</span>
<div style="display:none">
<div class="" style="display:none">
{foreach from=$requiredFields item=field}
{$field.class='form-control'}
{if $field.title=='Title'}
@ -42,6 +41,7 @@
{/if}
{/foreach}
{foreach from=$requiredFields item=field}
{$field.class='form-control'}
{if $field.title=='Description'}
<div class="col-md-6">
<label for="{$field.id}"><b style="color: #000000">{$field.name}</b></label>
@ -75,7 +75,7 @@
</div>
</div>
{$i = $i+1}
{/foreach}
<div class="well align-center">
<input type="submit" name="mass_upload_video" id="mass_upload_video" value="Mass Upload Videos Now" class="btn btn-primary" /></div>

31
upload/cb_install/clipbucket.php
View file

@ -1,16 +1,19 @@
<?php
/**
* All Details about ClipBucket
* Software Release version, authors are
* defined in this file, please do not edit this
*
*
* NOTE : EDITING THIS FILE MAY CAUSE YOUR CLIPBUCKET UPDATER NOT TO WORK PROPERLY
*/
define("ClipBucket","ClipBucket - Open Source Media Sharing Script by Arslan Hassan");
define("VERSION","2.8.1");
define("STATE","STABLE");
define("REV","4470");
define("RELEASED","27-07-2016");
define("AUTHORS","ARSLAN HASSAN,FAWAZ TAHIR,FAHAD ABBAS,SAQIB RAZZAQ");
/**
* All Details about ClipBucket
* Software Release version, authors are
* defined in this file, please do not edit this
*
*
* NOTE : EDITING THIS FILE MAY CASUE YOUR CLIPBUCKET UPDATER NOT TO WORK PROPERLY
*/
define("ClipBucket","ClipBucket - Open Source Media Sharing Script by Arslan Hassan");
define("VERSION","2.8.1");
define("STATE","STABLE");
define("REV","4470");
define("RELEASED","27-07-2016");
define("AUTHORS","ARSLAN HASSAN,FAWAZ TAHIR,FAHAD ABBAS,SAQIB RAZZAQ");
?>

279
upload/cb_install/sql/upgrade_2.8.2.sql
View file

@ -3,281 +3,4 @@ INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'st
INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'pseudostreaming', 'yes');
ALTER TABLE `{tbl_prefix}video` ADD `re_conv_status` text(33) NOT NULL;
#ALTER TABLE `{tbl_prefix}video` ADD `conv_progress` int(33) NOT NULL;
UPDATE `{tbl_prefix}action_log` SET action_type = convert(cast(convert(action_type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}action_log` SET action_username = convert(cast(convert(action_username using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}action_log` SET action_useremail = convert(cast(convert(action_useremail using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}action_log` SET action_ip = convert(cast(convert(action_ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}action_log` SET action_details = convert(cast(convert(action_details using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}admin_notes` SET note = convert(cast(convert(note using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}admin_todo` SET todo = convert(cast(convert(todo using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}ads_data` SET ad_name = convert(cast(convert(ad_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}ads_data` SET ad_code = convert(cast(convert(ad_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}ads_data` SET ad_placement = convert(cast(convert(ad_placement using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}ads_placements` SET placement = convert(cast(convert(placement using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}ads_placements` SET placement_name = convert(cast(convert(placement_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collection_categories` SET category_name = convert(cast(convert(category_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collection_categories` SET category_desc = convert(cast(convert(category_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collection_categories` SET date_added = convert(cast(convert(date_added using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collection_items` SET type = convert(cast(convert(type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET collection_name = convert(cast(convert(collection_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET collection_description = convert(cast(convert(collection_description using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET collection_tags = convert(cast(convert(collection_tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET category = convert(cast(convert(category using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET featured = convert(cast(convert(featured using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET broadcast = convert(cast(convert(broadcast using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET allow_comments = convert(cast(convert(allow_comments using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET active = convert(cast(convert(active using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET public_upload = convert(cast(convert(public_upload using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}collections` SET type = convert(cast(convert(type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET type = convert(cast(convert(type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET comment = convert(cast(convert(comment using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET anonym_name = convert(cast(convert(anonym_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET anonym_email = convert(cast(convert(anonym_email using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET vote = convert(cast(convert(vote using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET voters = convert(cast(convert(voters using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET spam_voters = convert(cast(convert(spam_voters using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}comments` SET comment_ip = convert(cast(convert(comment_ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}config` SET name = convert(cast(convert(name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}config` SET value = convert(cast(convert(value using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}conversion_queue` SET cqueue_name = convert(cast(convert(cqueue_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}conversion_queue` SET cqueue_ext = convert(cast(convert(cqueue_ext using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}conversion_queue` SET cqueue_tmp_ext = convert(cast(convert(cqueue_tmp_ext using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}conversion_queue` SET time_started = convert(cast(convert(time_started using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}conversion_queue` SET time_completed = convert(cast(convert(time_completed using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}counters` SET section = convert(cast(convert(section using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}counters` SET query = convert(cast(convert(query using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}counters` SET query_md5 = convert(cast(convert(query_md5 using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}counters` SET date_added = convert(cast(convert(date_added using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}countries` SET iso2 = convert(cast(convert(iso2 using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}countries` SET name = convert(cast(convert(name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}countries` SET name_en = convert(cast(convert(name_en using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}countries` SET iso3 = convert(cast(convert(iso3 using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}email_templates` SET email_template_name = convert(cast(convert(email_template_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}email_templates` SET email_template_code = convert(cast(convert(email_template_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}email_templates` SET email_template_subject = convert(cast(convert(email_template_subject using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}email_templates` SET email_template = convert(cast(convert(email_template using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}email_templates` SET email_template_allowed_tags = convert(cast(convert(email_template_allowed_tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}favorites` SET type = convert(cast(convert(type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}flags` SET type = convert(cast(convert(type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_categories` SET category_name = convert(cast(convert(category_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_categories` SET category_desc = convert(cast(convert(category_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_categories` SET date_added = convert(cast(convert(date_added using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_categories` SET category_thumb = convert(cast(convert(category_thumb using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_posts` SET post_content = convert(cast(convert(post_content using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_topics` SET topic_title = convert(cast(convert(topic_title using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_topics` SET topic_post = convert(cast(convert(topic_post using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}group_topics` SET topic_icon = convert(cast(convert(topic_icon using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}groups` SET group_name = convert(cast(convert(group_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}groups` SET group_admins = convert(cast(convert(group_admins using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}groups` SET group_description = convert(cast(convert(group_description using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}groups` SET group_tags = convert(cast(convert(group_tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}groups` SET group_url = convert(cast(convert(group_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}groups` SET category = convert(cast(convert(category using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}languages` SET language_code = convert(cast(convert(language_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}languages` SET language_name = convert(cast(convert(language_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}languages` SET language_regex = convert(cast(convert(language_regex using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}mass_emails` SET email_subj = convert(cast(convert(email_subj using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}mass_emails` SET email_from = convert(cast(convert(email_from using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}mass_emails` SET email_msg = convert(cast(convert(email_msg using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}mass_emails` SET configs = convert(cast(convert(configs using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}mass_emails` SET users = convert(cast(convert(users using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}messages` SET message_to = convert(cast(convert(message_to using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}messages` SET message_content = convert(cast(convert(message_content using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}messages` SET message_attachments = convert(cast(convert(message_attachments using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}messages` SET message_subject = convert(cast(convert(message_subject using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}modules` SET module_name = convert(cast(convert(module_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}modules` SET module_file = convert(cast(convert(module_file using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}modules` SET active = convert(cast(convert(active using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}modules` SET module_include_file = convert(cast(convert(module_include_file using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}pages` SET page_name = convert(cast(convert(page_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}pages` SET page_title = convert(cast(convert(page_title using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}pages` SET page_content = convert(cast(convert(page_content using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET photo_key = convert(cast(convert(photo_key using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET photo_title = convert(cast(convert(photo_title using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET photo_description = convert(cast(convert(photo_description using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET photo_tags = convert(cast(convert(photo_tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET voters = convert(cast(convert(voters using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET filename = convert(cast(convert(filename using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET file_directory = convert(cast(convert(file_directory using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET ext = convert(cast(convert(ext using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET server_url = convert(cast(convert(server_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET owner_ip = convert(cast(convert(owner_ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}photos` SET photo_details = convert(cast(convert(photo_details using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}phrases` SET lang_iso = convert(cast(convert(lang_iso using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}phrases` SET varname = convert(cast(convert(varname using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}phrases` SET text = convert(cast(convert(text using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlist_items` SET playlist_item_type = convert(cast(convert(playlist_item_type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET playlist_name = convert(cast(convert(playlist_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET playlist_type = convert(cast(convert(playlist_type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET description = convert(cast(convert(description using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET tags = convert(cast(convert(tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET voters = convert(cast(convert(voters using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET last_update = convert(cast(convert(last_update using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET first_item = convert(cast(convert(first_item using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}playlists` SET cover = convert(cast(convert(cover using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugin_config` SET plugin_id_code = convert(cast(convert(plugin_id_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugin_config` SET plugin_config_name = convert(cast(convert(plugin_config_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugin_config` SET plugin_config_value = convert(cast(convert(plugin_config_value using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugin_config` SET player_admin_file = convert(cast(convert(player_admin_file using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugin_config` SET player_include_file = convert(cast(convert(player_include_file using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugins` SET plugin_file = convert(cast(convert(plugin_file using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugins` SET plugin_folder = convert(cast(convert(plugin_folder using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugins` SET plugin_license_type = convert(cast(convert(plugin_license_type using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugins` SET plugin_license_key = convert(cast(convert(plugin_license_key using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}plugins` SET plugin_license_code = convert(cast(convert(plugin_license_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET session = convert(cast(convert(session using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET session_string = convert(cast(convert(session_string using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET session_value = convert(cast(convert(session_value using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET ip = convert(cast(convert(ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET current_page = convert(cast(convert(current_page using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET referer = convert(cast(convert(referer using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}sessions` SET agent = convert(cast(convert(agent using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}stats` SET video_stats = convert(cast(convert(video_stats using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}stats` SET user_stats = convert(cast(convert(user_stats using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}stats` SET group_stats = convert(cast(convert(group_stats using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}subscriptions` SET subscribed_to = convert(cast(convert(subscribed_to using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}template` SET template_name = convert(cast(convert(template_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}template` SET template_dir = convert(cast(convert(template_dir using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_categories` SET category_name = convert(cast(convert(category_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_categories` SET category_desc = convert(cast(convert(category_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_categories` SET date_added = convert(cast(convert(date_added using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_categories` SET category_thumb = convert(cast(convert(category_thumb using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_levels` SET user_level_name = convert(cast(convert(user_level_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_levels_permissions` SET plugins_perms = convert(cast(convert(plugins_perms using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_permission_types` SET user_permission_type_name = convert(cast(convert(user_permission_type_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_permission_types` SET user_permission_type_desc = convert(cast(convert(user_permission_type_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_permissions` SET permission_name = convert(cast(convert(permission_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_permissions` SET permission_code = convert(cast(convert(permission_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_permissions` SET permission_desc = convert(cast(convert(permission_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET profile_title = convert(cast(convert(profile_title using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET profile_desc = convert(cast(convert(profile_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET featured_video = convert(cast(convert(featured_video using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET first_name = convert(cast(convert(first_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET last_name = convert(cast(convert(last_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET avatar = convert(cast(convert(avatar using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET postal_code = convert(cast(convert(postal_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET profile_tags = convert(cast(convert(profile_tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET web_url = convert(cast(convert(web_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET hometown = convert(cast(convert(hometown using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET city = convert(cast(convert(city using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET browse_criteria = convert(cast(convert(browse_criteria using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET about_me = convert(cast(convert(about_me using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET education = convert(cast(convert(education using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET schools = convert(cast(convert(schools using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET occupation = convert(cast(convert(occupation using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET companies = convert(cast(convert(companies using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET relation_status = convert(cast(convert(relation_status using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET hobbies = convert(cast(convert(hobbies using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET fav_movies = convert(cast(convert(fav_movies using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET fav_music = convert(cast(convert(fav_music using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET fav_books = convert(cast(convert(fav_books using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET background = convert(cast(convert(background using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET profile_item = convert(cast(convert(profile_item using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}user_profile` SET voters = convert(cast(convert(voters using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET featured_video = convert(cast(convert(featured_video using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET username = convert(cast(convert(username using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET user_session_key = convert(cast(convert(user_session_key using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET password = convert(cast(convert(password using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET email = convert(cast(convert(email using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET avatar = convert(cast(convert(avatar using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET avatar_url = convert(cast(convert(avatar_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET country = convert(cast(convert(country using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET avcode = convert(cast(convert(avcode using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET session = convert(cast(convert(session using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET ip = convert(cast(convert(ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET signup_ip = convert(cast(convert(signup_ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET upload = convert(cast(convert(upload using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET background = convert(cast(convert(background using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET background_color = convert(cast(convert(background_color using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET background_url = convert(cast(convert(background_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}users` SET banned_users = convert(cast(convert(banned_users using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}validation_re` SET re_name = convert(cast(convert(re_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}validation_re` SET re_code = convert(cast(convert(re_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}validation_re` SET re_syntax = convert(cast(convert(re_syntax using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET videokey = convert(cast(convert(videokey using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET video_password = convert(cast(convert(video_password using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET video_users = convert(cast(convert(video_users using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET username = convert(cast(convert(username using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET title = convert(cast(convert(title using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET flv = convert(cast(convert(flv using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET file_name = convert(cast(convert(file_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET file_directory = convert(cast(convert(file_directory using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET description = convert(cast(convert(description using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET tags = convert(cast(convert(tags using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET category = convert(cast(convert(category using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET category_parents = convert(cast(convert(category_parents using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET broadcast = convert(cast(convert(broadcast using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET location = convert(cast(convert(location using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET country = convert(cast(convert(country using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET allow_embedding = convert(cast(convert(allow_embedding using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET rated_by = convert(cast(convert(rated_by using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET voter_ids = convert(cast(convert(voter_ids using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET allow_comments = convert(cast(convert(allow_comments using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET comment_voting = convert(cast(convert(comment_voting using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET featured = convert(cast(convert(featured using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET featured_description = convert(cast(convert(featured_description using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET allow_rating = convert(cast(convert(allow_rating using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET active = convert(cast(convert(active using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET favourite_count = convert(cast(convert(favourite_count using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET playlist_count = convert(cast(convert(playlist_count using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET flagged = convert(cast(convert(flagged using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET duration = convert(cast(convert(duration using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET flv_file_url = convert(cast(convert(flv_file_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET aspect_ratio = convert(cast(convert(aspect_ratio using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET embed_code = convert(cast(convert(embed_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET refer_url = convert(cast(convert(refer_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET uploader_ip = convert(cast(convert(uploader_ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET unique_embed_code = convert(cast(convert(unique_embed_code using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET remote_play_url = convert(cast(convert(remote_play_url using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET server_ip = convert(cast(convert(server_ip using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET file_server_path = convert(cast(convert(file_server_path using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET files_thumbs_path = convert(cast(convert(files_thumbs_path using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET file_thumbs_count = convert(cast(convert(file_thumbs_count using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET filegrp_size = convert(cast(convert(filegrp_size using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET video_version = convert(cast(convert(video_version using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET extras = convert(cast(convert(extras using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video` SET thumbs_version = convert(cast(convert(thumbs_version using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_categories` SET category_name = convert(cast(convert(category_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_categories` SET category_desc = convert(cast(convert(category_desc using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_categories` SET date_added = convert(cast(convert(date_added using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_categories` SET category_thumb = convert(cast(convert(category_thumb using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET file_conversion_log = convert(cast(convert(file_conversion_log using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET encoder = convert(cast(convert(encoder using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET command_used = convert(cast(convert(command_used using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_path = convert(cast(convert(src_path using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_name = convert(cast(convert(src_name using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_ext = convert(cast(convert(src_ext using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_format = convert(cast(convert(src_format using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_duration = convert(cast(convert(src_duration using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_size = convert(cast(convert(src_size using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_bitrate = convert(cast(convert(src_bitrate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_width = convert(cast(convert(src_video_width using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_height = convert(cast(convert(src_video_height using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_wh_ratio = convert(cast(convert(src_video_wh_ratio using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_codec = convert(cast(convert(src_video_codec using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_rate = convert(cast(convert(src_video_rate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_bitrate = convert(cast(convert(src_video_bitrate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_video_color = convert(cast(convert(src_video_color using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_audio_codec = convert(cast(convert(src_audio_codec using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_audio_bitrate = convert(cast(convert(src_audio_bitrate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_audio_rate = convert(cast(convert(src_audio_rate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET src_audio_channels = convert(cast(convert(src_audio_channels using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_path = convert(cast(convert(output_path using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_format = convert(cast(convert(output_format using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_duration = convert(cast(convert(output_duration using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_size = convert(cast(convert(output_size using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_bitrate = convert(cast(convert(output_bitrate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_width = convert(cast(convert(output_video_width using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_height = convert(cast(convert(output_video_height using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_wh_ratio = convert(cast(convert(output_video_wh_ratio using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_codec = convert(cast(convert(output_video_codec using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_rate = convert(cast(convert(output_video_rate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_bitrate = convert(cast(convert(output_video_bitrate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_video_color = convert(cast(convert(output_video_color using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_audio_codec = convert(cast(convert(output_audio_codec using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_audio_bitrate = convert(cast(convert(output_audio_bitrate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_audio_rate = convert(cast(convert(output_audio_rate using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_files` SET output_audio_channels = convert(cast(convert(output_audio_channels using latin1) as binary) using utf8);
UPDATE `{tbl_prefix}video_views` SET video_id = convert(cast(convert(video_id using latin1) as binary) using utf8);
#ALTER TABLE `{tbl_prefix}video` ADD `conv_progress` int(33) NOT NULL;

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

@ -527,7 +527,7 @@ class ClipBucket
$this->head_menu[] = array('name' => lang("photos"), 'icon' => '<i class="fa fa-camera"></i>','link' => cblink(array('name' => 'photos')), "this" => "photos");
$this->head_menu[] = array('name' => lang("menu_channels"),'icon' => '<i class="fa fa-desktop"></i>', 'link' => cblink(array('name' => 'channels')), "this" => "channels", "section" => "channels");
$this->head_menu[] = array('name' => lang("collections"), 'icon' => '<i class="fa fa-bars"></i>', 'link' => cblink(array('name' => 'collections')), "this" => "collections", "section" => "collections");
$this->head_menu[] = array('name' => lang("groups"), 'icon' => '<i class="fa fa-users"></i>', 'link' => cblink(array('name' => 'groups')), "this" => "groups", "section" => "groups");
$this->head_menu[] = array('name' => lang("Groups"), 'icon' => '<i class="fa fa-users"></i>', 'link' => cblink(array('name' => 'groups')), "this" => "groups", "section" => "groups");
/* Calling custom functions for headMenu. This can be used to add new tabs */
//cb_call_functions('headMenu');

194
upload/includes/classes/collections.class.php
View file

@ -46,11 +46,11 @@ class Collections extends CBCategory
$this->section_tbl = "collections";
$this->types = array();
if (isSectionEnabled('videos')) {
$this->types['videos'] = lang("videos");
$this->types['videos'] = lang("Videos");
}
if (isSectionEnabled('photos')) {
$this->types['photos'] = lang("photos");
$this->types['photos'] = lang("Photos");
}
ksort($this->types);
@ -89,10 +89,10 @@ class Collections extends CBCategory
// Adding My Account Links
if(isSectionEnabled('collections'))
$userquery->user_account[lang('collections')] = array(
lang('add_new_collection') => cblink(array('name'=>'manage_collections','extra_params'=>'mode=add_new')),
lang('manage_collections') => cblink(array('name'=>'manage_collections')),
lang('manage_favorite_collections') => cblink(array('name'=>'manage_collections','extra_params'=>'mode=favorite'))
);
lang('add_new_collection') => cblink(array('name'=>'manage_collections','extra_params'=>'mode=add_new')),
lang('manage_collections') => cblink(array('name'=>'manage_collections')),
lang('manage_favorite_collections') => cblink(array('name'=>'manage_collections','extra_params'=>'mode=favorite'))
);
// Adding Search Type
//if(isSectionEnabled('collections'))
@ -101,30 +101,22 @@ class Collections extends CBCategory
// Adding Collection links in Admin Area
if($per['collection_moderation'] == "yes")
$Cbucket->AdminMenu['Collections'] = array(
lang('manage_collections') =>'collection_manager.php',
lang('manage_categories') =>'collection_category.php',
lang('flagged_collections') =>'flagged_collections.php'
);
lang('Manage Collections')=>'collection_manager.php',
lang('Manage Categories')=>'collection_category.php',
lang('Flagged Collections')=>'flagged_collections.php');
// Adding Collection links in Cbucket Class
$Cbucket->links['collections'] = array('collections.php','collections/');
$Cbucket->links['manage_collections'] = array('manage_collections.php','manage_collections.php');
$Cbucket->links['edit_collection'] = array(
'manage_collections.php?mode=edit_collection&amp;cid=',
'manage_collections.php?mode=edit_collection&amp;cid='
);
$Cbucket->links['manage_items'] = array(
'manage_collections.php?mode=manage_items&amp;cid=%s&amp;type=%s',
'manage_collections.php?mode=manage_items&amp;cid=%s&amp;type=%s'
);
$Cbucket->links['user_collections'] = array(
'user_collections.php?mode=uploaded&user=',
'user_collections.php?mode=uploaded&user='
);
$Cbucket->links['user_fav_collections'] = array(
'user_collections.php?mode=favorite&user=',
'user_collections.php?mode=favorite&user='
);
$Cbucket->links['collections'] = array('collections.php','collections/');
$Cbucket->links['manage_collections'] = array('manage_collections.php','manage_collections.php');
$Cbucket->links['edit_collection'] = array('manage_collections.php?mode=edit_collection&amp;cid=',
'manage_collections.php?mode=edit_collection&amp;cid=');
$Cbucket->links['manage_items'] = array('manage_collections.php?mode=manage_items&amp;cid=%s&amp;type=%s',
'manage_collections.php?mode=manage_items&amp;cid=%s&amp;type=%s');
$Cbucket->links['user_collections'] = array('user_collections.php?mode=uploaded&user=','user_collections.php?mode=uploaded&user=');
$Cbucket->links['user_fav_collections'] = array('user_collections.php?mode=favorite&user=','user_collections.php?mode=favorite&user=');
}
/**
@ -145,19 +137,19 @@ class Collections extends CBCategory
$this->search->template_var = 'collection';
$this->search->has_user_id = true;
$sorting = array(
'date_added' => lang("date_added"),
'views' => lang("views"),
'total_comments'=> lang("comments"),
'total_objects' => lang("Items")
);
$sorting = array(
'date_added'=> lang("date_added"),
'views' => lang("views"),
'total_comments' => lang("comments"),
'total_objects' => lang("Items")
);
$this->search->sorting = array(
'date_added' => " date_added DESC",
'views' => " views DESC",
'total_comments'=> " total_comments DESC ",
'total_objects' => " total_objects DESC"
);
'date_added'=> " date_added DESC",
'views' => " views DESC",
'total_comments' => " total_comments DESC ",
'total_objects' => " total_objects DESC"
);
$default = $_GET;
if(is_array($default['category']))
@ -169,36 +161,36 @@ class Collections extends CBCategory
$this->search->results_per_page = config('videos_items_search_page');
$fields = array(
'query' => array(
'title'=> lang('keywords'),
'type'=> 'textfield',
'name'=> 'query',
'id'=> 'query',
'value'=>cleanForm($default['query'])
),
'category' => array(
'title' => lang('category'),
'type' => 'checkbox',
'name' => 'category[]',
'id' => 'category',
'value' => array('category',$cat_array),
'category_type' => 'collections'
),
'uploaded' => array(
'title' => lang('uploaded'),
'type' => 'dropdown',
'name' => 'datemargin',
'id' => 'datemargin',
'value' => $this->search->date_margins(),
'checked' => $uploaded,
),
'sort' => array(
'title' => lang('sort_by'),
'type' => 'dropdown',
'name' => 'sort',
'value' => $sorting,
'checked' => $sort
)
'query' => array(
'title'=> lang('keywords'),
'type'=> 'textfield',
'name'=> 'query',
'id'=> 'query',
'value'=>cleanForm($default['query'])
),
'category' => array(
'title' => lang('category'),
'type' => 'checkbox',
'name' => 'category[]',
'id' => 'category',
'value' => array('category',$cat_array),
'category_type' => 'collections'
),
'uploaded' => array(
'title' => lang('uploaded'),
'type' => 'dropdown',
'name' => 'datemargin',
'id' => 'datemargin',
'value' => $this->search->date_margins(),
'checked' => $uploaded,
),
'sort' => array(
'title' => lang('sort_by'),
'type' => 'dropdown',
'name' => 'sort',
'value' => $sorting,
'checked' => $sort
)
);
$this->search->search_type['collections']['fields'] = $fields;
@ -230,7 +222,8 @@ class Collections extends CBCategory
$result = $db->count(tbl($this->section_tbl),"collection_id"," collection_id = $id");
if($result)
return true;
return false;
else
return false;
}
/**
@ -259,7 +252,8 @@ class Collections extends CBCategory
//pex($result,true);
if($result)
return $result[0];
return false;
else
return false;
}
function is_viewable($cid)
@ -275,14 +269,16 @@ class Collections extends CBCategory
e(lang('collection_not_active'));
if(!has_access('admin_access',TRUE))
return false;
return true;
else
return true;
} elseif($c['broadcast'] == 'private' && !$userquery->is_confirmed_friend($c['userid'],userid())
&& $c['userid']!=userid() && !has_access('admin_access',TRUE))
{
e(lang('collection_is_private'));
return false;
} else {
return true;
}
return true;
}
/**
@ -358,6 +354,7 @@ class Collections extends CBCategory
$cond .= " AND ";
$cond .= " ".tbl('collections.type')." = '".$p['type']."'";
}
if(isset($p['user']))
{
@ -368,7 +365,8 @@ class Collections extends CBCategory
$cond .= " ".tbl('collections.userid')." = '".$p['user']."'";
//$cond .=')';
}
if(isset($p['featured']))
{
if($cond != '')
@ -385,6 +383,7 @@ class Collections extends CBCategory
$cond .= " ".tbl('collections.public_upload')." = '".$p['public_upload']."'";
if($brace)
$cond.=")";
}
if(isset($p['exclude']))
@ -463,8 +462,9 @@ class Collections extends CBCategory
$result = $db->select(tbl("collections,users"),
tbl("collections.*,users.userid,users.username"),
$cond.tbl("collections.userid")." = ".tbl("users.userid"),$limit,$order);
//echo $db->db_query;
//echo $db->db_query;
}
@ -491,7 +491,8 @@ class Collections extends CBCategory
$result = $db->select(tbl($this->items),"*"," collection_id = $id",$limit,$order);
if($result)
return $result;
return false;
else
return false;
}
/**
@ -551,7 +552,9 @@ class Collections extends CBCategory
//echo $db->db_query;
if($result)
return $result;
return false;
else
return false;
}
/**
@ -586,8 +589,11 @@ class Collections extends CBCategory
}
if($result)
return $result;
return false;
{
return $result;
}
else
return false;
}
/**
@ -600,7 +606,8 @@ class Collections extends CBCategory
$result = $db->select(tbl($this->items),$fields," object_id = $objID AND collection_id = $cid");
if($result)
return $result;
return false;
else
return false;
}
/**
@ -971,7 +978,8 @@ class Collections extends CBCategory
$result = $db->select(tbl($this->section_tbl.",users"),tbl($this->section_tbl).".*,$user_tbl.userid,$user_tbl.username"," collection_id = $cid AND ".tbl($this->section_tbl).".userid = $user_tbl.userid");
if($db->num_rows > 0)
return $result[0]['userid'];
return false;
else
return false;
}
/**
@ -1072,7 +1080,8 @@ class Collections extends CBCategory
if($details['userid'] == $userid)
return true;
return false;
else
return false;
}
/**
@ -1122,7 +1131,7 @@ class Collections extends CBCategory
{
global $db;
$cid = mysql_clean($cid);
$collection = $this->get_collection($cid);
$collection = $this->get_collection($id);
if(!$collection)
e(lang("collection_not_exists"));
elseif($collection['userid'] != userid() && !has_access('admin_access',true))
@ -1173,7 +1182,8 @@ class Collections extends CBCategory
$count = $db->count($this->items,"ci_id"," collection_id = $cid");
if($count)
return $count;
return 0;
else
return 0;
}
/**
@ -1400,13 +1410,15 @@ class Collections extends CBCategory
if($thumb)
return $thumb;
foreach($exts as $ext)
else
{
if($size=="small")
$s = "-small";
if(file_exists(COLLECT_THUMBS_DIR."/".$cid.$s.".".$ext))
return COLLECT_THUMBS_URL."/".$cid.$s.".".$ext;
foreach($exts as $ext)
{
if($size=="small")
$s = "-small";
if(file_exists(COLLECT_THUMBS_DIR."/".$cid.$s.".".$ext))
return COLLECT_THUMBS_URL."/".$cid.$s.".".$ext;
}
}
}

155
upload/includes/classes/conversion/ffmpeg.class.php
View file

@ -440,7 +440,7 @@ class FFMpeg{
$name = substr($name, 0, strrpos($name, "."));
$status = "Successful";
$this->log->TemplogData .= "\r\n Conversion Status : ".$status." @ ".date("Y-m-d H:i:s")." \r\n";
$this->log->writeLine("Conversion Ouput",$this->log->TemplogData, true);
$this->log->writeLine("Converiosn Ouput",$this->log->TemplogData, true);
$this->output_file = $this->sdFile;
$this->output_details = $this->get_file_info($this->output_file);
@ -485,7 +485,7 @@ class FFMpeg{
//logData(json_encode($this->sdFile1));
$status = "Successful";
$this->log->TemplogData .= "\r\n Conversion Status : ".$status." @ ".date("Y-m-d H:i:s")."\r\n";
$this->log->writeLine("Conversion Ouput",$this->log->TemplogData, true);
$this->log->writeLine("Converiosn Ouput",$this->log->TemplogData, true);
$this->output_file = $this->hdFile;
$this->output_details = $this->get_file_info($this->output_file);
@ -530,7 +530,7 @@ class FFMpeg{
$name = substr($name, 0, strrpos($name, "."));
$status = "Successful";
$this->log->TemplogData .= "\r\n Conversion Status : ".$status." @ ".date("Y-m-d H:i:s")." \r\n";
$this->log->writeLine("Conversion Ouput",$this->log->TemplogData, true);
$this->log->writeLine("Converiosn Ouput",$this->log->TemplogData, true);
$this->output_file = $this->sdFile;
$this->output_details = $this->get_file_info($this->output_file);
@ -794,15 +794,16 @@ class FFMpeg{
/**
* @Reason : this function is used to rearrange required resolution for conversion
* @params : { resolutions (Array) }
* @date : 13-12-2016
* return : refined resolution array
* @Reason : this funtion is used to rearrange required resolution for conversion
* @params : { resolutions (Array) , ffmpeg ( Object ) }
* @date : 23-12-2015
* return : refined reslolution array
*/
function reindex_required_resolutions($resolutions)
{
$original_video_height = $this->input_details['video_height'];
// Setting threshold for input video to convert
$valid_dimensions = array(240,360,480,720,1080);
$input_video_height = $this->getClosest($original_video_height, $valid_dimensions);
@ -815,19 +816,23 @@ class FFMpeg{
}
foreach ($resolutions as $key => $value)
{
//$video_width=(int)$value[0];
$video_width=(int)$value[0];
$video_height=(int)$value[1];
if($input_video_height != $video_height && $this->configs['gen_'.$video_height] == 'yes'){
if($input_video_height != $video_height && $this->configs['gen_'.$video_height] == 'yes'){
$final_res[$video_height] = $value;
}
}
logData("Final Res : ".$final_res,"checkpoints");
$revised_resolutions = $final_res;
if ( $revised_resolutions )
if ( $revised_resolutions ){
return $revised_resolutions;
return false;
}
else{
return false;
}
}
function isLocked($num=1)
@ -857,47 +862,54 @@ class FFMpeg{
//We will now add a loop
//that will check weather
logData('Checking conversion locks','checkpoints');
while( true )
while(1)
{
$use_crons = config('use_crons');
//logData($this->isLocked(PROCESSESS_AT_ONCE)."|| ".$use_crons."||".$this->set_conv_lock);
if( !$this->isLocked(PROCESSESS_AT_ONCE) || $use_crons == 'yes' )
if(!$this->isLocked(PROCESSESS_AT_ONCE) || $use_crons=='yes')
{
if( $use_crons == 'no' )
if($use_crons=='no')
{
//Lets make a file
$file = fopen($conv_file,"w+");
fwrite($file,"converting..");
fclose($file);
}
$this->start_time_check();
$this->start_log();
$this->prepare();
$ratio = substr($this->input_details['video_wh_ratio'], 0, 7);
$ratio = substr($this->input_details['video_wh_ratio'],0,7);
$max_duration = config('max_video_duration') * 60;
if( $this->input_details['duration'] > $max_duration )
if($this->input_details['duration']>$max_duration)
{
$max_duration_seconds = $max_duration / 60;
$this->TemplogData = "Video duration was ".$this->input_details['duration']." minutes and Max video duration is {$max_duration_seconds} minutes, Therefore Video cancelled\n";
$this->TemplogData .= "Conversion_status : failed\n";
$this->TemplogData .= "Failed Reason : Max Duration Configurations\n";
$this->log->writeLine("Max Duration configs",$this->TemplogData, true);
$this->log->writeLine("Max Duration configs",$this->TemplogData , true);
//$this->create_log_file();
$this->failed_reason = 'max_duration';
break;
return false;
}
$ratio = (float)$ratio;
if( $ratio >= 1.6 )
$ratio = (float) $ratio;
if($ratio>=1.6)
{
$res = $this->configs['res169'];
else
}else
{
$res = $this->configs['res43'];
}
logData('Video is about to convert','checkpoints');
@ -909,19 +921,17 @@ class FFMpeg{
$this->log->writeLine("Thumbs Generation", "Starting");
$this->TemplogData = "";
try {
try{
$thumbs_settings = $this->thumbs_res_settings;
logData($thumbs_settings,'checkpoints');
foreach( $thumbs_settings as $key => $thumbs_size )
{
foreach ($thumbs_settings as $key => $thumbs_size){
$height_setting = $thumbs_size[1];
$width_setting = $thumbs_size[0];
$dimension_setting = $width_setting.'x'.$height_setting;
if( $key == 'original' )
{
if($key == 'original'){
$dimension_setting = $key;
$dim_identifier = $key;
} else {
}else{
$dim_identifier = $width_setting.'x'.$height_setting;
}
$thumbs_settings['vid_file'] = $this->input_file;
@ -932,8 +942,8 @@ class FFMpeg{
$this->generateThumbs($thumbs_settings);
}
} catch(Exception $e) {
$this->TemplogData .= "\r\n Error Occured : ".$e->getMessage()."\r\n";
}catch(Exception $e){
$this->TemplogData .= "\r\n Errot Occured : ".$e->getMessage()."\r\n";
}
$this->TemplogData .= "\r\n ====== End : Thumbs Generation ======= \r\n";
$this->log->writeLine("Thumbs Files", $this->TemplogData , true );
@ -949,50 +959,64 @@ class FFMpeg{
// setting type of conversion, fetching from configs
$this->resolutions = $this->configs['cb_combo_res'];
switch( $this->resolutions )
$res169 = $this->res169;
switch ($this->resolutions)
{
case 'yes':
$res169 = $this->reindex_required_resolutions($this->res169);
{
$res169 = $this->reindex_required_resolutions($res169);
$this->ratio = $ratio;
foreach( $res169 as $value )
foreach ($res169 as $value)
{
$video_width = (int)$value[0];
$video_height = (int)$value[1];
$video_width=(int)$value[0];
$video_height=(int)$value[1];
// Here we must check width instead of height to be able to import other formats than 16/9 (For example : 1920x800)
if( $this->input_details['video_width'] >= $video_width )
$bypass = $this->check_threshold($this->input_details['video_height'],$video_height);
logData($bypass,'reindex');
if($this->input_details['video_height'] > $video_height-1 || $bypass)
{
$more_res['video_width'] = $video_width;
$more_res['video_height'] = $video_height;
$more_res['name'] = $video_height;
logData($more_res['video_height'], 'reindex');
$this->convert(NULL, false, $more_res);
$more_res['video_width'] = $video_width;
$more_res['video_height'] = $video_height;
$more_res['name'] = $video_height;
logData($more_res['video_height'],'reindex');
$this->convert(NULL,false,$more_res);
}
}
break;
}
break;
case 'no':
default :
{
$this->convertVideo($orig_file);
break;
}
break;
}
$this->end_time_check();
$this->total_time();
//Copying File To Original Folder
if( $this->keep_original == 'yes' )
if($this->keep_original=='yes')
{
$this->log->TemplogData .= "\r\nCopy File to original Folder";
if( copy($this->input_file, $this->original_output_path) )
if(copy($this->input_file,$this->original_output_path))
$this->log->TemplogData .= "\r\nFile Copied to original Folder...";
else
$this->log->TemplogData.= "\r\nUnable to copy file to original folder...";
}
$this->log->TemplogData .= "\r\n\r\nTime Took : ";
$this->log->TemplogData .= $this->total_time.' seconds'."\r\n\r\n";
if(file_exists($this->output_file) && filesize($this->output_file) > 0)
$this->log->TemplogData .= "conversion_status : completed ";
@ -1003,20 +1027,41 @@ class FFMpeg{
//$this->create_log_file();
break;
} else {
}else
{
#do nothing
}
}
}
/**
* Used to checks if video is under threshold for conversion
* @param : { Array } { app_id }
* @todo : This Function checks if video is under threshold
* @example : check_threshold($input_vidoe_height,$current_video_height) { will check the threshold for 240p }
* @return : { Boolean } { True/ False }
* @since : 27th Oct, 2016 Feedback 1.0
* @author : Fahad Abbas
*/
function check_threshold($input_video_height,$current_video_height){
$threshold = '200';
if ($current_video_height == "240"){
if ($input_video_height > $threshold){
return True;
}
}
return False;
}
public function generate_thumbs($input_file,$duration, $dim='120x90', $num=3, $prefix=NULL, $rand=NULL, $gen_thumb=FALSE, $output_file_path=false, $specific_dura=false)
public function generate_thumbs($input_file,$duration,$dim='120x90',$num=3,$prefix=NULL, $rand=NULL,$gen_thumb=FALSE,$output_file_path=false,$specific_dura=false)
{
if($specific_dura)
{
$durations_format = gmdate("H:i:s", $duration);
$command = $this->ffmpeg." -i $input_file -ss ".$durations_format." -r 1 $dim -y -f image2 -vframes 1 $output_file_path ";
$command = $this->ffmpeg." -i $input_file -ss ".$durations_format." -r 1 $dimension -y -f image2 -vframes 1 $output_file_path ";
//pr($command,true);
shell_output($command);
@ -1517,7 +1562,7 @@ class FFMpeg{
}
$this->log->TemplogData .="\r\n\r\nEnd resolutions @ ".date("Y-m-d H:i:s")."\r\n\r\n";
$this->log->writeLine('Conversion Ouput',$this->log->TemplogData,true);
$this->log->writeLine('Converiosn Ouput',$this->log->TemplogData,true);
$this->log->TemplogData = "";
$this->output_details = $this->get_file_info($this->output_file);
@ -2048,7 +2093,11 @@ class FFMpeg{
rmdir($tmpDir);
}
/**
/**
* Function used to convert seconds into proper time format
* @param : INT duration
* @parma : rand

44
upload/includes/classes/db.class.php
View file

@ -22,24 +22,17 @@ class Clipbucket_db
var $num_rows = 0;
/**
* Connect to mysqli Database
*
* @param $host
* @param $name
* @param $uname
* @param $pwd
*
* @return bool { boolean } { true or false }
* { true or false }
* @internal param $ : { string } { $host } { your database host e.g localhost } { $host } { your database host e.g localhost }
* @internal param $ : { string } { $name } { name of database to connect to } { $name } { name of database to connect to }
* @internal param $ : { string } { $uname } { your database username } { $uname } { your database username }
* @internal param $ : { string } { $pwd } { password of database to connect to } { $pwd } { password of database to connect to }
*/
/**
* Connect to mysqli Database
*
* @param : { string } { $host } { your database host e.g localhost }
* @param : { string } { $name } { name of database to connect to }
* @param : { string } { $uname } { your database username }
* @param : { string } { $pwd } { password of database to connect to }
* @return { boolean } { true or false }
*/
function connect($host=String, $name=String, $uname=String, $pwd=String)
{
function connect($host=String,$name=String,$uname=String,$pwd=String) {
try {
if(!$host) $host = $this->db_host;
if(!$name) $name = $this->db_name;
@ -47,15 +40,12 @@ class Clipbucket_db
if(!$pwd) $pwd = $this->db_pwd;
$this->mysqli = new mysqli($host,$uname, $pwd, $name);
if($this->mysqli->connect_errno)
return false;
if($this->mysqli->connect_errno) return false;
$this->db_host = $host;
$this->db_name = $name;
$this->uname = $uname;
$this->pwd = $pwd;
$this->execute('SET NAMES "utf8"');
} catch(DB_Exception $e) {
$e->getError();
}
@ -280,12 +270,9 @@ class Clipbucket_db
* @return : { boolean } { true of false }
*/
function db_update($tbl, $fields, $cond)
{
function db_update($tbl, $fields, $cond) {
$count = 0;
$fields_query = '';
foreach ($fields as $field => $val)
{
foreach ($fields as $field => $val) {
if ($count > 0)
$fields_query .= ',';
$needle = substr($val, 0, 2);
@ -302,7 +289,6 @@ class Clipbucket_db
//Complete Query
$query = "UPDATE $tbl SET $fields_query WHERE $cond $ep";
try {
global $db;
$db->mysqli->query($query);
} catch(DB_Exception $e) {
$e->getError();
@ -423,8 +409,6 @@ class Clipbucket_db
function db_insert($tbl, $fields)
{
global $db;
$count = 0;
$query_fields = array();
$query_values = array();
@ -481,6 +465,7 @@ class Clipbucket_db
/**
* Get effect rows
*/
function Affected_Rows()
{
return $this->mysqli->affected_rows;
@ -488,3 +473,4 @@ class Clipbucket_db
}
?>

65
upload/includes/classes/errorhandler.class.php
View file

@ -2,6 +2,7 @@
/**
* Very basic error handler
*/
class EH extends ClipBucket
{
@ -12,11 +13,15 @@ class EH extends ClipBucket
/**
* A CONSTRUCTOR
*/
function error_handler(){}
function error_handler()
{
}
/**
* Function used to add new Error
*/
function add_error($message=NULL,$id=NULL)
{
global $ignore_cb_errors;
@ -25,7 +30,7 @@ class EH extends ClipBucket
$this->error_list[] = $message;
}
/**
* Function usd to add new warning
*/
@ -37,19 +42,20 @@ class EH extends ClipBucket
/**
* Function used to get error list
*/
function error_list()
{
return $this->error_list;
}
/**
* Function used to flush errors
*/
function flush_error()
{
$this->error_list = '';
}
function error_list()
{
return $this->error_list;
}
/**
* Function used to flush errors
*/
function flush_error()
{
$this->error_list = '';
}
/**
* Functio nused to add message_list
*/
@ -94,40 +100,49 @@ class EH extends ClipBucket
$this->flush_error();
$this->flush_warning();
}
/**
* Function used to add error or either message using simple
* and small object
*
* @param : message, @param :type,@param:id
*
* @return null
*/
function e($message=NULL,$type='e',$id=NULL)
{
switch($type)
{
case 'm':
case 1:
case 'msg':
case 'message':
$this->add_message($message,$id);
break;
$this->add_message($message,$id);
break;
case 'e':
case 'err':
case 'error':
default:
$this->add_error($message,$id);
break;
$this->add_error($message,$id);
break;
case 'w':
case 2:
case 'war':
case 'warning':
{
$this->add_warning($message,$id);
break;
}
break;
default:
$this->error_list($message,$id);
break;
}
return $message;
}
}
}
?>

2
upload/includes/classes/upload.class.php
View file

@ -508,7 +508,7 @@ class Upload{
'desc' => array('title'=> lang('vdo_desc'),
'type'=> 'textarea',
'name'=> 'description',
'class'=> 'desc',
'id'=> 'desc',
'value'=> cleanForm($desc),
'size'=>'35',
'extra_params'=>' rows="4"',

2
upload/includes/config.inc.php
View file

@ -47,7 +47,7 @@ if(config('closed') && THIS_PAGE!='ajax' && !$in_bg_cron && THIS_PAGE!='cb_insta
template("message.html");
exit();
}else{
e(lang("website_offline"),"w");
e(lang("ATTENTION: THIS WEBSITE IS IN OFFLINE MODE"),"w");
}
}

185
upload/includes/functions.php
View file

@ -1730,25 +1730,14 @@
}
}
}
if($LANG != null && !isset($LANG[$var]))
{
error_log('[LANG] Missing translation for "'.$var.'"');
if (DEVELOPMENT_MODE)
error_log(print_r(debug_backtrace(), TRUE));
}
return $phrase;
}
/**
* Fetch lang value from smarty using lang code
*
* @param : { array } { $param } { array of parameters }
*
* @uses : { function lang() }
* @return mixed|string
*/
* Fetch lang value from smarty using lang code
* @param : { array } { $param } { array of parameters }
* @uses : { function lang() }
*/
function smarty_lang($param) {
if(getArrayValue($param, 'assign')=='') {
@ -2539,8 +2528,8 @@
return lang('no_date_provided');
}
$periods = array(lang("second"), lang("minute"), lang("hour"), lang("day"), lang("week"), lang("month"), lang("year"), lang("decade"));
$lengths = array(60,60,24,7,4.35,12,10);
$now = time();
$lengths = array(lang("60"),lang("60"),lang("24"),lang("7"),lang("4.35"),lang("12"),lang("10"));
$now = time();
if(!$istime) {
$unix_date = strtotime($date);
} else {
@ -5033,24 +5022,24 @@
if(!isset($_GET['time']))
$_GET['time'] = 'all_time';
$array = array(
'view_all' => lang('all'),
'most_recent' => lang('recent'),
'most_viewed' => lang('viewed'),
'featured' => lang('featured'),
'top_rated' => lang('top_rated'),
'most_commented'=> lang('commented')
);
$array = array
('view_all' => lang('All'),
'most_recent' => lang('recent'),
'most_viewed' => lang('viewed'),
'featured' => lang('featured'),
'top_rated' => lang('top_rated'),
'most_commented' => lang('commented')
);
return $array;
}
/**
* Function used for building time links that are used
* on main pages such as videos.php, photos.php etc
* @return array : { array } { $array } { an array with all possible time sorts }
* { $array } { an array with all possible time sorts }
* @internal param $ : { none }
*/
* Function used for building time links that are used
* on main pages such as videos.php, photos.php etc
*
* @param : { none }
* @return : { array } { $array } { an array with all possible time sorts }
*/
function time_links() {
$array = array
@ -5068,20 +5057,14 @@
}
/**
* Fetch videos from video collections
*
* @param $id
* @param $order
* @param $limit
* @param bool $count_only
*
* @return array { array } { $items } { an array with videos data }
* { $items } { an array with videos data }
* @internal param $ : { integer } { $id } { id of collection from which to fetch videos } { $id } { id of collection from which to fetch videos }
* @internal param $ : { string } { $order } { sorting of videos } { $order } { sorting of videos }
* @internal param $ : { integer } { $limit } { number of videos to fetch } { $limit } { number of videos to fetch }
* @internal param $ : { boolean } { $count_only } { false by default, if true, returns videos count only } { $count_only } { false by default, if true, returns videos count only }
*/
* Fetch videos from video collections
*
* @param : { integer } { $id } { id of collection from which to fetch videos }
* @param : { string } { $order } { sorting of videos }
* @param : { integer } { $limit } { number of videos to fetch }
* @param : { boolean } { $count_only } { false by default, if true, returns videos count only }
* @return { array } { $items } { an array with videos data }
*/
function get_videos_of_collection($id,$order,$limit,$count_only=false) {
global $cbvideo;
@ -5124,24 +5107,20 @@
}
/**
* function uses to parse certain string from bulk string
* @author : Awais Tariq
*
* @param $needle_start
* @param $needle_end
* @param $results
*
* @return array|bool {bool/string/int} {true/$return_arr}
* {true/$return_arr}
* @internal param $ : {string} {$needle_start} { string from where the parse starts} {$needle_start} { string from where the parse starts}
* @internal param $ : {string} {$needle_end} { string from where the parse end} {$needle_end} { string from where the parse end}
* @internal param $ : {string} {$results} { total string in which we search} {$results} { total string in which we search}
*
* @todo {.....}
*
*
*/
/**
* function uses to parse certain string from bulk string
* @author : Awais Tariq
* @param : {string} {$needle_start} { string from where the parse starts}
* @param : {string} {$needle_end} { string from where the parse end}
*@param : {string} {$results} { total string in which we search}
*
* @todo {.....}
*
*
* @return {bool/string/int} {true/$return_arr}
*/
function find_string($needle_start,$needle_end,$results) {
if(empty($results)||empty($needle_start)||empty($needle_end)) {
@ -5187,16 +5166,13 @@
}
/**
* Pulls subscribers ids for given userid
*
* @param : { integer } { $userid } { id of user to get subscribers for }
* @param bool $limit
*
* @return array : { array } { $ids } { ids of subscribers }
* { $ids } { ids of subscribers }
* @author : Saqib Razzaq
* @since : ClipBucket 2.8.1
*/
* Pulls subscribers ids for given userid
* @param : { integer } { $userid } { id of user to get subscribers for }
* @param : { integer / boolean } { false by default, number of subscribers to get }
* @return : { array } { $ids } { ids of subscribers }
* @author : Saqib Razzaq
* @since : ClipBucket 2.8.1
*/
function get_user_subscibers($userid, $limit = false) {
global $db;
@ -5231,20 +5207,18 @@
}
/**
* Check where a function is being called from
*
* @param bool $file
* @param bool $pex
*
* @internal param $ : { boolean } { $file } { false by default, returns file path if true } { $file } { false by default, returns file path if true }
* @internal param $ : { boolean } { $pex } { false by default, exists after pr() if true } { $pex } { false by default, exists after pr() if true }
* @since : 2nd March, 2016 ClipBucket 2.8.1
* @author : Saqib Razzaq
*/
* Check where a function is being called from
* @param : { boolean } { $file } { false by default, returns file path if true }
* @param : { boolean } { $pex } { false by default, exists after pr() if true }
* @since : 2nd March, 2016 ClipBucket 2.8.1
* @author : Saqib Razzaq
*/
function trace_func($file = false, $pex = false) {
$trace = debug_backtrace();
if ($file) {
if (!$file) {
$trace = debug_backtrace();
} else {
$trace = debug_backtrace();
$trace = $trace[1]['file'];
}
@ -5255,16 +5229,14 @@
}
}
/**
* Display an image or build image tag
*
* @param : { string } { $src } { link to image file }
* @param bool $return
*
* @return string
* @since : 2nd March, 2016 ClipBucket 2.8.1
* @author : Saqib Razzaq
*/
/**
* Display an image or build image tag
*
* @param : { string } { $src } { link to image file }
* @param : { boolean } { $return } { false by default, returns img tag if true }
* @since : 2nd March, 2016 ClipBucket 2.8.1
* @author : Saqib Razzaq
*/
function view_image($src, $return = false) {
if (!empty($src)) {
@ -5277,20 +5249,15 @@
}
/**
* Get part of a string between two characters
*
* @param $str
* @param $from
* @param $to
*
* @return string : { string } { requested part of stirng }
* { requested part of stirng }
* @internal param $ : { string } { $str } { string to read } { $str } { string to read }
* @internal param $ : { string } { $from } { character to start cutting } { $from } { character to start cutting }
* @internal param $ : { string } { $to } { character to stop cutting } { $to } { character to stop cutting }
* @since : 3rd March, 2016 ClipBucket 2.8.1
* @author : Saqib Razzaq
*/
* Get part of a string between two characters
*
* @param : { string } { $str } { string to read }
* @param : { string } { $from } { character to start cutting }
* @param : { string } { $to } { character to stop cutting }
* @return : { string } { requested part of stirng }
* @since : 3rd March, 2016 ClipBucket 2.8.1
* @author : Saqib Razzaq
*/
function getStringBetween($str,$from,$to) {
$sub = substr($str, strpos($str,$from)+strlen($from),strlen($str));

2
upload/includes/langs/en.lang
View file

File diff suppressed because one or more lines are too long

2
upload/includes/smartyv3/sysplugins/smarty_cacheresource.php
View file

@ -450,8 +450,6 @@ class Smarty_Template_Cached
function smarty_catch_error()
{
return;
global $Cbucket;
if( !replaceable() || defined('LOVE_CLIPBUCKET') || BACK_END ) return;

4
upload/js/clipbucket.js
View file

@ -925,7 +925,7 @@
/**
* Function used to add and remove video from quicklist
* Function used to add and remove video from qucklist
* THIS FEATURE IS SPECIALLY ADDED ON REQUEST BY JAHANZEB HASSAN
*/
this.add_quicklist = function (obj,vid){
@ -956,7 +956,7 @@
};
this.remove_quicklist = function(obj,vid){
this.remove_qucklist = function(obj,vid){
var self = this;
$.post(page,

2
upload/js/clipbucket.min.js vendored
View file

File diff suppressed because one or more lines are too long

6
upload/js/functions.js
View file

@ -769,7 +769,7 @@ var loading_img_2 = "<img style='vertical-align:middle' src='"+imageurl+"/ajax-l
/**
* Function used to add and remove video from quicklist
* Function used to add and remove video from qucklist
* THIS FEATURE IS SPECIALLY ADDED ON REQUEST BY JAHANZEB HASSAN
*/
@ -804,10 +804,10 @@ var loading_img_2 = "<img style='vertical-align:middle' src='"+imageurl+"/ajax-l
}
/**
* Function used to remove video from quicklist
* Function used to remove video from qucklist
*/
function remove_quicklist(obj,vid)
function remove_qucklist(obj,vid)
{
$.cookie("btn-q-"+vid, null);

2
upload/js/functions.min.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -148,7 +148,7 @@
logo : {
branding_logo : branding_logo,
product_link : product_link,
show_logo : true
show_logo : true
},
header : {
uploader : uploader,

20
upload/player/CB_video_js/js/cb_vjs_custom.js
View file

@ -22,25 +22,7 @@ $(document).ready(function() {
new_player_height();
$(".video-js").on("contextmenu",function() {
return false;
});
$('body').keydown(function(e)
{
if(e.keyCode == 0 || e.keyCode == 32)
{
e.preventDefault();
if( cb_player.paused() )
cb_player.play();
else
cb_player.pause()
}
});
$('body').keyup(function(e)
{
if(e.keyCode == 0 || e.keyCode == 32)
e.preventDefault();
});
});
});
$(window).resize(function(event) {

8
upload/player/CB_video_js/js/cb_vjs_plugin.js
View file

@ -14,12 +14,12 @@ cbvjslogo.prototype.init = function(){
var cbvjslogo = this;
var CbLogoBrand = document.createElement("div");
CbLogoBrand.id = "vjs-cb-logo";
/* CbLogoBrand.className = "vjs-cblogo-brand";
CbLogoBrand.className = "vjs-cblogo-brand";
CbLogoBrand.className += " vjs-menu-button";
CbLogoBrand.className += " vjs-control";
CbLogoBrand.className += " vjs-button";
CbLogoBrand.innerHTML = '<img style="display:block !important; cursor : pointer;margin:5px 0 0 4px;" src="data:image/png;base64, '+cbvjslogo.path+'" alt="">';
*/
var FullScreenToggle = cbvjslogo.player.controlBar.getChild('fullscreenToggle').el_;
cbvjslogo.player.controlBar.el_.insertBefore(CbLogoBrand, FullScreenToggle);
@ -78,8 +78,7 @@ cbvjsvolume.prototype.init = function(){
}else{
console.log("Ninja : Dont Mess Around Here! ");
}
cbvjsvolume.player.on('volumechange',function()
{
cbvjsvolume.player.on('volumechange',function(){
cbvjsvolume.Currvol = cbvjsvolume.player.volume();
cbvjsvolume.Muted = cbvjsvolume.player.muted();
@ -88,6 +87,7 @@ cbvjsvolume.prototype.init = function(){
}else{
$.cookie("cb_volume", cbvjsvolume.Currvol , { expires : 10 });
}
});
}

2
upload/styles/cb_27/layout/blocks/manage/account_head.html
View file

@ -11,7 +11,7 @@
<h4 class="media-heading headcolor">{$user.username} ({assign var=category value=$userquery->get_category($user.category)}
{$category.category_name})</h4>
<b>{lang code='Since:'}</b> ({$user.doj|date_format})
<b>{lang code='user_last_login'} :</b> ({$user.last_logged|nicetime})
<b>{lang code='last Login:'}</b> ({$user.last_logged|nicetime})
</div>
<!--<div class="col-md-4 procolor">-->

2
upload/styles/cb_27/layout/blocks/quicklist/video_block.html
View file

@ -13,7 +13,7 @@
</div>
{if $show_delete=='yes'}
<div class="ql_delete">
<img src="{$imageurl}/dot.gif" class="cross_icon" onclick="remove_quicklist('#{$unique_id}playlist_cont_{$video.videoid}','{$video.videoid}')" title="remove {$video.title} from quicklist" alt="quicklist">
<img src="{$imageurl}/dot.gif" class="cross_icon" onclick="remove_qucklist('#{$unique_id}playlist_cont_{$video.videoid}','{$video.videoid}')" title="remove {$video.title} from qucklist" alt="quicklist">
</div>
{/if}
<div class="pl_duration">{$video.duration|SetTime}</div>

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

@ -6,7 +6,7 @@
<a href="{videoLink vdetails=$video}" alt="{$video.title}" title="{$video.title}">
<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 quicklist" alt="quicklist">
<img src="{$imageurl}/dot.gif" class="add_icon" onclick="add_quicklist(this,'{$video.videoid}')" title="add {$video.title} to qucklist" alt="quicklist">
</div>
<div class="watch_video_box_details">
<a href="{videoLink vdetails=$video}">{$video.title|truncate:30}</a><br>

36
upload/styles/cb_27/layout/watch_video.html
View file

@ -72,8 +72,15 @@
<strong >Published:&nbsp;</strong>
<span >{$video.date_added|niceTime}</span>
</div>
<!-- view sec hide on told arslan bhai -->
<!-- <div class="mtm">
<strong>{lang code='views'}</strong> : {$vdo.views|number_format} &ndash;
<strong>{lang code='duration'}</strong> : {$vdo.duration|SetTime} &ndash;
<strong>{lang code='comments'}</strong> : {$vdo.comments_count|number_format}
</div> -->
</div>
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-5 no-padding" style="margin-top:25px;">
<div class="watch-vid-social-sec col-lg-12 pull-right no-padding">
<a class="cb-item-social-icon twitter" href="https://twitter.com/share" target="_blank">
@ -81,16 +88,18 @@
</a>
<a class="cb-item-social-icon googlep" href="https://plus.google.com/share?url={urlencode(videolink($video))}" target="_blank">
<i class="fa fa-google-plus"></i>
</a>
<a class="cb-item-social-icon facebook" href="http://www.facebook.com/sharer/sharer.php?s=100&p[url]={videoLink($video)|urlencode}&p[images][0]={get_thumb vdetails=$video}&p[title]={$video.title|title|urlencode}&p[summary]={$video.description|description|urlencode}" target="_blank">
<i class="fa fa-facebook"></i>
</a>
</div>
{if $Cbucket->configs.video_download==1 && $cbvid->downloadable($vdo)}
<div class="dropdown col-lg-12 pull-right no-padding text-right">
<button class="btn btn-success dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true" style="margin-top:10px;">
{lang('Download')}
<span class="caret"></span>
<button class="btn btn-success dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true" style="margin-top: 10px;">
Download
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
{$files = get_video_files($vdo,true,true)}
@ -99,8 +108,9 @@
{$quality = explode('.',$quality.1)}
{$file_quality = $quality.0}
<li role="presentation">
<a role="menuitem" tabindex="-1" href="{$file}" download>
<a role="menuitem" tabindex="-1" href="{$file}" download>
<span class="glyphicon glyphicon-download-alt"></span>{$file_quality}</a>
</li>
{/foreach}
</ul>
@ -108,6 +118,7 @@
{/if}
</div>
<br>
</div>
<div class="tab-pane" id="cb-item-share">
@ -117,7 +128,7 @@
<div class="tab-pane" id="cb-item-addto">
<div class="clearfix visible-xs-block" style="margin-bottom:25px;">
<div id="video_action_result_cont" style="display:none;"></div>
<a class="btn mtm btn-block btn-primary" href="javascript:void(0)" onclick="add_to_fav('video','{$vdo.videoid}');" style="color:white;">Add to My Favorites</a>
<a class="btn mtm btn-block btn-primary" href="javascript:void(0)" onclick="add_to_fav('video','{$vdo.videoid}');" style="color:white;">Add to My Favorites</a>
</div>
<div class="alert ">
@ -165,6 +176,9 @@
<div class="col-lg-4 col-md-4 visible-lg visible-md side-video pull-right">
<div class="cb-box">
<div class="ad">{AD place='ad_300x250'}</div>
<!-- <a href="http://www.arvixe.com/clipbucket_hosting?utm_campaign=300x250_Demo&utm_medium=banner&utm_source=clipbucket.com"><img class="banner" src="{$theme}/assets/images/add320x250.png" style="margin-bottom: 10px; width: 100%;" >
</a>-->
<!-- <h3>{lang code="Most Popular"}</h3> -->
{if $smarty.get.play_list == ''}
{foreach $videos as $video}
{include file="$style_dir/blocks/videos/video_popular.html"}
@ -187,7 +201,8 @@
<div style="height:20px"> </div>
<script>
var aspect_ratio = 2.2;
//var aspect_ratio = 1.77778
var aspect_ratio = 2.2
var $cb_player = $("#cb_player");
$(document).ready(function(){
@ -206,6 +221,13 @@
'{$object_type}'
);
// $('.cb-item-description').readmore({
// speed: 75,
// maxHeight: 120,
// moreLink : '<a href="#" class="btn btn-min btn-block btn-primary"><i class="glyphicon glyphicon-arrow-down"></i> {lang("Read more")}</a>',
// lessLink : '<a href="#" class="btn btn-min btn-block btn-default">{lang("Close")}</a>'
// });
$("#reportVideo").on({
click : function(e){
e.preventDefault();
@ -231,7 +253,7 @@
<style type="text/css">
footer{
position: relative;
position: relative;
top: 65px;
}
</style>

2
upload/styles/cb_27/theme/css/main.css
View file

@ -3628,7 +3628,7 @@ small {
margin: 0 0 5px;
}
/**
* QUICKLIST ICON
* QUCKLIST ICON
*/
.quick_container {
width: 1000px;

2
upload/styles/cb_27/theme/less/main.less
View file

@ -3619,7 +3619,7 @@ padding-right: 0px;
/**
* QUICKLIST ICON
* QUCKLIST ICON
*/
.quick_container{
width:1000px;

2
upload/styles/cb_28/layout/blocks/quicklist/fast_qlist.html
View file

@ -12,6 +12,6 @@
<p><a href="{videoLink($ql_item)}">{$ql_item.title|truncate:35}</a></p>
<p>by {$ql_item.username}</p>
</div>
<button todel={$ql_item.videoid} class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove {$ql_item.title} from quicklist" alt="quicklist">
<button todel={$ql_item.videoid} class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove {$ql_item.title} from qucklist" alt="quicklist">
</button>
</div>

2
upload/styles/cb_28/layout/blocks/quicklist/video_block.html
View file

@ -15,7 +15,7 @@
<p>by {$video.username}</p>
</div>
{if $show_delete=='yes'}
<button class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" onclick="remove_quicklist('#{$unique_id}playlist_cont_{$video.videoid}','{$video.videoid}')" title="remove {$video.title} from quicklist" alt="quicklist">
<button class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" onclick="remove_qucklist('#{$unique_id}playlist_cont_{$video.videoid}','{$video.videoid}')" title="remove {$video.title} from qucklist" alt="quicklist">
</button>
{/if}
</div>

2
upload/styles/cb_28/layout/footer.html
View file

@ -36,7 +36,7 @@
{/if}
</div>
<div class="copyright-poweredby column">
<span>©ClipBucket, édité par MacWarrior</span>
<span>#ClipBucket#</span>
</div>
</div>
</div><!-- end of custom-container -->

217
upload/styles/cb_28/layout/index.html
View file

@ -1,17 +1,204 @@
{if userid()}
<script type="text/javascript">
window.location.href = "/videos.php";
</script>
{else}
<div class="account-container" style="height:auto !important;margin-top:40px;margin-bottom:40px;">
<div class="signin-block" style="text-align:center;">
<div class="side-box">
<h2>{lang code='get_your_account'}</h2>
<div class="text-box">
<p>{lang code='create_account_msg'}</p>
</div>
<a class="btn btn-default btn-lg" href="{link name='signup'}">{lang code='get_your_account'}</a>
{lang code='no_featured_videos_found' assign='no_found_fe'}
{$vae = {lang code="no_featured_videos_found"}}
{$no_recent = {lang code="no_recent_videos_found"}}
{$loadMoreLang ={lang code="load_more"}}
{ANCHOR place="display_head_sec"}
<div id="main" class="clearfix container">
<div id="messageFav" class="alert alert-info marginTop" style="display:none; height:66px;"></div>
<div class="clearfix">
<div id="content">
{ANCHOR place='global'}
<div class="clearfix leaderboard-ad">
<div class="ad">{AD place='ad_728x90'}</div>
</div>
{$row = $myquery->Get_Website_Details()}
{if is_installed('editorspick')}
{if $editor_picks}
<div class="clearfix editorpick">
<div class="editorpick-holder">
<!-- Editor Pick Video Main Container START //-->
<div class="absolute-div">
<div id="ep_video_container">
{if is_installed('editorspick')}
{section name=e_list loop=$editor_picks max=1}
{include file="$style_dir/blocks/editor_pick/video_block.html" video=$editor_picks[e_list]}
{sectionelse}
There is no video in editor's pick, Please Add Videos In Editor's Pick<br />Videos Manager > Add to editor's pick
{/section}
{/if}
</div>
</div>
<!-- Editor Pick Video Main Container END //-->
<img src="{$theme}/images/player-ratio.png" class="playerRatio">
</div>
<!-- Editor Pick Videos Slider Container START //-->
<div class="editorpick-videos custom-elements">
<div class="scrollable-area vscrollable">
{section name=e_list loop=$editor_picks}
{include file="$style_dir/blocks/editor_pick/index_featured_video.html" video=$editor_picks[e_list]}
{/section}
</div>
</div>
<!-- Editor Pick Videos Slider Container END //-->
</div>
{/if}
{/if}
<!-- ******************************************* -->
<!-- ************ EDITORS BLOCK END ************ -->
<!-- ******************************************* -->
<section class="clearfix featured-videos">
<h1>{lang code="featured_videos"}</h1>
<div id="featured_vid_sec" class="clearfix row">
</div>
<div id="featured_pre" class="clearfix"></div>
<div id="featured-loadmore" class="clearfix text-center">
<button id="featured_load_more" class="btn btn-loadmore" loadtype="video" loadmode="featured" loadlimit="{$row.index_featured}" loadhit="1" title="Load more featured video">{lang code="load_more"}</button>
</div>
</section>
<section class="clearfix videos">
<h1>{lang code="recent_videos"}</h1>
<div id="recent_vids_sec" class="clearfix row">
</div>
<div id="recent_pre" class="clearfix"></div>
<div id="recent-loadmore" class="clearfix text-center">
<button id="recent_load_more" class="btn btn-loadmore" loadtype="video" loadmode="recent" loadlimit="{$row.index_recent}" loadhit="1" title="Load more recent video">{lang code="load_more"}</button>
</div>
</section>
</div>
</div>
{/if}
<aside id="sidebar">
<div class="box-ad ad">{AD place='ad_300x250'}</div>
<!-- ******************************************* -->
<!-- ************* USER BLOCK START ************ -->
<!-- ******************************************* -->
{$feature_users=get_users(['featured'=>'yes','limit'=>5])}
{if $feature_users}
<h2>{lang code="featured_users"}</h2>
<div class="clearfix sidebar-channels">
{foreach $feature_users as $user}
<div class="clearfix channel-item">
<a href="{$userquery->profile_link($user)}" class="avatar">
<img src="{$userquery->getuserthumb($user,'m')}" width="50" height="50" class="img-circle">
</a>
<div class="channel-info">
<h3><a href="{$userquery->profile_link($user)}">{$user.username}</a></h3>
<div class="clearfix views-videos">
<span>{prettyNum($user.profile_hits|number_format)} {lang code='views'}</span>
<span>{prettyNum($user.total_videos|number_format)} {lang code='videos'}</span>
</div>
</div>
</div>
{/foreach}
</div>
{/if}
<!-- ******************************************* -->
<!-- ************* USER BLOCK END ************** -->
<!-- ******************************************* -->
{if $row.collectionsSection == 'yes'}
{$collections = $cbcollection->get_collections(['limit'=>4, 'active'=>'yes', 'order'=>'total_objects DESC'])}
{$collections = $cbcollection->activeCollections($collections)}
<h2 title="Collections with most items">{lang code="top_collections"}</h2>
<div class="clearfix sidebar-items collections-grid">
<div class="clearfix row">
{$limit=10}
{if $collections}
{foreach from=$collections item=collection}
{$first_col_thumb = $cbcollection->coll_first_thumb($collection,'l')}
<div class="clearfix collection-item col-lg-6 col-md-6 col-sm-12 col-xs-12">
{include file="$style_dir/blocks/collection-item.html"}
</div>
{/foreach}
</div>
{else}
<div class="clearfix well">{lang code='no_collection_found'}</div>
{/if}
</div>
{/if}
<!-- playlists -->
{$playlists = get_playlists(['limit'=>4, 'order'=>'total_items DESC'])}
{$playlists = activePlaylists($playlists)}
{if $playlists}
<div class="clearfix sidebar-playlists">
<h2 title="Playlists with most videos">{lang code="top_playlists"}</h2>
{foreach $playlists as $playlist}
<div class="playlist clearfix">
<a href="{videoLink vdetails=$playlist['first_item']|@json_decode}{if $Cbucket->configs.seo == 'no'}&{else}?{/if}play_list={$playlist.playlist_id}"><h3>{$playlist.playlist_name}</h3></a>
{$items = get_playlist_items($playlist.playlist_id)}
<div class="clearfix row">
{foreach $items as $item}
{if $item@iteration == 5}
{break}
{/if}
{$videoid = $item.videoid}
{if $videoid}
<div class="video col-lg-3 col-md-4 col-sm-6 col-xs-6">
{$videos = get_videos(['videoid'=>$videoid,'limit'=>'2'])}
{foreach $videos as $video}
<a href="{videoLink($video)}{if $Cbucket->configs.seo == 'no'}&{else}?{/if}play_list={$playlist.playlist_id}" class="playlist-video">
<img src="{getThumb vdetails=$video size=168x105}" class="img-responsive">
<img src="{$theme}/images/thumb-ratio.png" alt="" class="thumb-ratio">
</a>
{/foreach}
</div>
{else}
<div class="clearfix well">no items</div>
{/if}
{/foreach}
</div>
<span class="videos-count">{$cbvid->action->count_playlist_items($playlist.playlist_id)|number_format}&nbsp;{lang code="videos"}</span>
</div>
{/foreach}
</div>
{else}
{if has_access('admin_access')}
<div class="clearfix well">{lang code="no_playlists"}</div>
{/if}
{/if}
</aside>
</div>
</div>
<script type="text/javascript">
// handles initial and load more
// for home page videos
var langCo = "{$vae}";
var noRecent = "{$no_recent}";
var loadMoreLang = "{$loadMoreLang}";
//console.log(langCo);
homePageVideos("{$got_qlitems}");
//
/* player height and editerpick videos height */
var WinWidHome = "";
function editpickVideos(){
WinWidHome = $(window).width();
if(WinWidHome > 991)
{
//console.log("height "+WinWidHome);
var bannerHeight = $(".editorpick-holder").height();
bannerHeight = bannerHeight - 12;
//console.log("height "+bannerHeight);
$(".editorpick-videos .scrollable-area").css({
"height" : bannerHeight+"px",
});
}
else
{
console.log("height "+WinWidHome);
$(".editorpick-videos .scrollable-area").css("height","auto");
}
}
$('.playerRatio').load(function(){
editpickVideos();
});
$(window).resize(function() {
editpickVideos();
});
</script>

9
upload/styles/cb_28/layout/signup.html
View file

@ -16,7 +16,7 @@
{if $mode == 'login'}
<div class="clearfix signin-block">
<div class="account-holder">
<form name="login_form" method="post" style="display:block;margin:auto;" id="login_form" class="user-form">
<form name="login_form" method="post" action="" id="login_form" class="user-form">
<h2>{lang code="login"}</h2>
<div class="form-group">
{*<label for="login_username_sp">{lang code="Username"}</label>*}
@ -50,6 +50,13 @@
</div>
{/if}
</form>
<div class="side-box">
<h2>{lang code='get_your_account'}</h2>
<div class="text-box">
<p>{lang code='create_account_msg'}</p>
</div>
<a class="btn btn-default btn-lg" href="{link name='signup'}">{lang code='get_your_account'}</a>
</div>
</div>
</div>
{else}

17
upload/styles/cb_28/layout/videos.html
View file

@ -2,7 +2,7 @@
{$leftMenuLinks = array_slice($myAccountLinks, 7)}
<div id="main" class="clearfix container">
<div class="clearfix">
<section id="content" class="clearfix videos" style="width:100%;">
<section id="content" class="clearfix videos">
<div class="clearfix leaderboard-ad ad">
{AD place='ad_728x90'}
</div>
@ -75,6 +75,21 @@
<!-- end of Pagination -->
</section>
<!-- videos ended -->
<aside id="sidebar">
<div class="box-ad ad">{AD place='ad_300x250'}</div>
<h2>{lang code="featured_videos"}</h2>
<div class="clearfix sidebar-items">
{$featured=$cbvid->get_videos(["featured"=>"yes","limit"=>6])}
{if $featured}
{foreach $featured as $video}
{include file="$style_dir/blocks/videos/video.html" display_type='featuredVideos_sidebar'}
{/foreach}
{else}
<div class="well well-info">{lang code="no_videos_found"}</div>
{/if}
</div>
</aside>
</div>
</div>
<script>

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

@ -119,7 +119,7 @@
{/if}
{/foreach}
{$usercat = $userquery->get_category_name($user.category)}
<li><strong>{lang code='category'}: </strong>{$usercat.category_name}</li>
<li><strong>Category: </strong>{$usercat.category_name}</li>
</ul>
</div>
{/if}

4
upload/styles/cb_28/theme/js/clipbucket.js
View file

@ -924,7 +924,7 @@
/**
* Function used to add and remove video from quicklist
* Function used to add and remove video from qucklist
* THIS FEATURE IS SPECIALLY ADDED ON REQUEST BY JAHANZEB HASSAN
*/
this.add_quicklist = function (obj,vid){
@ -955,7 +955,7 @@
};
this.remove_quicklist = function(obj,vid){
this.remove_qucklist = function(obj,vid){
var self = this;
$.post(page,

2
upload/styles/cb_28/theme/js/clipbucket.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
upload/styles/cb_28/theme/js/fast_qlist.js
View file

@ -37,7 +37,7 @@
vduration = $(obj).attr("vduration");
if (notInList == true) {
$('<div style="display:none" class="qlist_item clearfix" style="background-color:#fff; " id="quicklist_playlist_cont_'+thevid+'"><div class="pl_num"></div><div class="pl_thumb"><a href="'+obj.attr("vlink")+'" ><img src="'+vthumb+'" class="img-responsive" ><img src="'+baseurl+'/styles/cb_28/theme/images/thumb-ratio.png" alt="" class="thumb-ratio"></a><span class="pl_duration">'+vduration+'</span></div><div class="pl_details" "><p><a href="'+vlink+'" >'+vtitle+'</a></p></div><button todel="'+thevid+'" class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove '+vtitle+' from quicklist" alt="quicklist"></button></div>').appendTo('#my_quicklist').fadeIn('slow');
$('<div style="display:none" class="qlist_item clearfix" style="background-color:#fff; " id="quicklist_playlist_cont_'+thevid+'"><div class="pl_num"></div><div class="pl_thumb"><a href="'+obj.attr("vlink")+'" ><img src="'+vthumb+'" class="img-responsive" ><img src="'+baseurl+'/styles/cb_28/theme/images/thumb-ratio.png" alt="" class="thumb-ratio"></a><span class="pl_duration">'+vduration+'</span></div><div class="pl_details" "><p><a href="'+vlink+'" >'+vtitle+'</a></p></div><button todel="'+thevid+'" class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove '+vtitle+' from qucklist" alt="quicklist"></button></div>').appendTo('#my_quicklist').fadeIn('slow');
}
$.cookie("quick_list_box", "show", { expires : 10 });

2
upload/styles/cb_28/theme/js/fast_qlist.min.js vendored
View file

@ -1 +1 @@
function pushToQlist(t,i){if(i=parseInt(i),$.cookie("btn-q-"+i,"yes",{expires:10}),currentList=$.cookie("fast_qlist"),cleanList=currentList,null!=cleanList){if(notInList=!0,index=cleanList.indexOf(i),"-1"!=index)return!1;cleaned=cleanList.replace(/\[/g,""),cleaned=cleaned.replace(/\]/g,""),newCookie="["+cleaned+","+i+"]"}else notInList=!0,newCookie="["+i+"]";$.cookie("fast_qlist",newCookie,{expires:10});var e=$(t).attr("vtitle"),e=e.split(0,10);thevid=$(t).attr("v-id"),vlink=$(t).attr("vlink"),vthumb=$(t).attr("vthumb"),vduration=$(t).attr("vduration"),1==notInList&&$('<div style="display:none" class="qlist_item clearfix" style="background-color:#fff; " id="quicklist_playlist_cont_'+thevid+'"><div class="pl_num"></div><div class="pl_thumb"><a href="'+t.attr("vlink")+'" ><img src="'+vthumb+'" class="img-responsive" ><img src="'+baseurl+'/styles/cb_28/theme/images/thumb-ratio.png" alt="" class="thumb-ratio"></a><span class="pl_duration">'+vduration+'</span></div><div class="pl_details" "><p><a href="'+vlink+'" >'+e+'</a></p></div><button todel="'+thevid+'" class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove '+e+' from quicklist" alt="quicklist"></button></div>').appendTo("#my_quicklist").fadeIn("slow"),$.cookie("quick_list_box","show",{expires:10}),$("#qlist_main").show(),$(".quicklist_cont").css("display","block")}$(document).find("#qlist_main").hide(),"yes"==fastQitems&&$(document).find("#qlist_main").show();var notInList=!1;$(document).ready(function(){$(".ql_show-hide1").click(function(){$(this).toggleClass("glyphicon-minus glyphicon-plus")})}),$(document).on("click",".cb_quickie",function(){obj=$(this),$(this).addClass("icon-tick"),id=$(this).attr("v-id"),title=$(this).attr("vtitle"),thumb=$(this).attr("vthumb"),link=$(this).attr("vlink"),vdur=$(this).attr("vduration"),pushToQlist(obj,id)}),$(document).on("click",".ql_delete",function(t){t.preventDefault(),vid=$(this).attr("todel"),$(".cb_quickie[v-id="+vid+"]").removeClass("icon-tick"),currentList=$.cookie("fast_qlist"),cleaned=currentList.replace(vid,""),console.log(cleaned),$.cookie("fast_qlist",cleaned,{expires:10}),$(this).closest(".qlist_item").fadeOut("slow")}),$(document).on("click",".ql_rem",function(t){t.preventDefault(),$.cookie("fast_qlist",null,{expires:10}),$(".qlist_item").fadeOut("slow"),$("#qlist_main").fadeOut("slow"),$(".cb_quickie").removeClass("icon-tick")});
function pushToQlist(t,i){if(i=parseInt(i),$.cookie("btn-q-"+i,"yes",{expires:10}),currentList=$.cookie("fast_qlist"),cleanList=currentList,null!=cleanList){if(notInList=!0,index=cleanList.indexOf(i),"-1"!=index)return!1;cleaned=cleanList.replace(/\[/g,""),cleaned=cleaned.replace(/\]/g,""),newCookie="["+cleaned+","+i+"]"}else notInList=!0,newCookie="["+i+"]";$.cookie("fast_qlist",newCookie,{expires:10});var e=$(t).attr("vtitle"),e=e.split(0,10);thevid=$(t).attr("v-id"),vlink=$(t).attr("vlink"),vthumb=$(t).attr("vthumb"),vduration=$(t).attr("vduration"),1==notInList&&$('<div style="display:none" class="qlist_item clearfix" style="background-color:#fff; " id="quicklist_playlist_cont_'+thevid+'"><div class="pl_num"></div><div class="pl_thumb"><a href="'+t.attr("vlink")+'" ><img src="'+vthumb+'" class="img-responsive" ><img src="'+baseurl+'/styles/cb_28/theme/images/thumb-ratio.png" alt="" class="thumb-ratio"></a><span class="pl_duration">'+vduration+'</span></div><div class="pl_details" "><p><a href="'+vlink+'" >'+e+'</a></p></div><button todel="'+thevid+'" class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove '+e+' from qucklist" alt="quicklist"></button></div>').appendTo("#my_quicklist").fadeIn("slow"),$.cookie("quick_list_box","show",{expires:10}),$("#qlist_main").show(),$(".quicklist_cont").css("display","block")}$(document).find("#qlist_main").hide(),"yes"==fastQitems&&$(document).find("#qlist_main").show();var notInList=!1;$(document).ready(function(){$(".ql_show-hide1").click(function(){$(this).toggleClass("glyphicon-minus glyphicon-plus")})}),$(document).on("click",".cb_quickie",function(){obj=$(this),$(this).addClass("icon-tick"),id=$(this).attr("v-id"),title=$(this).attr("vtitle"),thumb=$(this).attr("vthumb"),link=$(this).attr("vlink"),vdur=$(this).attr("vduration"),pushToQlist(obj,id)}),$(document).on("click",".ql_delete",function(t){t.preventDefault(),vid=$(this).attr("todel"),$(".cb_quickie[v-id="+vid+"]").removeClass("icon-tick"),currentList=$.cookie("fast_qlist"),cleaned=currentList.replace(vid,""),console.log(cleaned),$.cookie("fast_qlist",cleaned,{expires:10}),$(this).closest(".qlist_item").fadeOut("slow")}),$(document).on("click",".ql_rem",function(t){t.preventDefault(),$.cookie("fast_qlist",null,{expires:10}),$(".qlist_item").fadeOut("slow"),$("#qlist_main").fadeOut("slow"),$(".cb_quickie").removeClass("icon-tick")});

2
upload/styles/helloWorld/layout/blocks/quicklist/fast_qlist.html
View file

@ -12,6 +12,6 @@
<p><a href="{videoLink($ql_item)}">{$ql_item.title|truncate:35}</a></p>
<p>by {$ql_item.username}</p>
</div>
<button todel={$ql_item.videoid} class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove {$ql_item.title} from quicklist" alt="quicklist">
<button todel={$ql_item.videoid} class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" title="remove {$ql_item.title} from qucklist" alt="quicklist">
</button>
</div>

2
upload/styles/helloWorld/layout/blocks/quicklist/video_block.html
View file

@ -15,7 +15,7 @@
<p>by {$video.username}</p>
</div>
{if $show_delete=='yes'}
<button class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" onclick="remove_quicklist('#{$unique_id}playlist_cont_{$video.videoid}','{$video.videoid}')" title="remove {$video.title} from quicklist" alt="quicklist">
<button class="ql_delete glyphicon glyphicon-trash btn btn-danger btn-sm" onclick="remove_qucklist('#{$unique_id}playlist_cont_{$video.videoid}','{$video.videoid}')" title="remove {$video.title} from qucklist" alt="quicklist">
</button>
{/if}
</div>

2
upload/videos.php
View file

@ -60,7 +60,7 @@
$tag='<li><a #params#>#page#</a><li>';
$pages->paginate($total_pages,$page,$link,$extra_params,$tag);
if (!$subtitle) {
$subtitle = 'videos';
$subtitle = 'Videos';
}
subtitle(lang($subtitle));
array_val_assign($assign_arry);