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

tag anyone

Browse Source
This commit is contained in:
friendica 2014-04-15 18:35:22 -07:00
parent 9026ea649a
commit 1eb8e570bf
4 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/notifier.php
View File

@ -265,23 +265,9 @@ function notifier_run($argv, $argc){
if($target_item['item_restrict'] & ITEM_DELETED) if($target_item['item_restrict'] & ITEM_DELETED)
logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG); logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
if($target_item['item_restrict'] & ITEM_DELAYED_PUBLISH) { $unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL;
logger('notifier: target item ITEM_DELAYED_PUBLISH', LOGGER_DEBUG); if($target_item['item_restrict'] & $unforwardable) {
return; logger('notifier: target item not forwardable: flags ' . $target_item['item_restrict'], LOGGER_DEBUG);
}
if($target_item['item_restrict'] & ITEM_WEBPAGE) {
logger('notifier: target item ITEM_WEBPAGE', LOGGER_DEBUG);
return;
}
if($target_item['item_restrict'] & ITEM_BUILDBLOCK) {
logger('notifier: target item ITEM_BUILDBLOCK', LOGGER_DEBUG);
return;
}
if($target_item['item_restrict'] & ITEM_PDL) {
logger('notifier: target item ITEM_PDL', LOGGER_DEBUG);
return; return;
} }

21
mod/acl.php
View File

@ -55,6 +55,17 @@ function acl_init(&$a){
intval(XCHAN_FLAGS_DELETED) intval(XCHAN_FLAGS_DELETED)
); );
$contact_count = (int)$r[0]['c']; $contact_count = (int)$r[0]['c'];
if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_user(),'system','taganyone'))) {
if(((! $r) || (! $r[0]['total'])) && $type == 'c') {
$r = q("SELECT COUNT(xchan_hash) AS c FROM xchan
WHERE not (xchan_flags & %d ) $sql_extra2" ,
intval(XCHAN_FLAGS_DELETED)
);
$contact_count = (int)$r[0]['c'];
}
}
} }
elseif ($type == 'm') { elseif ($type == 'm') {
@ -134,7 +145,15 @@ function acl_init(&$a){
intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED),
intval(XCHAN_FLAGS_DELETED) intval(XCHAN_FLAGS_DELETED)
); );
if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_user(),'system','taganyone'))) {
if((! $r) && $type == 'c') {
$r = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags
FROM xchan
WHERE not (xchan_flags & %d ) $sql_extra2 order by xchan_name asc" ,
intval(XCHAN_FLAGS_DELETED)
);
}
}
} }
elseif($type == 'm') { elseif($type == 'm') {

21
mod/item.php
View File

@ -981,24 +981,37 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
} }
// Here we're looking for an address book entry as provided by the auto-completer // Here we're looking for an address book entry as provided by the auto-completer
// of the form something+nnn where nnn is an abook_id // of the form something+nnn where nnn is an abook_id or the first chars of xchan_hash
if(strrpos($newname,'+')) { if(strrpos($newname,'+')) {
//get the id //get the id
$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
if(strrpos($tagcid,' '))
$tagcid = substr($tagcid,0,strrpos($tagcid,' '));
$tagcid = substr($newname,strrpos($newname,'+') + 1);
if(strlen($tagcid) < 16)
$abook_id = intval($tagcid);
//remove the next word from tag's name //remove the next word from tag's name
if(strpos($name,' ')) { if(strpos($name,' ')) {
$name = substr($name,0,strpos($name,' ')); $name = substr($name,0,strpos($name,' '));
} }
if($tagcid) { // if there was an id if($abook_id) { // if there was an id
// select channel with that id from the logged in user's address book // select channel with that id from the logged in user's address book
$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_id = %d AND abook_channel = %d LIMIT 1", WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
intval($tagcid), intval($abook_id),
intval($profile_uid) intval($profile_uid)
); );
} }
else {
$r = q("SELECT * FROM xchan
WHERE xchan_hash like '%s%%' LIMIT 1",
dbesc($tagcid)
);
}
} }
if(! $r) { if(! $r) {

2
version.inc
View File

@ -1 +1 @@
2014-04-14.646 2014-04-15.647