X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FItem.php;h=19e3fdead1f2c7a09d2dab33ad04f06aa328b1f4;hb=b1e83f331ee3f986a7c86d29de9002f88ff76968;hp=4da5b8a59ff630bf30f8bc81473a3d0d294ac1f9;hpb=1d6dd1666f4fc5da64447a48e158f8755d1d2a1b;p=friendica.git

diff --git a/object/Item.php b/object/Item.php
index 4da5b8a59f..19e3fdead1 100644
--- 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'));
@@ -45,7 +45,7 @@ class Item extends BaseObject {
 				}
 			}
 		}
-		
+
 		$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
 
 		$ssl_state = ((local_user()) ? true : false);
@@ -66,6 +66,7 @@ class Item extends BaseObject {
 				if(! visible_activity($item)) {
 					continue;
 				}
+				$item['pagedrop'] = $data['pagedrop'];
 				$child = new Item($item);
 				$this->add_child($child);
 			}
@@ -80,17 +81,27 @@ class Item extends BaseObject {
 	 *      _ false on failure
 	 */
 	public function get_template_data($alike, $dlike, $thread_level=1) {
+		require_once("mod/proxy.php");
+
 		$result = array();
 
 		$a = $this->get_app();
 
 		$item = $this->get_data();
-
+                $edited = false;
+                if (strcmp($item['created'], $item['edited'])<>0) {
+                      $edited = array(
+                          'label' => t('This entry was edited'),
+                          'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
+                          'relative' => relative_date($item['edited'])
+                      );
+                }
 		$commentww = '';
 		$sparkle = '';
 		$buttons = '';
 		$dropping = false;
 		$star = false;
+		$ignore = false;
 		$isstarred = "unstarred";
 		$indent = '';
 		$shiny = '';
@@ -115,10 +126,10 @@ class Item extends BaseObject {
 		$drop = array(
 			'dropping' => $dropping,
 			'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''),
-			'select' => t('Select'), 
+			'select' => t('Select'),
 			'delete' => t('Delete'),
 		);
-		
+
 		$filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false);
 
 		$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
@@ -133,7 +144,7 @@ class Item extends BaseObject {
 		if($sp)
 			$sparkle = ' sparkle';
 		else
-			$profile_link = zrl($profile_link);                 
+			$profile_link = zrl($profile_link);
 
 		$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
 		if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
@@ -145,10 +156,13 @@ class Item extends BaseObject {
 		call_hooks('render_location',$locate);
 		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
+		$searchpath = $a->get_baseurl()."/search?tag=";
 		$tags=array();
 		$hashtags = array();
 		$mentions = array();
-		foreach(explode(',',$item['tag']) as $tag){
+
+
+		/*foreach(explode(',',$item['tag']) as $tag){
 			$tag = trim($tag);
 			if ($tag!="") {
 				$t = bbcode($tag);
@@ -158,8 +172,7 @@ class Item extends BaseObject {
 				elseif($t[0] == '@')
 					$mentions[] = $t;
 			}
-
-		}        
+		}*/
 
 		$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
 		$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
@@ -170,10 +183,10 @@ class Item extends BaseObject {
 		 * Maybe we should establish a way to be notified about conversation changes
 		 */
 		$this->check_wall_to_wall();
-		
+
 		if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
 			$osparkle = ' sparkle';
-		
+
 		if($this->is_toplevel()) {
 			if($conv->get_profile_owner() == local_user()) {
 				$isstarred = (($item['starred']) ? "starred" : "unstarred");
@@ -186,6 +199,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(
@@ -212,9 +240,34 @@ class Item extends BaseObject {
 
 		localize_item($item);
 
+		if ($item["postopts"] and !get_config("system", "suppress_language")) {
+			//$langdata = explode(";", $item["postopts"]);
+			//$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
+			$langstr = "";
+			if (substr($item["postopts"], 0, 5) == "lang=") {
+				$postopts = substr($item["postopts"], 5);
+
+				$languages = explode(":", $postopts);
+
+				if (sizeof($languages) == 1) {
+					$languages = array();
+					$languages[] = $postopts;
+				}
+
+				foreach ($languages as $language) {
+					$langdata = explode(";", $language);
+					if ($langstr != "")
+						$langstr .= ", ";
+
+					//$langstr .= $langdata[0]." (".round($langdata[1]*100, 1)."%)";
+					$langstr .= round($langdata[1]*100, 1)."% ".$langdata[0];
+				}
+			}
+		}
+
 		$body = prepare_body($item,true);
 
-        list($categories, $folders) = get_cats_and_terms($item);
+		list($categories, $folders) = get_cats_and_terms($item);
 
 		if($a->theme['template_engine'] === 'internal') {
 			$body_e = template_escape($body);
@@ -233,22 +286,43 @@ 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' : ''),
 			'has_folders' => ((count($folders)) ? 'true' : ''),
-            'categories' => $categories,
-            'folders' => $folders,            
+			'categories' => $categories,
+			'folders' => $folders,
 			'body' => $body_e,
 			'text' => $text_e,
 			'id' => $this->get_id(),
+			'guid' => $item['guid'],
 			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
 			'to' => t('to'),
@@ -258,35 +332,41 @@ class Item extends BaseObject {
 			'profile_url' => $profile_link,
 			'item_photo_menu' => item_photo_menu($item),
 			'name' => $name_e,
-			'thumb' => $profile_avatar,
+			'thumb' => proxy_url($profile_avatar),
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
 			'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,
 			'shiny' => $shiny,
 			'owner_url' => $this->get_owner_url(),
-			'owner_photo' => $this->get_owner_photo(),
+			'owner_photo' => proxy_url($this->get_owner_photo()),
 			'owner_name' => $owner_name_e,
 			'plink' => get_plink($item),
 			'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,
 			'vote' => $buttons,
 			'like' => $like,
-			'dislike'   => $dislike,
+                        'dislike'   => $dislike,
 			'switchcomment' => t('Comment'),
 			'comment' => $this->get_comment_box($indent),
 			'previewing' => ($conv->is_preview() ? ' preview ' : ''),
 			'wait' => t('Please wait'),
-			'remove' => t('remove'),
-			'thread_level' => $thread_level
+			'thread_level' => $thread_level,
+                        'postopts' => $langstr,
+                        'edited' => $edited,
+			'network' => $item["item_network"],
+			'network_name' => network_to_name($item['item_network']),
 		);
 
 		$arr = array('item' => $item, 'output' => $tmp_item);
@@ -316,12 +396,12 @@ class Item extends BaseObject {
 				}
 			}
 		}
-		
+
         if ($this->is_toplevel()) {
             $result['total_comments_num'] = "$total_children";
             $result['total_comments_text'] = tt('comment', 'comments', $total_children);
         }
-        
+
 		$result['private'] = $item['private'];
 		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
 
@@ -336,7 +416,7 @@ class Item extends BaseObject {
 
 		return $result;
 	}
-	
+
 	public function get_id() {
 		return $this->get_data_value('id');
 	}
@@ -367,7 +447,7 @@ class Item extends BaseObject {
 		if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
 			return false;
 		}
-		
+
 		$item->set_parent($this);
 		$this->children[] = $item;
 		return end($this->children);
@@ -474,7 +554,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;
 		}
 
@@ -492,13 +572,7 @@ class Item extends BaseObject {
 			return false;
 		}
 
-		if($a->theme['template_engine'] === 'smarty3') {
-			$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
-		}
-		else {
-			$template_file = $this->available_templates[$name];
-		}
-		$this->template = $template_file;
+		$this->template = $this->available_templates[$name];
 	}
 
 	/**
@@ -588,7 +662,7 @@ class Item extends BaseObject {
 				$qcomment = (($qc) ? explode("\n",$qc) : null);
 			}
 			$comment_box = replace_macros($template,array(
-				'$return_path' => '',
+				'$return_path' => $a->query_string,
 				'$threaded' => $this->is_threaded(),
 //				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
 				'$jsreload' => '',
@@ -632,11 +706,10 @@ class Item extends BaseObject {
 		$a = $this->get_app();
 		$conv = $this->get_conversation();
 		$this->wall_to_wall = false;
-		
-		if($this->is_toplevel()) {
-			if( (! $this->get_data_value('self')) && ($conv->get_mode() !== 'profile')) {
-				if($this->get_data_value('wall')) {
 
+		if($this->is_toplevel()) {
+			if($conv->get_mode() !== 'profile') {
+				if($this->get_data_value('wall') AND !$this->get_data_value('self')) {
 					// On the network page, I am the owner. On the display page it will be the profile owner.
 					// This will have been stored in $a->page_contact by our calling page.
 					// Put this person as the wall owner of the wall-to-wall notice.
@@ -651,6 +724,7 @@ class Item extends BaseObject {
 					$owner_linkmatch = (($this->get_data_value('owner-link')) && link_compare($this->get_data_value('owner-link'),$this->get_data_value('author-link')));
 					$alias_linkmatch = (($this->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link')));
 					$owner_namematch = (($this->get_data_value('owner-name')) && $this->get_data_value('owner-name') == $this->get_data_value('author-name'));
+
 					if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
 
 						// The author url doesn't match the owner (typically the contact)
@@ -661,7 +735,7 @@ class Item extends BaseObject {
 						// well that it's the same Bob Smith. 
 
 						// But it could be somebody else with the same name. It just isn't highly likely. 
-						
+
 
 						$this->owner_photo = $this->get_data_value('owner-avatar');
 						$this->owner_name = $this->get_data_value('owner-name');