X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=a6a3a50c801644ab06b66f1bb16059f9821ebf6c;hb=7211fc4f1ac33819ed0543ac65f9a075250c3190;hp=823350874b0f422c28aff708eb39917b31565790;hpb=8329705ebab61159b114b274e794bf6c3d6a6a95;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index 823350874b..a6a3a50c80 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -93,9 +93,9 @@ function item_post(App $a) {
 
 	if ($thr_parent || $thr_parent_uri) {
 		if ($thr_parent) {
-			$parent_item = dba::selectFirst('item', [], ['id' => $thr_parent]);
+			$parent_item = Item::selectFirst([], ['id' => $thr_parent]);
 		} elseif ($thr_parent_uri) {
-			$parent_item = dba::selectFirst('item', [], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
+			$parent_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
 		}
 
 		// if this isn't the real parent of the conversation, find it
@@ -106,7 +106,7 @@ function item_post(App $a) {
 			$thr_parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
 
 			if ($parent_item['id'] != $parent_item['parent']) {
-				$parent_item = dba::selectFirst('item', [], ['id' => $parent_item['parent']]);
+				$parent_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $parent_item['parent']]);
 			}
 		}
 
@@ -170,7 +170,7 @@ function item_post(App $a) {
 	$orig_post = null;
 
 	if ($post_id) {
-		$orig_post = dba::selectFirst('item', [], ['id' => $post_id]);
+		$orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
 	}
 
 	$user = dba::selectFirst('user', [], ['uid' => $profile_uid]);
@@ -178,6 +178,8 @@ function item_post(App $a) {
 		return;
 	}
 
+	$categories = '';
+
 	if ($orig_post) {
 		$str_group_allow   = $orig_post['allow_gid'];
 		$str_contact_allow = $orig_post['allow_cid'];
@@ -223,13 +225,13 @@ function item_post(App $a) {
 			$str_contact_deny  = perms2str($_REQUEST['contact_deny']);
 		}
 
-		$title             = notags(trim($_REQUEST['title']));
-		$location          = notags(trim($_REQUEST['location']));
-		$coord             = notags(trim($_REQUEST['coord']));
-		$verb              = notags(trim($_REQUEST['verb']));
-		$emailcc           = notags(trim($_REQUEST['emailcc']));
-		$body              = escape_tags(trim($_REQUEST['body']));
-		$network           = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN)));
+		$title             =      notags(trim(defaults($_REQUEST, 'title'   , '')));
+		$location          =      notags(trim(defaults($_REQUEST, 'location', '')));
+		$coord             =      notags(trim(defaults($_REQUEST, 'coord'   , '')));
+		$verb              =      notags(trim(defaults($_REQUEST, 'verb'    , '')));
+		$emailcc           =      notags(trim(defaults($_REQUEST, 'emailcc' , '')));
+		$body              = escape_tags(trim(defaults($_REQUEST, 'body'    , '')));
+		$network           =      notags(trim(defaults($_REQUEST, 'network' , NETWORK_DFRN)));
 		$guid              = get_guid(32);
 
 		$postopts = defaults($_REQUEST, 'postopts', '');
@@ -279,15 +281,15 @@ function item_post(App $a) {
 		}
 	}
 
-	if (strlen($categories)) {
+	if (!empty($categories)) {
 		// get the "fileas" tags for this post
 		$filedas = file_tag_file_to_list($categories, 'file');
 	}
 	// save old and new categories, so we can determine what needs to be deleted from pconfig
 	$categories_old = $categories;
-	$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+	$categories = file_tag_list_to_file(trim(defaults($_REQUEST, 'category', '')), 'category');
 	$categories_new = $categories;
-	if (strlen($filedas)) {
+	if (!empty($filedas)) {
 		// append the fileas stuff to the new categories list
 		$categories .= file_tag_list_to_file($filedas, 'file');
 	}
@@ -567,7 +569,7 @@ function item_post(App $a) {
 		$network = NETWORK_DFRN;
 	}
 
-	$gravity = ($parent ? 6 : 0);
+	$gravity = ($parent ? GRAVITY_COMMENT : GRAVITY_PARENT);
 
 	// even if the post arrived via API we are considering that it
 	// originated on this site by default for determining relayability.
@@ -576,7 +578,7 @@ function item_post(App $a) {
 
 	$notify_type = ($parent ? 'comment-new' : 'wall-new');
 
-	$uri = ($message_id ? $message_id : item_new_uri($a->get_hostname(), $profile_uid, $guid));
+	$uri = ($message_id ? $message_id : Item::newURI($profile_uid, $guid));
 
 	// Fallback so that we alway have a parent uri
 	if (!$thr_parent_uri || !$parent) {
@@ -647,13 +649,13 @@ function item_post(App $a) {
 	// This field is for storing the raw conversation data
 	$datarray['protocol'] = PROTOCOL_DFRN;
 
-	$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']);
-	if (DBM::is_result($r)) {
+	$conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
+	if (DBM::is_result($conversation)) {
 		if ($r['conversation-uri'] != '') {
-			$datarray['conversation-uri'] = $r['conversation-uri'];
+			$datarray['conversation-uri'] = $conversation['conversation-uri'];
 		}
 		if ($r['conversation-href'] != '') {
-			$datarray['conversation-href'] = $r['conversation-href'];
+			$datarray['conversation-href'] = $conversation['conversation-href'];
 		}
 	}
 
@@ -737,7 +739,7 @@ function item_post(App $a) {
 		goaway($return_path);
 	}
 
-	$datarray = dba::selectFirst('item', [], ['id' => $post_id]);
+	$datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
 
 	if (!DBM::is_result($datarray)) {
 		logger("Item with id ".$post_id." couldn't be fetched.");