Import/export issues

First, here is the code for a simple filter I have exported:

$filter = array(
  'fid' => _customfilter_map_filter_id('4'),
  'name' => base64_decode('RmlsdGVyICM0'),
  'cache' => 1,
  'description' => base64_decode(''),
  'shorttips' => base64_decode(''),
  'longtips' => base64_decode(''),
);

$rules[] = array(
  'rid' => _customfilter_map_rule_id('5'),
  'fid' => _customfilter_map_filter_id('4'),
  'prid' => _customfilter_map_rule_id('0'),
  'name' => base64_decode('JDE='),
  'description' => base64_decode(''),
  'matches' => base64_decode('MQ=='),
  'pattern' => base64_decode('L3JlZ2V4L2k='),
  'replacement' => base64_decode('UmVndWxhciBFeHByZXNzaW9ucw=='),
  'code' => 0,
  'weight' => 0,
);

The error message from line 93 occurs, because preg_match_all misses the $matches parameter. Here is a fix (see patch attached).

          '#rows' => max(40, preg_match_all('/(\r\n?|\n)/', $export_data, $matches)),

But this does not affect the generated export. It seems to be okay. The import fails, because the imported textarea is always empty. In customfilter.import.inc (line 29) the form parameter '#value' is set to an empty string. This should be '#default_value' (see patch).

If you have an empty database the import now works. But there is another problem if there are already some filters there. In this case the functions _customfilter_map_filter_id and _customfilter_map_rule_id don't work correct. I think because

  if (isset($fids[$id])) {
    $fids[$id] = (integer) db_result(db_query("SELECT MAX(fid) FROM {customfilter_filters}")) + 1;
  }

should have a NOT-Operator:

  if (!isset($fids[$id])) {
    $fids[$id] = (integer) db_result(db_query("SELECT MAX(fid) FROM {customfilter_filters}")) + 1;
  }

Then there is at least a problem with the 'prid'. I think it should not be mapped. In my case the prid was '0' before the export and '5' after the import. This leads to a filter without rules. Correcting this to '0' helped.

Maybe you can have a quick look at the patches.