X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FItem.php;h=b8afe2213a547651b49607a973ef5f542157683a;hb=c8b4ce9ccad9e710bdc40086368aba1c6ec05f6d;hp=0639e4db71302bd271d11348498b85e0eb9aca6b;hpb=04f14d96c679d1732993252d137515ad38c4b41f;p=friendica.git

diff --git a/object/Item.php b/object/Item.php
index 0639e4db71..b8afe2213a 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -18,7 +18,7 @@ class Item extends BaseObject {
 	);
 	private $comment_box_template = 'comment_item.tpl';
 	private $toplevel = false;
-	private $writeable = false;
+	private $writable = false;
 	private $children = array();
 	private $parent = null;
 	private $conversation = null;
@@ -27,6 +27,8 @@ class Item extends BaseObject {
 	private $owner_photo = '';
 	private $owner_name = '';
 	private $wall_to_wall = false;
+	private $threaded = false;
+	private $visiting = false;
 
 	public function __construct($data) {
 		$a = $this->get_app();
@@ -34,14 +36,36 @@ class Item extends BaseObject {
 		$this->data = $data;
 		$this->set_template('wall');
 		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
-		$this->writeable = ($this->get_data_value('writeable') || $this->get_data_value('self'));
+
+		if(is_array($_SESSION['remote'])) {
+			foreach($_SESSION['remote'] as $visitor) {
+				if($visitor['cid'] == $this->get_data_value('contact-id')) {
+					$this->visiting = true;
+					break;
+				}
+			}
+		}
+		
+		$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
 
 		$ssl_state = ((local_user()) ? true : false);
 		$this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ;
 
+		if(get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel())
+			$this->threaded = true;
+
 		// Prepare the children
 		if(count($data['children'])) {
 			foreach($data['children'] as $item) {
+				/*
+				 * Only add will be displayed
+				 */
+				if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+					continue;
+				}
+				if(! visible_activity($item)) {
+					continue;
+				}
 				$child = new Item($item);
 				$this->add_child($child);
 			}
@@ -52,8 +76,8 @@ class Item extends BaseObject {
 	 * Get data in a form usable by a conversation template
 	 *
 	 * Returns:
-	 * 		_ The data requested on success
-	 * 		_ false on failure
+	 *      _ The data requested on success
+	 *      _ false on failure
 	 */
 	public function get_template_data($alike, $dlike, $thread_level=1) {
 		$result = array();
@@ -69,6 +93,7 @@ class Item extends BaseObject {
 		$star = false;
 		$isstarred = "unstarred";
 		$indent = '';
+		$shiny = '';
 		$osparkle = '';
 		$total_children = $this->count_descendants();
 
@@ -83,11 +108,12 @@ class Item extends BaseObject {
 			$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
 		else
 			$edpost = false;
-		if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+		if(($this->get_data_value('uid') == local_user()) || $this->is_visiting())
 			$dropping = true;
 
 		$drop = array(
 			'dropping' => $dropping,
+			'pagedrop' => $item['pagedrop'],
 			'select' => t('Select'), 
 			'delete' => t('Delete'),
 		);
@@ -106,7 +132,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)))
@@ -119,10 +145,20 @@ class Item extends BaseObject {
 		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
 		$tags=array();
+		$hashtags = array();
+		$mentions = array();
 		foreach(explode(',',$item['tag']) as $tag){
 			$tag = trim($tag);
-			if ($tag!="") $tags[] = bbcode($tag);
-		}
+			if ($tag!="") {
+				$t = bbcode($tag);
+				$tags[] = $t;
+				if($t[0] == '#')
+					$hashtags[] = $t;
+				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']) : '');
@@ -156,7 +192,7 @@ class Item extends BaseObject {
 			$indent = 'comment';
 		}
 
-		if($conv->is_writeable()) {
+		if($conv->is_writable()) {
 			$buttons = array(
 				'like' => array( t("I like this \x28toggle\x29"), t("like")),
 				'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
@@ -164,18 +200,29 @@ class Item extends BaseObject {
 			if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
 		}
 
-		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-			$indent .= ' shiny';
+		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0){
+			$shiny = 'shiny';
+		}
 
 		localize_item($item);
 
 		$body = prepare_body($item,true);
 
+        list($categories, $folders) = get_cats_and_terms($item);
+
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			
 			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 			'tags' => $tags,
+            'hashtags' => $hashtags,
+            'mentions' => $mentions,
+			'txt_cats' => t('Categories:'),
+			'txt_folders' => t('Filed under:'),
+			'has_cats' => ((count($categories)) ? 'true' : ''),
+			'has_folders' => ((count($folders)) ? 'true' : ''),
+            'categories' => $categories,
+            'folders' => $folders,            
 			'body' => template_escape($body),
 			'text' => strip_tags(template_escape($body)),
 			'id' => $this->get_id(),
@@ -191,10 +238,12 @@ class Item extends BaseObject {
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
 			'title' => template_escape($item['title']),
+			'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'])),
 			'lock' => $lock,
 			'location' => template_escape($location),
 			'indent' => $indent,
+			'shiny' => $shiny,
 			'owner_url' => $this->get_owner_url(),
 			'owner_photo' => $this->get_owner_photo(),
 			'owner_name' => template_escape($this->get_owner_name()),
@@ -207,9 +256,10 @@ class Item extends BaseObject {
 			'vote' => $buttons,
 			'like' => $like,
 			'dislike' => $dislike,
-			'comment' => $this->get_comment_box(),
-			'previewing' => $previewing,
+			'comment' => $this->get_comment_box($indent),
+			'previewing' => ($conv->is_preview() ? ' preview ' : ''),
 			'wait' => t('Please wait'),
+			'thread_level' => $thread_level
 		);
 
 		$arr = array('item' => $item, 'output' => $tmp_item);
@@ -228,6 +278,8 @@ class Item extends BaseObject {
 			if(($nb_children > 2) || ($thread_level > 1)) {
 				$result['children'][0]['comment_firstcollapsed'] = true;
 				$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+				$result['children'][0]['hidden_comments_num'] = $total_children;
+				$result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children);
 				$result['children'][0]['hide_text'] = t('show more');
 				if($thread_level > 1) {
 					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
@@ -238,10 +290,15 @@ 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' : '');
 
-		if(get_config('system','thread_allow')) {
+		if($this->is_threaded()) {
 			$result['flatten'] = false;
 			$result['threaded'] = true;
 		}
@@ -257,6 +314,10 @@ class Item extends BaseObject {
 		return $this->get_data_value('id');
 	}
 
+	public function is_threaded() {
+		return $this->threaded;
+	}
+
 	/**
 	 * Add a child item
 	 */
@@ -270,6 +331,16 @@ class Item extends BaseObject {
 			logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG);
 			return false;
 		}
+		/*
+		 * Only add what will be displayed
+		 */
+		if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
+			return false;
+		}
+		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);
@@ -371,11 +442,11 @@ class Item extends BaseObject {
 	 * Get a data value
 	 *
 	 * Returns:
-	 * 		_ value on success
-	 * 		_ false on failure
+	 *      _ value on success
+	 *      _ false on failure
 	 */
 	public function get_data_value($name) {
-		if(!x($this->data, $name)) {
+		if(!isset($this->data[$name])) {
 			logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
 			return false;
 		}
@@ -409,10 +480,17 @@ class Item extends BaseObject {
 	}
 
 	/**
-	 * Check if this is writeable
+	 * Check if this is writable
 	 */
-	private function is_writeable() {
-		return $this->writeable;
+	private function is_writable() {
+		$conv = $this->get_conversation();
+
+		if($conv) {
+			// This will allow us to comment on wall-to-wall items owned by our friends
+			// and community forums even if somebody else wrote the post.
+			return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'profile'));
+		}
+		return $this->writable;
 	}
 
 	/**
@@ -440,11 +518,12 @@ class Item extends BaseObject {
 	 * Get the comment box
 	 *
 	 * Returns:
-	 * 		_ The comment box string (empty if no comment box)
-	 * 		_ false on failure
+	 *      _ The comment box string (empty if no comment box)
+	 *      _ false on failure
 	 */
-	private function get_comment_box() {
-		if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
+	private function get_comment_box($indent) {
+		$a = $this->get_app();
+		if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
 			return '';
 		}
 		
@@ -455,8 +534,7 @@ class Item extends BaseObject {
 		if( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() )
 			$ww = 'ww';
 
-		if($conv->is_writeable() && $this->is_writeable()) {
-			$a = $this->get_app();
+		if($conv->is_writable() && $this->is_writable()) {
 			$qc = $qcomment =  null;
 
 			/*
@@ -468,8 +546,10 @@ class Item extends BaseObject {
 				$qcomment = (($qc) ? explode("\n",$qc) : null);
 			}
 			$comment_box = replace_macros($template,array(
-				'$return_path' => '', 
-				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+				'$return_path' => '',
+				'$threaded' => $this->is_threaded(),
+//				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+				'$jsreload' => '',
 				'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
 				'$id' => $this->get_id(),
 				'$parent' => $this->get_id(),
@@ -489,8 +569,10 @@ class Item extends BaseObject {
 				'$edurl' => t('Link'),
 				'$edvideo' => t('Video'),
 				'$preview' => t('Preview'),
+				'$indent' => $indent,
 				'$sourceapp' => t($a->sourcename),
-				'$ww' => (($conv->get_mode() === 'network') ? $ww : '')
+				'$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
+				'$rand_num' => random_digits(12)
 			));
 		}
 
@@ -520,38 +602,36 @@ class Item extends BaseObject {
 					$this->owner_url = zrl($a->page_contact['url']);
 					$this->owner_photo = $a->page_contact['thumb'];
 					$this->owner_name = $a->page_contact['name'];
-					$this->set_template('wall2wall');
 					$this->wall_to_wall = true;
 				}
-			}
-			else if($this->get_data_value('owner-link')) {
-
-				$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)
-					// and also doesn't match the contact alias. 
-					// The name match is a hack to catch several weird cases where URLs are 
-					// all over the park. It can be tricked, but this prevents you from
-					// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-					// 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');
-					$this->set_template('wall2wall');
-					$this->wall_to_wall = true;
-					// If it is our contact, use a friendly redirect link
-					if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
-						&& ($this->get_data_value('network') === NETWORK_DFRN)) {
-						$this->owner_url = $this->get_redirect_url();
+				else if($this->get_data_value('owner-link')) {
+
+					$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)
+						// and also doesn't match the contact alias. 
+						// The name match is a hack to catch several weird cases where URLs are 
+						// all over the park. It can be tricked, but this prevents you from
+						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+						// 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');
+						$this->wall_to_wall = true;
+						// If it is our contact, use a friendly redirect link
+						if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
+							&& ($this->get_data_value('network') === NETWORK_DFRN)) {
+							$this->owner_url = $this->get_redirect_url();
+						}
+						else
+							$this->owner_url = zrl($this->get_data_value('owner-link'));
 					}
-					else
-						$this->owner_url = zrl($this->get_data_value('owner-link'));
 				}
 			}
 		}
@@ -579,5 +659,13 @@ class Item extends BaseObject {
 	private function get_owner_name() {
 		return $this->owner_name;
 	}
+
+	private function is_visiting() {
+		return $this->visiting;
+	}
+
+
+
+
 }
 ?>