diff --git a/sql/2.0.1~2.0.2.txt b/sql/2.0.1~2.0.2.sql similarity index 100% rename from sql/2.0.1~2.0.2.txt rename to sql/2.0.1~2.0.2.sql diff --git a/sql/2.0.2~2.0.3.txt b/sql/2.0.2~2.0.3.sql similarity index 100% rename from sql/2.0.2~2.0.3.txt rename to sql/2.0.2~2.0.3.sql diff --git a/sql/2.0.3~2.0.4.txt b/sql/2.0.3~2.0.4.sql similarity index 100% rename from sql/2.0.3~2.0.4.txt rename to sql/2.0.3~2.0.4.sql diff --git a/sql/upgrade.sql.txt b/sql/upgrade.sql similarity index 88% rename from sql/upgrade.sql.txt rename to sql/upgrade.sql index 7bc628c2..eedd3a75 100644 --- a/sql/upgrade.sql.txt +++ b/sql/upgrade.sql @@ -1,5 +1,5 @@ -- Please Put all the DB changes here -- Also add those changes that have been made and not been added +-- Please Put all the DB changes here +-- Also add those changes that have been made and not been added ALTER TABLE `video` ADD `userid` INT NOT NULL AFTER `username` diff --git a/upload/includes/classes/signup.class.php b/upload/includes/classes/signup.class.php index 9fdea359..d1a6d6bf 100644 --- a/upload/includes/classes/signup.class.php +++ b/upload/includes/classes/signup.class.php @@ -19,12 +19,13 @@ class signup { //This Function Is Used To Check Regiseration is allowed or not - function Registration(){ - if(ALLOW_REGISTERATION == 1 ){ - return true; - }else{ - return false; - } + function Registration() + { + if(ALLOW_REG == 1) + { + return true; + } + return false; } } diff --git a/upload/includes/common.php b/upload/includes/common.php index 1bf80371..e3099b6f 100644 --- a/upload/includes/common.php +++ b/upload/includes/common.php @@ -2,19 +2,19 @@ /* ******************************************************************** * @Software ClipBucket - * @Author ArslanHassan - * @copyright Copyright (c) 2007-2008 {@link http://www.clip-bucket.com} + * @Author Arslan Hassan, et al + * @copyright Copyright (c) 2007 - 2010 {@link http://www.clip-bucket.com} * @license http://www.clip-bucket.com * @version v2 * $Id$ * @since 2007-10-15 - * @License CBLA + * @License Attribution Assurance License ******************************************************************* This Source File Is Written For ClipBucket, Please Read its End User License First and Agree its Terms of use at http://www.opensource.org/licenses/attribution.php ******************************************************************* - Copyright (c) 2007-2008 Clip-Bucket.com. All rights reserved. + Copyright (c) 2007 - 2010 Clip-Bucket.com. All rights reserved. ******************************************************************* */ @@ -152,7 +152,7 @@ switch(DEBUG_LEVEL) //Registration & Email Settings define('EMAIL_VERIFICATION',$row['email_verification']); - define('ALLOW_REGISTERATION',$row['allow_registeration']); + define('ALLOW_REG',$row['allow_registration']); define('WEBSITE_EMAIL',$row['website_email']); define('SUPPORT_EMAIL',$row['support_email']); define('WELCOME_EMAIL',$row['welcome_email']); diff --git a/upload/install/cb_v2.sql b/upload/install/cb_v2.sql index b82627c2..3830b543 100644 --- a/upload/install/cb_v2.sql +++ b/upload/install/cb_v2.sql @@ -22,15 +22,15 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; CREATE TABLE IF NOT EXISTS `{tbl_prefix}action_log` ( `action_id` int(255) NOT NULL AUTO_INCREMENT, - `action_type` varchar(60) CHARACTER SET latin1 NOT NULL, - `action_username` varchar(60) CHARACTER SET latin1 NOT NULL, + `action_type` varchar(60) CHARACTER SET utf8 NOT NULL, + `action_username` varchar(60) CHARACTER SET utf8 NOT NULL, `action_userid` int(30) NOT NULL, - `action_useremail` varchar(200) CHARACTER SET latin1 NOT NULL, + `action_useremail` varchar(200) CHARACTER SET utf8 NOT NULL, `action_userlevel` int(11) NOT NULL, - `action_ip` varchar(15) CHARACTER SET latin1 NOT NULL, + `action_ip` varchar(15) CHARACTER SET utf8 NOT NULL, `date_added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `action_success` enum('yes','no') CHARACTER SET latin1 NOT NULL, - `action_details` text CHARACTER SET latin1 NOT NULL, + `action_success` enum('yes','no') CHARACTER SET utf8 NOT NULL, + `action_details` text CHARACTER SET utf8 NOT NULL, `action_link` text NOT NULL, `action_obj_id` int(255) NOT NULL, `action_done_id` int(255) NOT NULL, @@ -186,7 +186,7 @@ INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (21, 'activation', ''), (22, 'mplayerpath', ''), (23, 'email_verification', '1'), -(24, 'allow_registeration', '1'), +(24, 'allow_registration', '1'), (25, 'php_path', '/usr/bin/local/php'), (26, 'videos_list_per_page', '30'), (27, 'channels_list_per_page', '25'), @@ -338,10 +338,10 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}contacts` ( CREATE TABLE IF NOT EXISTS `{tbl_prefix}conversion_queue` ( `cqueue_id` int(11) NOT NULL AUTO_INCREMENT, - `cqueue_name` varchar(32) CHARACTER SET latin1 NOT NULL, - `cqueue_ext` varchar(5) CHARACTER SET latin1 NOT NULL, - `cqueue_tmp_ext` varchar(3) CHARACTER SET latin1 NOT NULL, - `cqueue_conversion` enum('yes','no','p') CHARACTER SET latin1 NOT NULL DEFAULT 'no', + `cqueue_name` varchar(32) CHARACTER SET utf8 NOT NULL, + `cqueue_ext` varchar(5) CHARACTER SET utf8 NOT NULL, + `cqueue_tmp_ext` varchar(3) CHARACTER SET utf8 NOT NULL, + `cqueue_conversion` enum('yes','no','p') CHARACTER SET utf8 NOT NULL DEFAULT 'no', `date_added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `time_started` varchar(32) NOT NULL, `time_completed` varchar(32) NOT NULL, @@ -363,10 +363,10 @@ INSERT INTO `{tbl_prefix}conversion_queue` (`cqueue_id`, `cqueue_name`, `cqueue_ CREATE TABLE IF NOT EXISTS `{tbl_prefix}countries` ( `country_id` int(80) NOT NULL AUTO_INCREMENT, - `iso2` char(2) CHARACTER SET latin1 NOT NULL, - `name` varchar(80) CHARACTER SET latin1 NOT NULL, - `name_en` varchar(80) CHARACTER SET latin1 NOT NULL, - `iso3` char(3) CHARACTER SET latin1 DEFAULT NULL, + `iso2` char(2) CHARACTER SET utf8 NOT NULL, + `name` varchar(80) CHARACTER SET utf8 NOT NULL, + `name_en` varchar(80) CHARACTER SET utf8 NOT NULL, + `iso3` char(3) CHARACTER SET utf8 DEFAULT NULL, `numcode` smallint(6) DEFAULT NULL, PRIMARY KEY (`country_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=240 ; @@ -671,11 +671,11 @@ INSERT INTO `{tbl_prefix}email_settings` (`email_settings_id`, `email_settings_n CREATE TABLE IF NOT EXISTS `{tbl_prefix}email_templates` ( `email_template_id` int(11) NOT NULL AUTO_INCREMENT, - `email_template_name` varchar(225) CHARACTER SET latin1 NOT NULL, - `email_template_code` varchar(225) CHARACTER SET latin1 NOT NULL, - `email_template_subject` mediumtext CHARACTER SET latin1 NOT NULL, - `email_template` text CHARACTER SET latin1 NOT NULL, - `email_template_allowed_tags` mediumtext CHARACTER SET latin1 NOT NULL, + `email_template_name` varchar(225) CHARACTER SET utf8 NOT NULL, + `email_template_code` varchar(225) CHARACTER SET utf8 NOT NULL, + `email_template_subject` mediumtext CHARACTER SET utf8 NOT NULL, + `email_template` text CHARACTER SET utf8 NOT NULL, + `email_template_allowed_tags` mediumtext CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`email_template_id`), UNIQUE KEY `email_template_code` (`email_template_code`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=15 ; @@ -708,7 +708,7 @@ INSERT INTO `{tbl_prefix}email_templates` (`email_template_id`, `email_template_ CREATE TABLE IF NOT EXISTS `{tbl_prefix}favorites` ( `favorite_id` int(225) NOT NULL AUTO_INCREMENT, - `type` varchar(4) CHARACTER SET latin1 NOT NULL, + `type` varchar(4) CHARACTER SET utf8 NOT NULL, `id` int(225) NOT NULL, `userid` int(225) NOT NULL, `date_added` datetime NOT NULL, @@ -726,7 +726,7 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}favorites` ( CREATE TABLE IF NOT EXISTS `{tbl_prefix}flags` ( `flag_id` int(225) NOT NULL AUTO_INCREMENT, - `type` varchar(4) CHARACTER SET latin1 NOT NULL, + `type` varchar(4) CHARACTER SET utf8 NOT NULL, `id` int(225) NOT NULL, `userid` int(225) NOT NULL, `flag_type` bigint(25) NOT NULL, @@ -2165,9 +2165,9 @@ INSERT INTO `{tbl_prefix}phrases` (`id`, `lang_iso`, `varname`, `text`) VALUES CREATE TABLE IF NOT EXISTS `{tbl_prefix}playlists` ( `playlist_id` int(11) NOT NULL AUTO_INCREMENT, - `playlist_name` varchar(225) CHARACTER SET latin1 NOT NULL, + `playlist_name` varchar(225) CHARACTER SET utf8 NOT NULL, `userid` int(11) NOT NULL, - `playlist_type` varchar(10) CHARACTER SET latin1 NOT NULL, + `playlist_type` varchar(10) CHARACTER SET utf8 NOT NULL, `date_added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`playlist_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; @@ -2186,7 +2186,7 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}playlist_items` ( `playlist_item_id` int(225) NOT NULL AUTO_INCREMENT, `object_id` int(225) NOT NULL, `playlist_id` int(225) NOT NULL, - `playlist_item_type` varchar(10) CHARACTER SET latin1 NOT NULL, + `playlist_item_type` varchar(10) CHARACTER SET utf8 NOT NULL, `userid` int(255) NOT NULL, `date_added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`playlist_item_id`) @@ -2234,12 +2234,12 @@ INSERT INTO `{tbl_prefix}plugins` (`plugin_id`, `plugin_file`, `plugin_folder`, CREATE TABLE IF NOT EXISTS `{tbl_prefix}plugin_config` ( `plugin_config_id` int(223) NOT NULL AUTO_INCREMENT, - `plugin_id_code` varchar(25) CHARACTER SET latin1 NOT NULL, - `plugin_config_name` text CHARACTER SET latin1 NOT NULL, - `plugin_config_value` text CHARACTER SET latin1 NOT NULL, - `player_type` enum('built-in','plugin') CHARACTER SET latin1 NOT NULL DEFAULT 'built-in', - `player_admin_file` text CHARACTER SET latin1 NOT NULL, - `player_include_file` text CHARACTER SET latin1 NOT NULL, + `plugin_id_code` varchar(25) CHARACTER SET utf8 NOT NULL, + `plugin_config_name` text CHARACTER SET utf8 NOT NULL, + `plugin_config_value` text CHARACTER SET utf8 NOT NULL, + `player_type` enum('built-in','plugin') CHARACTER SET utf8 NOT NULL DEFAULT 'built-in', + `player_admin_file` text CHARACTER SET utf8 NOT NULL, + `player_include_file` text CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`plugin_config_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -2423,8 +2423,8 @@ INSERT INTO `{tbl_prefix}user_categories` (`category_id`, `category_name`, `cate CREATE TABLE IF NOT EXISTS `{tbl_prefix}user_levels` ( `user_level_id` int(20) NOT NULL AUTO_INCREMENT, - `user_level_active` enum('yes','no') CHARACTER SET latin1 NOT NULL DEFAULT 'yes', - `user_level_name` varchar(100) CHARACTER SET latin1 NOT NULL, + `user_level_active` enum('yes','no') CHARACTER SET utf8 NOT NULL DEFAULT 'yes', + `user_level_name` varchar(100) CHARACTER SET utf8 NOT NULL, `user_level_is_default` enum('yes','no') NOT NULL DEFAULT 'no', PRIMARY KEY (`user_level_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=17 ; @@ -2495,10 +2495,10 @@ INSERT INTO `{tbl_prefix}user_levels_permissions` (`user_level_permission_id`, ` CREATE TABLE IF NOT EXISTS `{tbl_prefix}user_permissions` ( `permission_id` int(225) NOT NULL AUTO_INCREMENT, `permission_type` int(225) NOT NULL, - `permission_name` varchar(225) CHARACTER SET latin1 NOT NULL, - `permission_code` varchar(225) CHARACTER SET latin1 NOT NULL, - `permission_desc` mediumtext CHARACTER SET latin1 NOT NULL, - `permission_default` enum('yes','no') CHARACTER SET latin1 NOT NULL DEFAULT 'yes', + `permission_name` varchar(225) CHARACTER SET utf8 NOT NULL, + `permission_code` varchar(225) CHARACTER SET utf8 NOT NULL, + `permission_desc` mediumtext CHARACTER SET utf8 NOT NULL, + `permission_default` enum('yes','no') CHARACTER SET utf8 NOT NULL DEFAULT 'yes', PRIMARY KEY (`permission_id`), UNIQUE KEY `permission_code` (`permission_code`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=34 ; @@ -2538,8 +2538,8 @@ INSERT INTO `{tbl_prefix}user_permissions` (`permission_id`, `permission_type`, CREATE TABLE IF NOT EXISTS `{tbl_prefix}user_permission_types` ( `user_permission_type_id` int(225) NOT NULL AUTO_INCREMENT, - `user_permission_type_name` varchar(225) CHARACTER SET latin1 NOT NULL, - `user_permission_type_desc` mediumtext CHARACTER SET latin1 NOT NULL, + `user_permission_type_name` varchar(225) CHARACTER SET utf8 NOT NULL, + `user_permission_type_desc` mediumtext CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`user_permission_type_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; @@ -2595,7 +2595,6 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}user_profile` ( `background` mediumtext NOT NULL, `profile_video` int(255) NOT NULL, PRIMARY KEY (`user_profile_id`), - KEY `ind_status_id` (`userid`), FULLTEXT KEY `profile_tags` (`profile_tags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; @@ -2677,7 +2676,7 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}video` ( `downloads` bigint(255) NOT NULL, `uploader_ip` varchar(20) NOT NULL, PRIMARY KEY (`videoid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=116 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Dumping data for table `{tbl_prefix}video` @@ -2736,45 +2735,45 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}video_favourites` ( CREATE TABLE IF NOT EXISTS `{tbl_prefix}video_files` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `status` int(2) NOT NULL, - `file_conversion_log` text CHARACTER SET latin1 NOT NULL, - `encoder` char(16) CHARACTER SET latin1 NOT NULL, - `command_used` text CHARACTER SET latin1 NOT NULL, - `src_path` text CHARACTER SET latin1 NOT NULL, - `src_name` char(64) CHARACTER SET latin1 NOT NULL, - `src_ext` char(8) CHARACTER SET latin1 NOT NULL, - `src_format` char(32) CHARACTER SET latin1 NOT NULL, - `src_duration` char(10) CHARACTER SET latin1 NOT NULL, - `src_size` char(10) CHARACTER SET latin1 NOT NULL, - `src_bitrate` char(6) CHARACTER SET latin1 NOT NULL, - `src_video_width` char(5) CHARACTER SET latin1 NOT NULL, - `src_video_height` char(5) CHARACTER SET latin1 NOT NULL, - `src_video_wh_ratio` char(10) CHARACTER SET latin1 NOT NULL, - `src_video_codec` char(16) CHARACTER SET latin1 NOT NULL, - `src_video_rate` char(10) CHARACTER SET latin1 NOT NULL, - `src_video_bitrate` char(10) CHARACTER SET latin1 NOT NULL, - `src_video_color` char(16) CHARACTER SET latin1 NOT NULL, - `src_audio_codec` char(16) CHARACTER SET latin1 NOT NULL, - `src_audio_bitrate` char(10) CHARACTER SET latin1 NOT NULL, - `src_audio_rate` char(10) CHARACTER SET latin1 NOT NULL, - `src_audio_channels` char(16) CHARACTER SET latin1 NOT NULL, - `output_path` text CHARACTER SET latin1 NOT NULL, - `output_format` char(32) CHARACTER SET latin1 NOT NULL, - `output_duration` char(10) CHARACTER SET latin1 NOT NULL, - `output_size` char(10) CHARACTER SET latin1 NOT NULL, - `output_bitrate` char(6) CHARACTER SET latin1 NOT NULL, - `output_video_width` char(5) CHARACTER SET latin1 NOT NULL, - `output_video_height` char(5) CHARACTER SET latin1 NOT NULL, - `output_video_wh_ratio` char(10) CHARACTER SET latin1 NOT NULL, - `output_video_codec` char(16) CHARACTER SET latin1 NOT NULL, - `output_video_rate` char(10) CHARACTER SET latin1 NOT NULL, - `output_video_bitrate` char(10) CHARACTER SET latin1 NOT NULL, - `output_video_color` char(16) CHARACTER SET latin1 NOT NULL, - `output_audio_codec` char(16) CHARACTER SET latin1 NOT NULL, - `output_audio_bitrate` char(10) CHARACTER SET latin1 NOT NULL, - `output_audio_rate` char(10) CHARACTER SET latin1 NOT NULL, - `output_audio_channels` char(16) CHARACTER SET latin1 NOT NULL, - `hd` enum('yes','no') CHARACTER SET latin1 NOT NULL DEFAULT 'no', - `hq` enum('yes','no') CHARACTER SET latin1 NOT NULL DEFAULT 'no', + `file_conversion_log` text CHARACTER SET utf8 NOT NULL, + `encoder` char(16) CHARACTER SET utf8 NOT NULL, + `command_used` text CHARACTER SET utf8 NOT NULL, + `src_path` text CHARACTER SET utf8 NOT NULL, + `src_name` char(64) CHARACTER SET utf8 NOT NULL, + `src_ext` char(8) CHARACTER SET utf8 NOT NULL, + `src_format` char(32) CHARACTER SET utf8 NOT NULL, + `src_duration` char(10) CHARACTER SET utf8 NOT NULL, + `src_size` char(10) CHARACTER SET utf8 NOT NULL, + `src_bitrate` char(6) CHARACTER SET utf8 NOT NULL, + `src_video_width` char(5) CHARACTER SET utf8 NOT NULL, + `src_video_height` char(5) CHARACTER SET utf8 NOT NULL, + `src_video_wh_ratio` char(10) CHARACTER SET utf8 NOT NULL, + `src_video_codec` char(16) CHARACTER SET utf8 NOT NULL, + `src_video_rate` char(10) CHARACTER SET utf8 NOT NULL, + `src_video_bitrate` char(10) CHARACTER SET utf8 NOT NULL, + `src_video_color` char(16) CHARACTER SET utf8 NOT NULL, + `src_audio_codec` char(16) CHARACTER SET utf8 NOT NULL, + `src_audio_bitrate` char(10) CHARACTER SET utf8 NOT NULL, + `src_audio_rate` char(10) CHARACTER SET utf8 NOT NULL, + `src_audio_channels` char(16) CHARACTER SET utf8 NOT NULL, + `output_path` text CHARACTER SET utf8 NOT NULL, + `output_format` char(32) CHARACTER SET utf8 NOT NULL, + `output_duration` char(10) CHARACTER SET utf8 NOT NULL, + `output_size` char(10) CHARACTER SET utf8 NOT NULL, + `output_bitrate` char(6) CHARACTER SET utf8 NOT NULL, + `output_video_width` char(5) CHARACTER SET utf8 NOT NULL, + `output_video_height` char(5) CHARACTER SET utf8 NOT NULL, + `output_video_wh_ratio` char(10) CHARACTER SET utf8 NOT NULL, + `output_video_codec` char(16) CHARACTER SET utf8 NOT NULL, + `output_video_rate` char(10) CHARACTER SET utf8 NOT NULL, + `output_video_bitrate` char(10) CHARACTER SET utf8 NOT NULL, + `output_video_color` char(16) CHARACTER SET utf8 NOT NULL, + `output_audio_codec` char(16) CHARACTER SET utf8 NOT NULL, + `output_audio_bitrate` char(10) CHARACTER SET utf8 NOT NULL, + `output_audio_rate` char(10) CHARACTER SET utf8 NOT NULL, + `output_audio_channels` char(16) CHARACTER SET utf8 NOT NULL, + `hd` enum('yes','no') CHARACTER SET utf8 NOT NULL DEFAULT 'no', + `hq` enum('yes','no') CHARACTER SET utf8 NOT NULL DEFAULT 'no', PRIMARY KEY (`id`), FULLTEXT KEY `src_bitrate` (`src_bitrate`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/upload/install/upgrader.php b/upload/install/upgrader.php index 26f45848..8568cc12 100644 --- a/upload/install/upgrader.php +++ b/upload/install/upgrader.php @@ -285,7 +285,7 @@ if($_POST['upgrade']) } elseif($arr == 'allow_reg') { - $db->update(tbl("config"),array("value"),array($nconfig[$arr])," name='allow_registeration'"); + $db->update(tbl("config"),array("value"),array($nconfig[$arr])," name='allow_registration'"); }elseif($arr== 'allowed_types') { $db->update(tbl("config"),array("value"),array(preg_replace("/ /",",",$nconfig[$arr]))," name='allowed_types'");