diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-08-17 22:23:23 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-17 22:23:23 -0700 |
commit | 9763c46b7eebe4ab537e5499e34a0d92618fb029 (patch) | |
tree | 2ddaa18018eb9e7a452df7080a4fcfdfddc27558 /mod | |
parent | abe362bdd442739580d065b0b66300522cfab316 (diff) | |
parent | f6823259241484a761bc7e69ce44db281a6cb825 (diff) | |
download | volse-hubzilla-9763c46b7eebe4ab537e5499e34a0d92618fb029.tar.gz volse-hubzilla-9763c46b7eebe4ab537e5499e34a0d92618fb029.tar.bz2 volse-hubzilla-9763c46b7eebe4ab537e5499e34a0d92618fb029.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
Diffstat (limited to 'mod')
-rw-r--r-- | mod/uexport.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/uexport.php b/mod/uexport.php index 8217a17c4..a1fa31cfe 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -13,11 +13,15 @@ function uexport_init(&$a) { $year = intval(argv(1)); } + if(argc() > 2 && intval(argv(2)) > 1 && intval(argv(2)) <= 12) { + $month = intval(argv(2)); + } + header('content-type: application/octet_stream'); header('content-disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . '.json"' ); if($year) { - echo json_encode(identity_export_year(local_channel(),$year)); + echo json_encode(identity_export_year(local_channel(),$year,$month)); killme(); } |