Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split...

[friendica.git] / include / tags.php

diff --git a/include/tags.php b/include/tags.php
index 0a094384782bb4358af16ac28811182ade537a84..6c45a4aee21c4fe63ae07c5660036848892741d4 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,4 +1,7 @@
 <?php
+
+use Friendica\App;
+
 function create_tags_from_item($itemid) {
        $profile_base = App::get_baseurl();
        $profile_data = parse_url($profile_base);
@@ -28,7 +31,7 @@ function create_tags_from_item($itemid) {
 
        $tags = "";
        foreach ($taglist as $tag)
-               if ((substr(trim($tag), 0, 1) == "#") OR (substr(trim($tag), 0, 1) == "@"))
+               if ((substr(trim($tag), 0, 1) == "#") || (substr(trim($tag), 0, 1) == "@"))
                        $tags .= " ".trim($tag);
                else
                        $tags .= " #".trim($tag);
@@ -55,10 +58,10 @@ function create_tags_from_item($itemid) {
 
                if (substr(trim($tag), 0, 1) == "#") {
                        // try to ignore #039 or #1 or anything like that
-                       if(ctype_digit(substr(trim($tag),1)))
+                       if (ctype_digit(substr(trim($tag),1)))
                                continue;
                        // try to ignore html hex escapes, e.g. #x2317
-                       if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
+                       if ((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
                                continue;
                        $type = TERM_HASHTAG;
                        $term = substr($tag, 1);
@@ -88,7 +91,7 @@ function create_tags_from_item($itemid) {
                        dbesc($link), dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]), intval($global));
 
                // Search for mentions
-               if ((substr($tag, 0, 1) == '@') AND (strpos($link, $profile_base_friendica) OR strpos($link, $profile_base_diaspora))) {
+               if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) {
                        $users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
                        foreach ($users AS $user) {
                                if ($user["uid"] == $message["uid"]) {
@@ -104,19 +107,19 @@ function create_tags_from_item($itemid) {
 function create_tags_from_itemuri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if(count($messages)) {
-               foreach ($messages as $message)
+       if (count($messages)) {
+               foreach ($messages as $message) {
                        create_tags_from_item($message["id"]);
+               }
        }
 }
 
 function update_items() {
-       global $db;
 
-        $messages = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''", true);
+       $messages = dba::p("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''");
 
-        logger("fetched messages: ".count($messages));
-        while ($message = $db->qfetch()) {
+       logger("fetched messages: ".dba::num_rows($messages));
+       while ($message = dba::fetch($messages)) {
 
                if ($message["uid"] == 0) {
                        $global = true;
@@ -135,15 +138,14 @@ function update_items() {
                        intval($global), intval(TERM_OBJ_POST), intval($message["oid"]));
        }
 
-        $db->qclose();
+       dba::close($messages);
 
-       $messages = $db->q("SELECT `guid` FROM `item` WHERE `uid` = 0", true);
+       $messages = dba::p("SELECT `guid` FROM `item` WHERE `uid` = 0");
 
-       logger("fetched messages: ".count($messages));
-       while ($message = $db->qfetch()) {
+       logger("fetched messages: ".dba::num_rows($messages));
+       while ($message = dba::fetch(messages)) {
                q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message["guid"]));
        }
 
-       $db->qclose();
+       dba::close($messages);
 }
-?>