Merge branch 'dev' into sabre32

This commit is contained in:
Mario Vavti 2016-06-29 09:11:22 +02:00
commit 3102440d40
3 changed files with 43 additions and 2 deletions

View File

@ -64,9 +64,9 @@ class SuperCurl {
$this->auth = $v;
break;
case 'magicauth':
// currently experimental
$this->magicauth = $v;
\Zotlabs\Daemon\Master::Summon([ 'CurlAuth', $v ]);
sleep(2);
break;
case 'custom':
$this->request_method = $v;

View File

@ -10,8 +10,11 @@ class Viewconnections extends \Zotlabs\Web\Controller {
if(observer_prohibited()) {
return;
}
if(argc() > 1)
if(argc() > 1) {
profile_load(argv(1));
}
}
function get() {

View File

@ -747,6 +747,44 @@ function identity_export_year($channel_id,$year,$month = 0) {
return $ret;
}
// export items within an arbitrary date range. Date/time is in UTC.
function channel_export_items($channel_id,$start,$finish) {
if(! $start)
return array();
else
$start = datetime_convert('UTC','UTC',$start);
$finish = datetime_convert('UTC','UTC',(($finish) ? $finish : 'now'));
if($finish < $start)
return array();
$ret = array();
$ch = channelx_by_n($channel_id);
if($ch) {
$ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
}
$r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s' and resource_type = '' order by created",
intval(ITEM_TYPE_POST),
intval($channel_id),
dbesc($start),
dbesc($finish)
);
if($r) {
$ret['item'] = array();
xchan_query($r);
$r = fetch_post_tags($r,true);
foreach($r as $rr)
$ret['item'][] = encode_item($rr,true);
}
return $ret;
}
/**
* @brief Loads a profile into the App structure.