friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum)

Browse source
This commit is contained in:
Domovoy 2012-08-24 05:11:39 +02:00
parent 5cd1dde59b
commit 9390eda5e6
2 changed files with 0 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/conversation.php
View file

@ -490,42 +490,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$owner_url = zrl($owner_url);
}
}
if($commentww != 'ww') {
// Fallback, check if can find a @ tag
$tags = $item['tag'];
if(strpos($tags, '@[url') !== FALSE) {
// We have at least one @ tag
$template = $wallwall_template;
$matches = array();
preg_match_all('/\@\[url=([^\]]+)\]([^\[]+)\[\/url\]/', $tags, $matches, PREG_SET_ORDER);
$r = null;
foreach($matches as $wall) {
$uri = $wall[1];
$r = q("SELECT `url`,`name`,`photo` FROM `contact` WHERE `url`='%s' LIMIT 1",
dbesc($uri)
);
if(count($r)) {
$owner_url = zrl($r[0]['url']);
$owner_name = $r[0]['name'];
$owner_photo = $r[0]['photo'];
$commentww = 'ww';
break;
}
}
if($commentww != 'ww') {
// We found no matching contact in the database, just do the best we can (we'll only miss the photo)
$owner_url = zrl($matches[0][1]);
$owner_name = $matches[0][2];
// Use the nosign
$owner_photo = $a->get_baseurl() .'/images/nosign.jpg';
$commentww = 'ww';
}
}
}
}
if($profile_owner == local_user()) {
$isstarred = (($item['starred']) ? "starred" : "unstarred");

37
object/Item.php
View file

@ -589,43 +589,6 @@ class Item extends BaseObject {
}
}
if(!$this->wall_to_wall) {
// Fallback, check if can find a @ tag
$tags = $this->get_data_value('tag');
if(strpos($tags, '@[url') !== FALSE) {
// We have at least one @ tag
$this->set_template('wall2wall');
$matches = array();
preg_match_all('/\@\[url=([^\]]+)\]([^\[]+)\[\/url\]/', $tags, $matches, PREG_SET_ORDER);
$r = null;
foreach($matches as $wall) {
$uri = $wall[1];
$r = q("SELECT `url`,`name`,`photo` FROM `contact` WHERE `url`='%s' LIMIT 1",
dbesc($uri)
);
if(count($r)) {
$this->owner_url = zrl($r[0]['url']);
$this->owner_name = $r[0]['name'];
$this->owner_photo = $r[0]['photo'];
$this->wall_to_wall = true;
break;
}
}
if(!$this->wall_to_wall) {
// We found no matching contact in the database, just do the best we can (we'll only miss the photo)
$this->owner_url = zrl($matches[0][1]);
$this->owner_name = $matches[0][2];
// Use the nosign
$this->owner_photo = $a->get_baseurl() .'/images/nosign.jpg';
$this->wall_to_wall = true;
}
}
}
if(!$this->wall_to_wall) {
// Definitely not wall to wall
$this->set_template('wall');