X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=ad598eb7d07f1b7f4b9a9e76d5d651743b56c694;hb=fcf6651299418f834076649f1fad4833476aad76;hp=9cc2e2826cf0e5d6eae7d45a6609d2e52cefda77;hpb=3811923c14b5a2be88104ea8069d0d0bb3d9800a;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 9cc2e2826c..ad598eb7d0 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,11 +2,6 @@
 
 require_once('include/acl_selectors.php');
 
-function message_init(&$a) {
-
-
-}
-
 function message_post(&$a) {
 
 	if(! local_user()) {
@@ -69,18 +64,47 @@ function message_post(&$a) {
 	if(count($r))
 		$post_id = $r[0]['id'];
 
-	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	/**
+	 *
+	 * When a photo was uploaded into the message using the (profile wall) ajax 
+	 * uploader, The permissions are initially set to disallow anybody but the
+	 * owner from seeing it. This is because the permissions may not yet have been
+	 * set for the post. If it's private, the photo permissions should be set
+	 * appropriately. But we didn't know the final permissions on the post until
+	 * now. So now we'll look for links of uploaded messages that are in the
+	 * post and set them to the same permissions as the post itself.
+	 *
+	 */
+
+	$match = null;
+
+	if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+		$images = $match[1];
+		if(count($images)) {
+			foreach($images as $image) {
+				if(! stristr($image,$a->get_baseurl() . '/photo/'))
+					continue;
+				$image_uri = substr($image,strrpos($image,'/') + 1);
+				$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+				$r = q("UPDATE `photo` SET `allow_cid` = '%s'
+					WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
+					dbesc('<' . $recipient . '>'),
+					dbesc($image_uri),
+					dbesc( t('Wall Photos')),
+					intval(local_user())
+				); 
+			}
+		}
+	}
 	
 	if($post_id) {
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
-			array(),$foo));
-		notice( t('Message sent.') . EOL );
+		proc_run('php',"include/notifier.php","mail","$post_id");
+		info( t('Message sent.') . EOL );
 	}
 	else {
 		notice( t('Message could not be sent.') . EOL );
 	}
 	return;
-
 }
 
 function message_content(&$a) {
@@ -96,7 +120,7 @@ function message_content(&$a) {
 	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
 
-	$tpl = load_view_file('view/mail_head.tpl');
+	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
 		'$messages' => t('Messages'),
 		'$inbox' => t('Inbox'),
@@ -115,7 +139,7 @@ function message_content(&$a) {
 				intval(local_user())
 			);
 			if($r) {
-				notice( t('Message deleted.') . EOL );
+				info( t('Message deleted.') . EOL );
 			}
 			goaway($a->get_baseurl() . '/message' );
 		}
@@ -131,7 +155,7 @@ function message_content(&$a) {
 					intval(local_user())
 				);
 				if($r)
-					notice( t('Conversation removed.') . EOL );
+					info( t('Conversation removed.') . EOL );
 			} 
 			goaway($a->get_baseurl() . '/message' );
 		}	
@@ -140,12 +164,18 @@ function message_content(&$a) {
 
 	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
 		
-		$tpl = load_view_file('view/msg-header.tpl');
-	
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+		$tpl = get_markup_template('msg-header.tpl');
 
-		$select = contact_select('messageto','message-to-select', false, 4, true);
-		$tpl = load_view_file('view/prv_message.tpl');
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$nickname' => $a->user['nickname'],
+			'$linkurl' => t('Please enter a link URL:')
+		));
+	
+		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+	
+		$select = contact_select('messageto','message-to-select', $preselect, 4, true);
+		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
@@ -191,11 +221,11 @@ function message_content(&$a) {
 			intval($a->pager['itemspage'])
 		);
 		if(! count($r)) {
-			notice( t('No messages.') . EOL);
+			info( t('No messages.') . EOL);
 			return $o;
 		}
 
-		$tpl = load_view_file('view/mail_list.tpl');
+		$tpl = get_markup_template('mail_list.tpl');
 		foreach($r as $rr) {
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
@@ -207,7 +237,7 @@ function message_content(&$a) {
 				'$delete' => t('Delete conversation'),
 				'$body' => $rr['body'],
 				'$to_name' => $rr['name'],
-				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A')
+				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A'))
 			));
 		}
 		$o .= paginate($a);	
@@ -245,7 +275,7 @@ function message_content(&$a) {
 
 		require_once("include/bbcode.php");
 
-		$tpl = load_view_file('view/msg-header.tpl');
+		$tpl = get_markup_template('msg-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$nickname' => $a->user['nickname'],
@@ -253,7 +283,7 @@ function message_content(&$a) {
 		));
 
 
-		$tpl = load_view_file('view/mail_conv.tpl');
+		$tpl = get_markup_template('mail_conv.tpl');
 		foreach($messages as $message) {
 			if($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
@@ -279,7 +309,7 @@ function message_content(&$a) {
 		}
 		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-		$tpl = load_view_file('view/prv_message.tpl');
+		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Reply'),
 			'$to' => t('To:'),
@@ -298,4 +328,4 @@ function message_content(&$a) {
 		return $o;
 	}
 
-}
\ No newline at end of file
+}