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

diff --git a/mod/message.php b/mod/message.php
index eb18bac898..dbca45930b 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,10 +1,35 @@
 <?php
 
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
+require_once('include/message.php');
 
 function message_init(&$a) {
-
-
+	$tabs = array(
+	/*
+		array(
+			'label' => t('All'),
+			'url'=> $a->get_baseurl(true) . '/message',
+			'sel'=> ($a->argc == 1),
+		),
+		array(
+			'label' => t('Sent'),
+			'url' => $a->get_baseurl(true) . '/message/sent',
+			'sel'=> ($a->argv[1] == 'sent'),
+		),
+	*/
+	);
+	$new = array(
+		'label' => t('New Message'),
+		'url' => $a->get_baseurl(true) . '/message/new',
+		'sel'=> ($a->argv[1] == 'new'),
+	);
+	
+	$tpl = get_markup_template('message_side.tpl');
+	$a->page['aside'] = replace_macros($tpl, array(
+		'$tabs'=>$tabs,
+		'$new'=>$new,
+	));
+	
 }
 
 function message_post(&$a) {
@@ -14,100 +39,153 @@ 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($_REQUEST,'replyto'))   ? notags(trim($_REQUEST['replyto']))   : '');
+	$subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
+	$body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
+	$recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto'])       : 0 );
 
-	if(! $recipient) {
-		notice( t('No recipient selected.') . EOL );
-		return;
-	}
-
-	$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-		intval($_SESSION['uid'])
-	);
-	$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($recipient),
-			intval($_SESSION['uid'])
-	);
+	// Work around doubled linefeeds in Tinymce 3.5b2
 
-	if(! (count($me) && (count($contact)))) {
-		notice( t('Unable to locate contact information.') . EOL );
-		return;
+	$plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
+	if(! $plaintext) {
+		$body = fix_mce_lf($body);
 	}
+	
+	$ret = send_message($recipient, $body, $subject, $replyto);
+	$norecip = false;
 
-	$hash = random_string();
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . $_SESSION['uid'] . ':' . $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']),
-		dbesc($me[0]['name']),
-		dbesc($me[0]['thumb']),
-		dbesc($me[0]['url']),
-		intval($recipient),
-		dbesc($subject),
-		dbesc($body),
-		0,
-		0,
-		0,
-		dbesc($uri),
-		dbesc($replyto),
-		datetime_convert()
-	);
-	$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
-		dbesc($uri),
-		intval($_SESSION['uid'])
-	);
-	if(count($r))
-		$post_id = $r[0]['id'];
+	switch($ret){
+		case -1:
+			notice( t('No recipient selected.') . EOL );
+			$norecip = true;
+			break;
+		case -2:
+			notice( t('Unable to locate contact information.') . EOL );
+			break;
+		case -3:
+			notice( t('Message could not be sent.') . EOL );
+			break;
+		case -4:
+			notice( t('Message collection failure.') . EOL );
+			break;
+		default:
+			info( t('Message sent.') . EOL );
+	}
 
-	$url = $a->get_baseurl();
+	// fake it to go back to the input form if no recipient listed
 
-	if($post_id) {
-		proc_close(proc_open("php include/notifier.php \"$url\" \"mail\" \"$post_id\" > mail.log &",
-			array(),$foo));
-		notice( t('Message sent.') . EOL );
-	}
-	else {
-		notice( t('Message could not be sent.') . EOL );
+	if($norecip) {
+		$a->argc = 2;
+		$a->argv[1] = 'new';
 	}
-	return;
 
 }
 
 function message_content(&$a) {
 
+	$o = '';
+	nav_set_selected('messages');
+
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+	$myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
 
-	if(($a->argc > 1) && ($a->argv[1] == 'new')) {
-		
-		$tpl = file_get_contents('view/jot-header.tpl');
+
+
+
+
+	$tpl = get_markup_template('mail_head.tpl');
+	$header = replace_macros($tpl, array(
+		'$messages' => t('Messages'),
+		'$tab_content' => $tab_content
+	));
+
+
+	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) {
+				info( t('Message deleted.') . EOL );
+			}
+			goaway($a->get_baseurl(true) . '/message' );
+		}
+		else {
+			$r = q("SELECT `parent-uri`,`convid` 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'];
+				$convid = $r[0]['convid'];
+
+				$r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ",
+					dbesc($parent),
+					intval(local_user())
+				);
+
+				// remove diaspora conversation pointer
+				// Actually if we do this, we can never receive another reply to that conversation,
+				// as we will never again have the info we need to re-create it. 
+				// We'll just have to orphan it. 
+
+				//if($convid) {
+				//	q("delete from conv where id = %d limit 1",
+				//		intval($convid)
+				//	);
+				//}
+
+				if($r)
+					info( t('Conversation removed.') . EOL );
+			} 
+			goaway($a->get_baseurl(true) . '/message' );
+		}	
 	
-		$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(
+	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+		
+		$o .= $header;
+		
+		$plaintext = false;
+		if(intval(get_pconfig(local_user(),'system','plaintext')))
+			$plaintext = true;
+
+
+		$tpl = get_markup_template('msg-header.tpl');
+
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+			'$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, false, false, 10);
+		$tpl = get_markup_template('prv_message.tpl');
+		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
 			'$subject' => t('Subject:'),
+			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+			'$readonly' => '',
 			'$yourmessage' => t('Your message:'),
 			'$select' => $select,
+			'$parent' => '',
 			'$upload' => t('Upload photo'),
 			'$insert' => t('Insert web link'),
 			'$wait' => t('Please wait')
-
 		));
 
 		return $o;
