harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/identity.php
This commit is contained in:
redmatrix
2015-08-17 22:23:23 -07:00
parent abe362bdd4 f682325924
commit 9763c46b7e
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/identity.php
View File

@@ -604,15 +604,27 @@ function identity_basic_export($channel_id, $items = false) {
}
function identity_export_year($channel_id,$year) {
function identity_export_year($channel_id,$year,$month = 0) {
if(! $year)
return array();
if($month && $month <= 12) {
$target_month = sprintf('%02d',$month);
$target_month_plus = sprintf('%02d',$month+1);
}
else
$target_month = '01';
$ret = array();
$mindate = datetime_convert('UTC','UTC',$year . '-01-01 00:00:00');
$mindate = datetime_convert('UTC','UTC',$year . '-' . $target_month . '-01 00:00:00');
if($month && $month < 12)
$maxdate = datetime_convert('UTC','UTC',$year . '-' . $target_month_plus . '-01 00:00:00');
else
$maxdate = datetime_convert('UTC','UTC',$year+1 . '-01-01 00:00:00');
$r = q("select * from item where item_wall = 1 and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s' ",
$r = q("select * from item where item_wall = 1 and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s' order by created",
intval($channel_id),
dbesc($mindate),
dbesc($maxdate)

6
mod/uexport.php
View File

@@ -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();
}