X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=cefc44356f34a01101f1942ffa35c3e6444cd77c;hb=52625653d389c9c8d484781059a11f626e8f6a7a;hp=d3bd1558cc8d5f6116755677be3e0a54250e7180;hpb=d2b3e0daf57319caa80393914102d575d464a6ea;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index d3bd1558cc..cefc44356f 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,8 +1,13 @@
 <?php
 
-require_once('include/acl_selectors.php');
-require_once('include/message.php');
-require_once('include/Smilies.php');
+use Friendica\App;
+use Friendica\Content\Smilies;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+
+require_once 'include/acl_selectors.php';
+require_once 'include/message.php';
 
 function message_init(App $a) {
 
@@ -24,17 +29,17 @@ function message_init(App $a) {
 		'$tabs'=>$tabs,
 		'$new'=>$new,
 	));
-	$base = App::get_baseurl();
+	$base = System::baseUrl();
 
 	$head_tpl = get_markup_template('message-head.tpl');
 	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
-		'$baseurl' => App::get_baseurl(true),
+		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
 	));
 
 	$end_tpl = get_markup_template('message-end.tpl');
 	$a->page['end'] .= replace_macros($end_tpl,array(
-		'$baseurl' => App::get_baseurl(true),
+		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
 	));
 
@@ -75,18 +80,17 @@ function message_post(App $a) {
 
 	// fake it to go back to the input form if no recipient listed
 
-	if($norecip) {
+	if ($norecip) {
 		$a->argc = 2;
 		$a->argv[1] = 'new';
-	}
-	else
+	} else
 		goaway($_SESSION['return_url']);
 
 }
 
 // Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
 // is identical to the code in include/conversation.php
-if(! function_exists('item_extract_images')) {
+if (! function_exists('item_extract_images')) {
 function item_extract_images($body) {
 
 	$saved_image = array();
@@ -102,20 +106,19 @@ function item_extract_images($body) {
 		$img_st_close++; // make it point to AFTER the closing bracket
 		$img_end += $img_start;
 
-		if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+		if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
 			// This is an embedded image
 
 			$saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
 			$new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]';
 
 			$cnt++;
-		}
-		else
+		} else
 			$new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
 
 		$orig_body = substr($orig_body, $img_end + strlen('[/img]'));
 
-		if($orig_body === false) // in case the body ends on a closing image tag
+		if ($orig_body === false) // in case the body ends on a closing image tag
 			$orig_body = '';
 
 		$img_start = strpos($orig_body, '[img');
@@ -128,7 +131,7 @@ function item_extract_images($body) {
 	return array('body' => $new_body, 'images' => $saved_image);
 }}
 
