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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
git-marijus 2017-08-28 23:45:03 +02:00
commit 8517e7e798
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Zotlabs/Lib/ActivityStreams.php
View File

@ -14,6 +14,8 @@ class ActivityStreams {
public $origin = null;
public $owner = null;
public $recips = null;
function __construct($string) {
$this->data = json_decode($string,true);
@ -28,7 +30,7 @@ class ActivityStreams {
$this->obj = $this->get_compound_property('object');
$this->tgt = $this->get_compound_property('target');
$this->origin = $this->get_compound_property('origin');
$this->owner = $this->get_compound_property('owner','','http://purl.org/zot/protocol');
$this->recips = $this->collect_recips();
if(($this->type === 'Note') && (! $this->obj)) {
$this->obj = $this->data;
@ -41,6 +43,45 @@ class ActivityStreams {
return $this->valid;
}
function collect_recips($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
$x = [];
$fields = [ 'to','cc','bto','bcc','audience'];
foreach($fields as $f) {
$y = $this->get_compound_property($f,$base,$namespace);
if($y)
$x = array_merge($x,$y);
}
// not yet ready for prime time
// $x = $this->expand($x,$base,$namespace);
return $x;
}
function expand($arr,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
$ret = [];
// right now use a hardwired recursion depth of 5
for($z = 0; $z < 5; $z ++) {
if(is_array($arr) && $arr) {
foreach($arr as $a) {
if(is_array($a)) {
$ret[] = $a;
}
else {
$x = $this->get_compound_property($a,$base,$namespace);
if($x) {
$ret = array_merge($ret,$x);
}
}
}
}
}
// @fixme de-duplicate
return $ret;
}
function get_namespace($base,$namespace) {
$key = null;

2
Zotlabs/Widget/Categories.php
View File

@ -19,7 +19,7 @@ class Categories {
}
$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
$srchurl = \App::$query_string;
$srchurl = (($cards) ? \App::$argv[0] . '/' . \App::$argv[1] : \App::$query_string);
$srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);

4
view/js/main.js
View File

@ -1128,8 +1128,10 @@ function post_comment(id) {
$("#comment-edit-wrapper-" + id).hide();
$("#comment-edit-text-" + id).val('');
var tarea = document.getElementById("comment-edit-text-" + id);
if(tarea)
if(tarea) {
commentClose(tarea, id);
$(document).unbind( "click.commentOpen");
}
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,1500);
}