X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=8aa7c665af8733df7cbb873f35818698192f76fe;hb=bf0b98017decf73123891e935993f2921d3b0acf;hp=eaced3e467a9a230e8f4e8071378891dcd290c77;hpb=6b44fbbda03af125035c185c964f10ce78f97610;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index eaced3e467..8aa7c665af 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -14,7 +14,9 @@
  * All of these become an "item" which is our basic unit of
  * information.
  */
+
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -22,16 +24,13 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Model\Item;
-use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
 require_once 'include/enotify.php';
-require_once 'include/tags.php';
-require_once 'include/threads.php';
 require_once 'include/text.php';
 require_once 'include/items.php';
 
@@ -230,7 +229,7 @@ function item_post(App $a) {
 		$verb              = notags(trim($_REQUEST['verb']));
 		$emailcc           = notags(trim($_REQUEST['emailcc']));
 		$body              = escape_tags(trim($_REQUEST['body']));
-		$network           = notags(trim($_REQUEST['network']));
+		$network           = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN)));
 		$guid              = get_guid(32);
 
 		$postopts = defaults($_REQUEST, 'postopts', '');
@@ -506,7 +505,7 @@ function item_post(App $a) {
 	// embedded bookmark or attachment in post? set bookmark flag
 
 	$bookmark = 0;
-	$data = get_attachment_data($body);
+	$data = BBCode::getAttachmentData($body);
 	if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) {
 		$objecttype = ACTIVITY_OBJ_BOOKMARK;
 		$bookmark = 1;
@@ -518,13 +517,12 @@ function item_post(App $a) {
 	// Fold multi-line [code] sequences
 	$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
 
-	$body = scale_external_images($body, false);
+	$body = BBCode::scaleExternalImages($body, false);
 
 	// Setting the object type if not defined before
 	if (!$objecttype) {
 		$objecttype = ACTIVITY_OBJ_NOTE; // Default value
-		require_once 'include/plaintext.php';
-		$objectdata = get_attached_data($body);
+		$objectdata = BBCode::getAttachedData($body);
 
 		if ($objectdata["type"] == "link") {
 			$objecttype = ACTIVITY_OBJ_BOOKMARK;
@@ -595,16 +593,16 @@ function item_post(App $a) {
 	$datarray['owner-name']    = $contact_record['name'];
 	$datarray['owner-link']    = $contact_record['url'];
 	$datarray['owner-avatar']  = $contact_record['thumb'];
-	$datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link'], 0);
+	$datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link']);
 	$datarray['author-name']   = $author['name'];
 	$datarray['author-link']   = $author['url'];
 	$datarray['author-avatar'] = $author['thumb'];
-	$datarray['author-id']     = Contact::getIdForURL($datarray['author-link'], 0);
-	$datarray['created']       = datetime_convert();
-	$datarray['edited']        = datetime_convert();
-	$datarray['commented']     = datetime_convert();
-	$datarray['received']      = datetime_convert();
-	$datarray['changed']       = datetime_convert();
+	$datarray['author-id']     = Contact::getIdForURL($datarray['author-link']);
+	$datarray['created']       = DateTimeFormat::utcNow();
+	$datarray['edited']        = DateTimeFormat::utcNow();
+	$datarray['commented']     = DateTimeFormat::utcNow();
+	$datarray['received']      = DateTimeFormat::utcNow();
+	$datarray['changed']       = DateTimeFormat::utcNow();
 	$datarray['extid']         = $extid;
 	$datarray['guid']          = $guid;
 	$datarray['uri']           = $uri;
@@ -633,8 +631,6 @@ function item_post(App $a) {
 	$datarray['postopts']      = $postopts;
 	$datarray['origin']        = $origin;
 	$datarray['moderated']     = false;
-	$datarray['gcontact-id']   = GContact::getId(["url" => $datarray['author-link'], "network" => $datarray['network'],
-							"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']]);
 	$datarray['object']        = $object;
 
 	/*
@@ -708,8 +704,8 @@ function item_post(App $a) {
 			'file' => $datarray['file'],
 			'rendered-html' => $datarray['rendered-html'],
 			'rendered-hash' => $datarray['rendered-hash'],
-			'edited' => datetime_convert(),
-			'changed' => datetime_convert()];
+			'edited' => DateTimeFormat::utcNow(),
+			'changed' => DateTimeFormat::utcNow()];
 
 		Item::update($fields, ['id' => $post_id]);
 
@@ -729,7 +725,7 @@ function item_post(App $a) {
 	unset($datarray['self']);
 	unset($datarray['api_source']);
 
-	$post_id = item_store($datarray);
+	$post_id = Item::insert($datarray);
 
 	if (!$post_id) {
 		logger("Item wasn't stored.");
@@ -877,7 +873,7 @@ function item_content(App $a) {
 	$o = '';
 	if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 		if (is_ajax()) {
-			$o = Item::delete($a->argv[2]);
+			$o = Item::deleteById($a->argv[2]);
 		} else {
 			$o = drop_item($a->argv[2]);
 		}