diff options
| author | Mario <mario@mariovavti.com> | 2018-01-09 09:00:20 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-01-09 09:00:20 +0100 |
| commit | 4f4d0e416eac87121898b8a27b1afa6065ff17a2 (patch) | |
| tree | aae7f2582b2b9c6596dcbf87c06a836434140830 /include/api_zot.php | |
| parent | 22c89b6c660e185d5c5c6362acf23b145d932d15 (diff) | |
| parent | 8fde0f01b8472082158b38386046ed606bcfbc49 (diff) | |
| download | volse-hubzilla-3.0.tar.gz volse-hubzilla-3.0.tar.bz2 volse-hubzilla-3.0.zip | |
Merge branch '3.0RC'3.0
Diffstat (limited to 'include/api_zot.php')
| -rw-r--r-- | include/api_zot.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/api_zot.php b/include/api_zot.php index aaa9ee497..54f905b4c 100644 --- a/include/api_zot.php +++ b/include/api_zot.php @@ -150,7 +150,11 @@ $start = ((array_key_exists('start',$_REQUEST)) ? intval($_REQUEST['start']) : 0); $records = ((array_key_exists('records',$_REQUEST)) ? intval($_REQUEST['records']) : 0); - $x = attach_list_files(api_user(),get_observer_hash(),$hash,$filename,$filetype,'created asc',$start,$records); + $since = ((array_key_exists('since',$_REQUEST)) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['since']) : NULL_DATE); + $until = ((array_key_exists('until',$_REQUEST)) ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['until']) : datetime_convert()); + + $x = attach_list_files(api_user(),get_observer_hash(),$hash,$filename,$filetype,'created asc',$start,$records, $since, $until); + if($start || $records) { $x['start'] = $start; $x['records'] = count($x['results']); @@ -226,7 +230,10 @@ if(! $_REQUEST['file_id']) return false; - $ret = attach_export_data(api_user(),$_REQUEST['file_id']); + $channel = channelx_by_n(api_user()); + + $ret = attach_export_data($channel,$_REQUEST['file_id']); + if($ret) { json_return_and_die($ret); } |