X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=0d447f2b40bcd1723701c78c150ac8958e216f54;hb=3da1b9f3196a029708571009ecb820a2dc2aff7d;hp=14a74c8e51ea5afa0ff7e91cda3cd9aead2419b3;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 14a74c8e51..0d447f2b40 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3,14 +3,14 @@
  * @file include/items.php
  */
 
+use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 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\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Feed;
@@ -24,7 +24,8 @@ require_once 'include/text.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 
-function add_page_info_data($data, $no_photos = false) {
+function add_page_info_data(array $data, $no_photos = false)
+{
 	Addon::callHooks('page_info_data', $data);
 
 	// It maybe is a rich content, but if it does have everything that a link has,
@@ -83,7 +84,7 @@ function add_page_info_data($data, $no_photos = false) {
 	$hashtags = "";
 	if (isset($data["keywords"]) && count($data["keywords"])) {
 		$hashtags = "\n";
-		foreach ($data["keywords"] AS $keyword) {
+		foreach ($data["keywords"] as $keyword) {
 			/// @TODO make a positive list of allowed characters
 			$hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
 						["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
@@ -94,8 +95,8 @@ function add_page_info_data($data, $no_photos = false) {
 	return "\n".$text.$hashtags;
 }
 
-function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "") {
-
+function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+{
 	$data = ParseUrl::getSiteinfoCached($url, true);
 
 	if ($photo != "") {
@@ -110,8 +111,10 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
 
 	if (($keyword_blacklist != "") && isset($data["keywords"])) {
 		$list = explode(", ", $keyword_blacklist);
-		foreach ($list AS $keyword) {
+
+		foreach ($list as $keyword) {
 			$keyword = trim($keyword);
+
 			$index = array_search($keyword, $data["keywords"]);
 			if ($index !== false) {
 				unset($data["keywords"][$index]);
@@ -122,12 +125,13 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
 	return $data;
 }
 
-function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "") {
+function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+{
 	$data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
 
 	$tags = "";
 	if (isset($data["keywords"]) && count($data["keywords"])) {
-		foreach ($data["keywords"] AS $keyword) {
+		foreach ($data["keywords"] as $keyword) {
 			$hashtag = str_replace([" ", "+", "/", ".", "#", "'"],
 				["", "", "", "", "", ""], $keyword);
 
@@ -142,7 +146,8 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
 	return $tags;
 }
 
-function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
+function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "")
+{
 	$data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
 
 	$text = add_page_info_data($data, $no_photos);
@@ -150,8 +155,8 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false,
 	return $text;
 }
 
-function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
-
+function add_page_info_to_body($body, $texturl = false, $no_photos = false)
+{
 	logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG);
 
 	$URLSearchString = "^\[\]";
@@ -228,10 +233,9 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
  * model where comments can have sub-threads. That would require some massive sorting
  * to get all the feed items into a mostly linear ordering, and might still require
  * recursion.
- *
- * @TODO find proper type-hints
  */
-function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0) {
+function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0, $pass = 0)
+{
 	if ($contact['network'] === NETWORK_OSTATUS) {
 		if ($pass < 2) {
 			// Test - remove before flight
@@ -240,6 +244,7 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 			logger("Consume OStatus messages ", LOGGER_DEBUG);
 			OStatus::import($xml, $importer, $contact, $hub);
 		}
+
 		return;
 	}
 
@@ -248,6 +253,7 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 			logger("Consume feeds", LOGGER_DEBUG);
 			Feed::import($xml, $importer, $contact, $hub);
 		}
+
 		return;
 	}
 
@@ -264,9 +270,10 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 			FROM `contact`
 			LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
-			dbesc($contact["id"]), dbesc($importer["uid"])
+			DBA::escape($contact["id"]), DBA::escape($importer["uid"])
 		);
-		if (DBM::is_result($r)) {
+
+		if (DBA::isResult($r)) {
 			logger("Now import the DFRN feed");
 			DFRN::import($xml, $r[0], true);
 			return;
@@ -274,12 +281,12 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 	}
 }
 
-function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
-
-	$a = get_app();
+function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'subscribe')
+{
+	$a = BaseObject::getApp();
 	$r = null;
 
-	if (is_array($importer)) {
+	if (!empty($importer)) {
 		$r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($importer['uid'])
 		);
@@ -290,7 +297,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 	 * through the direct Diaspora protocol. If we try and use
 	 * the feed, we'll get duplicates. So don't.
 	 */
-	if ((!DBM::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) {
+	if ((!DBA::isResult($r)) || $contact['network'] === NETWORK_DIASPORA) {
 		return;
 	}
 
@@ -304,7 +311,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 	logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
 	if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
-		dba::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
+		DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
 	}
 
 	Network::post($url, $params);
@@ -315,33 +322,35 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 }
 
-/// @TODO type-hint is array
-function drop_items($items) {
+function drop_items(array $items)
+{
 	$uid = 0;
 
 	if (!local_user() && !remote_user()) {
 		return;
 	}
 
-	if (count($items)) {
+	if (!empty($items)) {
 		foreach ($items as $item) {
 			$owner = Item::deleteForUser(['id' => $item], local_user());
-			if ($owner && !$uid)
+
+			if ($owner && !$uid) {
 				$uid = $owner;
+			}
 		}
 	}
 }
 
-function drop_item($id) {
-
-	$a = get_app();
+function drop_item($id)
+{
+	$a = BaseObject::getApp();
 
 	// locate item to be deleted
 
 	$fields = ['id', 'uid', 'contact-id', 'deleted'];
 	$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
-	if (!DBM::is_result($item)) {
+	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found.') . EOL);
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 	}
@@ -354,7 +363,7 @@ function drop_item($id) {
 
 	// check if logged in user is either the author or owner of this item
 
-	if (is_array($_SESSION['remote'])) {
+	if (!empty($_SESSION['remote'])) {
 		foreach ($_SESSION['remote'] as $visitor) {
 			if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
 				$contact_id = $visitor['cid'];
@@ -370,6 +379,7 @@ function drop_item($id) {
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
 			$inputs = [];
+
 			foreach ($query['args'] as $arg) {
 				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
@@ -405,7 +415,8 @@ function drop_item($id) {
 }
 
 /* arrange the list in years */
-function list_post_dates($uid, $wall) {
+function list_post_dates($uid, $wall)
+{
 	$dnow = DateTimeFormat::localNow('Y-m-d');
 
 	$dthen = Item::firstPostDate($uid, $wall);
@@ -441,7 +452,8 @@ function list_post_dates($uid, $wall) {
 	return $ret;
 }
 
-function posted_date_widget($url, $uid, $wall) {
+function posted_date_widget($url, $uid, $wall)
+{
 	$o = '';
 
 	if (!Feature::isEnabled($uid, 'archives')) {
@@ -455,14 +467,11 @@ function posted_date_widget($url, $uid, $wall) {
 		return $o;
 	*/
 
-	$visible_years = PConfig::get($uid,'system','archive_visible_years');
-	if (!$visible_years) {
-		$visible_years = 5;
-	}
+	$visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
 
 	$ret = list_post_dates($uid, $wall);
 
-	if (!DBM::is_result($ret)) {
+	if (!DBA::isResult($ret)) {
 		return $o;
 	}