X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=c04bef01c3de0ecb72a8e0c98d52d303f60313e1;hb=8779f22b5f341e1adbe562b94101cf954f2dcee9;hp=f1c895f90fece19a2aac720a9d5fa1835c8b4b0b;hpb=5e7285b9ba3236e3c5b6163df323eefebbc8b20e;p=friendica.git

diff --git a/include/items.php b/include/items.php
index f1c895f90f..c04bef01c3 100644
--- a/include/items.php
+++ b/include/items.php
@@ -17,21 +17,19 @@ use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
+use Friendica\Util\Temporal;
 
-require_once 'include/bbcode.php';
-require_once 'include/tags.php';
 require_once 'include/text.php';
-require_once 'include/threads.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 
-function add_page_info_data($data) {
+function add_page_info_data($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,
 	// then treat it that way
 	if (($data["type"] == "rich") && is_string($data["title"]) &&
-		is_string($data["text"]) && (sizeof($data["images"]) > 0)) {
+		is_string($data["text"]) && !empty($data["images"])) {
 		$data["type"] = "link";
 	}
 
@@ -65,7 +63,7 @@ function add_page_info_data($data) {
 		$text .= " title='".$data["title"]."'";
 	}
 
-	if (sizeof($data["images"]) > 0) {
+	if (!empty($data["images"])) {
 		$preview = str_replace(["[", "]"], ["[", "]"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
 		// if the preview picture is larger than 500 pixels then show it in a larger mode
 		// But only, if the picture isn't higher than large (To prevent huge posts)
@@ -93,7 +91,7 @@ function add_page_info_data($data) {
 	return "\n".$text.$hashtags;
 }
 
-function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
+function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "") {
 
 	$data = ParseUrl::getSiteinfoCached($url, true);
 
@@ -121,8 +119,8 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals
 	return $data;
 }
 
-function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
-	$data = query_page_info($url, $no_photos, $photo, $keywords, $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"])) {
@@ -142,9 +140,9 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa
 }
 
 function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
-	$data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist);
+	$data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
 
-	$text = add_page_info_data($data);
+	$text = add_page_info_data($data, $no_photos);
 
 	return $text;
 }
@@ -230,7 +228,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
  *
  * @TODO find proper type-hints
  */
-function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) {
+function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0) {
 	if ($contact['network'] === NETWORK_OSTATUS) {
 		if ($pass < 2) {
 			// Test - remove before flight
@@ -292,7 +290,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 		return;
 	}
 
-	$push_url = Config::get('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
+	$push_url = System::baseUrl() . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
 
 	// Use a single verify token, even if multiple hubs
 	$verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());
@@ -323,7 +321,7 @@ function drop_items($items) {
 
 	if (count($items)) {
 		foreach ($items as $item) {
-			$owner = Item::delete($item);
+			$owner = Item::deleteById($item);
 			if ($owner && !$uid)
 				$uid = $owner;
 		}
@@ -395,7 +393,7 @@ function drop_item($id) {
 		}
 
 		// delete the item
-		Item::delete($item['id']);
+		Item::deleteById($item['id']);
 
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 		//NOTREACHED
@@ -428,7 +426,7 @@ function list_post_dates($uid, $wall) {
 	while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
 		$dyear = intval(substr($dnow, 0, 4));
 		$dstart = substr($dnow, 0, 8) . '01';
-		$dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5)));
+		$dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
 		$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
 		$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
 		$str = day_translate(DateTimeFormat::utc($dnow, 'F'));