Implement filefield and og support [patch]

The file field patch isn't working properly. If an item on the remote site doesn't contain a file the patch is downloading the complete frontpage of the remote website to set in the file field.
The file table and the files directory is growing with a huge amount of temporary files.
I am working on a patch..

I have the same issue as reported in #3.

#2 Patch fixes the problem with the file not attaching properly. However, if there's no file attached then it creates a file.

miechiel, did you get anywhere with that patch by chance?

I fixed this for now by adding an extra check in the function subscribe_remap_files.

I changed the following in the subscribe.module (after patch run) On line 597 it says:

$fileurl = $subscription->base_url . '/' . $file['filepath'];
$filedata = @file_get_contents($fileurl);

Chenged this to:

fileurl = $subscription->base_url . '/' . $file['filepath'];
if($file['filepath'] != ''){
  $filedata = @file_get_contents($fileurl);
}
else {
  continue;
}

Looks okay on my environments.

Hi Miechiel, thanks for the response and shedding some light on where the problem is.

I notice with your fix above, if there's no File Attachment attached to the node on the Publishing site, it never gets sent to the Subscribing site. It only gets sent to the Subscribing site if there is an attachment. So I removed the following code above:

}
else {
  continue;
}

and wrapped that IF Statement around most of the function. So the complete function in the subscribe.module looks like:

function subscribe_remap_files($existing_files, &$incoming_files, $node, $sid) {

  // Stuff local and remote file records into array,
  // indexed by a composite portable keys, by which file equality may be considered.
  $files = array('local' => array(), 'remote' => array());

  foreach ($existing_files as $file) {
    $files['local']["$file[filename]-$file[filesize]-$file[timestamp]"] = $file;
  }

  // Take reference as we gonna modify original record
  foreach ($incoming_files as &$file) {
    $files['remote']["$file[filename]-$file[filesize]-$file[timestamp]"] =& $file;
  } 
  
  //For further processing select keys only
  $keys = array(
    'local' => array_keys($files['local']),
    'remote' => array_keys($files['remote']),
  );

  // Sort out files to take appropriate actions on them
  $new_keys = array(
    'created' => array_diff($keys['remote'], $keys['local']),
    //Just for completness - not actually needed..
    'updated' => array_intersect($keys['remote'], $keys['local']),
    'deleted' => array_diff($keys['local'], $keys['remote']),
  );

  // Collects file records ids and deletes physical files
  $deleted_ids = array();
  foreach ($new_keys['deleted'] as $key) {
    $deleted_ids[] = $files['local'][$key]['fid'];
    file_delete($files['local'][$key]['filepath']);
   }

  //$subscription = subscribe_subscription_load($sid);
  
   // Deletes logical file records all at once
  if (count($deleted_ids) > 0) {
    $ids = implode(',', $deleted_ids);
    db_query('DELETE FROM {files} WHERE fid IN (' . $ids .')');
    db_query('DELETE FROM {upload} WHERE fid IN (' . $ids . ')');
  }

  //Mark files that need to be created by a temporary flag
  foreach ($new_keys['created'] as $key) {
    $files['remote'][$key]['is_new'] = TRUE;
  }
 	  
	$fileurl = $subscription->base_url . '/' . $file['filepath'];
	if($file['filepath'] != '') {
	  $filedata = @file_get_contents($fileurl);

			   watchdog('subscribe', print_r(array(
			'KEYS' => $new_keys,
			'FILES' => $files), TRUE));
		
		  $subscription = subscribe_subscription_load($sid);
		
		  foreach ($files['remote'] as $key => & $file) {
			$newfile = FALSE;
			$is_new = $file['is_new'];
			unset($file['is_new']);
		
			if ($is_new) {
			  $fileurl = $subscription->base_url . '/' . $file['filepath'];
			  $filedata = @file_get_contents($fileurl);
		
			  if (!$filedata) {
				continue;
			  }
		
			  $newfile = file_save_data($filedata, $file['filename']);
			  unset($file['fid']);
			}
			
			//$newfile = file_save_data($filedata, $file['filename']);
			else {
			  $newfile = $files['local'][$key]['filepath'];
			  // If there's matching local file then inherit it's ID
			  $file['fid'] = $files['local'][$key]['fid'];
			}   
			
			if ($newfile) {
			  $fileinfo = pathinfo($newfile);
			  $file['filepath'] = $newfile;
			  $file['filename'] = $fileinfo['basename'];
			  $file['nid'] = $node->nid;
			  $file['vid'] = $node->vid;
			  $file['uid'] = $node->uid;
		
			  //drupal_write_record('files', $file);
			  //drupal_write_record('upload', $file);
			  $update = $is_new ? array() : array('fid');
		
			  drupal_write_record('files', $file, $update);
			  
			  if (!isset($file['filefield_upload'])) {
				drupal_write_record('upload', $file, $update);
			  }
			}
		  }
	}
}

Hopefully this helps someone in the future.