Move Temporal::convert() to DateTimeFormat::convert()

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 97a8006efaae281ca6c2c8e58b0775c0a6ddc8ca..ccf98667c8793ee99cfc7208905cda10e32b57a0 100644 (file)
--- 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;
@@ -24,9 +26,9 @@ 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';
@@ -272,7 +274,7 @@ function item_post(App $a) {
                        if ($preview) {
                                killme();
                        }
-                       info(t('Empty post discarded.') . EOL);
+                       info(L10n::t('Empty post discarded.') . EOL);
                        if (x($_REQUEST, 'return')) {
                                goaway($return_path);
                        }
@@ -469,7 +471,7 @@ function item_post(App $a) {
 
                                $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
                                                'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
-                               $condition = ['resource-id' => $image_uri, 'uid' => $profile_uid, 'album' => t('Wall Photos')];
+                               $condition = ['resource-id' => $image_uri, 'uid' => $profile_uid, 'album' => L10n::t('Wall Photos')];
                                dba::update('photo', $fields, $condition);
                        }
                }
@@ -506,7 +508,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 +520,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;
@@ -600,11 +601,11 @@ function item_post(App $a) {
        $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['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;
@@ -708,8 +709,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 +730,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.");
@@ -800,14 +801,14 @@ function item_post(App $a) {
                                if (!strlen($addr)) {
                                        continue;
                                }
-                               $disclaimer = '<hr />' . sprintf(t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
+                               $disclaimer = '<hr />' . L10n::t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username'])
                                        . '<br />';
-                               $disclaimer .= sprintf(t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
-                               $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
+                               $disclaimer .= L10n::t('You may visit them online at %s', System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
+                               $disclaimer .= L10n::t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
                                if (!$datarray['title']=='') {
                                        $subject = Email::encodeHeader($datarray['title'], 'UTF-8');
                                } else {
-                                       $subject = Email::encodeHeader('[Friendica]' . ' ' . sprintf(t('%s posted an update.'), $a->user['username']), 'UTF-8');
+                                       $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8');
                                }
                                $link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
                                $html    = prepare_body($datarray);
@@ -1046,5 +1047,5 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
                }
        }
 
-       return ['replaced' => $replaced, 'contact' => $r[0]];
+       return ['replaced' => $replaced, 'contact' => $contact];
 }