Fixed : Conversion process

upload/actions/send_subscription_email.php

@@ -17,11 +17,11 @@
  if($video)
  {
 	 
-	 if(
+    if(
-	 ($video['broadcast']=='public' || $video['broadcast'] =="logged")
+    ($video['broadcast']=='public' || $video['broadcast'] =="logged")
-	 && $video['subscription_email']=='pending')
+    && $video['subscription_email']=='pending')
-	
+
-	 $userquery->sendSubscriptionEmail($video,true);
+    $userquery->sendSubscriptionEmail($video,true);
  }
 
 ?>

upload/actions/video_convert.php

@@ -188,16 +188,17 @@ if ($process_running <= $max_processes && $queued_files)
                     break;
                 }
             }
-
+            
+            $file_name = $queue['queue_name'];
+            
+            if($file_name)
+                exec(php_path() . " -q " . BASEDIR . "/actions/verify_videos.php $file_name &> /dev/null &");
+            
+            
             if (!$convert)
             {
                 $cbupload->update_queue_status($queue, 's', 'File removed from queue');
             }
-            
-            
-            $file_name = $queue['queue_name'];
-            if($file_name)
-                exec(php_path() . " -q " . BASEDIR . "/actions/verify_videos.php $file_name &> /dev/null &");
         }
 
         break;

upload/cb_install/sql/upgrade_3.0.sql

@@ -193,5 +193,7 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}notifications` (
 --12-18-2012 @author : Fawaz
 ALTER TABLE  `{tbl_prefix}photos` ADD  `file_directory` VARCHAR( 25 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER  `view_exif`
 
---12-20-2012 @author : Arslan
+--12-20-2012 @author : Arslan [Cancelled]
-ALTER TABLE  `{tbl_prefix}video` ADD  `emails_sent` ENUM(  'yes',  'no' ) NOT NULL DEFAULT  'no';
+--ALTER TABLE  `{tbl_prefix}video` ADD  `emails_sent` ENUM(  'yes',  'no' ) NOT NULL DEFAULT  'no';
+
+ALTER TABLE  `{tbl_prefix}conversion_queue` ADD  `active` ENUM(  'yes',  'no' ) NOT NULL DEFAULT  'yes' AFTER  `status`;

upload/includes/classes/upload.class.php

@@ -1313,6 +1313,17 @@ class Upload {
         else
             return false;
     }
+    
+    
+    /**
+     * deactivate a queue
+     */
+    function deactivate_queue($filename)
+    {
+        db_update(tbl('conversion_queue'),array(
+            'active'    => 'no'
+        )," queue_name='$filename' ");
+    }
 
 }
 

upload/includes/functions_videos.php

@@ -599,27 +599,46 @@ function get_queued_video($update = TRUE) {
 /**
  * Function used to get video being processed
  */
-function get_video_being_processed($filename = NULL) 
+function get_video_being_processed($filename = NULL,$active='yes') 
 {
     global $db;
     
-    $query = "SELECT * FROM ".tbl('conversion_queue');
+    $ct = tbl('conversion_queue');
-    $query .= "LEFT JOIN ".tbl('video')." ON ";
+    $vt = tbl("video");
-    $query .= tbl("video.file_name")."=".tbl('conversion_queue.queue_name');
+    
+    $fields = $ct.'.*,'.$ct.'.status AS queue_status';
+    $fields .= ",".$vt.".*";
+    
+    $query = "SELECT $fields FROM ".$ct;
+    $query .= " LEFT JOIN ".$vt." ON ";
+    $query .= $vt.".file_name=".$ct.".queue_name";
+    
+    start_where();
     
     if($filename)
-    $query .= " WHERE queue_name='$filename' ";
+        add_where(" queue_name='$filename'  ");
+    
+    if($active)
+        add_where($ct.".active='$active'  ");
+    
+    if(get_where())
+    $query .= " WHERE ".get_where();
+    
     
     $results = db_select($query);
     
-    $queues = array();
+    end_where();
     
+    $queues = array();
+    if($results)
     foreach($results as $queue)
     {
         //Get Files of the qeueue...
         $queue['files'] = get_video_files($filename);
         $queues[] = $queue;
     }
+    
+    return $queues;
 }
 
 
@@ -742,6 +761,7 @@ function get_hq_video_file($vdetails, $return_default = true) {
 /**
  * Function used to update processed video
  * @param Files details
+ * @deprecated 2012 3.0
  */
 function update_processed_video($file_array, $status = 'Successful', $ingore_file_status = false, $failed_status = '') {
     global $db;
@@ -778,6 +798,16 @@ function update_processed_video($file_array, $status = 'Successful', $ingore_fil
     }
 }
 
+function update_video_status($file_name,$status,$reason=NULL)
+{
+    db_update(tbl('video'),array(
+        'status'    => $status,
+        'failed_reason' => $reason
+    )," file_name='$file_name' ");
+    
+    return true;
+}
+
 /**
  * This function will activate the video if file exists
  */
@@ -1213,4 +1243,19 @@ function get_size_by_name($name)
     
     
     return $sizes[$name];
+}
+
+
+/**
+ * function used to update specific field of the vide
+ * @param INT videoid
+ * @param STRING fieldname
+ * @param STRING value
+ * 
+ * @return TRUE
+ */
+function update_video_data($vid,$field,$val)
+{
+    $vid = mysql_clean($vid);
+    db_update(tbl('video'),array($field=>$val),"videoid='$vid' ");
 }