Subversion Repositories cheapmusic

Rev

Rev 18 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 18 Rev 44
Line 11... Line 11...
11 
        }
 11 
        }
12 
    }
 12 
    }
13 
 
 13 
 
14 
}
 14 
}
15 
 
 15 
 
16 
function fputcsv2 ($fh, array $fields, $delimiter = ',', $enclosure = '"', $mysql_null = false) {
 16 
function fputcsv2 ($fh, array $fields, $delimiter = ',', $enclosure = '"', $mysql_null = true) {
17 
    $delimiter_esc = preg_quote($delimiter, '/');
 17 
    $delimiter_esc = preg_quote($delimiter, '/');
18 
    $enclosure_esc = preg_quote($enclosure, '/');
 18 
    $enclosure_esc = preg_quote($enclosure, '/');
19 
 
 19 
 
20 
    $output = array();
 20 
    $output = array();
21 
    foreach ($fields as $field) {
 21 
    foreach ($fields as $field) {
22 
        if ($field === null && $mysql_null) {
 22 
        if (($field === null || empty($field)) && $mysql_null) {
23 
            $output[] = 'NULL';
 23 
            $output[] = 'NULL';
24 
            continue;
 24 
            continue;
25 
        }
 25 
        }
26 
 
 26 
 
27 
        $output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field) ? (
 27 
        $output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field) ? (