@@ -115,41 +193,195 @@ function message_content(&$a) {
 
 	if($a->argc == 1) {
 
+		// list messages
+
+		$o .= $header;
+		
 		$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` , `contact`.`network`,
+			count( * ) as count
 			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']),
-			dbesc($myprofile),
+			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
+			intval(local_user()),
+			//
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
 		if(! count($r)) {
-			notice( t('No messages.') . EOL);
-			return;
+			info( t('No messages.') . EOL);
+			return $o;
 		}
 
-		$tpl = file_get_contents('view/mail_list.tpl');
+		$tpl = get_markup_template('mail_list.tpl');
 		foreach($r as $rr) {
+			if($rr['unknown']) {
+				$partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
+			}
+			elseif (link_compare($rr['from-url'],$myprofile)){
+				$partecipants = sprintf( t("You and %s"), $rr['name']);
+			}
+			else {
+				$partecipants = sprintf( t("%s and You"), $rr['from-name']);
+			}
+			
 			$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>'),
-				'$to_name' => $rr['name'],
-				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'],'D, d M Y - g:i A')
+				'$from_name' => $partecipants,
+				'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
+				'$sparkle' => ' sparkle',
+				'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
+				'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
+				'$delete' => t('Delete conversation'),
+				'$body' => template_escape($rr['body']),
+				'$to_name' => template_escape($rr['name']),
+				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
+				'$seen' => $rr['mailseen'],
+				'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
 			));
 		}
 		$o .= paginate($a);	
 		return $o;
 	}
 
-}
\ No newline at end of file
+	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'];
+			$convid = $r[0]['convid'];
+
+			$sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
+			if($convid)
+				$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
+					dbesc($r[0]['parent-uri']),
+					intval($convid)
+				);  
+
+			$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 $sql_extra ORDER BY `mail`.`created` ASC",
+				intval(local_user())
+			);
+		}
+		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 = get_markup_template('msg-header.tpl');
+	
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$nickname' => $a->user['nickname'],
+			'$baseurl' => $a->get_baseurl(true)
+		));
+
+
+		$mails = array();
+		$seen = 0;
+		$unknown = false;
+
+		foreach($messages as $message) {
+			if($message['unknown'])
+				$unknown = true;
+			if($message['from-url'] == $myprofile) {
+				$from_url = $myprofile;
+				$sparkle = '';
+			}
+			else {
+				$from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
+				$sparkle = ' sparkle';
+			}
+
+
+			$Text = $message['body'];
+			$saved_image = '';
+			$img_start = strpos($Text,'[img]data:');
+			$img_end = strpos($Text,'[/img]');
+
+			if($img_start !== false && $img_end !== false && $img_end > $img_start) {
+				$start_fragment = substr($Text,0,$img_start);
+				$img_start += strlen('[img]');
+				$saved_image = substr($Text,$img_start,$img_end - $img_start);
+				$end_fragment = substr($Text,$img_end + strlen('[/img]'));		
+				$Text = $start_fragment . '[!#saved_image#!]' . $end_fragment;
+				$search = '/\[url\=(.*?)\]\[!#saved_image#!\]\[\/url\]' . '/is';
+				$replace = '[url=' . z_path() . '/redir/' . $message['contact-id'] 
+					. '?f=1&url=' . '$1' . '][!#saved_image#!][/url]' ;
+
+				$Text = preg_replace($search,$replace,$Text);
+
+			if(strlen($saved_image))
+				$message['body'] = str_replace('[!#saved_image#!]', '[img]' . $saved_image . '[/img]',$Text);
+			}
+
+			$mails[] = array(
+				'id' => $message['id'],
+				'from_name' => template_escape($message['from-name']),
+				'from_url' => $from_url,
+				'sparkle' => $sparkle,
+				'from_photo' => $message['from-photo'],
+				'subject' => template_escape($message['title']),
+				'body' => template_escape(smilies(bbcode($message['body']))),
+				'delete' => t('Delete message'),
+				'to_name' => template_escape($message['name']),
+				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
+			);
+				
+			$seen = $message['seen'];
+		}
+		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
+		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
+			
+
+		$tpl = get_markup_template('mail_display.tpl');
+		$o = replace_macros($tpl, array(
+			'$thread_id' => $a->argv[1],
+			'$thread_subject' => $message['title'],
+			'$thread_seen' => $seen,
+			'$delete' =>  t('Delete conversation'),
+			'$canreply' => (($unknown) ? false : '1'),
+			'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),			
+			'$mails' => $mails,
+			
+			// reply
+			'$header' => t('Send Reply'),
+			'$to' => t('To:'),
+			'$subject' => t('Subject:'),
+			'$subjtxt' => template_escape($message['title']),
+			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+			'$yourmessage' => t('Your message:'),
+			'$text' => '',
+			'$select' => $select,
+			'$parent' => $parent,
+			'$upload' => t('Upload photo'),
+			'$insert' => t('Insert web link'),
+			'$wait' => t('Please wait')
+
+		));
+
+		return $o;
+	}
+
+}