-if(! function_exists('item_redir_and_replace_images')) {
+if (! function_exists('item_redir_and_replace_images')) {
 function item_redir_and_replace_images($body, $images, $cid) {
 
 	$origbody = $body;
@@ -136,7 +139,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 
 	for($i = 0; $i < count($images); $i++) {
 		$search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
-		$replace = '[url=' . z_path() . '/redir/' . $cid
+		$replace = '[url=' . System::baseUrl() . '/redir/' . $cid
 		           . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
 
 		$img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
@@ -172,7 +175,7 @@ function message_content(App $a) {
 		return;
 	}
 
-	$myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
+	$myprofile = System::baseUrl().'/profile/' . $a->user['nickname'];
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
@@ -181,18 +184,18 @@ function message_content(App $a) {
 	));
 
 
-	if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
-		if(! intval($a->argv[2]))
+	if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
+		if (! intval($a->argv[2]))
 			return;
 
 		// Check if we should do HTML-based delete confirmation
-		if($_REQUEST['confirm']) {
+		if ($_REQUEST['confirm']) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
 			$inputs = array();
 			foreach($query['args'] as $arg) {
-				if(strpos($arg, 'confirm=') === false) {
+				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
 					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
 				}
@@ -210,12 +213,12 @@ function message_content(App $a) {
 			));
 		}
 		// Now check how the user responded to the confirmation query
-		if($_REQUEST['canceled']) {
+		if ($_REQUEST['canceled']) {
 			goaway($_SESSION['return_url']);
 		}
 
 		$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(local_user())
@@ -223,15 +226,14 @@ function message_content(App $a) {
 			if ($r) {
 				info( t('Message deleted.') . EOL );
 			}
-			//goaway(App::get_baseurl(true) . '/message' );
+			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
-		}
-		else {
+		} 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 (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$parent = $r[0]['parent-uri'];
 				$convid = $r[0]['convid'];
 
@@ -245,35 +247,35 @@ function message_content(App $a) {
 				// as we will never again have the info we need to re-create it.
 				// We'll just have to orphan it.
 
-				//if($convid) {
+				//if ($convid) {
 				//	q("delete from conv where id = %d limit 1",
 				//		intval($convid)
 				//	);
 				//}
 
-				if($r)
+				if ($r)
 					info( t('Conversation removed.') . EOL );
 			}
-			//goaway(App::get_baseurl(true) . '/message' );
+			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
 		}
 
 	}
 
-	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
 		$o .= $header;
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
-			'$baseurl' => App::get_baseurl(true),
+			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
-			'$baseurl' => App::get_baseurl(true),
+			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
@@ -283,26 +285,26 @@ function message_content(App $a) {
 
 		$prename = $preurl = $preid = '';
 
-		if($preselect) {
+		if ($preselect) {
 			$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 				intval(local_user()),
 				intval($a->argv[2])
 			);
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
 					intval(local_user()),
 					dbesc(normalise_link(base64_decode($a->argv[2])))
 				);
 			}
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
 					intval(local_user()),
 					dbesc(base64_decode($a->argv[2]))
 				);
 			}
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$prename = $r[0]['name'];
 				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
@@ -349,18 +351,18 @@ function message_content(App $a) {
 
 		$o .= $header;
 
-		$r = q("SELECT count(*) AS `total` FROM `mail`, ANY_VALUE(`created`) AS `created`
+		$r = q("SELECT count(*) AS `total`, ANY_VALUE(`created`) AS `created` FROM `mail`
 			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$a->set_pager_total($r[0]['total']);
 		}
 
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			info( t('No messages.') . EOL);
 			return $o;
 		}
@@ -372,7 +374,7 @@ function message_content(App $a) {
 		return $o;
 	}
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 
 		$o .= $header;
 
@@ -382,12 +384,12 @@ function message_content(App $a) {
 			intval(local_user()),
 			intval($a->argv[1])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($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)
+			if ($convid)
 				$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
 					dbesc($r[0]['parent-uri']),
 					intval($convid)
@@ -399,7 +401,7 @@ function message_content(App $a) {
 				intval(local_user())
 			);
 		}
-		if(! count($messages)) {
+		if (! count($messages)) {
 			notice( t('Message not available.') . EOL );
 			return $o;
 		}
@@ -413,14 +415,14 @@ function message_content(App $a) {
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
-			'$baseurl' => App::get_baseurl(true),
+			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
-			'$baseurl' => App::get_baseurl(true),
+			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
@@ -430,9 +432,9 @@ function message_content(App $a) {
 		$unknown = false;
 
 		foreach($messages as $message) {
-			if($message['unknown'])
+			if ($message['unknown'])
 				$unknown = true;
-			if($message['from-url'] == $myprofile) {
+			if ($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
 			} elseif ($message['contact-id'] != 0) {
@@ -445,22 +447,15 @@ function message_content(App $a) {
 
 
 			$extracted = item_extract_images($message['body']);
-			if($extracted['images'])
+			if ($extracted['images'])
 				$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
 
-			if($a->theme['template_engine'] === 'internal') {
-				$from_name_e = template_escape($message['from-name']);
-				$subject_e = template_escape($message['title']);
-				$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
-				$to_name_e = template_escape($message['name']);
-			} else {
-				$from_name_e = $message['from-name'];
-				$subject_e = $message['title'];
-				$body_e = Smilies::replace(bbcode($message['body']));
-				$to_name_e = $message['name'];
-			}
+			$from_name_e = $message['from-name'];
+			$subject_e = $message['title'];
+			$body_e = Smilies::replace(bbcode($message['body']));
+			$to_name_e = $message['name'];
 
-			$contact = get_contact_details_by_url($message['from-url']);
+			$contact = Contact::getDetailsByURL($message['from-url']);
 			if (isset($contact["thumb"]))
 				$from_photo = $contact["thumb"];
 			else
@@ -470,6 +465,7 @@ function message_content(App $a) {
 				'id' => $message['id'],
 				'from_name' => $from_name_e,
 				'from_url' => $from_url,
+				'from_addr' => $contact['addr'],
 				'sparkle' => $sparkle,
 				'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
 				'subject' => $subject_e,
@@ -489,12 +485,7 @@ function message_content(App $a) {
 
 		$tpl = get_markup_template('mail_display.tpl');
 
-		if($a->theme['template_engine'] === 'internal') {
-			$subjtxt_e = template_escape($message['title']);
-		}
-		else {
-			$subjtxt_e = $message['title'];
-		}
+		$subjtxt_e = $message['title'];
 
 		$o = replace_macros($tpl, array(
 			'$thread_id' => $a->argv[1],
@@ -530,15 +521,18 @@ 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`,
-		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
+		ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`,
+		ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`,
+		ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`,
+		ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`,
+		ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`,
+		ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`,
+		`mail`.`parent-uri`,
+		ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`,
+		ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `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 ",
+		WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
 		intval($user), intval($lstart), intval($lend)
 	);
 }
@@ -550,29 +544,22 @@ function render_messages(array $msg, $t) {
 	$tpl = get_markup_template($t);
 	$rslt = '';
 
-	$myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
+	$myprofile = System::baseUrl().'/profile/' . $a->user['nickname'];
 
 	foreach($msg as $rr) {
 
-		if($rr['unknown'])
+		if ($rr['unknown'])
 			$participants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
 		elseif (link_compare($rr['from-url'], $myprofile))
 			$participants = sprintf( t("You and %s"), $rr['name']);
 		else
 			$participants = sprintf(t("%s and You"), $rr['from-name']);
 
-		if($a->theme['template_engine'] === 'internal') {
-			$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
-			$body_e = template_escape($rr['body']);
-			$to_name_e = template_escape($rr['name']);
-		}
-		else {
-			$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
-			$body_e = $rr['body'];
-			$to_name_e = $rr['name'];
-		}
+		$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
+		$body_e = $rr['body'];
+		$to_name_e = $rr['name'];
 
-		$contact = get_contact_details_by_url($rr['url']);
+		$contact = Contact::getDetailsByURL($rr['url']);
 		if (isset($contact["thumb"]))
 			$from_photo = $contact["thumb"];
 		else
@@ -582,6 +569,7 @@ function render_messages(array $msg, $t) {
 			'$id' => $rr['id'],
 			'$from_name' => $participants,
 			'$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
+			'$from_addr' => $contact['addr'],
 			'$sparkle' => ' sparkle',
 			'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
 			'$subject' => $subject_e,