# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
710,719d709
<     $cck_original_video_field = content_fields(flashvideo_variable_get($node_type, 'cck_original_video_field', ''), $node_type);
<     $cck_finished_video_field = content_fields(flashvideo_variable_get($node_type, 'cck_finished_video_field', ''), $node_type);
<     $cck_finished_thumbnail_field = content_fields(flashvideo_variable_get($node_type, 'cck_finished_thumbnail_field', ''), $node_type);
<     // Ask CCK for db info about the fields (table names and column info)
<     $cck_original_video_field_db_info = content_database_info($cck_original_video_field);
<     $cck_finished_video_field_db_info = content_database_info($cck_finished_video_field);
<     $cck_finished_thumbnail_field_db_info = content_database_info($cck_finished_thumbnail_field);
< 
<     db_query("UPDATE {". $cck_finished_video_field_db_info['table'] ."} SET ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_finished_video_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $newfile->fid, $newfile->nid);
< 
782d771
<             db_query("UPDATE {". $cck_original_video_field_db_info['table'] ."} SET ". $cck_original_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_original_video_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $newfile->fid, $newfile->nid);
825c814
<               db_query("UPDATE {". $cck_original_video_field_db_info['table'] ."} SET ". $cck_original_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_original_video_field_db_info['columns']['list']['column'] ." = NULL WHERE nid = %d", $newfile->fid, $oldfile->nid);
---
>               db_query("UPDATE {". $cck_original_video_field_db_info['table'] ."} SET ". $cck_original_video_field_db_info['columns']['fid']['column'] ." = NULL, ". $cck_original_video_field_db_info['columns']['list']['column'] ." = NULL WHERE nid = %d", $oldfile->nid);
1172c1161
<           $original_path .= '/' . basename($file->filepath);
---
>           $original_path .= '/'. basename($file->filepath);
1562a1552,1553
>     // If they removed at least one file from the node...
>     if (count($node->$cck_original_video_field['field_name']) < count($node->$cck_finished_video_field['field_name'])) {
1564,1569d1554
<     foreach($node->$cck_finished_video_field['field_name'] as $fv) {
<       if(isset($fv['filefield_remove']) && !empty($fv[filename])) {
<         //file_delete($fv['filepath']);
<         db_query("UPDATE {". $cck_original_video_field_db_info['table'] ."} SET ". $cck_original_video_field_db_info['columns']['fid']['column'] ." = NULL, ". $cck_original_video_field_db_info['columns']['list']['column'] ." = NULL, ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." = NULL, ". $cck_finished_video_field_db_info['columns']['list']['column'] ." = NULL, ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." = NULL, ". $cck_finished_thumbnail_field_db_info['columns']['list']['column'] ." = NULL WHERE nid = %d", $node->nid);
<       }
<     }
1601a1587
>     }
1603c1589
<     if (!empty($node->$cck_original_video_field['field_name'])) {
---
>     elseif (!empty($node->$cck_original_video_field['field_name'])) {
1615,1635d1600
<           /*
<            * If they want to remove a file and upload a new one
<            */
<           if(isset($node->$cck_finished_video_field['field_name']) && sizeof($node->$cck_finished_video_field['field_name']) == 1){
<             $file_finished = $node->$cck_finished_video_field['field_name'];
<             $file_finished = (object)$file_finished[0];
<           }
<           if(isset($node->$cck_finished_thumbnail_field['field_name']) && sizeof($node->$cck_finished_thumbnail_field['field_name']) == 1){
<             $file_thumb = $node->$cck_finished_thumbnail_field['field_name'];
<             $file_thumb = (object)$file_thumb[0];
<           }
<           //Look if the file in filefield is a new one
<           if($file->fid > $file_finished->fid && $file->fid > $file_thumb->fid){
<             
<             _flashvideo_file_delete_by_id($file_finished->fid);
<             _flashvideo_file_delete_by_id($file_thumb->fid);
<             $result = db_fetch_object(db_query('SELECT oid FROM {flashvideo} WHERE fid = %d',$file_finished->fid));
<             //unpublish the node
<             db_query('UPDATE {node} SET status = 0 WHERE nid = %d',$node->nid);
<             db_query('DELETE FROM {flashvideo} WHERE oid = %d',$result->oid);
<           }
1643c1608
<             $video_index = (!empty($node->$cck_finished_video_field['field_name']) && is_array($node->$cck_finished_video_field['field_name'])) ? count($node->$cck_finished_video_field['field_name']) - 1 : $video_index;
---
>             $video_index = (!empty($cck_finished_video_field['field_name']) && is_array($cck_finished_video_field['field_name'])) ? count($cck_finished_video_field['field_name']) - 1 : $video_index;
1726,1755d1690
<  * Deletes a file by its id
<  * @param $fid
<  * @return Array of two boolean values.
<  * <ul>
<  *  <li>first boolean tells, if file could be deleted from database</li>
<  *  <li>second boolean tells, if file could be deleted from file system</li>
<  * </ul>
<  * 
<  * 
<  */
< 
< function _flashvideo_file_delete_by_id($fid){
<   $ret = array(TRUE,TRUE);
<   
<   $result = db_query("SELECT * FROM {files} WHERE fid = %d",$fid);
<   if(db_affected_rows() == 0){
<     return array(FALSE,FALSE);
<   }
<   
<   $file=db_fetch_object($result);
<   $ret[1] = file_delete($file->filepath);
<   
<   $result = db_query("DELETE FROM {files} WHERE fid = %d",$fid);
<   if(!$result){
<     $ret[0] = FALSE;
<   }
<   return $ret;
< }
< 
< /**