Preparations for a new tag structure. Tags are now stored in a dedicated table.
This commit is contained in:
Michael Vogel
parent
82820d8e95
commit
61c78711df
2
boot.php
2
boot.php
|
|
@ -14,7 +14,7 @@ require_once('include/features.php');
|
|||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.1.1572' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1157 );
|
||||
define ( 'DB_UPDATE_VERSION', 1158 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
|
|
|||
14
database.sql
14
database.sql
|
|
@ -1118,3 +1118,17 @@ CREATE TABLE IF NOT EXISTS `userd` (
|
|||
`username` char(255) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `tag`
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `tag` (
|
||||
`iid` int(11) NOT NULL,
|
||||
`tag` char(255) NOT NULL,
|
||||
`link` char(255) NOT NULL,
|
||||
PRIMARY KEY (`iid`, `tag`),
|
||||
KEY `tag` (`tag`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ require_once('include/oembed.php');
|
|||
require_once('include/salmon.php');
|
||||
require_once('include/crypto.php');
|
||||
require_once('include/Photo.php');
|
||||
|
||||
require_once('include/tags.php');
|
||||
|
||||
function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// default permissions - anonymous user
|
||||
|
||||
|
|
@ -670,7 +670,7 @@ function get_atom_elements($feed,$item) {
|
|||
}
|
||||
|
||||
// translate OStatus unfollow to activity streams if it happened to get selected
|
||||
|
||||
|
||||
if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
|
||||
$res['verb'] = ACTIVITY_UNFOLLOW;
|
||||
|
||||
|
|
@ -721,7 +721,7 @@ function get_atom_elements($feed,$item) {
|
|||
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
|
||||
$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
|
||||
$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
|
||||
}
|
||||
}
|
||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
|
||||
$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
|
||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
|
||||
|
|
@ -759,7 +759,7 @@ function get_atom_elements($feed,$item) {
|
|||
$child = $rawobj[0]['child'];
|
||||
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
|
||||
$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
|
||||
}
|
||||
}
|
||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
|
||||
$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
|
||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
|
||||
|
|
@ -1032,7 +1032,7 @@ function item_store($arr,$force_parent = false) {
|
|||
logger('item_store: item parent was not found - ignoring item');
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
$parent_deleted = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -1072,6 +1072,7 @@ function item_store($arr,$force_parent = false) {
|
|||
|
||||
if(count($r)) {
|
||||
$current_post = $r[0]['id'];
|
||||
create_tags_from_item($r[0]['id']);
|
||||
logger('item_store: created item ' . $current_post);
|
||||
}
|
||||
else {
|
||||
|
|
@ -1087,7 +1088,7 @@ function item_store($arr,$force_parent = false) {
|
|||
);
|
||||
}
|
||||
|
||||
if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
|
||||
if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
|
||||
$parent_id = $current_post;
|
||||
|
||||
if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
|
||||
|
|
@ -1108,6 +1109,7 @@ function item_store($arr,$force_parent = false) {
|
|||
intval($parent_deleted),
|
||||
intval($current_post)
|
||||
);
|
||||
create_tags_from_item($current_post);
|
||||
|
||||
$arr['id'] = $current_post;
|
||||
$arr['parent'] = $parent_id;
|
||||
|
|
@ -1287,7 +1289,7 @@ function tag_deliver($uid,$item_id) {
|
|||
intval($item_id)
|
||||
);
|
||||
|
||||
proc_run('php','include/notifier.php','tgroup',$item_id);
|
||||
proc_run('php','include/notifier.php','tgroup',$item_id);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1358,7 +1360,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
if($contact['duplex'] && $contact['dfrn-id'])
|
||||
$idtosend = '0:' . $orig_id;
|
||||
if($contact['duplex'] && $contact['issued-id'])
|
||||
$idtosend = '1:' . $orig_id;
|
||||
$idtosend = '1:' . $orig_id;
|
||||
|
||||
$rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
|
||||
|
||||
|
|
@ -1376,7 +1378,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
break;
|
||||
case SSL_POLICY_SELFSIGN:
|
||||
$ssl_policy = 'self';
|
||||
break;
|
||||
break;
|
||||
case SSL_POLICY_NONE:
|
||||
default:
|
||||
$ssl_policy = 'none';
|
||||
|
|
@ -1429,7 +1431,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
intval(($perm == 'rw') ? 1 : 0),
|
||||
intval($contact['id'])
|
||||
);
|
||||
$contact['writable'] = (string) 1 - intval($contact['writable']);
|
||||
$contact['writable'] = (string) 1 - intval($contact['writable']);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1573,7 +1575,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
logger('consume_feed: empty input');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$feed = new SimplePie();
|
||||
$feed->set_raw_data($xml);
|
||||
if($datedir)
|
||||
|
|
@ -1609,7 +1611,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
|
||||
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
|
||||
$new_name = $elems['name'][0]['data'];
|
||||
}
|
||||
}
|
||||
if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
|
||||
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
|
||||
$photo_url = $elems['link'][0]['attribs']['']['href'];
|
||||
|
|
@ -1652,12 +1654,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
intval($contact['uid'])
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
$img->scaleImageSquare(175);
|
||||
|
||||
|
||||
$hash = $resource_id;
|
||||
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 4);
|
||||
|
||||
|
||||
$img->scaleImage(80);
|
||||
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 5);
|
||||
|
||||
|
|
@ -1666,7 +1668,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
|
||||
$a = get_app();
|
||||
|
||||
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
||||
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
||||
WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
|
||||
|
|
@ -1716,7 +1718,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
* to contain a sparkle link and perhaps a photo.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
$bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
|
||||
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ) ;
|
||||
|
||||
|
|
@ -1733,7 +1735,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($bdtext2),
|
||||
dbesc('birthday')
|
||||
);
|
||||
|
||||
|
||||
|
||||
// update bdyear
|
||||
|
||||
|
|
@ -1825,6 +1827,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc(implode(',',$newtags)),
|
||||
intval($i[0]['id'])
|
||||
);
|
||||
create_tags_from_item($i[0]['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1839,6 +1842,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($item['uri']),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item['uri'], $importer['uid']);
|
||||
}
|
||||
else {
|
||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
|
||||
|
|
@ -1849,6 +1853,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($uri),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
create_tags_from_itemuri($uri, $importer['uid']);
|
||||
if($item['last-child']) {
|
||||
// ensure that last-child is set in case the comment that had it just got wiped.
|
||||
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
||||
|
|
@ -1962,6 +1967,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($item_id),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item_id, $importer['uid']);
|
||||
}
|
||||
|
||||
// update last-child if it changes
|
||||
|
|
@ -2003,7 +2009,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($parent_uri)
|
||||
);
|
||||
if($r && count($r))
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
|
||||
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
||||
|
|
@ -2026,6 +2032,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
|
||||
intval($r[0]['id'])
|
||||
);
|
||||
create_tags_from_item($r[0]['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2109,6 +2116,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
dbesc($item_id),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item_id, $importer['uid']);
|
||||
}
|
||||
|
||||
// update last-child if it changes
|
||||
|
|
@ -2246,7 +2254,7 @@ function local_delivery($importer,$data) {
|
|||
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
|
||||
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
|
||||
$new_name = $elems['name'][0]['data'];
|
||||
}
|
||||
}
|
||||
if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
|
||||
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
|
||||
$photo_url = $elems['link'][0]['attribs']['']['href'];
|
||||
|
|
@ -2285,12 +2293,12 @@ function local_delivery($importer,$data) {
|
|||
intval($importer['importer_uid'])
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
$img->scaleImageSquare(175);
|
||||
|
||||
|
||||
$hash = $resource_id;
|
||||
$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 4);
|
||||
|
||||
|
||||
$img->scaleImage(80);
|
||||
$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 5);
|
||||
|
||||
|
|
@ -2299,7 +2307,7 @@ function local_delivery($importer,$data) {
|
|||
|
||||
$a = get_app();
|
||||
|
||||
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
||||
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
||||
WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
|
||||
|
|
@ -2358,17 +2366,17 @@ function local_delivery($importer,$data) {
|
|||
/** relocated user must have original key pair */
|
||||
/*$newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
|
||||
$newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));*/
|
||||
|
||||
|
||||
logger("items:relocate contact ".print_r($newloc, true).print_r($importer, true), LOGGER_DEBUG);
|
||||
|
||||
|
||||
// update contact
|
||||
$r = q("SELECT photo, url FROM contact WHERE id=%d AND uid=%d;",
|
||||
intval($importer['id']),
|
||||
intval($importer['importer_uid']));
|
||||
if ($r === false)
|
||||
if ($r === false)
|
||||
return 1;
|
||||
$old = $r[0];
|
||||
|
||||
|
||||
$x = q("UPDATE contact SET
|
||||
name = '%s',
|
||||
photo = '%s',
|
||||
|
|
@ -2411,7 +2419,7 @@ function local_delivery($importer,$data) {
|
|||
if ($x === false)
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
// TODO
|
||||
// merge with current record, current contents have priority
|
||||
// update record, set url-updated
|
||||
|
|
@ -2485,7 +2493,7 @@ function local_delivery($importer,$data) {
|
|||
|
||||
|
||||
$hash = random_string();
|
||||
|
||||
|
||||
$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
|
||||
VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
|
||||
intval($fsugg['uid']),
|
||||
|
|
@ -2539,7 +2547,7 @@ function local_delivery($importer,$data) {
|
|||
$msg['uri'] = notags(unxmlify($base['id'][0]['data']));
|
||||
$msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
|
||||
$msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
|
||||
|
||||
|
||||
dbesc_array($msg);
|
||||
|
||||
$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
|
||||
|
|
@ -2563,12 +2571,12 @@ function local_delivery($importer,$data) {
|
|||
'verb' => ACTIVITY_POST,
|
||||
'otype' => 'mail'
|
||||
);
|
||||
|
||||
|
||||
notification($notif_params);
|
||||
return 0;
|
||||
|
||||
// NOTREACHED
|
||||
}
|
||||
}
|
||||
|
||||
$community_page = 0;
|
||||
$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
|
||||
|
|
@ -2582,7 +2590,7 @@ function local_delivery($importer,$data) {
|
|||
);
|
||||
$importer['forum'] = (string) $community_page;
|
||||
}
|
||||
|
||||
|
||||
logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
|
||||
|
||||
// process any deleted entries
|
||||
|
|
@ -2692,14 +2700,14 @@ function local_delivery($importer,$data) {
|
|||
if(count($i)) {
|
||||
|
||||
// For tags, the owner cannot remove the tag on the author's copy of the post.
|
||||
|
||||
|
||||
$owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
|
||||
$author_remove = (($item['origin'] && $item['self']) ? true : false);
|
||||
$author_copy = (($item['origin']) ? true : false);
|
||||
$author_copy = (($item['origin']) ? true : false);
|
||||
|
||||
if($owner_remove && $author_copy)
|
||||
continue;
|
||||
if($author_remove || $owner_remove) {
|
||||
if($author_remove || $owner_remove) {
|
||||
$tags = explode(',',$i[0]['tag']);
|
||||
$newtags = array();
|
||||
if(count($tags)) {
|
||||
|
|
@ -2711,6 +2719,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc(implode(',',$newtags)),
|
||||
intval($i[0]['id'])
|
||||
);
|
||||
create_tags_from_item($i[0]['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2725,6 +2734,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($item['uri']),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item['uri'], $importer['importer_uid']);
|
||||
}
|
||||
else {
|
||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
|
||||
|
|
@ -2735,6 +2745,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($uri),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
create_tags_from_itemuri($uri, $importer['importer_uid']);
|
||||
if($item['last-child']) {
|
||||
// ensure that last-child is set in case the comment that had it just got wiped.
|
||||
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
||||
|
|
@ -2742,7 +2753,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($item['parent-uri']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
// who is the last child now?
|
||||
// who is the last child now?
|
||||
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
|
||||
ORDER BY `created` DESC LIMIT 1",
|
||||
dbesc($item['parent-uri']),
|
||||
|
|
@ -2752,7 +2763,7 @@ function local_delivery($importer,$data) {
|
|||
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
||||
intval($r[0]['id'])
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
// if this is a relayed delete, propagate it to other recipients
|
||||
|
||||
|
|
@ -2846,11 +2857,11 @@ function local_delivery($importer,$data) {
|
|||
if(count($r)) {
|
||||
$iid = $r[0]['id'];
|
||||
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
|
||||
|
||||
|
||||
// do not accept (ignore) an earlier edit than one we currently have.
|
||||
if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
|
||||
continue;
|
||||
|
||||
|
||||
logger('received updated comment' , LOGGER_DEBUG);
|
||||
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($datarray['title']),
|
||||
|
|
@ -2860,6 +2871,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($item_id),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item_id, $importer['importer_uid']);
|
||||
|
||||
proc_run('php',"include/notifier.php","comment-import",$iid);
|
||||
|
||||
|
|
@ -2896,14 +2908,14 @@ function local_delivery($importer,$data) {
|
|||
dbesc($datarray['verb']),
|
||||
dbesc($datarray['parent-uri']),
|
||||
dbesc($datarray['parent-uri'])
|
||||
|
||||
|
||||
);
|
||||
if($r && count($r))
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
|
||||
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
||||
|
||||
|
||||
$xo = parse_xml_string($datarray['object'],false);
|
||||
$xt = parse_xml_string($datarray['target'],false);
|
||||
|
||||
|
|
@ -2916,9 +2928,9 @@ function local_delivery($importer,$data) {
|
|||
intval($importer['importer_uid'])
|
||||
);
|
||||
if(! count($tagp))
|
||||
continue;
|
||||
continue;
|
||||
|
||||
// extract tag, if not duplicate, and this user allows tags, add to parent item
|
||||
// extract tag, if not duplicate, and this user allows tags, add to parent item
|
||||
|
||||
if($xo->id && $xo->content) {
|
||||
$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
|
||||
|
|
@ -2932,9 +2944,10 @@ function local_delivery($importer,$data) {
|
|||
intval($tagp[0]['id']),
|
||||
dbesc(datetime_convert())
|
||||
);
|
||||
create_tags_from_item($tagp[0]['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2951,7 +2964,7 @@ function local_delivery($importer,$data) {
|
|||
$parent = $r[0]['parent'];
|
||||
$parent_uri = $r[0]['parent-uri'];
|
||||
}
|
||||
|
||||
|
||||
if(! $is_like) {
|
||||
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
|
||||
dbesc(datetime_convert()),
|
||||
|
|
@ -2969,7 +2982,7 @@ function local_delivery($importer,$data) {
|
|||
if($posted_id && $parent) {
|
||||
|
||||
proc_run('php',"include/notifier.php","comment-import","$posted_id");
|
||||
|
||||
|
||||
if((! $is_like) && (! $importer['self'])) {
|
||||
|
||||
require_once('include/enotify.php');
|
||||
|
|
@ -3032,6 +3045,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($item_id),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item_id, $importer['importer_uid']);
|
||||
}
|
||||
|
||||
// update last-child if it changes
|
||||
|
|
@ -3068,7 +3082,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($parent_uri)
|
||||
);
|
||||
if($r && count($r))
|
||||
continue;
|
||||
continue;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -3083,24 +3097,25 @@ function local_delivery($importer,$data) {
|
|||
intval($importer['importer_uid'])
|
||||
);
|
||||
if(! count($r))
|
||||
continue;
|
||||
continue;
|
||||
|
||||
// extract tag, if not duplicate, add to parent item
|
||||
// extract tag, if not duplicate, add to parent item
|
||||
if($xo->content) {
|
||||
if(! (stristr($r[0]['tag'],trim($xo->content)))) {
|
||||
q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
|
||||
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
|
||||
intval($r[0]['id'])
|
||||
);
|
||||
create_tags_from_item($r[0]['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$posted_id = item_store($datarray);
|
||||
|
||||
// find out if our user is involved in this conversation and wants to be notified.
|
||||
|
||||
|
||||
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
|
||||
|
||||
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
|
||||
|
|
@ -3114,11 +3129,11 @@ function local_delivery($importer,$data) {
|
|||
// first make sure this isn't our own post coming back to us from a wall-to-wall event
|
||||
if(! link_compare($datarray['author-link'],$importer_url)) {
|
||||
|
||||
|
||||
|
||||
foreach($myconv as $conv) {
|
||||
|
||||
// now if we find a match, it means we're in this conversation
|
||||
|
||||
|
||||
if(! link_compare($conv['author-link'],$importer_url))
|
||||
continue;
|
||||
|
||||
|
|
@ -3206,6 +3221,7 @@ function local_delivery($importer,$data) {
|
|||
dbesc($item_id),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
create_tags_from_itemuri($item_id, $importer['importer_uid']);
|
||||
}
|
||||
|
||||
// update last-child if it changes
|
||||
|
|
@ -3329,7 +3345,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
|||
// send email notification to owner?
|
||||
}
|
||||
else {
|
||||
|
||||
|
||||
// create contact record
|
||||
|
||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
|
||||
|
|
@ -3352,7 +3368,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
|||
if(count($r))
|
||||
$contact_record = $r[0];
|
||||
|
||||
// create notification
|
||||
// create notification
|
||||
$hash = random_string();
|
||||
|
||||
if(is_array($contact_record)) {
|
||||
|
|
@ -3390,7 +3406,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
|||
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||
. 'Content-transfer-encoding: 8bit' );
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3460,7 +3476,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
|
|||
post_url($url,$params);
|
||||
|
||||
logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG);
|
||||
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
|
@ -3793,16 +3809,16 @@ function item_expire($uid,$days) {
|
|||
|
||||
$expire_items = get_pconfig($uid, 'expire','items');
|
||||
$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
|
||||
|
||||
|
||||
$expire_notes = get_pconfig($uid, 'expire','notes');
|
||||
$expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
|
||||
|
||||
$expire_starred = get_pconfig($uid, 'expire','starred');
|
||||
$expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
|
||||
|
||||
|
||||
$expire_photos = get_pconfig($uid, 'expire','photos');
|
||||
$expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
|
||||
|
||||
|
||||
logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
|
||||
|
||||
foreach($r as $item) {
|
||||
|
|
@ -3897,6 +3913,7 @@ function drop_item($id,$interactive = true) {
|
|||
dbesc(datetime_convert()),
|
||||
intval($item['id'])
|
||||
);
|
||||
create_tags_from_item($item['id']);
|
||||
|
||||
// clean up categories and tags so they don't end up as orphans
|
||||
|
||||
|
|
@ -3962,6 +3979,7 @@ function drop_item($id,$interactive = true) {
|
|||
dbesc($item['parent-uri']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
create_tags_from_item($item['parent-uri'], $item['uid']);
|
||||
// ignore the result
|
||||
}
|
||||
else {
|
||||
|
|
@ -3971,7 +3989,7 @@ function drop_item($id,$interactive = true) {
|
|||
dbesc($item['parent-uri']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
// who is the last child now?
|
||||
// who is the last child now?
|
||||
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
|
||||
dbesc($item['parent-uri']),
|
||||
intval($item['uid'])
|
||||
|
|
@ -4003,7 +4021,7 @@ function drop_item($id,$interactive = true) {
|
|||
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
//NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
82
include/tags.php
Normal file
82
include/tags.php
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
<?php
|
||||
/*
|
||||
require_once("boot.php");
|
||||
if(@is_null($a)) {
|
||||
$a = new App;
|
||||
}
|
||||
|
||||
if(is_null($db)) {
|
||||
@include(".htconfig.php");
|
||||
require_once("dba.php");
|
||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||
unset($db_host, $db_user, $db_pass, $db_data);
|
||||
};
|
||||
|
||||
$a->set_baseurl(get_config('system','url'));
|
||||
*/
|
||||
|
||||
function create_tags_from_item($itemid) {
|
||||
global $a;
|
||||
|
||||
$searchpath = $a->get_baseurl()."/search?tag=";
|
||||
|
||||
$messages = q("SELECT `uri`, `uid`, `id`, `deleted`, `title`, `body`, `tag` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
|
||||
|
||||
if (!$messages)
|
||||
return;
|
||||
|
||||
$message = $messages[0];
|
||||
|
||||
// Clean up all tags
|
||||
q("DELETE FROM `tag` WHERE `iid` = %d", intval($itemid));
|
||||
|
||||
if ($message["deleted"])
|
||||
return;
|
||||
|
||||
$taglist = explode(",", $message["tag"]);
|
||||
|
||||
$tags = "";
|
||||
foreach ($taglist as $tag)
|
||||
if ((substr(trim($tag), 0, 1) == "#") OR (substr(trim($tag), 0, 1) == "@"))
|
||||
$tags .= " ".trim($tag);
|
||||
else
|
||||
$tags .= " #".trim($tag);
|
||||
|
||||
$data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
|
||||
|
||||
$tags = array();
|
||||
|
||||
$pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";
|
||||
if (preg_match_all($pattern, $data, $matches))
|
||||
foreach ($matches[1] as $match)
|
||||
$tags["#".strtolower($match)] = $searchpath.strtolower($match);
|
||||
|
||||
$pattern = "/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism";
|
||||
if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
|
||||
foreach ($matches as $match)
|
||||
$tags[$match[1].strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2];
|
||||
}
|
||||
|
||||
foreach ($tags as $tag=>$link)
|
||||
$r = q("INSERT INTO `tag` (`iid`, `tag`, `link`) VALUES (%d, '%s', '%s')",
|
||||
intval($itemid), dbesc($tag), dbesc($link));
|
||||
}
|
||||
|
||||
function create_tags_from_itemuri($itemuri, $uid) {
|
||||
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
|
||||
|
||||
foreach ($messages as $message)
|
||||
create_tags_from_item($message["id"]);
|
||||
}
|
||||
|
||||
function update_items() {
|
||||
$messages = q("SELECT `id` FROM `item` where tag !='' ORDER BY `created` DESC LIMIT 100");
|
||||
|
||||
foreach ($messages as $message)
|
||||
create_tags_from_item($message["id"]);
|
||||
}
|
||||
|
||||
//update_items();
|
||||
//create_tags_from_item(265194);
|
||||
//create_tags_from_itemuri("infoagent@diasp.org:cce94abd104c06e8", 2);
|
||||
?>
|
||||
|
|
@ -148,7 +148,18 @@ class Item extends BaseObject {
|
|||
$tags=array();
|
||||
$hashtags = array();
|
||||
$mentions = array();
|
||||
foreach(explode(',',$item['tag']) as $tag){
|
||||
|
||||
$taglist = q("select tag,link from tag where iid=%d", intval($item['id']));
|
||||
|
||||
foreach($taglist as $tag) {
|
||||
$tags[] = substr($tag["tag"], 0, 1)."<a href=\"".$tag["link"]."\" target=\"external-link\">".substr($tag["tag"], 1)."</a>";
|
||||
if (substr($tag["tag"], 0, 1) == "#")
|
||||
$hashtags[] = "#<a href=\"".$tag["link"]."\" target=\"external-link\">".substr($tag["tag"], 1)."</a>";
|
||||
elseif (substr($tag["tag"], 0, 1) == "@")
|
||||
$mentions[] = "@<a href=\"".$tag["link"]."\" target=\"external-link\">".substr($tag["tag"], 1)."</a>";
|
||||
}
|
||||
|
||||
/*foreach(explode(',',$item['tag']) as $tag){
|
||||
$tag = trim($tag);
|
||||
if ($tag!="") {
|
||||
$t = bbcode($tag);
|
||||
|
|
@ -158,8 +169,7 @@ class Item extends BaseObject {
|
|||
elseif($t[0] == '@')
|
||||
$mentions[] = $t;
|
||||
}
|
||||
|
||||
}
|
||||
}*/
|
||||
|
||||
$like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
|
||||
$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
|
||||
|
|
@ -270,7 +280,7 @@ class Item extends BaseObject {
|
|||
'has_cats' => ((count($categories)) ? 'true' : ''),
|
||||
'has_folders' => ((count($folders)) ? 'true' : ''),
|
||||
'categories' => $categories,
|
||||
'folders' => $folders,
|
||||
'folders' => $folders,
|
||||
'body' => $body_e,
|
||||
'text' => $text_e,
|
||||
'id' => $this->get_id(),
|
||||
|
|
|
|||
15
update.php
15
update.php
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1157 );
|
||||
define( 'UPDATE_VERSION' , 1158 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -1369,3 +1369,16 @@ ADD INDEX ( `datasize` ) ");
|
|||
if(!$r) return UPDATE_FAILED;
|
||||
return UPDATE_SUCCESS;
|
||||
}
|
||||
|
||||
function update_1157() {
|
||||
$r = q("CREATE TABLE IF NOT EXISTS `tag` (
|
||||
`iid` int(11) NOT NULL,
|
||||
`tag` char(255) NOT NULL,
|
||||
`link` char(255) NOT NULL,
|
||||
PRIMARY KEY (`iid`, `tag`),
|
||||
KEY `tag` (`tag`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;");
|
||||
|
||||
if(!$r) return UPDATE_FAILED;
|
||||
return UPDATE_SUCCESS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</ul>
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
|
||||
<!-- <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div> -->
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1305,16 +1305,16 @@ border-bottom: 1px solid #D2D2D2;
|
|||
.wall-item-tags {
|
||||
padding-top: 1px;
|
||||
padding-bottom: 2px;
|
||||
display: none;
|
||||
/*display: none;*/
|
||||
}
|
||||
|
||||
.tag {
|
||||
color: rgb(153,153,153);
|
||||
padding-left: 3px;
|
||||
font-size: 10px;
|
||||
/*padding-left: 3px;
|
||||
font-size: 10px;*/
|
||||
}
|
||||
.tag a {
|
||||
padding-right: 8px;
|
||||
/*padding-right: 8px;*/
|
||||
color: rgb(153,153,153);
|
||||
}
|
||||
.wwto {
|
||||
|
|
|
|||
Loading…
Reference in a new issue