X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=f4d7c5f5a6c549b80f894bf3396821678455fb84;hb=9dfc970bd63086c85569f144d1d2a507d51935de;hp=a2c7f072017c80fe046592cbe34bd284fe5af10a;hpb=65f29800ff875ea20b298c358431b440cfe4f66c;p=friendica.git

diff --git a/include/api.php b/include/api.php
index a2c7f07201..f4d7c5f5a6 100644
--- a/include/api.php
+++ b/include/api.php
@@ -15,6 +15,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
@@ -42,6 +43,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'include/conversation.php';
@@ -96,9 +98,9 @@ function api_source()
 			return "Twidere";
 		}
 
-		logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
+		Logger::log("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], Logger::DEBUG);
 	} else {
-		logger("Empty user-agent", LOGGER_DEBUG);
+		Logger::log("Empty user-agent", Logger::DEBUG);
 	}
 
 	return "api";
@@ -180,7 +182,7 @@ function api_login(App $a)
 		var_dump($consumer, $token);
 		die();
 	} catch (Exception $e) {
-		logger($e);
+		Logger::log($e);
 	}
 
 	// workaround for HTTP-auth in CGI mode
@@ -194,7 +196,7 @@ function api_login(App $a)
 	}
 
 	if (!x($_SERVER, 'PHP_AUTH_USER')) {
-		logger('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+		Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		throw new UnauthorizedException("This API requires login");
 	}
@@ -235,7 +237,7 @@ function api_login(App $a)
 	}
 
 	if (!DBA::isResult($record)) {
-		logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+		Logger::log('API_login failure: ' . print_r($_SERVER, true), Logger::DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		//header('HTTP/1.0 401 Unauthorized');
 		//die('This api requires login');
@@ -308,19 +310,19 @@ function api_call(App $a)
 					api_login($a);
 				}
 
-				logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
-				logger('API parameters: ' . print_r($_REQUEST, true));
+				Logger::log('API call for ' . $a->user['username'] . ': ' . $a->query_string);
+				Logger::log('API parameters: ' . print_r($_REQUEST, true));
 
 				$stamp =  microtime(true);
 				$return = call_user_func($info['func'], $type);
 				$duration = (float) (microtime(true) - $stamp);
-				logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG);
+				Logger::log("API call duration: " . round($duration, 2) . "\t" . $a->query_string, Logger::DEBUG);
 
 				if (Config::get("system", "profiler")) {
 					$duration = microtime(true)-$a->performance["start"];
 
 					/// @TODO round() really everywhere?
-					logger(
+					Logger::log(
 						parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf(
 							"Database: %s/%s, Cache %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s",
 							round($a->performance["database"] - $a->performance["database_write"], 3),
@@ -334,7 +336,7 @@ function api_call(App $a)
 								+ $a->performance["network"] + $a->performance["file"]), 2),
 							round($duration, 2)
 						),
-						LOGGER_DEBUG
+						Logger::DEBUG
 					);
 
 					if (Config::get("rendertime", "callstack")) {
@@ -375,7 +377,7 @@ function api_call(App $a)
 								$o .= $func . ": " . $time . "\n";
 							}
 						}
-						logger($o, LOGGER_DEBUG);
+						Logger::log($o, Logger::DEBUG);
 					}
 				}
 
@@ -412,7 +414,7 @@ function api_call(App $a)
 			}
 		}
 
