added border-radius for #profile-jot-form

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 06b3683c6a494753e30dfde75c8f4057dc43155d..3ea970e7ff4496d2ec7eba55db955c110a08589b 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -32,7 +32,7 @@ class Item extends BaseObject {
 
        public function __construct($data) {
                $a = $this->get_app();
-               
+
                $this->data = $data;
                $this->set_template('wall');
                $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
@@ -158,23 +158,6 @@ class Item extends BaseObject {
                $hashtags = array();
                $mentions = array();
 
-               $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
-                               intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
-
-               foreach($taglist as $tag) {
-
-                       if ($tag["url"] == "")
-                               $tag["url"] = $searchpath.strtolower($tag["term"]);
-
-                       if ($tag["type"] == TERM_HASHTAG) {
-                               $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-                               $prefix = "#";
-                       } elseif ($tag["type"] == TERM_MENTION) {
-                               $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-                               $prefix = "@";
-                       }
-                       $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
-               }
 
                /*foreach(explode(',',$item['tag']) as $tag){
                        $tag = trim($tag);
@@ -239,7 +222,7 @@ class Item extends BaseObject {
 
                localize_item($item);
 
-               if ($item["postopts"]) {
+               if ($item["postopts"] and !get_config("system", "suppress_language")) {
                        //$langdata = explode(";", $item["postopts"]);
                        //$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
                        $langstr = "";
@@ -285,13 +268,33 @@ class Item extends BaseObject {
                        $owner_name_e = $this->get_owner_name();
                }
 
+               // Disable features that aren't available in several networks
+               if (($item["item_network"] != "dfrn") AND isset($buttons["dislike"])) {
+                       unset($buttons["dislike"]);
+                       $tagger = '';
+               }
+
+               if (($item["item_network"] == "feed") AND isset($buttons["like"]))
+                       unset($buttons["like"]);
+
+               if (($item["item_network"] == "mail") AND isset($buttons["like"]))
+                       unset($buttons["like"]);
+
+               if (($item["item_network"] == "dspr") AND ($indent == 'comment') AND isset($buttons["like"]))
+                       unset($buttons["like"]);
+
+               // Facebook can like comments - but it isn't programmed in the connector yet.
+               if (($item["item_network"] == "face") AND ($indent == 'comment') AND isset($buttons["like"]))
+                       unset($buttons["like"]);
+
+
                $tmp_item = array(
                        'template' => $this->get_template(),
 
                        'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-                       'tags' => $tags,
-                       'hashtags' => $hashtags,
-                       'mentions' => $mentions,
+                       'tags' => $item['tags'],
+                       'hashtags' => $item['hashtags'],
+                       'mentions' => $item['mentions'],
                        'txt_cats' => t('Categories:'),
                        'txt_folders' => t('Filed under:'),
                        'has_cats' => ((count($categories)) ? 'true' : ''),
@@ -316,6 +319,8 @@ class Item extends BaseObject {
                        'title' => $title_e,
                        'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
                        'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                       'app' => $item['app'],
+                       'created' => relative_date($item['created']),
                        'lock' => $lock,
                        'location' => $location_e,
                        'indent' => $indent,
@@ -339,7 +344,9 @@ class Item extends BaseObject {
                        'wait' => t('Please wait'),
                        'thread_level' => $thread_level,
                         'postopts' => $langstr,
-                        'edited' => $edited
+                        'edited' => $edited,
+                       'network' => $item["item_network"],
+                       'network_name' => network_to_name($item['item_network']),
                );
 
                $arr = array('item' => $item, 'output' => $tmp_item);
@@ -527,7 +534,7 @@ class Item extends BaseObject {
         */
        public function get_data_value($name) {
                if(!isset($this->data[$name])) {
-                       logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
+//                     logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
                        return false;
                }