X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=4821a45d263bc0aa5a1bb12d05ce7e84e2a3c44c;hb=878bdeccfd66b7b8229fd761c23ba13bc51c7454;hp=3f5b71cc2f34bb50eedab36e26648a35b5ff1948;hpb=8c395f96deb3d9bc9c24e3c62b3709de12d44f39;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 3f5b71cc2f..4821a45d26 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()) {
@@ -47,8 +42,8 @@ function message_post(&$a) {
 		$replyto = $uri;
 
 	$r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`, 
-		`contact-id`, `title`, `body`, `delivered`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
-		VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
+		`contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
+		VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
 		intval(local_user()),
 		dbesc($me[0]['name']),
 		dbesc($me[0]['thumb']),
@@ -56,7 +51,6 @@ function message_post(&$a) {
 		intval($recipient),
 		dbesc($subject),
 		dbesc($body),
-		0,
 		1,
 		0,
 		dbesc($uri),
@@ -70,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));
+		proc_run('php',"include/notifier.php","mail","$post_id");
 		notice( t('Message sent.') . EOL );
 	}
 	else {
 		notice( t('Message could not be sent.') . EOL );
 	}
 	return;
-
 }
 
 function message_content(&$a) {
@@ -138,23 +161,16 @@ function message_content(&$a) {
 		}	
 	
 	}
-	if(($a->argc > 2) && ($a->argv[1] === 'redeliver') && intval($a->argv[2])) {
-		$post_id = intval($a->argv[2]);
-		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" & ",
-			array(),$foo));
-		goaway($a->get_baseurl() . '/message' );
-	}
-
-
 
 	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()));
 
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$nickname' => $a->user['nickname']
+		));
+	
 		$select = contact_select('messageto','message-to-select', false, 4, true);
 		$tpl = load_view_file('view/prv_message.tpl');
 		$o .= replace_macros($tpl,array(
@@ -213,7 +229,7 @@ function message_content(&$a) {
 				'$from_name' =>$rr['from-name'],
 				'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
 				'$sparkle' => ' sparkle',
-				'$from_photo' => $rr['from-photo'],
+				'$from_photo' => $rr['thumb'],
 				'$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
 				'$delete' => t('Delete conversation'),
 				'$body' => $rr['body'],
@@ -258,7 +274,10 @@ function message_content(&$a) {
 
 		$tpl = load_view_file('view/msg-header.tpl');
 	
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$nickname' => $a->user['nickname'],
+			'$baseurl' => $a->get_baseurl()
+		));
 
 
 		$tpl = load_view_file('view/mail_conv.tpl');
@@ -278,7 +297,7 @@ function message_content(&$a) {
 				'$sparkle' => $sparkle,
 				'$from_photo' => $message['from-photo'],
 				'$subject' => $message['title'],
-				'$body' => bbcode($message['body']),
+				'$body' => smilies(bbcode($message['body'])),
 				'$delete' => t('Delete message'),
 				'$to_name' => $message['name'],
 				'$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')