X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=5ce0b850efdab64f3632782aab356d3c913d6a90;hb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;hp=54595452cdbf4b886ead91fcb2c9d72ac6a89ac8;hpb=6ae43962997d50691b3fdf0fd870f5f68612a587;p=friendica.git

diff --git a/include/text.php b/include/text.php
index 54595452cd..5ce0b850ef 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1,16 +1,22 @@
 <?php
-
+/**
+ * @file include/text.php
+ */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Feature;
+use Friendica\Content\Smilies;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
+use Friendica\Model\Term;
+use Friendica\Util\Map;
 
-require_once "include/template_processor.php";
 require_once "include/friendica_smarty.php";
-require_once "include/Smilies.php";
-require_once "include/map.php";
 require_once "mod/proxy.php";
+require_once "include/conversation.php";
 
 /**
  * This is our template processor
@@ -31,7 +37,7 @@ function replace_macros($s, $r) {
 
 	$t = $a->template_engine();
 	try {
-		$output = $t->replace_macros($s, $r);
+		$output = $t->replaceMacros($s, $r);
 	} catch (Exception $e) {
 		echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
 		killme();
@@ -42,18 +48,21 @@ function replace_macros($s, $r) {
 	return $output;
 }
 
+/**
+ * @brief Generates a pseudo-random string of hexadecimal characters
+ *
+ * @param int $size
+ * @return string
+ */
+function random_string($size = 64)
+{
+	$byte_size = ceil($size / 2);
 
-// random string, there are 86 characters max in text mode, 128 for hex
-// output is urlsafe
+	$bytes = random_bytes($byte_size);
 
-define('RANDOM_STRING_HEX',  0x00);
-define('RANDOM_STRING_TEXT', 0x01);
+	$return = substr(bin2hex($bytes), 0, $size);
 
-function random_string($size = 64, $type = RANDOM_STRING_HEX) {
-	// generate a bit of entropy and run it through the whirlpool
-	$s = hash('whirlpool', (string) rand() . uniqid(rand(),true) . (string) rand(), (($type == RANDOM_STRING_TEXT) ? true : false));
-	$s = (($type == RANDOM_STRING_TEXT) ? str_replace("\n", "", base64url_encode($s,true)) : $s);
-	return substr($s,0,$size);
+	return $return;
 }
 
 /**
@@ -74,7 +83,7 @@ function random_string($size = 64, $type = RANDOM_STRING_HEX) {
  * @return string Filtered string
  */
 function notags($string) {
-	return str_replace(array("<", ">"), array('[', ']'), $string);
+	return str_replace(["<", ">"], ['[', ']'], $string);
 
 //  High-bit filter no longer used
 //	return str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string);
@@ -104,12 +113,12 @@ function autoname($len) {
 		return '';
 	}
 
-	$vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u');
+	$vowels = ['a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'];
 	if (mt_rand(0, 5) == 4) {
 		$vowels[] = 'y';
 	}
 
-	$cons = array(
+	$cons = [
 			'b','bl','br',
 			'c','ch','cl','cr',
 			'd','dr',
@@ -130,13 +139,13 @@ function autoname($len) {
 			'w','wh',
 			'x',
 			'z','zh'
-			);
+			];
 
-	$midcons = array('ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp',
-				'nd','ng','nk','nt','rn','rp','rt');
+	$midcons = ['ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp',
+				'nd','ng','nk','nt','rn','rp','rt'];
 
-	$noend = array('bl', 'br', 'cl','cr','dr','fl','fr','gl','gr',
-				'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh');
+	$noend = ['bl', 'br', 'cl','cr','dr','fl','fr','gl','gr',
+				'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'];
 
 	$start = mt_rand(0,2);
 	if ($start == 0) {
@@ -271,14 +280,14 @@ function paginate_data(App $a, $count = null) {
 	}
 
 	$url = $stripped;
-	$data = array();
+	$data = [];
 
 	function _l(&$d, $name, $url, $text, $class = '') {
 		if (strpos($url, '?') === false && ($pos = strpos($url, '&')) !== false) {
 			$url = substr($url, 0, $pos) . '?' . substr($url, $pos + 1);
 		}
 
-		$d[$name] = array('url' => $url, 'text' => $text, 'class' => $class);
+		$d[$name] = ['url' => $url, 'text' => $text, 'class' => $class];
 	}
 
 	if (!is_null($count)) {
@@ -304,7 +313,7 @@ function paginate_data(App $a, $count = null) {
 				$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 8));
 			}
 
-			$pages = array();
+			$pages = [];
 
 			for ($i = $numstart; $i <= $numstop; $i++) {
 				if ($i == $a->pager['page']) {
@@ -353,7 +362,7 @@ function paginate(App $a) {
 
 	$data = paginate_data($a);
 	$tpl = get_markup_template("paginate.tpl");
-	return replace_macros($tpl, array("pager" => $data));
+	return replace_macros($tpl, ["pager" => $data]);
 
 }
 
@@ -368,7 +377,7 @@ function alt_pager(App $a, $i) {
 
 	$data = paginate_data($a, $i);
 	$tpl = get_markup_template("paginate.tpl");
-	return replace_macros($tpl, array('pager' => $data));
+	return replace_macros($tpl, ['pager' => $data]);
 
 }
 
@@ -379,10 +388,10 @@ function alt_pager(App $a, $i) {
  */
 function scroll_loader() {
 	$tpl = get_markup_template("scroll_loader.tpl");
-	return replace_macros($tpl, array(
+	return replace_macros($tpl, [
 		'wait' => t('Loading more entries...'),
 		'end' => t('The end')
-	));
+	]);
 }
 
 
@@ -395,7 +404,7 @@ function scroll_loader() {
 function expand_acl($s) {
 	// turn string array of angle-bracketed elements into numeric array
 	// e.g. "<1><2><3>" => array(1,2,3);
-	$ret = array();
+	$ret = [];
 
 	if (strlen($s)) {
 		$t = str_replace('<', '', $s);
@@ -468,7 +477,7 @@ function item_new_uri($hostname, $uid, $guid = "") {
 
 		$uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash;
 
-		$dups = dba::exists('item', array('uri' => $uri));
+		$dups = dba::exists('item', ['uri' => $uri]);
 	} while ($dups == true);
 
 	return $uri;
@@ -592,7 +601,7 @@ function get_markup_template($s, $root = '') {
 	$a = get_app();
 	$t = $a->template_engine();
 	try {
-		$template = $t->get_template_file($s, $root);
+		$template = $t->getTemplateFile($s, $root);
 	} catch (Exception $e) {
 		echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
 		killme();
@@ -654,7 +663,7 @@ function attribute_contains($attr, $s) {
 
 
 /* setup int->string log level map */
-$LOGGER_LEVELS = array();
+$LOGGER_LEVELS = [];
 
 /**
  * @brief Logs the given message at the given log level
@@ -816,7 +825,7 @@ function activity_match($haystack,$needle) {
  * @return array List of tag and person names
  */
 function get_tags($string) {
-	$ret = array();
+	$ret = [];
 
 	// Convert hashtag links to hashtags
 	$string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2', $string);
@@ -825,7 +834,7 @@ function get_tags($string) {
 	$string = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $string);
 
 	// Force line feeds at bbtags
-	$string = str_replace(array('[', ']'), array("\n[", "]\n"), $string);
+	$string = str_replace(['[', ']'], ["\n[", "]\n"], $string);
 
 	// ignore anything in a bbtag
 	$string = preg_replace('/\[(.*?)\]/sm', '', $string);
@@ -933,7 +942,7 @@ function contact_block() {
 				intval($shown)
 		);
 		if (DBM::is_result($r)) {
-			$contacts = array();
+			$contacts = [];
 			foreach ($r AS $contact) {
 				$contacts[] = $contact["id"];
 			}
@@ -942,7 +951,7 @@ function contact_block() {
 
 			if (DBM::is_result($r)) {
 				$contacts = sprintf(tt('%d Contact','%d Contacts', $total),$total);
-				$micropro = Array();
+				$micropro = [];
 				foreach ($r as $rr) {
 					$micropro[] = micropro($rr,true,'mpfriend');
 				}
@@ -951,14 +960,14 @@ function contact_block() {
 	}
 
 	$tpl = get_markup_template('contact_block.tpl');
-	$o = replace_macros($tpl, array(
+	$o = replace_macros($tpl, [
 		'$contacts' => $contacts,
 		'$nickname' => $a->profile['nickname'],
 		'$viewcontacts' => t('View Contacts'),
 		'$micropro' => $micropro,
-	));
+	]);
 
-	$arr = array('contacts' => $r, 'output' => $o);
+	$arr = ['contacts' => $r, 'output' => $o];
 
 	call_hooks('contact_block_end', $arr);
 	return $o;
@@ -988,7 +997,7 @@ function contact_block() {
 function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 
 	// Use the contact URL if no address is available
-	if ($contact["addr"] == "") {
+	if (!x($contact, "addr")) {
 		$contact["addr"] = $contact["url"];
 	}
 
@@ -997,14 +1006,13 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 	$redir = false;
 
 	if ($redirect) {
-		$a = get_app();
 		$redirect_url = 'redir/' . $contact['id'];
 		if (local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) {
 			$redir = true;
 			$url = $redirect_url;
 			$sparkle = ' sparkle';
 		} else {
-			$url = zrl($url);
+			$url = Profile::zrl($url);
 		}
 	}
 
@@ -1013,8 +1021,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 		$url = '';
 	}
 
-	return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array(
-		'$click' => (($contact['click']) ? $contact['click'] : ''),
+	return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[
+		'$click' => defaults($contact, 'click', ''),
 		'$class' => $class,
 		'$url' => $url,
 		'$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
@@ -1023,35 +1031,45 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 		'$parkle' => $sparkle,
 		'$redir' => $redir,
 
-	));
+	]);
 }
 
 /**
- * search box
+ * Search box.
  *
- * @param string $s search query
- * @param string $id html id
- * @param string $url search url
- * @param boolean $savedsearch show save search button
+ * @param string $s     Search query.
+ * @param string $id    HTML id
+ * @param string $url   Search url.
+ * @param bool   $save  Show save search button.
+ * @param bool   $aside Display the search widgit aside.
+ *
+ * @return string Formatted HTML.
  */
-function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) {
-	$a = get_app();
+function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true)
+{
+	$mode = 'text';
 
-	$values = array(
+	if (strpos($s, '#') === 0) {
+		$mode = 'tag';
+	}
+	$save_label = $mode === 'text' ? t('Save') : t('Follow');
+
+	$values = [
 			'$s' => htmlspecialchars($s),
 			'$id' => $id,
 			'$action_url' => $url,
 			'$search_label' => t('Search'),
-			'$save_label' => t('Save'),
-			'$savedsearch' => feature_enabled(local_user(),'savedsearch'),
+			'$save_label' => $save_label,
+			'$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'),
 			'$search_hint' => t('@name, !forum, #tags, content'),
-		);
+			'$mode' => $mode
+		];
 
 	if (!$aside) {
-		$values['$searchoption'] = array(
+		$values['$searchoption'] = [
 					t("Full Text"),
 					t("Tags"),
-					t("Contacts"));
+					t("Contacts")];
 
 		if (Config::get('system','poco_local_search')) {
 			$values['$searchoption'][] = t("Forums");
@@ -1062,17 +1080,14 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
 }
 
 /**
- * Check if $x is a valid email string
+ * @brief Check for a valid email string
  *
- * @param string $x
+ * @param string $email_address
  * @return boolean
  */
-function valid_email($x){
-
-	/// @TODO Removed because Fabio told me so.
-	//if (Config::get('system','disable_email_validation'))
-	//	return true;
-	return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x);
+function valid_email($email_address)
+{
+	return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $email_address);
 }
 
 
@@ -1100,65 +1115,31 @@ function get_poke_verbs() {
 	// index is present tense verb
 	// value is array containing past tense verb, translation of present, translation of past
 
-	$arr = array(
-		'poke' => array('poked', t('poke'), t('poked')),
-		'ping' => array('pinged', t('ping'), t('pinged')),
-		'prod' => array('prodded', t('prod'), t('prodded')),
-		'slap' => array('slapped', t('slap'), t('slapped')),
-		'finger' => array('fingered', t('finger'), t('fingered')),
-		'rebuff' => array('rebuffed', t('rebuff'), t('rebuffed')),
-	);
+	$arr = [
+		'poke' => ['poked', t('poke'), t('poked')],
+		'ping' => ['pinged', t('ping'), t('pinged')],
+		'prod' => ['prodded', t('prod'), t('prodded')],
+		'slap' => ['slapped', t('slap'), t('slapped')],
+		'finger' => ['fingered', t('finger'), t('fingered')],
+		'rebuff' => ['rebuffed', t('rebuff'), t('rebuffed')],
+	];
 	call_hooks('poke_verbs', $arr);
 	return $arr;
 }
 
-/**
- * Load moods
- * @return array index is mood, value is translated mood
- * @hook mood_verbs moods array
- */
-function get_mood_verbs() {
-
-	$arr = array(
-		'happy'      => t('happy'),
-		'sad'        => t('sad'),
-		'mellow'     => t('mellow'),
-		'tired'      => t('tired'),
-		'perky'      => t('perky'),
-		'angry'      => t('angry'),
-		'stupefied'  => t('stupified'),
-		'puzzled'    => t('puzzled'),
-		'interested' => t('interested'),
-		'bitter'     => t('bitter'),
-		'cheerful'   => t('cheerful'),
-		'alive'      => t('alive'),
-		'annoyed'    => t('annoyed'),
-		'anxious'    => t('anxious'),
-		'cranky'     => t('cranky'),
-		'disturbed'  => t('disturbed'),
-		'frustrated' => t('frustrated'),
-		'motivated'  => t('motivated'),
-		'relaxed'    => t('relaxed'),
-		'surprised'  => t('surprised'),
-	);
-
-	call_hooks('mood_verbs', $arr);
-	return $arr;
-}
-
 /**
  * @brief Translate days and months names.
- * 
+ *
  * @param string $s String with day or month name.
  * @return string Translated string.
  */
 function day_translate($s) {
-	$ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),
-		array(t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')),
+	$ret = str_replace(['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'],
+		[t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')],
 		$s);
 
-	$ret = str_replace(array('January','February','March','April','May','June','July','August','September','October','November','December'),
-		array(t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')),
+	$ret = str_replace(['January','February','March','April','May','June','July','August','September','October','November','December'],
+		[t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')],
 		$ret);
 
 	return $ret;
@@ -1166,16 +1147,16 @@ function day_translate($s) {
 
 /**
  * @brief Translate short days and months names.
- * 
+ *
  * @param string $s String with short day or month name.
  * @return string Translated string.
  */
 function day_short_translate($s) {
-	$ret = str_replace(array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'),
-		array(t('Mon'), t('Tue'), t('Wed'), t('Thu'), t('Fri'), t('Sat'), t('Sund')),
+	$ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+		[t('Mon'), t('Tue'), t('Wed'), t('Thu'), t('Fri'), t('Sat'), t('Sun')],
 		$s);
-	$ret = str_replace(array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','Dec'),
-		array(t('Jan'), t('Feb'), t('Mar'), t('Apr'), t('May'), ('Jun'), t('Jul'), t('Aug'), t('Sep'), t('Oct'), t('Nov'), t('Dec')),
+	$ret = str_replace(['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','Dec'],
+		[t('Jan'), t('Feb'), t('Mar'), t('Apr'), t('May'), ('Jun'), t('Jul'), t('Aug'), t('Sep'), t('Oct'), t('Nov'), t('Dec')],
 		$ret);
 	return $ret;
 }
@@ -1188,7 +1169,7 @@ function day_short_translate($s) {
  * @return string
  */
 function normalise_link($url) {
-	$ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url);
+	$ret = str_replace(['https:', '//www.'], ['http:', '//'], $url);
 	return rtrim($ret,'/');
 }
 
@@ -1233,11 +1214,15 @@ function redir_private_images($a, &$item)
 	}
 }
 
-function put_item_in_cache(&$item, $update = false) {
-
-	if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") ||
-		($item["rendered-html"] == "") || Config::get("system", "ignore_cache")) {
+function put_item_in_cache(&$item, $update = false)
+{
+	$rendered_hash = defaults($item, 'rendered-hash', '');
 
+	if ($rendered_hash == ''
+		|| $item["rendered-html"] == ""
+		|| $rendered_hash != hash("md5", $item["body"])
+		|| Config::get("system", "ignore_cache")
+	) {
 		// The function "redir_private_images" changes the body.
 		// I'm not sure if we should store it permanently, so we save the old value.
 		$body = $item["body"];
@@ -1250,8 +1235,8 @@ function put_item_in_cache(&$item, $update = false) {
 		$item["body"] = $body;
 
 		if ($update && ($item["id"] > 0)) {
-			dba::update('item', array('rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]),
-					array('id' => $item["id"]), false);
+			dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]],
+					['id' => $item["id"]], false);
 		}
 	}
 }
@@ -1274,9 +1259,9 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 
 	$searchpath = System::baseUrl() . "/search?tag=";
 
-	$tags = array();
-	$hashtags = array();
-	$mentions = array();
+	$tags = [];
+	$hashtags = [];
+	$mentions = [];
 
 	// In order to provide theme developers more possibilities, event items
 	// are treated differently.
@@ -1328,14 +1313,14 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 	put_item_in_cache($item, $update);
 	$s = $item["rendered-html"];
 
-	$prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
+	$prep_arr = ['item' => $item, 'html' => $s, 'preview' => $preview];
 	call_hooks('prepare_body', $prep_arr);
 	$s = $prep_arr['html'];
 
 	if (! $attach) {
 		// Replace the blockquotes with quotes that are used in mails.
 		$mailquote = '<blockquote type="cite" class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">';
-		$s = str_replace(array('<blockquote>', '<blockquote class="spoiler">', '<blockquote class="author">'), array($mailquote, $mailquote, $mailquote), $s);
+		$s = str_replace(['<blockquote>', '<blockquote class="spoiler">', '<blockquote class="author">'], [$mailquote, $mailquote, $mailquote], $s);
 		return $s;
 	}
 
@@ -1360,23 +1345,23 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 					if (strpos($mime, 'video') !== false) {
 						if (!$vhead) {
 							$vhead = true;
-							$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
+							$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), [
 								'$baseurl' => System::baseUrl(),
-							));
-							$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
+							]);
+							$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), [
 								'$baseurl' => System::baseUrl(),
-							));
+							]);
 						}
 
 						$id = end(explode('/', $the_url));
-						$as .= replace_macros(get_markup_template('video_top.tpl'), array(
-							'$video' => array(
+						$as .= replace_macros(get_markup_template('video_top.tpl'), [
+							'$video' => [
 								'id'     => $id,
 								'title'  => t('View Video'),
 								'src'    => $the_url,
 								'mime'   => $mime,
-							),
-						));
+							],
+						]);
 					}
 
 					$filetype = strtolower(substr($mime, 0, strpos($mime, '/')));
@@ -1403,7 +1388,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 
 	// Map.
 	if (strpos($s, '<div class="map">') !== false && x($item, 'coord')) {
-		$x = generate_map(trim($item['coord']));
+		$x = Map::byCoordinates(trim($item['coord']));
 		if ($x) {
 			$s = preg_replace('/\<div class\=\"map\"\>/', '$0' . $x, $s);
 		}
@@ -1446,7 +1431,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 		$s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
 	}
 
-	$prep_arr = array('item' => $item, 'html' => $s);
+	$prep_arr = ['item' => $item, 'html' => $s];
 	call_hooks('prepare_body_final', $prep_arr);
 
 	return $prep_arr['html'];
@@ -1498,24 +1483,23 @@ function prepare_text($text) {
  *       ]
  *  ]
  */
-function get_cats_and_terms($item) {
-
-	$a = get_app();
-	$categories = array();
-	$folders = array();
+function get_cats_and_terms($item)
+{
+	$categories = [];
+	$folders = [];
 
 	$matches = false;
 	$first = true;
 	$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
 	if ($cnt) {
 		foreach ($matches as $mtch) {
-			$categories[] = array(
+			$categories[] = [
 				'name' => xmlify(file_tag_decode($mtch[1])),
 				'url' =>  "#",
 				'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
 				'first' => $first,
 				'last' => false
-			);
+			];
 			$first = false;
 		}
 	}
@@ -1530,13 +1514,13 @@ function get_cats_and_terms($item) {
 		$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
 		if ($cnt) {
 			foreach ($matches as $mtch) {
-				$folders[] = array(
+				$folders[] = [
 					'name' => xmlify(file_tag_decode($mtch[1])),
 					'url' =>  "#",
 					'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) : ""),
 					'first' => $first,
 					'last' => false
-				);
+				];
 				$first = false;
 			}
 		}
@@ -1546,7 +1530,7 @@ function get_cats_and_terms($item) {
 		$folders[count($folders) - 1]['last'] = true;
 	}
 
-	return array($categories, $folders);
+	return [$categories, $folders];
 }
 
 
@@ -1559,13 +1543,13 @@ function get_plink($item) {
 	$a = get_app();
 
 	if ($a->user['nickname'] != "") {
-		$ret = array(
+		$ret = [
 				//'href' => "display/" . $a->user['nickname'] . "/" . $item['id'],
 				'href' => "display/" . $item['guid'],
 				'orig' => "display/" . $item['guid'],
 				'title' => t('View on separate page'),
 				'orig_title' => t('view on separate page'),
-			);
+			];
 
 		if (x($item, 'plink')) {
 			$ret["href"] = $a->remove_baseurl($item['plink']);
@@ -1573,13 +1557,13 @@ function get_plink($item) {
 		}
 
 	} elseif (x($item, 'plink') && ($item['private'] != 1)) {
-		$ret = array(
+		$ret = [
 				'href' => $item['plink'],
 				'orig' => $item['plink'],
 				'title' => t('link to source'),
-			);
+			];
 	} else {
-		$ret = array();
+		$ret = [];
 	}
 
 	return $ret;
@@ -1732,7 +1716,7 @@ function array_xmlify($val){
 
 
 /**
- * transorm link href and img src from relative to absolute
+ * transform link href and img src from relative to absolute
  *
  * @param string $text
  * @param string $base base url
@@ -1796,11 +1780,11 @@ function item_post_type($item) {
 // To do this we need to escape these characters if they appear in our tag.
 
 function file_tag_encode($s) {
-	return str_replace(array('<','>','[',']'),array('%3c','%3e','%5b','%5d'),$s);
+	return str_replace(['<','>','[',']'],['%3c','%3e','%5b','%5d'],$s);
 }
 
 function file_tag_decode($s) {
-	return str_replace(array('%3c', '%3e', '%5b', '%5d'), array('<', '>', '[', ']'), $s);
+	return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
 }
 
 function file_tag_file_query($table,$s,$type = 'file') {
@@ -1882,7 +1866,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 		$filetags_updated = $saved;
 
 		// check for new tags to be added as filetags in pconfig
-		$new_tags = array();
+		$new_tags = [];
 		$check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
 
 		foreach ($check_new_tags as $tag) {
@@ -1893,7 +1877,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 		$filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
 
 		// check for deleted tags to be removed from filetags in pconfig
-		$deleted_tags = array();
+		$deleted_tags = [];
 		$check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
 
 		foreach ($check_deleted_tags as $tag) {
@@ -1925,12 +1909,12 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 	return true;
 }
 
-function file_tag_save_file($uid, $item, $file) {
-	require_once "include/files.php";
-
-	$result = false;
-	if (! intval($uid))
+function file_tag_save_file($uid, $item, $file)
+{
+	if (! intval($uid)) {
 		return false;
+	}
+
 	$r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($item),
 		intval($uid)
@@ -1944,7 +1928,7 @@ function file_tag_save_file($uid, $item, $file) {
 			);
 		}
 
-		create_files_from_item($item);
+		Term::createFromItem($item);
 
 		$saved = PConfig::get($uid, 'system', 'filetags');
 		if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
@@ -1955,12 +1939,11 @@ function file_tag_save_file($uid, $item, $file) {
 	return true;
 }
 
-function file_tag_unsave_file($uid, $item, $file, $cat = false) {
-	require_once "include/files.php";
-
-	$result = false;
-	if (! intval($uid))
+function file_tag_unsave_file($uid, $item, $file, $cat = false)
+{
+	if (! intval($uid)) {
 		return false;
+	}
 
 	if ($cat == true) {
 		$pattern = '<' . file_tag_encode($file) . '>' ;
@@ -1970,7 +1953,6 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
 		$termtype = TERM_FILE;
 	}
 
-
 	$r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($item),
 		intval($uid)
@@ -1985,14 +1967,14 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
 		intval($uid)
 	);
 
-	create_files_from_item($item);
+	Term::createFromItem($item);
 
 	$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
 		dbesc($file),
 		intval(TERM_OBJ_POST),
 		intval($termtype),
-		intval($uid));
-
+		intval($uid)
+	);
 	if (!DBM::is_result($r)) {
 		$saved = PConfig::get($uid, 'system', 'filetags');
 		PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
@@ -2002,7 +1984,7 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
 }
 
 function normalise_openid($s) {
-	return trim(str_replace(array('http://', 'https://'), array('', ''), $s), '/');
+	return trim(str_replace(['http://', 'https://'], ['', ''], $s), '/');
 }
 
 
@@ -2041,7 +2023,7 @@ function is_a_date_arg($s) {
 function deindent($text, $chr = "[\t ]", $count = NULL) {
 	$lines = explode("\n", $text);
 	if (is_null($count)) {
-		$m = array();
+		$m = [];
 		$k = 0;
 		while ($k < count($lines) && strlen($lines[$k]) == 0) {
 			$k++;
@@ -2057,7 +2039,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) {
 }
 
 function formatBytes($bytes, $precision = 2) {
-	 $units = array('B', 'KB', 'MB', 'GB', 'TB');
+	$units = ['B', 'KB', 'MB', 'GB', 'TB'];
 
 	$bytes = max($bytes, 0);
 	$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
@@ -2079,16 +2061,14 @@ function formatBytes($bytes, $precision = 2) {
  */
 function format_network_name($network, $url = 0) {
 	if ($network != "") {
-		require_once 'include/contact_selectors.php';
 		if ($url != "") {
-			$network_name = '<a href="'.$url.'">'.network_to_name($network, $url)."</a>";
+			$network_name = '<a href="'.$url.'">'.ContactSelector::networkToName($network, $url)."</a>";
 		} else {
-			$network_name = network_to_name($network);
+			$network_name = ContactSelector::networkToName($network);
 		}
 
 		return $network_name;
 	}
-
 }
 
 /**
@@ -2107,10 +2087,10 @@ function text_highlight($s, $lang) {
 	// Autoload the library to make constants available
 	class_exists('Text_Highlighter_Renderer_Html');
 
-	$options = array(
+	$options = [
 		'numbers' => HL_NUMBERS_LI,
 		'tabsize' => 4,
-	);
+	];
 
 	$tag_added = false;
 	$s = trim(html_entity_decode($s, ENT_COMPAT));
@@ -2127,7 +2107,8 @@ function text_highlight($s, $lang) {
 	}
 
 	$renderer = new Text_Highlighter_Renderer_Html($options);
-	$hl = Text_Highlighter::factory($lang);
+	$factory = new Text_Highlighter();
+	$hl = $factory->factory($lang);
 	$hl->setRenderer($renderer);
 	$o = $hl->highlight($s);
 	$o = str_replace("\n", '', $o);