X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=9cc2e2826cf0e5d6eae7d45a6609d2e52cefda77;hb=723aca6109f57e68654c978169b57b73ab25330f;hp=eb18bac8989c1a6b615f97341e9ee8473565b360;hpb=b399b20dee2752a038a64a8be2c89df142aae280;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index eb18bac898..9cc2e2826c 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
 
 function message_init(&$a) {
 
@@ -14,22 +14,25 @@ function message_post(&$a) {
 		return;
 	}
 
-	$replyto = notags(trim($_POST['replyto']));
-	$recipient = intval($_POST['messageto']);
-	$subject = notags(trim($_POST['subject']));
-	$body = escape_tags(trim($_POST['body']));
+	$replyto   = ((x($_POST,'replyto'))   ? notags(trim($_POST['replyto']))   : '');
+	$subject   = ((x($_POST,'subject'))   ? notags(trim($_POST['subject']))   : '');
+	$body      = ((x($_POST,'body'))      ? escape_tags(trim($_POST['body'])) : '');
+	$recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto'])       : 0 );
 
 	if(! $recipient) {
 		notice( t('No recipient selected.') . EOL );
 		return;
 	}
 
+	if(! strlen($subject))
+		$subject = t('[no subject]');
+
 	$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-		intval($_SESSION['uid'])
+		intval(local_user())
 	);
 	$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($recipient),
-			intval($_SESSION['uid'])
+			intval(local_user())
 	);
 
 	if(! (count($me) && (count($contact)))) {
@@ -38,23 +41,22 @@ function message_post(&$a) {
 	}
 
 	$hash = random_string();
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . $_SESSION['uid'] . ':' . $hash ;
+ 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
 
 	if(! strlen($replyto))
 		$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' )",
-		intval($_SESSION['uid']),
+		`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']),
 		dbesc($me[0]['url']),
 		intval($recipient),
 		dbesc($subject),
 		dbesc($body),
-		0,
-		0,
+		1,
 		0,
 		dbesc($uri),
 		dbesc($replyto),
@@ -62,15 +64,15 @@ function message_post(&$a) {
 	);
 	$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
 		dbesc($uri),
-		intval($_SESSION['uid'])
+		intval(local_user())
 	);
 	if(count($r))
 		$post_id = $r[0]['id'];
 
-	$url = $a->get_baseurl();
-
+	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	
 	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\" &",
 			array(),$foo));
 		notice( t('Message sent.') . EOL );
 	}
@@ -83,6 +85,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;
@@ -90,20 +95,66 @@ function message_content(&$a) {
 
 	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
-	if(($a->argc > 1) && ($a->argv[1] == 'new')) {
+
+	$tpl = load_view_file('view/mail_head.tpl');
+	$header = replace_macros($tpl, array(
+		'$messages' => t('Messages'),
+		'$inbox' => t('Inbox'),
+		'$outbox' => t('Outbox'),
+		'$new' => t('New Message')
+	));
+
+
+	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') {
+			$r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval($a->argv[2]),
+				intval(local_user())
+			);
+			if($r) {
+				notice( t('Message deleted.') . EOL );
+			}
+			goaway($a->get_baseurl() . '/message' );
+		}
+		else {
+			$r = q("SELECT `parent-uri` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval($a->argv[2]),
+				intval(local_user())
+			);
+			if(count($r)) {
+				$parent = $r[0]['parent-uri'];
+				$r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ",
+					dbesc($parent),
+					intval(local_user())
+				);
+				if($r)
+					notice( t('Conversation removed.') . EOL );
+			} 
+			goaway($a->get_baseurl() . '/message' );
+		}	
+	
+	}
+
+	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
 		
-		$tpl = file_get_contents('view/jot-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');
-		$o = replace_macros($tpl,array(
+		$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:'),
 			'$subject' => t('Subject:'),
+			'$subjtxt' => '',
+			'$readonly' => '',
 			'$yourmessage' => t('Your message:'),
 			'$select' => $select,
+			'$parent' => '',
 			'$upload' => t('Upload photo'),
 			'$insert' => t('Insert web link'),
 			'$wait' => t('Please wait')
@@ -113,43 +164,138 @@ function message_content(&$a) {
 		return $o;
 	}
 
-	if($a->argc == 1) {
+	if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) {
+
+		$o .= $header;
+		
+		if($a->argc == 2)
+			$eq = '='; // I'm not going to bother escaping this.
+		else
+			$eq = '!='; // or this.
 
 		$r = q("SELECT count(*) AS `total` FROM `mail` 
-			WHERE `mail`.`uid` = %d AND `from-url` != '%s' ",
-			intval($_SESSION['uid']),
+			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
+			intval(local_user()),
 			dbesc($myprofile)
 		);
 		if(count($r))
 			$a->set_pager_total($r[0]['total']);
 	
-		$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
+		$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
+			`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
-			WHERE `mail`.`uid` = %d AND `from-url` != '%s' LIMIT %d , %d ",
-			intval($_SESSION['uid']),
+			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC  LIMIT %d , %d ",
+			intval(local_user()),
 			dbesc($myprofile),
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
 		if(! count($r)) {
 			notice( t('No messages.') . EOL);
-			return;
+			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'],
-				'$from_photo' => $rr['from-photo'],
-				'$subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
+				'$sparkle' => ' sparkle',
+				'$from_photo' => $rr['thumb'],
+				'$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
+				'$delete' => t('Delete conversation'),
+				'$body' => $rr['body'],
 				'$to_name' => $rr['name'],
-				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'],'D, d M Y - g:i A')
+				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A')
 			));
 		}
 		$o .= paginate($a);	
 		return $o;
 	}
 
+	if(($a->argc > 1) && (intval($a->argv[1]))) {
+
+		$o .= $header;
+
+		$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
+			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
+			WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
+			intval(local_user()),
+			intval($a->argv[1])
+		);
+		if(count($r)) { 
+			$contact_id = $r[0]['contact-id'];
+			$messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
+				FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
+				WHERE `mail`.`uid` = %d AND `mail`.`parent-uri` = '%s' ORDER BY `mail`.`created` ASC",
+				intval(local_user()),
+				dbesc($r[0]['parent-uri'])
+			);
+		}
+		if(! count($messages)) {
+			notice( t('Message not available.') . EOL );
+			return $o;
+		}
+
+		$r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
+			dbesc($r[0]['parent-uri']),
+			intval(local_user())
+		);
+
+		require_once("include/bbcode.php");
+
+		$tpl = load_view_file('view/msg-header.tpl');
+	
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$nickname' => $a->user['nickname'],
+			'$baseurl' => $a->get_baseurl()
+		));
+
+
+		$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' => $from_url,
+				'$sparkle' => $sparkle,
+				'$from_photo' => $message['from-photo'],
+				'$subject' => $message['title'],
+				'$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')
+			));
+				
+		}
+		$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');
+		$o .= replace_macros($tpl,array(
+			'$header' => t('Send Reply'),
+			'$to' => t('To:'),
+			'$subject' => t('Subject:'),
+			'$subjtxt' => $message['title'],
+			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+			'$yourmessage' => t('Your message:'),
+			'$select' => $select,
+			'$parent' => $parent,
+			'$upload' => t('Upload photo'),
+			'$insert' => t('Insert web link'),
+			'$wait' => t('Please wait')
+
+		));
+
+		return $o;
+	}
+
 }
\ No newline at end of file