Merge pull request #5418 from MrPetovan/task/5410-move-dba-to-src

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index c04bef01c3de0ecb72a8e0c98d52d303f60313e1..14a74c8e51ea5afa0ff7e91cda3cd9aead2419b3 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -9,6 +9,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Protocol\DFRN;
@@ -33,6 +34,8 @@ function add_page_info_data($data, $no_photos = false) {
                $data["type"] = "link";
        }
 
+       $data["title"] = defaults($data, "title", "");
+
        if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
                return "";
        }
@@ -47,19 +50,19 @@ function add_page_info_data($data, $no_photos = false) {
 
        $text = "[attachment type='".$data["type"]."'";
 
-       if ($data["text"] == "") {
+       if (empty($data["text"])) {
                $data["text"] = $data["title"];
        }
 
-       if ($data["text"] == "") {
+       if (empty($data["text"])) {
                $data["text"] = $data["url"];
        }
 
-       if ($data["url"] != "") {
+       if (!empty($data["url"])) {
                $text .= " url='".$data["url"]."'";
        }
 
-       if ($data["title"] != "") {
+       if (!empty($data["title"])) {
                $text .= " title='".$data["title"]."'";
        }
 
@@ -274,6 +277,7 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
        $a = get_app();
+       $r = null;
 
        if (is_array($importer)) {
                $r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
@@ -321,7 +325,7 @@ function drop_items($items) {
 
        if (count($items)) {
                foreach ($items as $item) {
-                       $owner = Item::deleteById($item);
+                       $owner = Item::deleteForUser(['id' => $item], local_user());
                        if ($owner && !$uid)
                                $uid = $owner;
                }
@@ -334,17 +338,14 @@ function drop_item($id) {
 
        // locate item to be deleted
 
-       $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
-               intval($id)
-       );
+       $fields = ['id', 'uid', 'contact-id', 'deleted'];
+       $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
-       if (!DBM::is_result($r)) {
+       if (!DBM::is_result($item)) {
                notice(L10n::t('Item not found.') . EOL);
                goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
        }
 
-       $item = $r[0];
-
        if ($item['deleted']) {
                return 0;
        }
@@ -363,7 +364,6 @@ function drop_item($id) {
        }
 
        if ((local_user() == $item['uid']) || $contact_id) {
-
                // Check if we should do HTML-based delete confirmation
                if ($_REQUEST['confirm']) {
                        // <form> can't take arguments in its "action" parameter
@@ -393,7 +393,7 @@ function drop_item($id) {
                }
 
                // delete the item
-               Item::deleteById($item['id']);
+               Item::deleteForUser(['id' => $item['id']], local_user());
 
                goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
                //NOTREACHED
@@ -430,9 +430,11 @@ function list_post_dates($uid, $wall) {
                $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
                $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
                $str = day_translate(DateTimeFormat::utc($dnow, 'F'));
-               if (!$ret[$dyear]) {
+
+               if (empty($ret[$dyear])) {
                        $ret[$dyear] = [];
                }
+
                $ret[$dyear][] = [$str, $end_month, $start_month];
                $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
        }