X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=d3bd1558cc8d5f6116755677be3e0a54250e7180;hb=a941199760420298d5977b285e2016d860b1e073;hp=776a23bccdced6baec9f83b64185c860473ee9b8;hpb=ee39aba490fb7e17ba9c01a9a4f4aedc51bee564;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 776a23bccd..d3bd1558cc 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -4,7 +4,7 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 require_once('include/Smilies.php');
 
-function message_init(App &$a) {
+function message_init(App $a) {
 
 	$tabs = '';
 
@@ -40,7 +40,7 @@ function message_init(App &$a) {
 
 }
 
-function message_post(App &$a) {
+function message_post(App $a) {
 
 	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -52,17 +52,6 @@ function message_post(App &$a) {
 	$body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
 	$recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto'])       : 0 );
 
-	// Work around doubled linefeeds in Tinymce 3.5b2
-
-/*	$plaintext = intval(get_pconfig(local_user(),'system','plaintext') && !feature_enabled(local_user(),'richtext'));
-	if(! $plaintext) {
-		$body = fix_mce_lf($body);
-	}*/
-	$plaintext = intval(!feature_enabled(local_user(),'richtext'));
-	if(! $plaintext) {
-		$body = fix_mce_lf($body);
-	}
-
 	$ret = send_message($recipient, $body, $subject, $replyto);
 	$norecip = false;
 
@@ -173,7 +162,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 
 
 
-function message_content(App &$a) {
+function message_content(App $a) {
 
 	$o = '';
 	nav_set_selected('messages');
@@ -275,18 +264,9 @@ function message_content(App &$a) {
 
 		$o .= $header;
 
-/*		$plaintext = false;
-		if(intval(get_pconfig(local_user(),'system','plaintext')))
-			$plaintext = true;*/
-		$plaintext = true;
-		if( local_user() && feature_enabled(local_user(),'richtext') )
-			$plaintext = false;
-
-
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => App::get_baseurl(true),
-			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
@@ -294,7 +274,6 @@ function message_content(App &$a) {
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
 			'$baseurl' => App::get_baseurl(true),
-			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
@@ -370,7 +349,7 @@ function message_content(App &$a) {
 
 		$o .= $header;
 
-		$r = q("SELECT count(*) AS `total` FROM `mail`
+		$r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created`
 			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
 			intval(local_user())
 		);
@@ -397,10 +376,6 @@ function message_content(App &$a) {
 
 		$o .= $header;
 
-		$plaintext = true;
-		if( local_user() && feature_enabled(local_user(),'richtext') )
-			$plaintext = false;
-
 		$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",
@@ -439,7 +414,6 @@ function message_content(App &$a) {
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => App::get_baseurl(true),
-			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
@@ -447,12 +421,10 @@ function message_content(App &$a) {
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
 			'$baseurl' => App::get_baseurl(true),
-			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
 
-
 		$mails = array();
 		$seen = 0;
 		$unknown = false;
@@ -556,9 +528,14 @@ function message_content(App &$a) {
 }
 
 function get_messages($user, $lstart, $lend) {
-
+	//TODO: rewritte with a sub-query to get the first message of each private thread with certainty
 	return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
-		`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
+		ANY_VALUE(`mail`.`id`), ANY_VALUE(`mail`.`uid`), ANY_VALUE(`mail`.`guid`), ANY_VALUE(`mail`.`from-name`),
+		ANY_VALUE(`mail`.`from-photo`), ANY_VALUE(`mail`.`from-url`), ANY_VALUE(`mail`.`contact-id`),
+		ANY_VALUE(`mail`.`convid`), ANY_VALUE(`mail`.`title`), ANY_VALUE(`mail`.`body`), ANY_VALUE(`mail`.`seen`),
+		ANY_VALUE(`mail`.`reply`), ANY_VALUE(`mail`.`replied`), ANY_VALUE(`mail`.`unknown`),
+		ANY_VALUE(`mail`.`uri`), ANY_VALUE(`mail`.`parent-uri`), ANY_VALUE(`mail`.`created`),
+		ANY_VALUE(`contact`.`name`), ANY_VALUE(`contact`.`url`), ANY_VALUE(`contact`.`thumb`), ANY_VALUE(`contact`.`network`),
 		count( * ) as count
 		FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
 		WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",