-		logger('API call not implemented: ' . $a->query_string);
+		Logger::log('API call not implemented: ' . $a->query_string);
 		throw new NotImplementedException();
 	} catch (HTTPException $e) {
 		header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
@@ -521,11 +523,11 @@ function api_get_user(App $a, $contact_id = null)
 	$extra_query = "";
 	$url = "";
 
-	logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);
+	Logger::log("api_get_user: Fetching user data for user ".$contact_id, Logger::DEBUG);
 
 	// Searching for contact URL
 	if (!is_null($contact_id) && (intval($contact_id) == 0)) {
-		$user = DBA::escape(normalise_link($contact_id));
+		$user = DBA::escape(Strings::normaliseLink($contact_id));
 		$url = $user;
 		$extra_query = "AND `contact`.`nurl` = '%s' ";
 		if (api_user() !== false) {
@@ -570,7 +572,7 @@ function api_get_user(App $a, $contact_id = null)
 	}
 
 	if (is_null($user) && x($_GET, 'profileurl')) {
-		$user = DBA::escape(normalise_link($_GET['profileurl']));
+		$user = DBA::escape(Strings::normaliseLink($_GET['profileurl']));
 		$extra_query = "AND `contact`.`nurl` = '%s' ";
 		if (api_user() !== false) {
 			$extra_query .= "AND `contact`.`uid`=".intval(api_user());
@@ -605,7 +607,7 @@ function api_get_user(App $a, $contact_id = null)
 		}
 	}
 
-	logger("api_get_user: user ".$user, LOGGER_DEBUG);
+	Logger::log("api_get_user: user ".$user, Logger::DEBUG);
 
 	if (!$user) {
 		if (api_user() === false) {
@@ -617,7 +619,7 @@ function api_get_user(App $a, $contact_id = null)
 		}
 	}
 
-	logger('api_user: ' . $extra_query . ', user: ' . $user);
+	Logger::log('api_user: ' . $extra_query . ', user: ' . $user);
 
 	// user info
 	$uinfo = q(
@@ -638,7 +640,7 @@ function api_get_user(App $a, $contact_id = null)
 			throw new BadRequestException("User not found.");
 		}
 
-		$contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => normalise_link($url)]);
+		$contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
 
 		if (DBA::isResult($contact)) {
 			$network_name = ContactSelector::networkToName($contact['network'], $contact['url']);
@@ -1033,7 +1035,7 @@ function api_statuses_mediap($type)
 	$a = get_app();
 
 	if (api_user() === false) {
-		logger('api_statuses_update: no user');
+		Logger::log('api_statuses_update: no user');
 		throw new ForbiddenException();
 	}
 	$user_info = api_get_user($a);
@@ -1045,7 +1047,7 @@ function api_statuses_mediap($type)
 	//$txt = urldecode(requestdata('status'));
 
 	if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
-		$txt = html2bb_video($txt);
+		$txt = HTML::toBBCodeVideo($txt);
 		$config = HTMLPurifier_Config::createDefault();
 		$config->set('Cache.DefinitionImpl', null);
 		$purifier = new HTMLPurifier($config);
@@ -1081,7 +1083,7 @@ function api_statuses_update($type)
 	$a = get_app();
 
 	if (api_user() === false) {
-		logger('api_statuses_update: no user');
+		Logger::log('api_statuses_update: no user');
 		throw new ForbiddenException();
 	}
 
@@ -1091,7 +1093,7 @@ function api_statuses_update($type)
 	if (requestdata('htmlstatus')) {
 		$txt = requestdata('htmlstatus');
 		if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
-			$txt = html2bb_video($txt);
+			$txt = HTML::toBBCodeVideo($txt);
 
 			$config = HTMLPurifier_Config::createDefault();
 			$config->set('Cache.DefinitionImpl', null);
@@ -1135,7 +1137,7 @@ function api_statuses_update($type)
 			$posts_day = DBA::count('thread', $condition);
 
 			if ($posts_day > $throttle_day) {
-				logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
+				Logger::log('Daily posting limit reached for user '.api_user(), Logger::DEBUG);
 				// die(api_error($type, L10n::t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
 				throw new TooManyRequestsException(L10n::tt("Daily posting limit of %d post reached. The post was rejected.", "Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
 			}
@@ -1149,7 +1151,7 @@ function api_statuses_update($type)
 			$posts_week = DBA::count('thread', $condition);
 
 			if ($posts_week > $throttle_week) {
-				logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
+				Logger::log('Weekly posting limit reached for user '.api_user(), Logger::DEBUG);
 				// die(api_error($type, L10n::t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)));
 				throw new TooManyRequestsException(L10n::tt("Weekly posting limit of %d post reached. The post was rejected.", "Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week));
 			}
@@ -1163,7 +1165,7 @@ function api_statuses_update($type)
 			$posts_month = DBA::count('thread', $condition);
 
 			if ($posts_month > $throttle_month) {
-				logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
+				Logger::log('Monthly posting limit reached for user '.api_user(), Logger::DEBUG);
 				// die(api_error($type, L10n::t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
 				throw new TooManyRequestsException(L10n::t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
 			}
@@ -1223,7 +1225,7 @@ function api_media_upload()
 	$a = get_app();
 
 	if (api_user() === false) {
-		logger('no user');
+		Logger::log('no user');
 		throw new ForbiddenException();
 	}
 
@@ -1248,7 +1250,7 @@ function api_media_upload()
 					"h" => $media["height"],
 					"image_type" => $media["type"]];
 
-	logger("Media uploaded: " . print_r($returndata, true), LOGGER_DEBUG);
+	Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG);
 
 	return ["media" => $returndata];
 }
@@ -1268,7 +1270,7 @@ function api_status_show($type, $item_id = 0)
 
 	$user_info = api_get_user($a);
 
-	logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
+	Logger::log('api_status_show: user_info: '.print_r($user_info, true), Logger::DEBUG);
 
 	if ($type == "raw") {
 		$privacy_sql = "AND NOT `private`";
@@ -1344,7 +1346,7 @@ function api_status_show($type, $item_id = 0)
 		unset($status_info["user"]["uid"]);
 		unset($status_info["user"]["self"]);
 
-		logger('status_info: '.print_r($status_info, true), LOGGER_DEBUG);
+		Logger::log('status_info: '.print_r($status_info, true), Logger::DEBUG);
 
 		if ($type == "raw") {
 			return $status_info;
@@ -1647,6 +1649,7 @@ function api_statuses_home_timeline($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
 			break;
@@ -1729,6 +1732,7 @@ function api_statuses_public_timeline($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
 			break;
@@ -1785,6 +1789,7 @@ function api_statuses_networkpublic_timeline($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
 			break;
@@ -1824,7 +1829,7 @@ function api_statuses_show($type)
 		$id = intval(defaults($a->argv, 4, 0));
 	}
 
-	logger('API: api_statuses_show: ' . $id);
+	Logger::log('API: api_statuses_show: ' . $id);
 
 	$conversation = !empty($_REQUEST['conversation']);
 
@@ -1906,7 +1911,7 @@ function api_conversation_show($type)
 		$id = intval(defaults($a->argv, 4, 0));
 	}
 
-	logger('API: api_conversation_show: '.$id);
+	Logger::log('API: api_conversation_show: '.$id);
 
 	// try to fetch the item for the local user - or the public item, if there is no local one
 	$item = Item::selectFirst(['parent-uri'], ['id' => $id]);
@@ -1977,7 +1982,7 @@ function api_statuses_repeat($type)
 		$id = intval(defaults($a->argv, 4, 0));
 	}
 
-	logger('API: api_statuses_repeat: '.$id);
+	Logger::log('API: api_statuses_repeat: '.$id);
 
 	$fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
 	$item = Item::selectFirst($fields, ['id' => $id, 'private' => false]);
@@ -2042,7 +2047,7 @@ function api_statuses_destroy($type)
 		$id = intval(defaults($a->argv, 4, 0));
 	}
 
-	logger('API: api_statuses_destroy: '.$id);
+	Logger::log('API: api_statuses_destroy: '.$id);
 
 	$ret = api_statuses_show($type);
 
@@ -2106,6 +2111,7 @@ function api_statuses_mentions($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
 			break;
@@ -2137,11 +2143,11 @@ function api_statuses_user_timeline($type)
 		throw new ForbiddenException();
 	}
 
-	logger(
+	Logger::log(
 		"api_statuses_user_timeline: api_user: ". api_user() .
 			"\nuser_info: ".print_r($user_info, true) .
 			"\n_REQUEST:  ".print_r($_REQUEST, true),
-		LOGGER_DEBUG
+		Logger::DEBUG
 	);
 
 	$since_id        = x($_REQUEST, 'since_id')        ? $_REQUEST['since_id']        : 0;
@@ -2186,6 +2192,7 @@ function api_statuses_user_timeline($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
 			break;
@@ -2261,8 +2268,10 @@ function api_favorites_create_destroy($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
+			break;
 	}
 
 	return api_format_data("status", $type, $data);
@@ -2294,7 +2303,7 @@ function api_favorites($type)
 
 	// in friendica starred item are private
 	// return favorites only for self
-	logger('api_favorites: self:' . $user_info['self']);
+	Logger::log('api_favorites: self:' . $user_info['self']);
 
 	if ($user_info['self'] == 0) {
 		$ret = [];
@@ -2328,8 +2337,10 @@ function api_favorites($type)
 	$data = ['status' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
+			break;
 	}
 
 	return api_format_data("statuses", $type, $data);
@@ -2661,7 +2672,7 @@ function api_get_entitities(&$text, $bbcode)
 							"id" => $start+1,
 							"id_str" => (string)$start+1,
 							"indices" => [$start, $start+strlen($url)],
-							"media_url" => normalise_link($media_url),
+							"media_url" => Strings::normaliseLink($media_url),
 							"media_url_https" => $media_url,
 							"url" => $url,
 							"display_url" => $display_url,
@@ -2921,6 +2932,7 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
 			$retweeted_item = api_share_as_retweet($item);
 			if ($retweeted_item !== false) {
 				$retweeted_status = $status;
+				$status['user'] = $status['friendica_owner'];
 				try {
 					$retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
 				} catch (BadRequestException $e) {
@@ -3142,6 +3154,7 @@ function api_lists_statuses($type)
 	$data = ['status' => $items];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
 			break;
@@ -3538,8 +3551,10 @@ function api_direct_messages_new($type)
 
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $sender);
+			break;
 	}
 
 	return api_format_data("direct-messages", $type, $data);
@@ -3649,7 +3664,7 @@ function api_friendships_destroy($type)
 	$contact_id = defaults($_REQUEST, 'user_id');
 
 	if (empty($contact_id)) {
-		logger("No user_id specified", LOGGER_DEBUG);
+		Logger::log("No user_id specified", Logger::DEBUG);
 		throw new BadRequestException("no user_id specified");
 	}
 
@@ -3657,24 +3672,24 @@ function api_friendships_destroy($type)
 	$contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => 0, 'self' => false]);
 
 	if(!DBA::isResult($contact)) {
-		logger("No contact found for ID" . $contact_id, LOGGER_DEBUG);
+		Logger::log("No contact found for ID" . $contact_id, Logger::DEBUG);
 		throw new NotFoundException("no contact found to given ID");
 	}
 
 	$url = $contact["url"];
 
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
-			$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
-			normalise_link($url), $url];
+			$uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
+			Strings::normaliseLink($url), $url];
 	$contact = DBA::selectFirst('contact', [], $condition);
 
 	if (!DBA::isResult($contact)) {
-		logger("Not following Contact", LOGGER_DEBUG);
+		Logger::log("Not following Contact", Logger::DEBUG);
 		throw new NotFoundException("Not following Contact");
 	}
 
 	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-		logger("Not supported", LOGGER_DEBUG);
+		Logger::log("Not supported", Logger::DEBUG);
 		throw new ExpectationFailedException("Not supported");
 	}
 
@@ -3685,7 +3700,7 @@ function api_friendships_destroy($type)
 		Contact::terminateFriendship($owner, $contact, $dissolve);
 	}
 	else {
-		logger("No owner found", LOGGER_DEBUG);
+		Logger::log("No owner found", Logger::DEBUG);
 		throw new NotFoundException("Error Processing Request");
 	}
 
@@ -3789,9 +3804,9 @@ function api_direct_messages_box($type, $box, $verbose)
 	foreach ($r as $item) {
 		if ($box == "inbox" || $item['from-url'] != $profile_url) {
 			$recipient = $user_info;
-			$sender = api_get_user($a, normalise_link($item['contact-url']));
+			$sender = api_get_user($a, Strings::normaliseLink($item['contact-url']));
 		} elseif ($box == "sentbox" || $item['from-url'] == $profile_url) {
-			$recipient = api_get_user($a, normalise_link($item['contact-url']));
+			$recipient = api_get_user($a, Strings::normaliseLink($item['contact-url']));
 			$sender = $user_info;
 		}
 
@@ -3804,8 +3819,10 @@ function api_direct_messages_box($type, $box, $verbose)
 	$data = ['direct_message' => $ret];
 	switch ($type) {
 		case "atom":
+			break;
 		case "rss":
 			$data = api_rss_extra($a, $data, $user_info);
+			break;
 	}
 
 	return api_format_data("direct-messages", $type, $data);
@@ -4485,10 +4502,10 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 	if ($imagedata) {
 		$filetype = $imagedata['mime'];
 	}
-	logger(
+	Logger::log(
 		"File upload src: " . $src . " - filename: " . $filename .
 		" - size: " . $filesize . " - type: " . $filetype,
-		LOGGER_DEBUG
+		Logger::DEBUG
 	);
 
 	// check if there was a php upload error
@@ -4498,7 +4515,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 	// check against max upload size within Friendica instance
 	$maximagesize = Config::get('system', 'maximagesize');
 	if ($maximagesize && ($filesize > $maximagesize)) {
-		$formattedBytes = formatBytes($maximagesize);
+		$formattedBytes = Strings::formatBytes($maximagesize);
 		throw new InternalServerErrorException("image size exceeds Friendica config setting (uploaded size: $formattedBytes)");
 	}
 
@@ -4520,7 +4537,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 	}
 	if ($max_length > 0) {
 		$Image->scaleDown($max_length);
-		logger("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
+		Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG);
 	}
 	$width = $Image->getWidth();
 	$height = $Image->getHeight();
@@ -4530,17 +4547,17 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 
 	if ($mediatype == "photo") {
 		// upload normal image (scales 0, 1, 2)
-		logger("photo upload: starting new photo upload", LOGGER_DEBUG);
+		Logger::log("photo upload: starting new photo upload", Logger::DEBUG);
 
 		$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
 		if (!$r) {
-			logger("photo upload: image upload with scale 0 (original size) failed");
+			Logger::log("photo upload: image upload with scale 0 (original size) failed");
 		}
 		if ($width > 640 || $height > 640) {
 			$Image->scaleDown(640);
 			$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
 			if (!$r) {
-				logger("photo upload: image upload with scale 1 (640x640) failed");
+				Logger::log("photo upload: image upload with scale 1 (640x640) failed");
 			}
 		}
 
@@ -4548,19 +4565,19 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 			$Image->scaleDown(320);
 			$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
 			if (!$r) {
-				logger("photo upload: image upload with scale 2 (320x320) failed");
+				Logger::log("photo upload: image upload with scale 2 (320x320) failed");
 			}
 		}
-		logger("photo upload: new photo upload ended", LOGGER_DEBUG);
+		Logger::log("photo upload: new photo upload ended", Logger::DEBUG);
 	} elseif ($mediatype == "profileimage") {
 		// upload profile image (scales 4, 5, 6)
-		logger("photo upload: starting new profile image upload", LOGGER_DEBUG);
+		Logger::log("photo upload: starting new profile image upload", Logger::DEBUG);
 
-		if ($width > 175 || $height > 175) {
-			$Image->scaleDown(175);
+		if ($width > 300 || $height > 300) {
+			$Image->scaleDown(300);
 			$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
 			if (!$r) {
-				logger("photo upload: profile image upload with scale 4 (175x175) failed");
+				Logger::log("photo upload: profile image upload with scale 4 (300x300) failed");
 			}
 		}
 
@@ -4568,7 +4585,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 			$Image->scaleDown(80);
 			$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
 			if (!$r) {
-				logger("photo upload: profile image upload with scale 5 (80x80) failed");
+				Logger::log("photo upload: profile image upload with scale 5 (80x80) failed");
 			}
 		}
 
@@ -4576,11 +4593,11 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 			$Image->scaleDown(48);
 			$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
 			if (!$r) {
-				logger("photo upload: profile image upload with scale 6 (48x48) failed");
+				Logger::log("photo upload: profile image upload with scale 6 (48x48) failed");
 			}
 		}
 		$Image->__destruct();
-		logger("photo upload: new profile image upload ended", LOGGER_DEBUG);
+		Logger::log("photo upload: new profile image upload ended", Logger::DEBUG);
 	}
 
 	if (isset($r) && $r) {
@@ -4778,7 +4795,7 @@ function api_friendica_remoteauth()
 		throw new BadRequestException("Wrong parameters.");
 	}
 
-	$c_url = normalise_link($c_url);
+	$c_url = Strings::normaliseLink($c_url);
 
 	// traditional DFRN
 
@@ -4801,15 +4818,16 @@ function api_friendica_remoteauth()
 		$dfrn_id = '0:' . $orig_id;
 	}
 
