Removed Google Maps

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 283381ef51a3fb42cd7b6091de9e75ac3f23cb84..3211048cef6745a124fb6987912fcfcfdb4ebb8a 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -82,6 +82,7 @@ class Item extends BaseObject {
         */
        public function get_template_data($alike, $dlike, $thread_level=1) {
                require_once("mod/proxy.php");
+               require_once("include/diaspora.php");
 
                $result = array();
 
@@ -101,6 +102,7 @@ class Item extends BaseObject {
                $buttons = '';
                $dropping = false;
                $star = false;
+               $ignore = false;
                $isstarred = "unstarred";
                $indent = '';
                $shiny = '';
@@ -153,7 +155,7 @@ class Item extends BaseObject {
 
                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                call_hooks('render_location',$locate);
-               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                $searchpath = $a->get_baseurl()."/search?tag=";
                $tags=array();
@@ -198,6 +200,21 @@ class Item extends BaseObject {
                                        'classundo' => (($item['starred']) ? "" : "hidden"),
                                        'starred' =>  t('starred'),
                                );
+                               $r = q("SELECT `ignored` FROM `thread` WHERE `uid` = %d AND `iid` = %d LIMIT 1",
+                                       intval($item['uid']),
+                                       intval($item['id'])
+                               );
+                               if (count($r)) {
+                                       $ignore = array(
+                                               'do' => t("ignore thread"),
+                                               'undo' => t("unignore thread"),
+                                               'toggle' => t("toggle ignore status"),
+                                               'classdo' => (($r[0]['ignored']) ? "hidden" : ""),
+                                               'classundo' => (($r[0]['ignored']) ? "" : "hidden"),
+                                               'ignored' =>  t('ignored'),
+                                       );
+                               }
+
                                $tagger = '';
                                if(feature_enabled($conv->get_profile_owner(),'commtag')) {
                                        $tagger = array(
@@ -271,22 +288,24 @@ class Item extends BaseObject {
                }
 
                // Disable features that aren't available in several networks
-               if (($item["item_network"] != "dfrn") AND isset($buttons["dislike"])) {
+               if (($item["item_network"] != NETWORK_DFRN) AND isset($buttons["dislike"])) {
                        unset($buttons["dislike"]);
                        $tagger = '';
                }
 
-               if (($item["item_network"] == "feed") AND isset($buttons["like"]))
+               if (($item["item_network"] == NETWORK_FEED) AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
-               if (($item["item_network"] == "mail") AND isset($buttons["like"]))
+               if (($item["item_network"] == NETWORK_MAIL) AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
-               if (($item["item_network"] == "dspr") AND ($indent == 'comment') AND isset($buttons["like"]))
+               // Diaspora isn't able to do likes on comments - but red does
+               if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
+                       !diaspora_is_redmatrix($item["owner-link"]) 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"]))
+               if (($item["item_network"] == NETWORK_FACEBOOK) AND ($indent == 'comment') AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
 
@@ -335,6 +354,7 @@ class Item extends BaseObject {
                        'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
                        'isstarred' => $isstarred,
                        'star'      => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
+                       'ignore'      => ((feature_enabled($conv->get_profile_owner(),'ignore_posts')) ? $ignore : ''),
                        'tagger'        => $tagger,
                        'filer'     => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
                        'drop' => $drop,