X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=38816a7d71ca1d2c31de29622c7a59cccca16849;hb=7d455a039552049de82704a20ccda9fe05c173d4;hp=0919419ecdd3ec01327a0ecb7e3196bdffe5c60c;hpb=afdbbaf27d4f841fce977186f125db452292da7c;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 0919419ecd..38816a7d71 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -33,14 +33,33 @@ function localize_item(&$item){
 	}
 	if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
 
-		$b = str_replace("[/url]","[/url]\n", $item['body']);
-		preg_match_all("|(\[url.*\[/url\])|", $b, $match);
+		if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
+
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		
+		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+		
+		$obj = parse_xml_string($xmlhead.$item['object']);
+		$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+		
+		$Bname = $obj->title;
+		$Blink = ""; $Bphoto = "";
+		foreach ($links->link as $l){
+			$atts = $l->attributes();
+			switch($atts['rel']){
+				case "alternate": $Blink = $atts['href'];
+				case "photo": $Bphoto = $atts['href'];
+			}
+			
+		}
+		
+		$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
+		$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
+		if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
+
+		$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
-		$item['body'] = $match[0][0]." "
-						.t('is now friends with')
-						." ".$match[0][1]."\n\n\n"
-						.$match[0][2];
-                
 	}
         
 }
@@ -275,6 +294,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$comments_seen ++;
 
 
+			$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
 			$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
@@ -349,7 +369,7 @@ function conversation(&$a, $items, $mode, $update) {
 					));
 				}
 
-				if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) {
+				if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
 					$comment = replace_macros($cmnt_tpl,array(
 						'$return_path' => '', 
 						'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
@@ -579,8 +599,8 @@ function item_photo_menu($item){
 	$menu = Array(
 		t("View status") => $status_link,
 		t("View profile") => $profile_link,
-		t("View photos") => $photos_link,
-		t("View recent") => $posts_link,		
+		t("View photos") => $photos_link,		
+		t("View recent") => $posts_link, 
 		t("Edit contact") => $contact_url,
 		t("Send PM") => $pm_url,
 	);
@@ -653,3 +673,88 @@ function format_like($cnt,$arr,$type,$id) {
 	}
 	return $o;
 }}
+
+
+function status_editor($a,$x) {
+
+	$o = '';
+		
+	$geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+
+		$tpl = load_view_file('view/jot-header.tpl');
+	
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$geotag' => $geotag,
+			'$nickname' => $x['nickname'],
+			'$linkurl' => t('Please enter a link URL:'),
+			'$utubeurl' => t('Please enter a YouTube link:'),
+			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
+			'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+			'$whereareu' => t('Where are you right now?'),
+			'$title' => t('Enter a title for this item') 
+		));
+
+
+		$tpl = load_view_file("view/jot.tpl");
+		
+		$jotplugins = '';
+		$jotnets = '';
+
+		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+		$mail_enabled = false;
+		$pubmail_enabled = false;
+
+		if(($x['is_owner']) && (! $mail_disabled)) {
+			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+				intval(local_user())
+			);
+			if(count($r)) {
+				$mail_enabled = true;
+				if(intval($r[0]['pubmail']))
+					$pubmail_enabled = true;
+			}
+		}
+
+		if($mail_enabled) {
+	       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+			$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+           	. t("Post to Email") . '</div>';
+		}
+
+		call_hooks('jot_tool', $jotplugins);
+		call_hooks('jot_networks', $jotnets);
+
+		$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
+
+		$o .= replace_macros($tpl,array(
+			'$return_path' => $a->cmd,
+			'$action' => 'item',
+			'$share' => t('Share'),
+			'$upload' => t('Upload photo'),
+			'$weblink' => t('Insert web link'),
+			'$youtube' => t('Insert YouTube video'),
+			'$video' => t('Insert Vorbis [.ogg] video'),
+			'$audio' => t('Insert Vorbis [.ogg] audio'),
+			'$setloc' => t('Set your location'),
+			'$noloc' => t('Clear browser location'),
+			'$title' => t('Set title'),
+			'$wait' => t('Please wait'),
+			'$permset' => t('Permission settings'),
+			'$content' => '',
+			'$post_id' => '',
+			'$baseurl' => $a->get_baseurl(),
+			'$defloc' => $x['default_location'],
+			'$visitor' => $x['visitor'],
+			'$emailcc' => t('CC: email addresses'),
+			'$jotnets' => $jotnets,
+			'$emtitle' => t('Example: bob@example.com, mary@example.com'),
+			'$lockstate' => $x['lockstate'],
+			'$acl' => $x['acl'],
+			'$bang' => $x['bang'],
+			'$profile_uid' => $x['profile_uid'],
+		));
+
+	return $o;
+}
\ No newline at end of file