X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=9d30abd668df63040c8a0af34caece92602ec3f2;hb=f20464112f274d720649c2f92480cc235df4db19;hp=c004b3d63b4ec29f34b85a6a0899769ce75963dc;hpb=acce5c95a373c68ac8a834396e822f6b177352ca;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index c004b3d63b..9d30abd668 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -87,24 +87,18 @@ function message_post(&$a) {
 				$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' ",
+					WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
 					dbesc('<' . $recipient . '>'),
 					dbesc($image_uri),
-					dbesc( t('Wall Photos'))
+					dbesc( t('Wall Photos')),
+					intval(local_user())
 				); 
 			}
 		}
 	}
-
-
-
-
-
-	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 	
 	if($post_id) {
-		//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo));
-		proc_run($php_path,"include/notifier.php","mail","$post_id");
+		proc_run('php',"include/notifier.php","mail","$post_id");
 		notice( t('Message sent.') . EOL );
 	}
 	else {
@@ -171,9 +165,13 @@ 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()));
 
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$nickname' => $a->user['nickname'],
+			'$linkurl' => t('Please enter a link URL:')
+		));
+	
 		$select = contact_select('messageto','message-to-select', false, 4, true);
 		$tpl = load_view_file('view/prv_message.tpl');
 		$o .= replace_macros($tpl,array(