Merge pull request #4633 from friendica/fabrixxm-36rc-patch-2

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 285ab751e3a613ab109d145340d92dc75b3c9e9a..5f01fae361f6ab1d8f9790db451302ddc42a3b5e 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -7,18 +7,21 @@ use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Smilies;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
+use Friendica\Render\FriendicaSmarty;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 
 require_once "mod/proxy.php";
+require_once "include/event.php";
 require_once "include/conversation.php";
 
 /**
@@ -486,31 +489,6 @@ function item_new_uri($hostname, $uid, $guid = "") {
        return $uri;
 }
 
-
-/**
- * Generate a guaranteed unique photo ID.
- * safe from birthday paradox
- *
- * @return string
- */
-function photo_new_resource() {
-
-       do {
-               $found = false;
-               $resource = hash('md5',uniqid(mt_rand(),true));
-               $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
-                       dbesc($resource)
-               );
-
-               if (DBM::is_result($r)) {
-                       $found = true;
-               }
-       } while ($found == true);
-
-       return $resource;
-}
-
-
 /**
  * @deprecated
  * wrapper to load a view template, checking for alternate
@@ -743,7 +721,7 @@ function dlogger($msg, $level = 0) {
        }
 
        $dlogip = Config::get('system', 'dlogip');
-       if ($dlogip && $_SERVER['REMOTE_ADDR'] != $dlogip) {
+       if (!is_null($dlogip) && $_SERVER['REMOTE_ADDR'] != $dlogip) {
                return;
        }
 
@@ -1421,13 +1399,10 @@ function prepare_body(&$item, $attach = false, $preview = false) {
  * @return string Formattet HTML.
  */
 function prepare_text($text) {
-
-       require_once 'include/bbcode.php';
-
        if (stristr($text, '[nosmile]')) {
-               $s = bbcode($text);
+               $s = BBCode::convert($text);
        } else {
-               $s = Smilies::replace(bbcode($text));
+               $s = Smilies::replace(BBCode::convert($text));
        }
 
        return trim($s);
@@ -1897,16 +1872,10 @@ function file_tag_save_file($uid, $item, $file)
                intval($uid)
        );
        if (DBM::is_result($r)) {
-               if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
-                       q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
-                               dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
-                               intval($item),
-                               intval($uid)
-                       );
+               if (!stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
+                       $fields = ['file' => $r[0]['file'] . '[' . file_tag_encode($file) . ']'];
+                       Item::update($fields, ['id' => $item]);
                }
-
-               Term::createFromItem($item);
-
                $saved = PConfig::get($uid, 'system', 'filetags');
                if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
                        PConfig::set($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
@@ -1938,13 +1907,8 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false)
                return false;
        }
 
-       q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
-               dbesc(str_replace($pattern,'',$r[0]['file'])),
-               intval($item),
-               intval($uid)
-       );
-
-       Term::createFromItem($item);
+       $fields = ['file' => str_replace($pattern,'',$r[0]['file'])];
+       Item::update($fields, ['id' => $item]);
 
        $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
                dbesc($file),