X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=7b1fee733c59eac1208c02e856b88d7a972343b5;hb=27646cc4ad8d715317a2ca055b6c3318ddf555a9;hp=12380f4b8403e6de3a7202d752f14a43fa451b78;hpb=ff459441cfd86375a7b0ed5f2d6854fbd0ae3a00;p=friendica.git

diff --git a/include/api.php b/include/api.php
index 12380f4b84..7b1fee733c 100644
--- a/include/api.php
+++ b/include/api.php
@@ -6,12 +6,18 @@
  * @todo Automatically detect if incoming data is HTML or BBCode
  */
 use Friendica\App;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\NotificationsManager;
+use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Network\FKOAuth1;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -21,15 +27,13 @@ use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Network\HTTPException\TooManyRequestsException;
-use Friendica\Object\Contact;
-use Friendica\Object\Photo;
+use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\XML;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
 require_once 'include/conversation.php';
-require_once 'include/oauth.php';
 require_once 'include/html2plain.php';
 require_once 'mod/share.php';
 require_once 'mod/item.php';
@@ -39,7 +43,6 @@ require_once 'include/html2bbcode.php';
 require_once 'mod/wall_upload.php';
 require_once 'mod/proxy.php';
 require_once 'include/message.php';
-require_once 'include/group.php';
 require_once 'include/like.php';
 require_once 'include/plaintext.php';
 
