Removed unused template variable

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 7e6d092711e31e705eaf0f59ec931ba7c928156c..a681ca70da192a739a2293be62eabf73a49010f6 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -16,6 +16,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/crypto.php';
 require_once 'include/enotify.php';
@@ -66,7 +67,7 @@ function item_post(App $a) {
        if (!$preview && x($_REQUEST, 'post_id_random')) {
                if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
                        logger("item post: duplicate post", LOGGER_DEBUG);
-                       item_post_return(App::get_baseurl(), $api_source, $return_path);
+                       item_post_return(System::baseUrl(), $api_source, $return_path);
                } else {
                        $_SESSION['post-random'] = $_REQUEST['post_id_random'];
                }
@@ -436,7 +437,7 @@ function item_post(App $a) {
                        $objecttype = ACTIVITY_OBJ_IMAGE;
 
                        foreach ($images as $image) {
-                               if (! stristr($image,App::get_baseurl() . '/photo/')) {
+                               if (! stristr($image,System::baseUrl() . '/photo/')) {
                                        continue;
                                }
                                $image_uri = substr($image,strrpos($image,'/') + 1);
@@ -625,7 +626,7 @@ function item_post(App $a) {
                                if (strlen($attachments)) {
                                        $attachments .= ',';
                                }
-                               $attachments .= '[attach]href="' . App::get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
+                               $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
                        }
                        $body = str_replace($match[1],'',$body);
                }
@@ -720,7 +721,7 @@ function item_post(App $a) {
 //     $datarray['prvnets']       = $user['prvnets'];
 
        $datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri'];
-       $datarray['plink'] = App::get_baseurl() . '/display/' . urlencode($datarray['guid']);
+       $datarray['plink'] = System::baseUrl() . '/display/' . urlencode($datarray['guid']);
        $datarray['last-child'] = 1;
        $datarray['visible'] = 1;
 
@@ -765,7 +766,7 @@ function item_post(App $a) {
 
                $json = array('cancel' => 1);
                if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
-                       $json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload'];
+                       $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
                }
 
                echo json_encode($json);
@@ -887,12 +888,7 @@ function item_post(App $a) {
        );
 
        if (dbm::is_result($r)) {
-               $r = q("SELECT LAST_INSERT_ID() AS `item-id`");
-               if (dbm::is_result($r)) {
-                       $post_id = $r[0]['item-id'];
-               } else {
-                       $post_id = 0;
-               }
+               $post_id = dba::lastInsertId();
        } else {
                logger('mod_item: unable to create post.');
                $post_id = 0;
@@ -940,7 +936,7 @@ function item_post(App $a) {
                                'to_email'     => $user['email'],
                                'uid'          => $user['uid'],
                                'item'         => $datarray,
-                               'link'         => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
+                               'link'         => System::baseUrl().'/display/'.urlencode($datarray['guid']),
                                'source_name'  => $datarray['author-name'],
                                'source_link'  => $datarray['author-link'],
                                'source_photo' => $datarray['author-avatar'],
@@ -972,7 +968,7 @@ function item_post(App $a) {
                                'to_email'     => $user['email'],
                                'uid'          => $user['uid'],
                                'item'         => $datarray,
-                               'link'         => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
+                               'link'         => System::baseUrl().'/display/'.urlencode($datarray['guid']),
                                'source_name'  => $datarray['author-name'],
                                'source_link'  => $datarray['author-link'],
                                'source_photo' => $datarray['author-avatar'],
@@ -994,14 +990,14 @@ function item_post(App $a) {
                                }
                                $disclaimer = '<hr />' . sprintf( 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'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
+                               $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;
                                if (!$datarray['title']=='') {
                                        $subject = email_header_encode($datarray['title'], 'UTF-8');
                                } else {
                                        $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
                                }
-                               $link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
+                               $link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
                                $html    = prepare_body($datarray);
                                $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
                                include_once 'include/html2plain.php';
@@ -1041,7 +1037,7 @@ function item_post(App $a) {
 
        logger('post_complete');
 
-       item_post_return(App::get_baseurl(), $api_source, $return_path);
+       item_post_return(System::baseUrl(), $api_source, $return_path);
        // NOTREACHED
 }