Merge https://github.com/redmatrix/hubzilla into pending_merge

include/message.php

@@ -13,6 +13,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 	$ret = array('success' => false);
 
 	$a = get_app();
+	$observer_hash = get_observer_hash();
 
 	if(! $recipient) {
 		$ret['message'] = t('No recipient provided.');
@@ -148,8 +149,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 
 	$match = null;
 	$images = null;
-	if(preg_match_all("/\[zmg\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
-		$images = $match[1];
+	if(preg_match_all("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
+		$images = $match[3];
 
 	$match = false;
 
@@ -173,7 +174,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 					'revision' => $r['data']['revision']
 				);
 			}
-			$body = str_replace($match[1],'',$body);
+			$body = trim(str_replace($match[1],'',$body));
 		}
 	}
 
@@ -230,7 +231,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 				dbesc($image_uri),
 				intval($channel['channel_id']),
 				dbesc('<' . $channel['channel_hash'] . '>')
-			); 
+			);
 			$r = q("UPDATE attach SET allow_cid = '%s' WHERE hash = '%s' AND is_photo = 1 and uid = %d and allow_cid = '%s'",
 				dbesc('<' . $recipient . '>'),
 				dbesc($image_uri),
@@ -239,7 +240,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 			); 
 		}
 	}
-	
+
 	if($attaches) {
 		foreach($attaches as $attach) {
 			$hash = substr($attach,0,strpos($attach,','));

mod/mail.php

@@ -329,7 +329,8 @@ function mail_content(&$a) {
 			'to_url' =>  chanlink_hash($message['to_xchan']),
 			'to_photo' => $message['to']['xchan_photo_s'],
 			'subject' => $message['title'],
-			'body' => smilies(bbcode($message['body']) . $s),
+			'body' => smilies(bbcode($message['body'])),
+			'attachments' => $s,
 			'delete' => t('Delete message'),
 			'dreport' => t('Delivery report'),
 			'recall' => t('Recall message'),

view/css/mod_mail.css

@@ -24,3 +24,7 @@
 #prvmail-rotator {
 	margin: 15px;
 }
+
+.mail-conv-outside-wrapper {
+	margin-bottom: 20px;
+}

view/theme/redbasic/css/style.css

@@ -1722,6 +1722,13 @@ nav .dropdown-menu {
 	border-bottom-left-radius: $radiuspx;
 }
 
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:focus,
+.dropdown-menu > .active > a:hover {
+	color: #333;
+	background-color: #f5f5f5;
+}
+
 .dropdown-menu-img-sm {
 	float: left;
 	width: 36px;

view/theme/redbasic/schema/bluegrid.css

@@ -110,7 +110,7 @@ input#jot-title:hover, input#jot-title:focus {
     border-color: transparent;
 }
 
-nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu {
+nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
     background-color: rgba(67,72,138,.97);
     color: #fff;
     border-radius: 0;

view/tpl/mail_conv.tpl

@@ -13,6 +13,12 @@
 			{{$mail.body}}
 			<div class="clear"></div>
 		</div>
+		{{if $mail.attachments}}
+		<div class="dropdown pull-left">
+			<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</ul>
+		</div>
+		{{/if}}
 		<div class="pull-right dropdown">
 			<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
 				<i class="icon-caret-down"></i>