X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Ftagger.php;h=16195cc339d2f02f4c04eb719f7e7b04484e1e98;hb=5ebe10d7fc808dc2ed3502b532e6db020928aa1c;hp=0ee2a0143748925523c763fd2a1d44e4d162aa66;hpb=0cd241bcbe762e38e2eba0c58800eb60a2240e36;p=friendica.git
diff --git a/mod/tagger.php b/mod/tagger.php
index 0ee2a01437..16195cc339 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,21 +1,29 @@
argc > 1) ? notags(trim($a->argv[1])) : 0);
@@ -27,7 +35,7 @@ function tagger_content(App $a) {
dbesc($item_id)
);
- if (! $item_id || (! dbm::is_result($r))) {
+ if(! $item_id || (! DBM::is_result($r))) {
logger('tagger: no item ' . $item_id);
return;
}
@@ -35,22 +43,24 @@ function tagger_content(App $a) {
$item = $r[0];
$owner_uid = $item['uid'];
+ $owner_nick = '';
+ $blocktags = 0;
$r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
intval($owner_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$owner_nick = $r[0]['nickname'];
$blocktags = $r[0]['blocktags'];
}
- if (local_user() != $owner_uid)
+ if(local_user() != $owner_uid)
return;
$r = q("select * from contact where self = 1 and uid = %d limit 1",
intval(local_user())
);
- if (dbm::is_result($r))
+ if (DBM::is_result($r))
$contact = $r[0];
else {
logger('tagger: no contact_id');
@@ -59,11 +69,16 @@ function tagger_content(App $a) {
$uri = item_new_uri($a->get_hostname(),$owner_uid);
$xterm = xmlify($term);
- $post_type = (($item['resource-id']) ? t('photo') : t('status'));
+ $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
- $link = xmlify('' . "\n") ;
+ if ($owner_nick) {
+ $href = System::baseUrl() . '/display/' . $owner_nick . '/' . $item['id'];
+ } else {
+ $href = System::baseUrl() . '/display/' . $item['guid'];
+ }
+
+ $link = xmlify('' . "\n") ;
$body = xmlify($item['body']);
@@ -78,7 +93,7 @@ function tagger_content(App $a) {
EOT;
- $tagid = App::get_baseurl() . '/search?tag=' . $term;
+ $tagid = System::baseUrl() . '/search?tag=' . $term;
$objtype = ACTIVITY_OBJ_TAGTERM;
$obj = <<< EOT
@@ -92,15 +107,15 @@ EOT;
EOT;
- $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
+ $bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s');
if (! isset($bodyverb)) {
return;
}
- $termlink = html_entity_decode('⌗') . '[url=' . App::get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+ $termlink = html_entity_decode('⌗') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
- $arr = array();
+ $arr = [];
$arr['guid'] = get_guid(32);
$arr['uri'] = $uri;
@@ -135,41 +150,26 @@ EOT;
$arr['deny_gid'] = $item['deny_gid'];
$arr['visible'] = 1;
$arr['unseen'] = 1;
- $arr['last-child'] = 1;
$arr['origin'] = 1;
- $post_id = item_store($arr);
-
-// q("UPDATE `item` set plink = '%s' where id = %d",
-// dbesc(App::get_baseurl() . '/display/' . $owner_nick . '/' . $post_id),
-// intval($post_id)
-// );
-
+ $post_id = Item::insert($arr);
- if (! $item['visible']) {
- $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
- intval($item['id']),
- intval($owner_uid)
- );
+ if (!$item['visible']) {
+ Item::update(['visible' => true], ['id' => $item['id']]);
}
- $term_objtype = (($item['resource-id']) ? TERM_OBJ_PHOTO : TERM_OBJ_POST );
+ $term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_POST);
$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
intval($item['id']),
dbesc($term)
);
- if ((! $blocktags) && $t[0]['tcount']==0 ) {
- /*q("update item set tag = '%s' where id = %d",
- dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . App::get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
- intval($item['id'])
- );*/
-
+ if((! $blocktags) && $t[0]['tcount']==0 ) {
q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
intval($item['id']),
$term_objtype,
TERM_HASHTAG,
dbesc($term),
- dbesc(App::get_baseurl() . '/search?tag=' . $term),
+ dbesc(System::baseUrl() . '/search?tag=' . $term),
intval($owner_uid)
);
}
@@ -179,7 +179,7 @@ EOT;
$r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1",
dbesc($item['uri'])
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
intval($r[0]['uid'])
);
@@ -187,36 +187,26 @@ EOT;
intval($r[0]['id']),
dbesc($term)
);
- if (count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
+ if(count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
- intval($r[0]['id']),
- $term_objtype,
- TERM_HASHTAG,
- dbesc($term),
- dbesc(App::get_baseurl() . '/search?tag=' . $term),
- intval($owner_uid)
- );
+ intval($r[0]['id']),
+ $term_objtype,
+ TERM_HASHTAG,
+ dbesc($term),
+ dbesc(System::baseUrl() . '/search?tag=' . $term),
+ intval($owner_uid)
+ );
}
-
- /*if (count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
- q("update item set tag = '%s' where id = %d",
- dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . App::get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
- intval($r[0]['id'])
- );
- }*/
-
}
$arr['id'] = $post_id;
- call_hooks('post_local_end', $arr);
+ Addon::callHooks('post_local_end', $arr);
- proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $post_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);
killme();
return; // NOTREACHED
-
-
}