Update functions and calls

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 9e7a4621af9ba966b9ed4fa3757af8bc6532b95f..f1ce70d46bade40dc26ae731fa837944488c74e7 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -12,6 +12,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
@@ -21,7 +22,6 @@ use Friendica\Util\ParseUrl;
 
 require_once 'include/bbcode.php';
 require_once 'include/tags.php';
-require_once 'include/files.php';
 require_once 'include/text.php';
 require_once 'include/threads.php';
 require_once 'include/plaintext.php';
@@ -562,9 +562,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
        // check for create date and expire time
        $expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
-       $r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
-       if (DBM::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
-               $expire_interval = $r['expire'];
+       $user = dba::selectFirst('user', ['expire'], ['uid' => $uid]);
+       if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
+               $expire_interval = $user['expire'];
        }
 
        if (($expire_interval > 0) && !empty($arr['created'])) {
@@ -1109,7 +1109,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
         * This is not perfect - but a workable solution until we found the reason for the problem.
         */
        create_tags_from_item($current_post);
-       create_files_from_item($current_post);
+       Term::createFromItem($current_post);
 
        /*
         * If this is now the last-child, force all _other_ children of this parent to *not* be last-child
@@ -1129,7 +1129,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
                add_shadow_entry($current_post);
        }
 
-       check_item_notification($current_post, $uid);
+       check_user_notification($current_post);
 
        if ($notify) {
                Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "Notifier", $notify_type, $current_post);
@@ -1149,14 +1149,14 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
  */
 function item_set_last_item($arr) {
        // Unarchive the author
-       $contact = dba::select('contact', [], ['id' => $arr["author-link"]], ['limit' => 1]);
+       $contact = dba::selectFirst('contact', [], ['id' => $arr["author-link"]]);
        if ($contact['term-date'] > NULL_DATE) {
                 Contact::unmarkForArchival($contact);
        }
 
        // Unarchive the contact if it is a toplevel posting
        if ($arr["parent-uri"] === $arr["uri"]) {
-               $contact = dba::select('contact', [], ['id' => $arr["contact-id"]], ['limit' => 1]);
+               $contact = dba::selectFirst('contact', [], ['id' => $arr["contact-id"]]);
                if ($contact['term-date'] > NULL_DATE) {
                         Contact::unmarkForArchival($contact);
                }
@@ -2157,7 +2157,7 @@ function drop_item($id, $interactive = true) {
                                array('id' => $item['id']));
 
                create_tags_from_item($item['id']);
-               create_files_from_item($item['id']);
+               Term::createFromItem($item['id']);
                delete_thread($item['id'], $item['parent-uri']);
 
                // clean up categories and tags so they don't end up as orphans
@@ -2230,7 +2230,7 @@ function drop_item($id, $interactive = true) {
                                array('parent-uri' => $item['parent-uri'], 'uid' => $item['uid']));
 
                        create_tags_from_itemuri($item['parent-uri'], $item['uid']);
-                       create_files_from_itemuri($item['parent-uri'], $item['uid']);
+                       Term::createFromItemURI($item['parent-uri'], $item['uid']);
                        delete_thread_uri($item['parent-uri'], $item['uid']);
                        // ignore the result
                } else {