X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=e9bfc076bb50e9ff42dcd5969a7610c1161cf48a;hb=105f3ca7479c20e118b47b3ec03f8c1b3ff8656f;hp=79b4ce0cecf769a1a8acad49595fe3968f66297d;hpb=3b0f69599e0a7c704ff0410eefc376c156ccf04d;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 79b4ce0cec..e9bfc076bb 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,16 +2,20 @@
 /**
  * @file mod/message.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Smilies;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
-require_once 'include/acl_selectors.php';
 require_once 'include/conversation.php';
 
 function message_init(App $a)
@@ -23,7 +27,7 @@ function message_init(App $a)
 	}
 
 	$new = [
-		'label' => t('New Message'),
+		'label' => L10n::t('New Message'),
 		'url' => 'message/new',
 		'sel' => $a->argc > 1 && $a->argv[1] == 'new',
 		'accesskey' => 'm',
@@ -79,7 +83,7 @@ function message_post(App $a)
 			notice(L10n::t('Message collection failure.') . EOL);
 			break;
 		default:
-			info(t('Message sent.') . EOL);
+			info(L10n::t('Message sent.') . EOL);
 	}
 
 	// fake it to go back to the input form if no recipient listed
@@ -105,7 +109,7 @@ function message_content(App $a)
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, [
-		'$messages' => t('Messages'),
+		'$messages' => L10n::t('Messages'),
 	]);
 
 	if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
@@ -129,12 +133,12 @@ function message_content(App $a)
 			//$a->page['aside'] = '';
 			return replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'get',
-				'$message' => t('Do you really want to delete this message?'),
+				'$message' => L10n::t('Do you really want to delete this message?'),
 				'$extra_inputs' => $inputs,
-				'$confirm' => t('Yes'),
+				'$confirm' => L10n::t('Yes'),
 				'$confirm_url' => $query['base'],
 				'$confirm_name' => 'confirmed',
-				'$cancel' => t('Cancel'),
+				'$cancel' => L10n::t('Cancel'),
 			]);
 		}
 		// Now check how the user responded to the confirmation query
@@ -149,7 +153,7 @@ function message_content(App $a)
 				intval(local_user())
 			);
 			if ($r) {
-				info(t('Message deleted.') . EOL);
+				info(L10n::t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
@@ -178,7 +182,7 @@ function message_content(App $a)
 				//}
 
 				if ($r) {
-					info(t('Conversation removed.') . EOL);
+					info(L10n::t('Conversation removed.') . EOL);
 				}
 			}
 			//goaway(System::baseUrl(true) . '/message' );
@@ -193,17 +197,17 @@ function message_content(App $a)
 		$a->page['htmlhead'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
-		$preselect = isset($a->argv[2]) ? [$a->argv[2]] : false;
+		$preselect = isset($a->argv[2]) ? [$a->argv[2]] : [];
 
 		$prename = $preurl = $preid = '';
 
@@ -232,34 +236,33 @@ function message_content(App $a)
 				$preid = $r[0]['id'];
 				$preselect = [$preid];
 			} else {
-				$preselect = false;
+				$preselect = [];
 			}
 		}
 
 		$prefill = $preselect ? $prename : '';
 
 		// the ugly select box
-		$select = contact_select('messageto', 'message-to-select', $preselect, 4, true, false, false, 10);
+		$select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl, [
-			'$header' => t('Send Private Message'),
-			'$to' => t('To:'),
+			'$header' => L10n::t('Send Private Message'),
+			'$to' => L10n::t('To:'),
 			'$showinputs' => 'true',
 			'$prefill' => $prefill,
-			'$autocomp' => $autocomp,
 			'$preid' => $preid,
-			'$subject' => t('Subject:'),
+			'$subject' => L10n::t('Subject:'),
 			'$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
 			'$text' => x($_REQUEST, 'body') ? escape_tags(htmlspecialchars($_REQUEST['body'])) : '',
 			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
+			'$yourmessage' => L10n::t('Your message:'),
 			'$select' => $select,
 			'$parent' => '',
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait'),
-			'$submit' => t('Submit')
+			'$upload' => L10n::t('Upload photo'),
+			'$insert' => L10n::t('Insert web link'),
+			'$wait' => L10n::t('Please wait'),
+			'$submit' => L10n::t('Submit')
 		]);
 		return $o;
 	}
@@ -285,7 +288,7 @@ function message_content(App $a)
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
 		if (!DBM::is_result($r)) {
-			info(t('No messages.') . EOL);
+			info(L10n::t('No messages.') . EOL);
 			return $o;
 		}
 
@@ -333,20 +336,18 @@ function message_content(App $a)
 			intval(local_user())
 		);
 
-		require_once("include/bbcode.php");
-
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$mails = [];
@@ -374,7 +375,7 @@ function message_content(App $a)
 
 			$from_name_e = $message['from-name'];
 			$subject_e = $message['title'];
-			$body_e = Smilies::replace(bbcode($message['body']));
+			$body_e = Smilies::replace(BBCode::convert($message['body']));
 			$to_name_e = $message['name'];
 
 			$contact = Contact::getDetailsByURL($message['from-url']);
@@ -393,10 +394,10 @@ function message_content(App $a)
 				'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
 				'subject' => $subject_e,
 				'body' => $body_e,
-				'delete' => t('Delete message'),
+				'delete' => L10n::t('Delete message'),
 				'to_name' => $to_name_e,
-				'date' => datetime_convert('UTC', date_default_timezone_get(), $message['created'], 'D, d M Y - g:i A'),
-				'ago' => relative_date($message['created']),
+				'date' => DateTimeFormat::local($message['created'], L10n::t('D, d M Y - g:i A')),
+				'ago' => Temporal::getRelativeDate($message['created']),
 			];
 
 			$seen = $message['seen'];
@@ -410,26 +411,26 @@ function message_content(App $a)
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
-			'$delete' => t('Delete conversation'),
+			'$delete' => L10n::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."),
+			'$unknown_text' => L10n::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:'),
+			'$header' => L10n::t('Send Reply'),
+			'$to' => L10n::t('To:'),
 			'$showinputs' => '',
-			'$subject' => t('Subject:'),
+			'$subject' => L10n::t('Subject:'),
 			'$subjtxt' => $message['title'],
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-			'$yourmessage' => t('Your message:'),
+			'$yourmessage' => L10n::t('Your message:'),
 			'$text' => '',
 			'$select' => $select,
 			'$parent' => $parent,
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$submit' => t('Submit'),
-			'$wait' => t('Please wait')
+			'$upload' => L10n::t('Upload photo'),
+			'$insert' => L10n::t('Insert web link'),
+			'$submit' => L10n::t('Submit'),
+			'$wait' => L10n::t('Please wait')
 		]);
 
 		return $o;
@@ -467,11 +468,11 @@ function render_messages(array $msg, $t)
 
 	foreach ($msg as $rr) {
 		if ($rr['unknown']) {
-			$participants = t("Unknown sender - %s", $rr['from-name']);
+			$participants = L10n::t("Unknown sender - %s", $rr['from-name']);
 		} elseif (link_compare($rr['from-url'], $myprofile)) {
-			$participants = t("You and %s", $rr['name']);
+			$participants = L10n::t("You and %s", $rr['name']);
 		} else {
-			$participants = t("%s and You", $rr['from-name']);
+			$participants = L10n::t("%s and You", $rr['from-name']);
 		}
 
 		$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
@@ -493,11 +494,11 @@ function render_messages(array $msg, $t)
 			'$sparkle' => ' sparkle',
 			'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
 			'$subject' => $subject_e,
-			'$delete' => t('Delete conversation'),
+			'$delete' => L10n::t('Delete conversation'),
 			'$body' => $body_e,
 			'$to_name' => $to_name_e,
-			'$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], t('D, d M Y - g:i A')),
-			'$ago' => relative_date($rr['mailcreated']),
+			'$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
+			'$ago' => Temporal::getRelativeDate($rr['mailcreated']),
 			'$seen' => $rr['mailseen'],
 			'$count' => L10n::tt('%d message', '%d messages', $rr['count']),
 		]);