X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=6b1f6492508aa9d9360ddae056da378cb106dc1a;hb=0c9f033505be5dbc2303d8758894e57c616c6534;hp=b536fed5fdb00009a18e98f3c27bbcdb3b29f3c9;hpb=9e2db5d5a614b5dedcd63cdc966c1382a1dfcd7a;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index b536fed5fd..6b1f649250 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -5,8 +5,7 @@
  */
 function localize_item(&$item){
 	
-	if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
-		$item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
+	if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
 
 		$r = q("SELECT * from `item`,`contact` WHERE 
 				`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -17,23 +16,42 @@ function localize_item(&$item){
 		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
 		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
 		
-		$post_type = (($obj['resource-id']) ? t('photo') : t('status'));		
+		switch($obj['verb']){
+			case ACTIVITY_POST:
+				switch ($obj['object-type']){
+					case ACTIVITY_OBJ_EVENT:
+						$post_type = t('event');
+						break;
+					default:
+						$post_type = t('status');
+				}
+				break;
+			default:
+				if($obj['resource-id']){
+					$post_type = t('photo');
+					$m=array();	preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+					$rr['plink'] = $m[1];
+				} else {
+					$post_type = t('status');
+				}
+		}
+	
 		$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
                 
 		switch($item['verb']){
-			case "http://activitystrea.ms/schema/1.0/like":
+			case ACTIVITY_LIKE :
 				$bodyverb = t('%1$s likes %2$s\'s %3$s');
 				break;
-			case "http://activitystrea.ms/schema/1.0/dislike":
+			case ACTIVITY_DISLIKE:
 				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 				break;
 		}
 		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 			
 	}
-	if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
+	if ($item['verb']=== ACTIVITY_FRIEND){
 
-		if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
+		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
 
 		$Aname = $item['author-name'];
 		$Alink = $item['author-link'];
@@ -101,6 +119,11 @@ function conversation(&$a, $items, $mode, $update) {
 		$page_writeable = can_write_wall($a,$profile_owner);
 	}
 
+	if($mode === 'community') {
+		$profile_owner = 0;
+		$page_writeable = false;
+	}
+
 	if($update)
 		$return_url = $_SESSION['return_url'];
 	else
@@ -122,7 +145,7 @@ function conversation(&$a, $items, $mode, $update) {
 	
 	if(count($items)) {
 
-		if($mode === 'network-new' || $mode === 'search') {
+		if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
 
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
@@ -137,7 +160,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$owner_name  = '';
 				$sparkle     = '';
 
-				if($mode === 'search') {
+				if($mode === 'search' || $mode === 'community') {
 					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
 						&& ($item['id'] != $item['parent']))
 						continue;
@@ -174,9 +197,14 @@ function conversation(&$a, $items, $mode, $update) {
 				$drop = '';
 
 				localize_item($item);
+				if($mode === 'network-new')
+					$t = $droptpl;
+				else
+					$t = $fakedrop;
 
-				$drop = replace_macros($droptpl,array('$id' => $item['id']));
+				$drop = replace_macros($t,array('$id' => $item['id']));
 				$lock = '<div class="wall-item-lock"></div>';
+				$star = '';
 
 				$body = prepare_body($item,true);
 				
@@ -191,12 +219,13 @@ function conversation(&$a, $items, $mode, $update) {
 					'$thumb' => $profile_avatar,
 					'$title' => $item['title'],
 					'$body' => $body,
-					'$ago' => relative_date($item['created']),
+					'$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 					'$location' => $location,
 					'$indent' => '',
 					'$owner_url' => $owner_url,
 					'$owner_photo' => $owner_photo,
 					'$owner_name' => $owner_name,
+					'$star' => $star,
 					'$drop' => $drop,
 					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
 				));
@@ -318,7 +347,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
 
-				if($item['type'] === 'wall') {
+				if($item['wall']) {
 
 					// 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.
@@ -330,7 +359,7 @@ function conversation(&$a, $items, $mode, $update) {
 					$template = $wallwall;
 					$commentww = 'ww';	
 				}
-				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+				if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
 
 					// Could be anybody. 
 
@@ -381,8 +410,8 @@ function conversation(&$a, $items, $mode, $update) {
 			}
 
 			$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
-					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
-						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
+					? '<a class="editpost icon pencil" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
+						. '" title="' . t('Edit') . '"></a>'
 					: '');
 
 
@@ -394,6 +423,8 @@ function conversation(&$a, $items, $mode, $update) {
 
             $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
 
+			$star = (($profile_owner == local_user() && $toplevelpost) ? '<a href="#" id="starred-' . $item['id'] . '" onclick="dostar(' . $item['id'] . '); return false;" class="star-item icon ' . (($item['starred']) ? 'starred' : 'unstarred') . '" title="' . t('toggle star status')  . '"></a>' : '');
+
 
 			$photo = $item['photo'];
 			$thumb = $item['thumb'];
@@ -413,7 +444,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$profile_link = '';
 
 			$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-			if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
+			if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
 				$profile_avatar = $a->contacts[$normalised]['thumb'];
 			else
 				$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
@@ -464,7 +495,7 @@ function conversation(&$a, $items, $mode, $update) {
 				'$sparkle' => $sparkle,
 				'$title' => $item['title'],
 				'$body' => $body,
-				'$ago' => relative_date($item['created']),
+				'$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 				'$lock' => $lock,
 				'$location' => $location,
 				'$indent' => $indent,
@@ -473,6 +504,7 @@ function conversation(&$a, $items, $mode, $update) {
 				'$owner_name' => $owner_name,
 				'$plink' => get_plink($item),
 				'$edpost' => $edpost,
+				'$star' => $star,
 				'$drop' => $drop,
 				'$vote' => $likebuttons,
 				'$like' => $like,
@@ -501,33 +533,6 @@ function conversation(&$a, $items, $mode, $update) {
 	return $o;
 } 
 
-
-if(! function_exists('load_contact_links')) {
-function load_contact_links($uid) {
-
-	$a = get_app();
-
-	$ret = array();
-
-	if(! $uid || x($a->contacts,'empty'))
-		return;
-
-	$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
-			intval($uid)
-	);
-	if(count($r)) {
-		foreach($r as $rr){
-			$url = normalise_link($rr['url']);
-			$ret[$url] = $rr;
-		}
-	}
-	else 
-		$ret['empty'] = true;	
-	$a->contacts = $ret;
-	return;		
-}}
-
-
 function best_link_url($item,&$sparkle) {
 
 	$a = get_app();
@@ -765,4 +770,4 @@ function status_editor($a,$x, $notes_cid = 0) {
 		));
 
 	return $o;
-}
\ No newline at end of file
+}