Merge pull request #4328 from tobiasd/20180125-msg

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index ea15b3f403647c5f5a35dd340d3d4eee8cc1e234..942cad2ad5b5f5957b943603949306798a92e7b2 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,11 +1,17 @@
 <?php
-
+/**
+ * @file mod/tagger.php
+ */
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
-require_once('include/security.php');
-require_once('include/bbcode.php');
-require_once('include/items.php');
+require_once 'include/security.php';
+require_once 'include/bbcode.php';
+require_once 'include/items.php';
 
 function tagger_content(App $a) {
 
@@ -15,7 +21,7 @@ function tagger_content(App $a) {
 
        $term = notags(trim($_GET['term']));
        // no commas allowed
-       $term = str_replace(array(',',' '),array('','_'),$term);
+       $term = str_replace([',',' '],['','_'],$term);
 
        if(! $term)
                return;
@@ -29,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;
        }
@@ -41,7 +47,7 @@ function tagger_content(App $a) {
        $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'];
        }
@@ -52,7 +58,7 @@ function tagger_content(App $a) {
        $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');
@@ -61,7 +67,7 @@ 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('<link rel="alternate" type="text/html" href="'
@@ -94,7 +100,7 @@ EOT;
        </object>
 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;
@@ -102,7 +108,7 @@ EOT;
 
        $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
 
-       $arr = array();
+       $arr = [];
 
        $arr['guid'] = get_guid(32);
        $arr['uri'] = $uri;
@@ -137,7 +143,6 @@ 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);
@@ -181,7 +186,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'])
                );
@@ -212,9 +217,9 @@ EOT;
 
        $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();