@@ -156,12 +159,12 @@ function api_register_func($path, $func, $auth = false, $method = API_METHOD_ANY
  */
 function api_login(App $a)
 {
+	$oauth1 = new FKOAuth1();
 	// login with oauth
 	try {
-		$oauth = new FKOAuth1();
-		list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request());
+		list($consumer, $token) = $oauth1->verify_request(OAuthRequest::from_request());
 		if (!is_null($token)) {
-			$oauth->loginUser($token->uid);
+			$oauth1->loginUser($token->uid);
 			call_hooks('logged_in', $a->user);
 			return;
 		}
@@ -468,12 +471,12 @@ function api_rss_extra(App $a, $arr, $user_info)
  * @return bool|string
  * 		Contact url or False if contact id is unknown
  */
-function api_unique_id_to_url($id)
+function api_unique_id_to_nurl($id)
 {
-	$r = dba::select('contact', array('url'), array('uid' => 0, 'id' => $id), array('limit' => 1));
+	$r = dba::select('contact', array('nurl'), array('uid' => 0, 'id' => $id), array('limit' => 1));
 
 	if (DBM::is_result($r)) {
-		return $r["url"];
+		return $r["nurl"];
 	} else {
 		return false;
 	}
@@ -484,9 +487,8 @@ function api_unique_id_to_url($id)
  *
  * @param object     $a          App
  * @param int|string $contact_id Contact ID or URL
- * @param string     $type       Return type (for errors)
  */
-function api_get_user(App $a, $contact_id = null, $type = "json")
+function api_get_user(App $a, $contact_id = null)
 {
 	global $called_api;
 
@@ -509,7 +511,7 @@ function api_get_user(App $a, $contact_id = null, $type = "json")
 
 	// Searching for contact id with uid = 0
 	if (!is_null($contact_id) && (intval($contact_id) != 0)) {
-		$user = dbesc(api_unique_id_to_url($contact_id));
+		$user = dbesc(api_unique_id_to_nurl($contact_id));
 
 		if ($user == "") {
 			throw new BadRequestException("User not found.");
@@ -523,7 +525,7 @@ function api_get_user(App $a, $contact_id = null, $type = "json")
 	}
 
 	if (is_null($user) && x($_GET, 'user_id')) {
-		$user = dbesc(api_unique_id_to_url($_GET['user_id']));
+		$user = dbesc(api_unique_id_to_nurl($_GET['user_id']));
 
 		if ($user == "") {
 			throw new BadRequestException("User not found.");
@@ -557,7 +559,7 @@ function api_get_user(App $a, $contact_id = null, $type = "json")
 		$argid = count($called_api);
 		list($user, $null) = explode(".", $a->argv[$argid]);
 		if (is_numeric($user)) {
-			$user = dbesc(api_unique_id_to_url($user));
+			$user = dbesc(api_unique_id_to_nurl($user));
 
 			if ($user == "") {
 				return false;
@@ -778,6 +780,37 @@ function api_get_user(App $a, $contact_id = null, $type = "json")
 		'network' => $uinfo[0]['network'],
 	);
 
+	// If this is a local user and it uses Frio, we can get its color preferences.
+	if ($ret['self']) {
+		$theme_info = dba::select('user', ['theme'], ['uid' => $ret['uid']], ['limit' => 1]);
+		if ($theme_info['theme'] === 'frio') {
+			$schema = PConfig::get($ret['uid'], 'frio', 'schema');
+			if ($schema && ($schema != '---')) {
+				if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
+					$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
+					require_once $schemefile;
+				}
+			} else {
+				$nav_bg = PConfig::get($ret['uid'], 'frio', 'nav_bg');
+				$link_color = PConfig::get($ret['uid'], 'frio', 'link_color');
+				$bgcolor = PConfig::get($ret['uid'], 'frio', 'background_color');
+			}
+			if (!$nav_bg) {
+				$nav_bg = "#708fa0";
+			}
+			if (!$link_color) {
+				$link_color = "#6fdbe8";
+			}
+			if (!$bgcolor) {
+				$bgcolor = "#ededed";
+			}
+
+			$ret['profile_sidebar_fill_color'] = str_replace('#', '', $nav_bg);
+			$ret['profile_link_color'] = str_replace('#', '', $link_color);
+			$ret['profile_background_color'] = str_replace('#', '', $bgcolor);
+		}
+	}
+
 	return $ret;
 }
 
@@ -1191,7 +1224,7 @@ function api_statuses_update($type)
 			api_user()
 		);
 		if (DBM::is_result($r)) {
-			$phototypes = Photo::supportedTypes();
+			$phototypes = Image::supportedTypes();
 			$ext = $phototypes[$r[0]['type']];
 			$_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
 			$_REQUEST['body'] .= '[img]' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . '[/img][/url]';
@@ -1323,8 +1356,9 @@ function api_status_show($type)
 			'retweeted' => false,
 			'possibly_sensitive' => false,
 			'lang' => "",
-			'statusnet_html'		=> $converted["html"],
-			'statusnet_conversation_id'	=> $lastwall['parent'],
+			'statusnet_html' => $converted["html"],
+			'statusnet_conversation_id' => $lastwall['parent'],
+			'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
 		);
 
 		if (count($converted["attachments"]) > 0) {
@@ -1412,7 +1446,8 @@ function api_users_show($type)
 			$geo => null,
 			'favorited' => $lastwall['starred'] ? true : false,
 			'statusnet_html' => $converted["html"],
-			'statusnet_conversation_id'	=> $lastwall['parent'],
+			'statusnet_conversation_id' => $lastwall['parent'],
+			'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
 		);
 
 		if (count($converted["attachments"]) > 0) {
@@ -1609,40 +1644,131 @@ function api_statuses_public_timeline($type)
 
 	$start = $page * $count;
 
-	if ($max_id > 0) {
-		$sql_extra = 'AND `item`.`id` <= ' . intval($max_id);
+	if ($exclude_replies && !$conversation_id) {
+		if ($max_id > 0) {
+			$sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id);
+		}
+
+		$r = dba::p("SELECT " . item_fieldlists() . "
+			FROM `thread`
+			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+			" . item_joins() . "
+			STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid`
+				AND NOT `user`.`hidewall`
+			AND `verb` = ?
+			AND NOT `thread`.`private`
+			AND `thread`.`wall`
+			AND `thread`.`visible`
+			AND NOT `thread`.`deleted`
+			AND NOT `thread`.`moderated`
+			AND `thread`.`iid` > ?
+			$sql_extra
+			ORDER BY `thread`.`iid` DESC
+			LIMIT " . intval($start) . ", " . intval($count),
+			ACTIVITY_POST,
+			$since_id
+		);
+
+		$r = dba::inArray($r);
+	} else {
+		if ($max_id > 0) {
+			$sql_extra = 'AND `item`.`id` <= ' . intval($max_id);
+		}
+		if ($conversation_id > 0) {
+			$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+		}
+
+		$r = dba::p("SELECT " . item_fieldlists() . "
+			FROM `item`
+			" . item_joins() . "
+			STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+				AND NOT `user`.`hidewall`
+			AND `verb` = ?
+			AND NOT `item`.`private`
+			AND `item`.`wall`
+			AND `item`.`visible`
+			AND NOT `item`.`deleted`
+			AND NOT `item`.`moderated`
+			AND `item`.`id` > ?
+			$sql_extra
+			ORDER BY `item`.`id` DESC
+			LIMIT " . intval($start) . ", " . intval($count),
+			ACTIVITY_POST,
+			$since_id
+		);
+
+		$r = dba::inArray($r);
 	}
-	if ($exclude_replies > 0) {
-		$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+
+	$ret = api_format_items($r, $user_info, false, $type);
+
+	$data = array('status' => $ret);
+	switch ($type) {
+		case "atom":
+		case "rss":
+			$data = api_rss_extra($a, $data, $user_info);
+			break;
 	}
-	if ($conversation_id > 0) {
-		$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+
+	return api_format_data("statuses", $type, $data);
+}
+
+/// @TODO move to top of file or somewhere better
+api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline', true);
+
+/**
+ * @brief Returns the list of public federated posts this node knows about
+ *
+ * @param string $type Return format: json, xml, atom, rss
+ * @return array|string
+ * @throws ForbiddenException
+ */
+function api_statuses_networkpublic_timeline($type)
+{
+	$a = get_app();
+
+	if (api_user() === false) {
+		throw new ForbiddenException();
 	}
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
-		`contact`.`id` AS `cid`,
-		`user`.`nickname`, `user`.`hidewall`
-		FROM `item`
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
-			AND NOT `user`.`hidewall`
-		WHERE `verb` = '%s' AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-		AND NOT `item`.`private` AND `item`.`wall`
+	$user_info = api_get_user($a);
+
+	$since_id        = x($_REQUEST, 'since_id')        ? $_REQUEST['since_id']        : 0;
+	$max_id          = x($_REQUEST, 'max_id')          ? $_REQUEST['max_id']          : 0;
+
+	// pagination
+	$count = x($_REQUEST, 'count') ? $_REQUEST['count']   : 20;
+	$page  = x($_REQUEST, 'page')  ? $_REQUEST['page']    : 1;
+	if ($page < 1) {
+		$page = 1;
+	}
+	$start = ($page - 1) * $count;
+
+	$sql_extra = '';
+	if ($max_id > 0) {
+		$sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id);
+	}
+
+	$r = dba::p("SELECT " . item_fieldlists() . "
+		FROM `thread`
+		STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+		" . item_joins() . "
+		WHERE `thread`.`uid` = 0
+		AND `verb` = ?
+		AND NOT `thread`.`private`
+		AND `thread`.`visible`
+		AND NOT `thread`.`deleted`
+		AND NOT `thread`.`moderated`
+		AND `thread`.`iid` > ?
 		$sql_extra
-		AND `item`.`id`>%d
-		ORDER BY `item`.`id` DESC LIMIT %d, %d ",
-		dbesc(ACTIVITY_POST),
-		intval($since_id),
-		intval($start),
-		intval($count)
+		ORDER BY `thread`.`iid` DESC
+		LIMIT " . intval($start) . ", " . intval($count),
+		ACTIVITY_POST,
+		$since_id
 	);
 
+	$r = dba::inArray($r);
+
 	$ret = api_format_items($r, $user_info, false, $type);
 
 	$data = array('status' => $ret);
@@ -1657,7 +1783,7 @@ function api_statuses_public_timeline($type)
 }
 
 /// @TODO move to top of file or somewhere better
-api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline', true);
+api_register_func('api/statuses/networkpublic_timeline', 'api_statuses_networkpublic_timeline', true);
 
 /**
  * @TODO nothing to say?
@@ -2017,6 +2143,13 @@ function api_statuses_mentions($type)
 api_register_func('api/statuses/mentions', 'api_statuses_mentions', true);
 api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
 
+/**
+ * @brief Returns a user's public timeline
+ *
+ * @param string $type Either "json" or "xml"
+ * @return string|array
+ * @throws ForbiddenException
+ */
 function api_statuses_user_timeline($type)
 {
 	$a = get_app();
@@ -2026,7 +2159,6 @@ function api_statuses_user_timeline($type)
 	}
 
 	$user_info = api_get_user($a);
-	// get last network messages
 
 	logger(
 		"api_statuses_user_timeline: api_user: ". api_user() .
@@ -2035,18 +2167,18 @@ function api_statuses_user_timeline($type)
 		LOGGER_DEBUG
 	);
 
-	// params
-	$count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
-	$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
-	if ($page < 0) {
-		$page = 0;
-	}
-	$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-	//$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
-	$exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
-	$conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
+	$since_id        = x($_REQUEST, 'since_id')        ? $_REQUEST['since_id']        : 0;
+	$max_id          = x($_REQUEST, 'max_id')          ? $_REQUEST['max_id']          : 0;
+	$exclude_replies = x($_REQUEST, 'exclude_replies') ? 1                            : 0;
+	$conversation_id = x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0;
 
-	$start = $page * $count;
+	// pagination
+	$count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
+	$page  = x($_REQUEST, 'page')  ? $_REQUEST['page']  : 1;
+	if ($page < 1) {
+		$page = 1;
+	}
+	$start = ($page - 1) * $count;
 
 	$sql_extra = '';
 	if ($user_info['self'] == 1) {
@@ -2056,10 +2188,15 @@ function api_statuses_user_timeline($type)
 	if ($exclude_replies > 0) {
 		$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
 	}
+
 	if ($conversation_id > 0) {
 		$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
 	}
 
+	if ($max_id > 0) {
+		$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+	}
+
 	$r = q(
 		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -2072,7 +2209,7 @@ function api_statuses_user_timeline($type)
 		AND `item`.`contact-id` = %d
 		AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
 		$sql_extra
-		AND `item`.`id`>%d
+		AND `item`.`id` > %d
 		ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
 		intval(api_user()),
 		dbesc(ACTIVITY_POST),
@@ -2376,7 +2513,7 @@ function api_get_attachments(&$body)
 	$attachments = array();
 
 	foreach ($images[1] as $image) {
-		$imagedata = Photo::getInfoFromURL($image);
+		$imagedata = Image::getInfoFromURL($image);
 
 		if ($imagedata) {
 			$attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]);
@@ -2508,7 +2645,7 @@ function api_get_entitities(&$text, $bbcode)
 
 		$start = iconv_strpos($text, $url, $offset, "UTF-8");
 		if (!($start === false)) {
-			$image = Photo::getInfoFromURL($url);
+			$image = Image::getInfoFromURL($url);
 			if ($image) {
 				// If image cache is activated, then use the following sizes:
 				// thumb  (150), small (340), medium (600) and large (1024)
@@ -2516,19 +2653,19 @@ function api_get_entitities(&$text, $bbcode)
 					$media_url = proxy_url($url);
 
 					$sizes = array();
-					$scale = Photo::scaleImageTo($image[0], $image[1], 150);
+					$scale = Image::getScalingDimensions($image[0], $image[1], 150);
 					$sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 
 					if (($image[0] > 150) || ($image[1] > 150)) {
-						$scale = Photo::scaleImageTo($image[0], $image[1], 340);
+						$scale = Image::getScalingDimensions($image[0], $image[1], 340);
 						$sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 					}
 
-					$scale = Photo::scaleImageTo($image[0], $image[1], 600);
+					$scale = Image::getScalingDimensions($image[0], $image[1], 600);
 					$sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 
 					if (($image[0] > 600) || ($image[1] > 600)) {
-						$scale = Photo::scaleImageTo($image[0], $image[1], 1024);
+						$scale = Image::getScalingDimensions($image[0], $image[1], 1024);
 						$sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 					}
 				} else {
@@ -2767,8 +2904,9 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
 			'user' =>  $status_user ,
 			'friendica_owner' => $owner_user,
 			//'entities' => NULL,
-			'statusnet_html'		=> $converted["html"],
-			'statusnet_conversation_id'	=> $item['parent'],
+			'statusnet_html' => $converted["html"],
+			'statusnet_conversation_id' => $item['parent'],
+			'external_url' => System::baseUrl() . "/display/" . $item['guid'],
 			'friendica_activities' => api_format_items_activities($item, $type),
 		);
 
@@ -2899,11 +3037,16 @@ function api_lists_list($type)
 api_register_func('api/lists/list', 'api_lists_list', true);
 
 /**
- * https://dev.twitter.com/docs/api/1/get/statuses/friends
- * This function is deprecated by Twitter
- * returns: json, xml
+ * @brief Returns either the friends of the follower list
+ *
+ * Note: Considers friends and followers lists to be private and won't return
+ * anything if any user_id parameter is passed.
+ *
+ * @param string $qtype Either "friends" or "followers"
+ * @return boolean|array
+ * @throws ForbiddenException
  */
-function api_statuses_f($type, $qtype)
+function api_statuses_f($qtype)
 {
 	$a = get_app();
 
@@ -2911,9 +3054,17 @@ function api_statuses_f($type, $qtype)
 		throw new ForbiddenException();
 	}
 
+	// pagination
+	$count = x($_GET, 'count') ? $_GET['count'] : 20;
+	$page = x($_GET, 'page') ? $_GET['page'] : 1;
+	if ($page < 1) {
+		$page = 1;
+	}
+	$start = ($page - 1) * $count;
+
 	$user_info = api_get_user($a);
 
-	if (x($_GET, 'cursor') && $_GET['cursor']=='undefined') {
+	if (x($_GET, 'cursor') && $_GET['cursor'] == 'undefined') {
 		/* this is to stop Hotot to load friends multiple times
 		*  I'm not sure if I'm missing return something or
 		*  is a bug in hotot. Workaround, meantime
@@ -2937,8 +3088,17 @@ function api_statuses_f($type, $qtype)
 	}
 
 	$r = q(
-		"SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra ORDER BY `nick`",
-		intval(api_user())
+		"SELECT `nurl`
+		FROM `contact`
+		WHERE `uid` = %d
+		AND NOT `self`
+		AND (NOT `blocked` OR `pending`)
+		$sql_extra
+		ORDER BY `nick`
+		LIMIT %d, %d",
+		intval(api_user()),
+		intval($start),
+		intval($count)
 	);
 
 	$ret = array();
@@ -2954,21 +3114,37 @@ function api_statuses_f($type, $qtype)
 	}
 
 	return array('user' => $ret);
-
 }
 
+
+/**
+ * @brief Returns the list of friends of the provided user
+ *
+ * @deprecated By Twitter API in favor of friends/list
+ *
+ * @param string $type Either "json" or "xml"
+ * @return boolean|string|array
+ */
 function api_statuses_friends($type)
 {
-	$data =  api_statuses_f($type, "friends");
+	$data =  api_statuses_f("friends");
 	if ($data === false) {
 		return false;
 	}
 	return api_format_data("users", $type, $data);
 }
 
+/**
+ * @brief Returns the list of friends of the provided user
+ *
+ * @deprecated By Twitter API in favor of friends/list
+ *
+ * @param string $type Either "json" or "xml"
+ * @return boolean|string|array
+ */
 function api_statuses_followers($type)
 {
-	$data = api_statuses_f($type, "followers");
+	$data = api_statuses_f("followers");
 	if ($data === false) {
 		return false;
 	}
@@ -3363,9 +3539,9 @@ api_register_func('api/direct_messages', 'api_direct_messages_inbox', true);
 
 function api_oauth_request_token($type)
 {
+	$oauth1 = new FKOAuth1();
 	try {
-		$oauth = new FKOAuth1();
-		$r = $oauth->fetch_request_token(OAuthRequest::from_request());
+		$r = $oauth1->fetch_request_token(OAuthRequest::from_request());
 	} catch (Exception $e) {
 		echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage());
 		killme();
@@ -3376,9 +3552,9 @@ function api_oauth_request_token($type)
 
 function api_oauth_access_token($type)
 {
+	$oauth1 = new FKOAuth1();
 	try {
-		$oauth = new FKOAuth1();
-		$r = $oauth->fetch_access_token(OAuthRequest::from_request());
+		$r = $oauth1->fetch_access_token(OAuthRequest::from_request());
 	} catch (Exception $e) {
 		echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage());
 		killme();
@@ -3945,7 +4121,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 	}
 
 	if ($filetype == "") {
-		$filetype=Photo::guessImageType($filename);
+		$filetype=Image::guessType($filename);
 	}
 	$imagedata = getimagesize($src);
 	if ($imagedata) {
@@ -3969,13 +4145,13 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 
 	// create Photo instance with the data of the image
 	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
-	if (! $ph->isValid()) {
+	$Image = new Image($imagedata, $filetype);
+	if (! $Image->isValid()) {
 		throw new InternalServerErrorException("unable to process image data");
 	}
 
 	// check orientation of image
-	$ph->orient($src);
+	$Image->orient($src);
 	@unlink($src);
 
 	// check max length of images on server
@@ -3984,11 +4160,11 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 		$max_length = MAX_IMAGE_LENGTH;
 	}
 	if ($max_length > 0) {
-		$ph->scaleImage($max_length);
+		$Image->scaleDown($max_length);
 		logger("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
 	}
-	$width = $ph->getWidth();
-	$height = $ph->getHeight();
+	$width = $Image->getWidth();
+	$height = $Image->getHeight();
 
 	// create a new resource-id if not already provided
 	$hash = ($photo_id == null) ? photo_new_resource() : $photo_id;
@@ -3997,21 +4173,21 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 		// upload normal image (scales 0, 1, 2)
 		logger("photo upload: starting new photo upload", LOGGER_DEBUG);
 
-		$r =$ph->store(local_user(), $visitor, $hash, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
+		$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");
 		}
 		if ($width > 640 || $height > 640) {
-			$ph->scaleImage(640);
-			$r = $ph->store(local_user(), $visitor, $hash, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
+			$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");
 			}
 		}
 
 		if ($width > 320 || $height > 320) {
-			$ph->scaleImage(320);
-			$r = $ph->store(local_user(), $visitor, $hash, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
+			$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");
 			}
@@ -4022,29 +4198,29 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 		logger("photo upload: starting new profile image upload", LOGGER_DEBUG);
 
 		if ($width > 175 || $height > 175) {
-			$ph->scaleImage(175);
-			$r = $ph->store(local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
+			$Image->scaleDown(175);
+			$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");
 			}
 		}
 
 		if ($width > 80 || $height > 80) {
-			$ph->scaleImage(80);
-			$r = $ph->store(local_user(), $visitor, $hash, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
+			$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");
 			}
 		}
 
 		if ($width > 48 || $height > 48) {
-			$ph->scaleImage(48);
-			$r = $ph->store(local_user(), $visitor, $hash, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
+			$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");
 			}
 		}
-		$ph->__destruct();
+		$Image->__destruct();
 		logger("photo upload: new profile image upload ended", LOGGER_DEBUG);
 	}
 
@@ -4643,7 +4819,7 @@ function api_friendica_group_show($type)
 
 	// loop through all groups and retrieve all members for adding data in the user array
 	foreach ($r as $rr) {
-		$members = group_get_members($rr['id']);
+		$members = Contact::getByGroupId($rr['id']);
 		$users = array();
 
 		if ($type == "xml") {
@@ -4672,7 +4848,9 @@ function api_friendica_group_delete($type)
 {
 	$a = get_app();
 
-	if (api_user() === false) throw new ForbiddenException();
+	if (api_user() === false) {
+		throw new ForbiddenException();
+	}
 
 	// params
 	$user_info = api_get_user($a);
@@ -4681,8 +4859,9 @@ function api_friendica_group_delete($type)
 	$uid = $user_info['uid'];
 
 	// error if no gid specified
-	if ($gid == 0 || $name == "")
+	if ($gid == 0 || $name == "") {
 		throw new BadRequestException('gid or name not specified');
+	}
 
 	// get data of the specified group id
 	$r = q(
@@ -4691,8 +4870,9 @@ function api_friendica_group_delete($type)
 		intval($gid)
 	);
 	// error message if specified gid is not in database
-	if (!DBM::is_result($r))
+	if (!DBM::is_result($r)) {
 		throw new BadRequestException('gid not available');
+	}
 
 	// get data of the specified group id and group name
 	$rname = q(
@@ -4702,11 +4882,12 @@ function api_friendica_group_delete($type)
 		dbesc($name)
 	);
 	// error message if specified gid is not in database
-	if (!DBM::is_result($rname))
+	if (!DBM::is_result($rname)) {
 		throw new BadRequestException('wrong group name');
+	}
 
 	// delete group
-	$ret = group_rmv($uid, $name);
+	$ret = Group::removeByName($uid, $name);
 	if ($ret) {
 		// return success
 		$success = array('success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => array());
@@ -4757,9 +4938,9 @@ function api_friendica_group_create($type)
 		$reactivate_group = true;
 
 	// create group
-	$ret = group_add($uid, $name);
+	$ret = Group::create($uid, $name);
 	if ($ret) {
-		$gid = group_byname($uid, $name);
+		$gid = Group::getIdByName($uid, $name);
 	} else {
 		throw new BadRequestException('other API error');
 	}
@@ -4776,7 +4957,7 @@ function api_friendica_group_create($type)
 			intval($uid)
 		);
 		if (count($contact))
-			$result = group_add_member($uid, $name, $cid, $gid);
+			$result = Group::addMember($gid, $cid);
 		else {
 			$erroraddinguser = true;
 			$errorusers[] = $cid;
@@ -4815,14 +4996,14 @@ function api_friendica_group_update($type)
 		throw new BadRequestException('gid not specified');
 
 	// remove members
-	$members = group_get_members($gid);
+	$members = Contact::getByGroupId($gid);
 	foreach ($members as $member) {
 		$cid = $member['id'];
 		foreach ($users as $user) {
 			$found = ($user['cid'] == $cid ? true : false);
 		}
 		if (!$found) {
-			$ret = group_rmv_member($uid, $name, $cid);
+			$ret = Group::removeMemberByName($uid, $name, $cid);
 		}
 	}
 
@@ -4839,7 +5020,7 @@ function api_friendica_group_update($type)
 		);
 
 		if (count($contact)) {
-			$result = group_add_member($uid, $name, $cid, $gid);
+			$result = Group::addMember($gid, $cid);
 		} else {
 			$erroraddinguser = true;
 			$errorusers[] = $cid;
@@ -5100,7 +5281,7 @@ function api_friendica_profile_show($type)
 	$profileid = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0);
 
 	// retrieve general information about profiles for user
-	$multi_profiles = feature_enabled(api_user(), 'multi_profiles');
+	$multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles');
 	$directory = Config::get('system', 'directory');
 
 	// get data of the specified profile id or all profiles of the user if not specified