Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index 0ee2a0143748925523c763fd2a1d44e4d162aa66..c7e8a9469aed35207dfc48a6ca269514cd968c96 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,13 +1,17 @@
 <?php
 
+use Friendica\App;
+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');
 
-
 function tagger_content(App $a) {
 
-       if (! local_user() && ! remote_user()) {
+       if(! local_user() && ! remote_user()) {
                return;
        }
 
@@ -15,7 +19,7 @@ function tagger_content(App $a) {
        // no commas allowed
        $term = str_replace(array(',',' '),array('','_'),$term);
 
-       if (! $term)
+       if(! $term)
                return;
 
        $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
@@ -27,7 +31,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;
        }
@@ -39,18 +43,18 @@ 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'];
        }
 
-       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');
@@ -63,7 +67,7 @@ function tagger_content(App $a) {
        $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 
        $link = xmlify('<link rel="alternate" type="text/html" href="'
-               . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+               . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 
        $body = xmlify($item['body']);
 
@@ -78,7 +82,7 @@ function tagger_content(App $a) {
        </target>
 EOT;
 
-       $tagid = App::get_baseurl() . '/search?tag=' . $term;
+       $tagid = System::baseUrl() . '/search?tag=' . $term;
        $objtype = ACTIVITY_OBJ_TAGTERM;
 
        $obj = <<< EOT
@@ -98,7 +102,7 @@ EOT;
                return;
        }
 
-       $termlink = html_entity_decode('&#x2317;') . '[url=' . App::get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
 
        $arr = array();
 
@@ -141,12 +145,12 @@ EOT;
        $post_id = item_store($arr);
 
 //     q("UPDATE `item` set plink = '%s' where id = %d",
-//             dbesc(App::get_baseurl() . '/display/' . $owner_nick . '/' . $post_id),
+//             dbesc(System::baseUrl() . '/display/' . $owner_nick . '/' . $post_id),
 //             intval($post_id)
 //     );
 
 
-       if (! $item['visible']) {
+       if(! $item['visible']) {
                $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
                        intval($item['id']),
                        intval($owner_uid)
@@ -158,9 +162,9 @@ EOT;
                 intval($item['id']),
                 dbesc($term)
         );
-       if ((! $blocktags) && $t[0]['tcount']==0 ) {
+       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]'),
+                       dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
                        intval($item['id'])
                );*/
 
@@ -169,7 +173,7 @@ EOT;
                   $term_objtype,
                   TERM_HASHTAG,
                   dbesc($term),
-                  dbesc(App::get_baseurl() . '/search?tag=' . $term),
+                  dbesc(System::baseUrl() . '/search?tag=' . $term),
                   intval($owner_uid)
                );
        }
@@ -179,7 +183,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,20 +191,20 @@ 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 . '['))) {
+               /*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]'),
+                               dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
                                intval($r[0]['id'])
                        );
                }*/
@@ -212,7 +216,7 @@ EOT;
 
        call_hooks('post_local_end', $arr);
 
-       proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $post_id);
+       Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);
 
        killme();