X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=1524bfd369e9012e42b131ba36a5f009743c24b4;hb=2a23a7e8405cde73ad95e1c0103fe49df3a883f9;hp=549ce434d5bb3e3f1c22fc6a9ec2070247ca0521;hpb=04e65823d70d448400d3be7f0b3244ea8658834d;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 549ce434d5..1524bfd369 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -24,6 +24,9 @@ function message_post(&$a) {
 		return;
 	}
 
+	if(! strlen($subject))
+		$subject = t('[no subject]');
+
 	$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 		intval($_SESSION['uid'])
 	);
@@ -67,10 +70,11 @@ function message_post(&$a) {
 	if(count($r))
 		$post_id = $r[0]['id'];
 
-	$url = $a->get_baseurl();
-
+	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	$proc_debug = get_config('system','proc_debug');
+	
 	if($post_id) {
-		proc_close(proc_open("php include/notifier.php \"$url\" \"mail\" \"$post_id\" > mail.log &",
+		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug &",
 			array(),$foo));
 		notice( t('Message sent.') . EOL );
 	}
@@ -83,6 +87,9 @@ function message_post(&$a) {
 
 function message_content(&$a) {
 
+	$o = '';
+	$o .= '<script>	$(document).ready(function() { $(\'#nav-messages-link\').addClass(\'nav-selected\'); });</script>';
+
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
@@ -91,7 +98,7 @@ function message_content(&$a) {
 	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
 
-	$tpl = file_get_contents('view/mail_head.tpl');
+	$tpl = load_view_file('view/mail_head.tpl');
 	$header = replace_macros($tpl, array(
 		'$messages' => t('Messages'),
 		'$inbox' => t('Inbox'),
@@ -100,11 +107,11 @@ function message_content(&$a) {
 	));
 
 
-	if(($a->argc == 3) && ($a->argv[1] == 'drop' || $a->argv[1] == 'dropconv')) {
+	if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
 		if(! intval($a->argv[2]))
 			return;
 		$cmd = $a->argv[1];
-		if($cmd == 'drop') {
+		if($cmd === 'drop') {
 			$r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($a->argv[2]),
 				intval($_SESSION['uid'])
@@ -132,24 +139,27 @@ function message_content(&$a) {
 		}	
 	
 	}
-	if(($a->argc > 2) && ($a->argv[1] == 'redeliver') && intval($a->argv[2])) {
-		$url = $a->get_baseurl();
+	if(($a->argc > 2) && ($a->argv[1] === 'redeliver') && intval($a->argv[2])) {
 		$post_id = intval($a->argv[2]);
-		proc_close(proc_open("php include/notifier.php \"$url\" \"mail\" \"$post_id\" > mail.log &",
+		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+		$proc_debug = get_config('system','proc_debug');
+
+
+		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug & ",
 			array(),$foo));
 		goaway($a->get_baseurl() . '/message' );
 	}
 
 
 
-	if(($a->argc > 1) && ($a->argv[1] == 'new')) {
+	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
 		
-		$tpl = file_get_contents('view/msg-header.tpl');
+		$tpl = load_view_file('view/msg-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
-		$select .= contact_select('messageto','message-to-select', false, 4, true);
-		$tpl = file_get_contents('view/prv_message.tpl');
+		$select = contact_select('messageto','message-to-select', false, 4, true);
+		$tpl = load_view_file('view/prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
@@ -168,7 +178,7 @@ function message_content(&$a) {
 		return $o;
 	}
 
-	if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] == 'sent')) {
+	if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) {
 
 		$o .= $header;
 		
@@ -199,12 +209,13 @@ function message_content(&$a) {
 			return $o;
 		}
 
-		$tpl = file_get_contents('view/mail_list.tpl');
+		$tpl = load_view_file('view/mail_list.tpl');
 		foreach($r as $rr) {
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
 				'$from_name' =>$rr['from-name'],
 				'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
+				'$sparkle' => ' sparkle',
 				'$from_photo' => $rr['from-photo'],
 				'$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
 				'$delete' => t('Delete conversation'),
@@ -248,18 +259,26 @@ function message_content(&$a) {
 
 		require_once("include/bbcode.php");
 
-		$tpl = file_get_contents('view/msg-header.tpl');
+		$tpl = load_view_file('view/msg-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
 
-		$tpl = file_get_contents('view/mail_conv.tpl');
+		$tpl = load_view_file('view/mail_conv.tpl');
 		foreach($messages as $message) {
+			if($message['from-url'] == $myprofile) {
+				$from_url = $myprofile;
+				$sparkle = '';
+			}
+			else {
+				$from_url = $a->get_baseurl() . '/redir/' . $message['contact-id'];
+				$sparkle = ' sparkle';
+			}
 			$o .= replace_macros($tpl, array(
 				'$id' => $message['id'],
 				'$from_name' =>$message['from-name'],
-				'$from_url' => (($message['from-url'] == $myprofile) 
-					? $myprofile : $a->get_baseurl() . '/redir/' . $message['contact-id']),
+				'$from_url' => $from_url,
+				'$sparkle' => $sparkle,
 				'$from_photo' => $message['from-photo'],
 				'$subject' => $message['title'],
 				'$body' => bbcode($message['body']),
@@ -271,7 +290,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 = file_get_contents('view/prv_message.tpl');
+		$tpl = load_view_file('view/prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Reply'),
 			'$to' => t('To:'),