X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftags.php;h=6067f3f4b93c58b2c41308412fbf18b4f9a264c2;hb=34815de99c548b61c94b6e6939edd485eca728d6;hp=e3e4edfa17f9c21a024083b01b365839b7b496de;hpb=2260415ca9be83e3389175d994d1d10c3b24c7e6;p=friendica.git

diff --git a/include/tags.php b/include/tags.php
index e3e4edfa17..6067f3f4b9 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,13 +1,14 @@
 <?php
-function create_tags_from_item($itemid) {
-	global $a;
 
-	$profile_base = $a->get_baseurl();
+use Friendica\App;
+
+function create_tags_from_item($itemid) {
+	$profile_base = App::get_baseurl();
 	$profile_data = parse_url($profile_base);
 	$profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
 	$profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";
 
-	$searchpath = $a->get_baseurl()."/search?tag=";
+	$searchpath = App::get_baseurl()."/search?tag=";
 
 	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `created`, `received`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
 
@@ -37,6 +38,9 @@ function create_tags_from_item($itemid) {
 
 	$data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
 
+	// ignore anything in a code block
+	$data = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$data);
+
 	$tags = array();
 
 	$pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";
@@ -110,13 +114,11 @@ function create_tags_from_itemuri($itemuri, $uid) {
 }
 
 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 = $db->q("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1", 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;
@@ -129,12 +131,20 @@ function update_items() {
 
 			$global = (count($isglobal) > 0);
 		}
-echo $message["created"]." - ".$message["guid"]."\n";
+
 		q("UPDATE `term` SET `guid` = '%s', `created` = '%s', `received` = '%s', `global` = %d WHERE `otype` = %d AND `oid` = %d",
 			dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]),
 			intval($global), intval(TERM_OBJ_POST), intval($message["oid"]));
 	}
 
-        $db->qclose();
+	dba::close($messages);
+
+	$messages = dba::p("SELECT `guid` FROM `item` WHERE `uid` = 0");
+
+	logger("fetched messages: ".dba::num_rows($messages));
+	while ($message = dba::fetch(messages)) {
+		q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message["guid"]));
+	}
+
+	dba::close($messages);
 }
-?>