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

catche edge case of tag "@abcdef +1", which tags the first entry in your abook, regardless of abcdef. This holds true for other similar patterns as well.

Browse Source
This commit is contained in:
friendica 2015-03-24 02:36:45 -07:00
parent 37f0bd6c9d
commit c024668cf2
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/diaspora.php
View File

@ -843,7 +843,7 @@ function diaspora_post($importer,$xml,$msg) {
// Look for tags and linkify them // Look for tags and linkify them
$results = linkify_tags(get_app(), $body, $importer['channel_id']); $results = linkify_tags(get_app(), $body, $importer['channel_id'], true);
$datarray['term'] = array(); $datarray['term'] = array();
@ -1062,7 +1062,7 @@ function diaspora_reshare($importer,$xml,$msg) {
$datarray = array(); $datarray = array();
// Look for tags and linkify them // Look for tags and linkify them
$results = linkify_tags(get_app(), $body, $importer['channel_id']); $results = linkify_tags(get_app(), $body, $importer['channel_id'], true);
$datarray['term'] = array(); $datarray['term'] = array();
@ -1397,7 +1397,7 @@ function diaspora_comment($importer,$xml,$msg) {
$datarray = array(); $datarray = array();
// Look for tags and linkify them // Look for tags and linkify them
$results = linkify_tags(get_app(), $body, $importer['channel_id']); $results = linkify_tags(get_app(), $body, $importer['channel_id'], true);
$datarray['term'] = array(); $datarray['term'] = array();

21
include/text.php
View File

@ -2105,7 +2105,7 @@ function extra_query_args() {
* *
* @return boolean true if replaced, false if not replaced * @return boolean true if replaced, false if not replaced
*/ */
function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $diaspora = false) {
$replaced = false; $replaced = false;
$r = null; $r = null;
@ -2173,7 +2173,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
if(strpos($tag,'@') === 0) { if(strpos($tag,'@') === 0) {
// The @! tag will alter permissions // The @! tag will alter permissions
$exclusive = ((strpos($tag,'!') === 1) ? true : false); $exclusive = ((strpos($tag,'!') === 1 && (! $diaspora)) ? true : false);
//is it already replaced? //is it already replaced?
if(strpos($tag,'[zrl=')) if(strpos($tag,'[zrl='))
@ -2202,10 +2202,19 @@ 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 or the first chars of xchan_hash // of the form something+nnn where nnn is an abook_id or the first chars of xchan_hash
if(strrpos($newname,'+')) {
// If there's a +nnn in the string make sure there isn't a space preceding it
$t1 = strpos($newname,' ');
$t2 = strrpos($newname,'+');
if($t1 && $t2 && $t1 < $t2)
$t2 = 0;
if(($t2) && (! $diaspora)) {
//get the id //get the id
$tagcid = substr($newname,strrpos($newname,'+') + 1); $tagcid = substr($newname,$t2 + 1);
if(strrpos($tagcid,' ')) if(strrpos($tagcid,' '))
$tagcid = substr($tagcid,0,strrpos($tagcid,' ')); $tagcid = substr($tagcid,0,strrpos($tagcid,' '));
@ -2350,7 +2359,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]); return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]);
} }
function linkify_tags($a, &$body, $uid) { function linkify_tags($a, &$body, $uid, $diaspora = false) {
$str_tags = ''; $str_tags = '';
$tagged = array(); $tagged = array();
$results = array(); $results = array();
@ -2374,7 +2383,7 @@ function linkify_tags($a, &$body, $uid) {
if($fullnametagged) if($fullnametagged)
continue; continue;
$success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : $a->profile_uid , $tag); $success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : $a->profile_uid , $tag, $diaspora);
$results[] = array('success' => $success, 'access_tag' => $access_tag); $results[] = array('success' => $success, 'access_tag' => $access_tag);
if($success['replaced']) $tagged[] = $tag; if($success['replaced']) $tagged[] = $tag;
} }

2
version.inc
View File

@ -1 +1 @@
2015-03-23.980 2015-03-24.981