diff options
| author | Juuso Lapinlampi <wub@partyvan.eu> | 2015-10-27 15:07:24 +0100 |
|---|---|---|
| committer | Juuso Lapinlampi <wub@partyvan.eu> | 2015-10-27 15:07:24 +0100 |
| commit | 73fbb9741df30e3a3a6b93bc7d07cd776643ccdd (patch) | |
| tree | 5d2c0268bd31862d687a904128a38d3fe4857ea8 /static | |
| parent | f6579d0716fc05901d95d4247e0f5c0364ab3d38 (diff) | |
| parent | 363f107191c2a2042a38b0f36026eb21282e6044 (diff) | |
Merge branch 'validate-csv' into refactor-response-api
Validate CSV responses by wrapping them in double quotes and using CRLF
linebreaks.
CRLF linebreaks are used to conform RFC 4180. Double quotes can be
useful to avoid subtle bugs and validation errors.
This code is ugly. For future improvement, something like arrays could
be used or dropping support for CSV API completely.
Vague OKs from ewhal@, luminarys@
Diffstat (limited to 'static')
| -rwxr-xr-x | static/classes/Response.class.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index a4e19b5..3518133 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -111,17 +111,17 @@ class Response private static function csv_error($description) { - return "error\n".$description."\n"; + return '"error"'."\r\n"."\"$description\""."\r\n"; } private static function csv_success($files) { - $result = "name,url,hash,size\n"; + $result = '"name","url","hash","size"'."\r\n"; foreach ($files as $file) { - $result .= $file['name'].','. - $file['url'].','. - $file['hash'].','. - $file['size']."\n"; + $result .= '"'.$file['name'].'"'.','. + '"'.$file['url'].'"'.','. + '"'.$file['hash'].'"'.','. + '"'.$file['size'].'"'."\r\n"; } return $result; |
