modified : issues fixed Random

upload/actions/video_convert.php

@@ -75,6 +75,12 @@
 	logData('Preparing configuration to parse in ffmpeg class','checkpoints');
 
 	$configs = array(
+		'use_video_rate' => true,
+		'use_video_bit_rate' => true,
+		'use_audio_rate' => true,
+		'use_audio_bit_rate' => true,
+		'use_audio_codec' => true,
+		'use_video_codec' => true,
 		'format' => 'mp4',
 		'video_codec'=> config('video_codec'),
 		'audio_codec'=> config('audio_codec'),
@@ -87,7 +93,8 @@
 		'high_res' => config('high_resolution'),
 		'max_video_duration' => config('max_video_duration'),
 		'resize'=>'max',
-		'outputPath' => $fileDir
+		'outputPath' => $fileDir,
+		'cb_combo_res' => config('cb_combo_res')
 	);
 
 	logData('Inlcuding FFmpeg Class','checkpoints');
@@ -95,7 +102,7 @@
 	
 	$ffmpeg = new FFMpeg($configs, $log);
 	$ffmpeg->ffmpeg($orig_file);
-	$ffmpeg->cb_combo_res = config('cb_combo_res');
+	$ffmpeg->configs = $configs;
 	$ffmpeg->res_configurations = array('gen_240'  => config('gen_240'),
 										'gen_360'  => config('gen_360'),
 										'gen_480'  => config('gen_480'),

upload/admin_area/members.php

@@ -130,6 +130,18 @@ if(isset($_POST['unban_selected'])){
 	$page = mysql_clean($_GET['page']);
 	$get_limit = create_query_limit($page,RESULTS);
 	
+	if ( isset($_GET['category']) )
+	{
+		if ( $_GET['category'][0] == 'all')
+		{
+			$cat_field = "";
+		}
+		else 
+		{
+			$cat_field = $_GET['category'];
+		}
+	}
+
 	if(isset($_GET['search']))
 	{
 		
@@ -137,7 +149,7 @@ if(isset($_POST['unban_selected'])){
 		(
 		 'userid' 	=> $_GET['userid'],
 		 'username'	=> $_GET['username'],
-		 'category' => $_GET['category'],
+		 'category' => $cat_field,
 		 'featured' => $_GET['featured'],
 		 'ban'		=> $_GET['ban'],
 		 'status'	=> $_GET['status'],
@@ -152,7 +164,7 @@ if(isset($_POST['unban_selected'])){
 	$result_array['limit'] = $get_limit;
 	if(!$array['order'])
 		$result_array['order'] = " doj DESC ";
-		
+	pr($result_array,true);
 	$users = get_users($result_array);
 
 	Assign('users', $users);	

upload/admin_area/styles/cb_2014/layout/global_header.html

@@ -93,14 +93,7 @@
 
 </script>
 <script>
-$(document).ready(function() {
+
-             $('.edit_lang').editable(baseurl+'/actions/update_phrase.php', {  alert('yu');
-            // cancel    : 'Cancel',
-            // submit    : 'OK',
-             indicator : '<img src="'+baseurl+'/images/icons/progIndicator.gif">',
-             tooltip   : 'Click to edit...',
-            });
-        });
     $(document).ready(function(){
         $(".drop").on({
             click: function(e){

upload/cb_install/modes/body.php

@@ -68,7 +68,7 @@
 <?php endif; ?>
 
     <div id="container" class="br5px">
-        <?php include($mode.'.php'); ?>
+        <?php include(__DIR__."/".$mode.'.php'); ?>
     </div>
     
 

upload/cb_install/sql/upgrade_2.7.sql

@@ -55,3 +55,22 @@ ALTER TABLE `{tbl_prefix}photos` ADD `photo_details` VARCHAR( 255 ) CHARACTER SE
 
 ALTER TABLE `{tbl_prefix}action_log` DROP `action_link`; 
 ALTER TABLE  `{tbl_prefix}video` ADD  `file_directory` VARCHAR( 10 ) NOT NULL AFTER  `file_server_path`
+
+
+
+ALTER TABLE `{tbl_prefix}video` ADD `video_files` text(33) NOT NULL;
+
+ALTER TABLE `{tbl_prefix}video` ADD `server_ip` varchar(20) NOT NULL;
+ALTER TABLE `{tbl_prefix}video` ADD `file_server_path` text NOT NULL;
+ALTER TABLE `{tbl_prefix}video` ADD `files_thumbs_path` text NOT NULL;
+
+ALTER TABLE `{tbl_prefix}video` ADD `file_thumbs_count` varchar(30) NOT NULL;
+ALTER TABLE `{tbl_prefix}video` ADD `has_hq` enum('yes','no') NOT NULL DEFAULT 'no';
+ALTER TABLE `{tbl_prefix}video` ADD `has_mobile` enum('yes','no') NOT NULL DEFAULT 'no';
+ALTER TABLE `{tbl_prefix}video` ADD `has_mobile` enum('yes','no') NOT NULL DEFAULT 'no';
+ALTER TABLE `{tbl_prefix}video` ADD `filegrp_size` varchar(30) NOT NULL;
+ALTER TABLE `{tbl_prefix}video` ADD `process_status` bigint(30) NOT NULL DEFAULT '0';
+ALTER TABLE `{tbl_prefix}video` ADD `has_hd` enum('yes','no') NOT NULL DEFAULT 'no';
+
+  
+ 

upload/includes/classes/conversion/ffmpeg.class.php

@@ -840,7 +840,7 @@ class FFMpeg{
 				$orig_file = $this->input_file;
 				
 				// setting type of conversion, fetching from configs
-				$this->resolutions = $this->cb_combo_res;
+				$this->resolutions = $this->configs['cb_combo_res'];
 
 				$res169 = $this->res169;
 				logData('CB combo reslution : '.$this->resolutions,'checkpoints');
@@ -855,7 +855,7 @@ class FFMpeg{
 						$this->configs['gen_480']  = $this->res_configurations['gen_480'];
 						$this->configs['gen_720']  = $this->res_configurations['gen_720'];
 						$this->configs['gen_1080'] = $this->res_configurations['gen_1080']; 
-						
+						logdata($this->configs,'checkpoints');
 						$this->ratio = $ratio;
 						foreach ($res169 as $value) 
 						{
@@ -867,6 +867,7 @@ class FFMpeg{
 								$more_res['video_width'] = $video_width;
 								$more_res['video_height'] = $video_height;
 								$more_res['name'] = $video_height;
+								logData("About to Call Convert() Function","checkpoints");
 								$this->convert(NULL,false,$more_res);
 							
 							}
@@ -1199,7 +1200,7 @@ class FFMpeg{
 
 		$p = $this->configs;
 		$i = $this->input_details;
-
+		logData($p,'checkpoints');
 		# Prepare the ffmpeg command to execute
 		if(isset($p['extra_options']))
 			$opt_av .= " -y {$p['extra_options']} ";
@@ -1323,8 +1324,7 @@ class FFMpeg{
 				$abrate = $i['audio_bitrate'];
 			if(!empty($abrate))
 			{
-				$abrate = min('128',$abrate);
+				$abrate_cmd = " -ab ".$abrate;
-				$abrate_cmd = " -ab ".$abrate."k";
 				$opt_av .= $abrate_cmd;
 			}
 		}
@@ -1355,6 +1355,7 @@ class FFMpeg{
 		$tmp_file = time().RandomString(5).'.tmp';
 		
 		//$opt_av .= " -map_meta_data ".$this->output_file.":".$this->input_file;
+		logData('Convert() function => setting options opt_av :'.$opt_av,'checkpoints');
 		
 		
 
@@ -2080,4 +2081,36 @@ public function regenerateThumbs($input_file,$test,$duration,$dim,$num,$rand=NUL
 			return false;
 	}
 
+	function validChannels($in)
+	{
+		if(!$in)
+			return true;
+		$in['audio_channels'] = strtolower($in['audio_channels']);
+		$channels = false;
+		if(is_numeric($in['audio_channels']))
+			$channels = $in['audio_channels'];
+		else
+		{
+			if(strstr($in['audio_channels'],'stereo'))
+				$channels = 2;
+			
+			if(strstr($in['audio_channels'],'mono'))
+				$channels = 1;
+	
+			if(!$channels)
+			{
+				preg_match('/([0-9.]+)/',$in['audio_channels'],$matches);
+				if($matches)
+					$channels = $matches[1];
+			}
+		}
+		
+		if(!$channels)
+			return true;
+		elseif($channels>2)
+			return false;
+		else
+			return true;
+	}
+
 }

upload/includes/classes/user.class.php

@@ -3493,9 +3493,9 @@ class userquery extends CBCategory{
 								 'type'=> 'dropdown',
 								 'name'=> 'category',
 								 'id'=> 'category',
-								 'value'=> array('category', isset($default['category'])),
+								 'value'=> array('category', $default['category']),
 								 'db_field'=>'category',
-								 'checked'=> isset($default['category']),
+								 'checked'=> $default['category'],
 								 'required'=>'yes',
 								 'invalid_err'=>lang("Please select your category"),
 								 'display_function' => 'convert_to_categories',

upload/includes/functions_user.php

@@ -56,13 +56,16 @@ function profile_fileds_check($array)
             $post_clean = false;
         }
 
-        if (!empty($array['profile_tags']) && preg_match('/[0-9]+/', $array['profile_tags']) || !strpos($array['profile_tags'], ','))
+        if (!empty($array['profile_tags']))
         {
-            e('Invalid tags. Kindly review!');
+            if (preg_match('/[0-9]+/', $array['profile_tags']) || !strpos($array['profile_tags'], ','))
-            $post_clean = false;
+            {
+                 e('Invalid tags. Kindly review!');
+                $post_clean = false;
+            }
         }
 
-        if (!filter_var($array['web_url'], FILTER_VALIDATE_URL))
+        if (!empty($array['web_url']) && !filter_var($array['web_url'], FILTER_VALIDATE_URL))
         {   
             e('Invalid URL provided.');
             $post_clean = false;

upload/styles/cb_27/layout/edit_account.html

@@ -55,13 +55,14 @@
                                   </button>
                               </div>
                           </div>
-                          </form>
+                          
                   </div>
                   <div id="asettings" class="tab-pane {if $mode=='account_settings'}active{/if}">
-                      <form method="post" class="accountForm">
+                    
                       <div  class="accountSettings col-md-6">
                           <!--- CHANGING USER ACCOUNT AND PROFILE -->
                           {$signup_fields = $userquery->load_signup_fields($user)}
+
                           {$cust_signup_fields = $userquery->load_custom_signup_fields($user,false,true)}
                           <legend>{lang code='account_details'}</legend>
                           <div class="form-group">
@@ -85,14 +86,14 @@
                               </label>
                           </div>
                           <div class="form-group">
-                              <label for="category">{lang code='account_details'}</label>
+                              <label for="category">{lang code='Category'}</label>
                               {ANCHOR place=$signup_fields.cat.anchor_before}
                               {$signup_fields.cat.class='form-control'}
                               {$formObj->createField($signup_fields.cat)}
                               {ANCHOR place=$signup_fields.cat.anchor_after}
 
 
-                                                  </div>
+                          </div>
                           <div class="form-group">
                               <label for="dob">{lang code='user_date_of_birth'}</label>
                               {ANCHOR place=$signup_fields.dob.anchor_before}