-	$sec = random_string();
+	$sec = Strings::getRandomHex();
 
 	$fields = ['uid' => api_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
 		'sec' => $sec, 'expire' => time() + 45];
 	DBA::insert('profile_check', $fields);
 
-	logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+	Logger::log($contact['name'] . ' ' . $sec, Logger::DEBUG);
 	$dest = ($url ? '&destination_url=' . $url : '');
-	goaway(
+
+	System::externalRedirect(
 		$contact['poll'] . '?dfrn_id=' . $dfrn_id
 		. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
 		. '&type=profile&sec=' . $sec . $dest
@@ -4941,7 +4959,7 @@ function api_get_nick($profile)
 
 	$r = q(
 		"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
-		DBA::escape(normalise_link($profile))
+		DBA::escape(Strings::normaliseLink($profile))
 	);
 
 	if (DBA::isResult($r)) {
@@ -4951,7 +4969,7 @@ function api_get_nick($profile)
 	if (!$nick == "") {
 		$r = q(
 			"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
-			DBA::escape(normalise_link($profile))
+			DBA::escape(Strings::normaliseLink($profile))
 		);
 
 		if (DBA::isResult($r)) {
@@ -5054,7 +5072,7 @@ function api_in_reply_to($item)
 		// https://github.com/friendica/friendica/issues/1010
 		// This is a bugfix for that.
 		if (intval($in_reply_to['status_id']) == intval($item['id'])) {
-			logger('this message should never appear: id: '.$item['id'].' similar to reply-to: '.$in_reply_to['status_id'], LOGGER_DEBUG);
+			Logger::log('this message should never appear: id: '.$item['id'].' similar to reply-to: '.$in_reply_to['status_id'], Logger::DEBUG);
 			$in_reply_to['status_id'] = null;
 			$in_reply_to['user_id'] = null;
 			$in_reply_to['status_id_str'] = null;
@@ -5834,9 +5852,9 @@ function api_friendica_direct_messages_search($type, $box = "")
 		foreach ($r as $item) {
 			if ($box == "inbox" || $item['from-url'] != $profile_url) {
 				$recipient = $user_info;
-				$sender = api_get_user($a, normalise_link($item['contact-url']));
+				$sender = api_get_user($a, Strings::normaliseLink($item['contact-url']));
 			} elseif ($box == "sentbox" || $item['from-url'] == $profile_url) {
-				$recipient = api_get_user($a, normalise_link($item['contact-url']));
+				$recipient = api_get_user($a, Strings::normaliseLink($item['contact-url']));
 				$sender = $user_info;
 			}