use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
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;
use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
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';
require_once 'mod/share.php';
require_once 'mod/item.php';
-require_once 'include/security.php';
require_once 'mod/wall_upload.php';
-require_once 'mod/proxy.php';
define('API_METHOD_ANY', '*');
define('API_METHOD_GET', 'GET');
*/
function api_user()
{
- if (x($_SESSION, 'allow_api')) {
+ if (!empty($_SESSION['allow_api'])) {
return local_user();
}
}
// Support for known clients that doesn't send a source name
- if (strpos($_SERVER['HTTP_USER_AGENT'], "Twidere") !== false) {
- return "Twidere";
- }
+ if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+ if(strpos($_SERVER['HTTP_USER_AGENT'], "Twidere") !== false) {
+ 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::log("Empty user-agent", Logger::DEBUG);
+ }
return "api";
}
$oauth1 = new FKOAuth1();
// login with oauth
try {
- list($consumer, $token) = $oauth1->verify_request(OAuthRequest::from_request());
+ $request = OAuthRequest::from_request();
+ list($consumer, $token) = $oauth1->verify_request($request);
if (!is_null($token)) {
$oauth1->loginUser($token->uid);
Addon::callHooks('logged_in', $a->user);
var_dump($consumer, $token);
die();
} catch (Exception $e) {
- logger($e);
+ Logger::log($e);
}
// workaround for HTTP-auth in CGI mode
- if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
- $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
+ if (!empty($_SERVER['REDIRECT_REMOTE_USER'])) {
+ $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
if (strlen($userpass)) {
list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
}
}
- if (!x($_SERVER, 'PHP_AUTH_USER')) {
- logger('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+ if (empty($_SERVER['PHP_AUTH_USER'])) {
+ Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
throw new UnauthorizedException("This API requires login");
}
- $user = $_SERVER['PHP_AUTH_USER'];
- $password = $_SERVER['PHP_AUTH_PW'];
+ $user = defaults($_SERVER, 'PHP_AUTH_USER', '');
+ $password = defaults($_SERVER, 'PHP_AUTH_PW', '');
// allow "user@server" login (but ignore 'server' part)
$at = strstr($user, "@", true);
} else {
$user_id = User::authenticate(trim($user), trim($password));
if ($user_id !== false) {
- $record = dba::selectFirst('user', [], ['uid' => $user_id]);
+ $record = DBA::selectFirst('user', [], ['uid' => $user_id]);
}
}
- if (!DBM::is_result($record)) {
- logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+ if (!DBA::isResult($record)) {
+ 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');
throw new UnauthorizedException("This API requires login");
}
- authenticate_success($record);
+ Authentication::setAuthenticatedSessionForUser($record);
$_SESSION["allow_api"] = true;
if ($method == "*") {
return true;
}
- return (strpos($method, $_SERVER['REQUEST_METHOD']) !== false);
+ return (stripos($method, defaults($_SERVER, 'REQUEST_METHOD', 'GET')) !== false);
}
/**
//unset($_SERVER['PHP_AUTH_USER']);
/// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even.
- if ($info['auth'] === true && api_user() === false) {
+ if (!empty($info['auth']) && api_user() === false) {
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),
+ $a->performance["network"] + $a->performance["file"]), 2),
round($duration, 2)
),
- LOGGER_DEBUG
+ Logger::DEBUG
);
if (Config::get("rendertime", "callstack")) {
$o .= $func . ": " . $time . "\n";
}
}
- logger($o, LOGGER_DEBUG);
+ Logger::log($o, Logger::DEBUG);
}
}
case "json":
header("Content-Type: application/json");
$json = json_encode(end($return));
- if (x($_GET, 'callback')) {
+ if (!empty($_GET['callback'])) {
$json = $_GET['callback'] . "(" . $json . ")";
}
$return = $json;
}
}
- 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}");
*/
function api_error($type, $e)
{
- $a = get_app();
+ $a = \get_app();
$error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc);
/// @TODO: https://dev.twitter.com/overview/api/response-codes
'base' => System::baseUrl(),
'updated' => api_date(null),
'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
- 'language' => $user_info['language'],
+ 'language' => $user_info['lang'],
'logo' => System::baseUrl() . "/images/friendica-32.png",
];
*/
function api_unique_id_to_nurl($id)
{
- $r = dba::selectFirst('contact', ['nurl'], ['id' => $id]);
+ $r = DBA::selectFirst('contact', ['nurl'], ['id' => $id]);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
return $r["nurl"];
} else {
return false;
$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 = dbesc(normalise_link($contact_id));
+ $user = DBA::escape(Strings::normaliseLink($contact_id));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user() !== false) {
// Searching for contact id with uid = 0
if (!is_null($contact_id) && (intval($contact_id) != 0)) {
- $user = dbesc(api_unique_id_to_nurl(intval($contact_id)));
+ $user = DBA::escape(api_unique_id_to_nurl(intval($contact_id)));
if ($user == "") {
throw new BadRequestException("User ID ".$contact_id." not found.");
}
}
- if (is_null($user) && x($_GET, 'user_id')) {
- $user = dbesc(api_unique_id_to_nurl($_GET['user_id']));
+ if (is_null($user) && !empty($_GET['user_id'])) {
+ $user = DBA::escape(api_unique_id_to_nurl($_GET['user_id']));
if ($user == "") {
throw new BadRequestException("User ID ".$_GET['user_id']." not found.");
$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
}
}
- if (is_null($user) && x($_GET, 'screen_name')) {
- $user = dbesc($_GET['screen_name']);
+ if (is_null($user) && !empty($_GET['screen_name'])) {
+ $user = DBA::escape($_GET['screen_name']);
$extra_query = "AND `contact`.`nick` = '%s' ";
if (api_user() !== false) {
$extra_query .= "AND `contact`.`uid`=".intval(api_user());
}
}
- if (is_null($user) && x($_GET, 'profileurl')) {
- $user = dbesc(normalise_link($_GET['profileurl']));
+ if (is_null($user) && !empty($_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());
}
}
+ // $called_api is the API path exploded on / and is expected to have at least 2 elements
if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) {
$argid = count($called_api);
- list($user, $null) = explode(".", $a->argv[$argid]);
+ if (!empty($a->argv[$argid])) {
+ $data = explode(".", $a->argv[$argid]);
+ if (count($data) > 1) {
+ list($user, $null) = $data;
+ }
+ }
if (is_numeric($user)) {
- $user = dbesc(api_unique_id_to_nurl(intval($user)));
+ $user = DBA::escape(api_unique_id_to_nurl(intval($user)));
if ($user != "") {
$url = $user;
}
}
} else {
- $user = dbesc($user);
+ $user = DBA::escape($user);
$extra_query = "AND `contact`.`nick` = '%s' ";
if (api_user() !== false) {
$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
}
}
- logger("api_get_user: user ".$user, LOGGER_DEBUG);
+ Logger::log("api_get_user: user ".$user, Logger::DEBUG);
if (!$user) {
if (api_user() === false) {
}
}
- logger('api_user: ' . $extra_query . ', user: ' . $user);
+ Logger::log('api_user: ' . $extra_query . ', user: ' . $user);
// user info
$uinfo = q(
}
// if the contact wasn't found, fetch it from the contacts with uid = 0
- if (!DBM::is_result($uinfo)) {
- $r = [];
-
- if ($url != "") {
- $r = q("SELECT * FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' LIMIT 1", dbesc(normalise_link($url)));
+ if (!DBA::isResult($uinfo)) {
+ if ($url == "") {
+ throw new BadRequestException("User not found.");
}
- if (DBM::is_result($r)) {
- $network_name = ContactSelector::networkToName($r[0]['network'], $r[0]['url']);
+ $contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ if (DBA::isResult($contact)) {
// If no nick where given, extract it from the address
- if (($r[0]['nick'] == "") || ($r[0]['name'] == $r[0]['nick'])) {
- $r[0]['nick'] = api_get_nick($r[0]["url"]);
+ if (($contact['nick'] == "") || ($contact['name'] == $contact['nick'])) {
+ $contact['nick'] = api_get_nick($contact["url"]);
}
$ret = [
- 'id' => $r[0]["id"],
- 'id_str' => (string) $r[0]["id"],
- 'name' => $r[0]["name"],
- 'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
- 'location' => ($r[0]["location"] != "") ? $r[0]["location"] : $network_name,
- 'description' => $r[0]["about"],
- 'profile_image_url' => $r[0]["micro"],
- 'profile_image_url_https' => $r[0]["micro"],
- 'profile_image_url_profile_size' => $r[0]["thumb"],
- 'profile_image_url_large' => $r[0]["photo"],
- 'url' => $r[0]["url"],
+ 'id' => $contact["id"],
+ 'id_str' => (string) $contact["id"],
+ 'name' => $contact["name"],
+ 'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
+ 'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url']),
+ 'description' => $contact["about"],
+ 'profile_image_url' => $contact["micro"],
+ 'profile_image_url_https' => $contact["micro"],
+ 'profile_image_url_profile_size' => $contact["thumb"],
+ 'profile_image_url_large' => $contact["photo"],
+ 'url' => $contact["url"],
'protected' => false,
'followers_count' => 0,
'friends_count' => 0,
'listed_count' => 0,
- 'created_at' => api_date($r[0]["created"]),
+ 'created_at' => api_date($contact["created"]),
'favourites_count' => 0,
'utc_offset' => 0,
'time_zone' => 'UTC',
'follow_request_sent' => false,
'statusnet_blocking' => false,
'notifications' => false,
- 'statusnet_profile_url' => $r[0]["url"],
+ 'statusnet_profile_url' => $contact["url"],
'uid' => 0,
- 'cid' => Contact::getIdForURL($r[0]["url"], api_user(), true),
- 'pid' => Contact::getIdForURL($r[0]["url"], 0, true),
+ 'cid' => Contact::getIdForURL($contact["url"], api_user(), true),
+ 'pid' => Contact::getIdForURL($contact["url"], 0, true),
'self' => 0,
- 'network' => $r[0]["network"],
+ 'network' => $contact["network"],
];
return $ret;
if ($uinfo[0]['self']) {
if ($uinfo[0]['network'] == "") {
- $uinfo[0]['network'] = NETWORK_DFRN;
+ $uinfo[0]['network'] = Protocol::DFRN;
}
- $usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]);
- $profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
+ $usr = DBA::selectFirst('user', ['default-location'], ['uid' => api_user()]);
+ $profile = DBA::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
}
- $countitms = 0;
+ $countitems = 0;
$countfriends = 0;
$countfollowers = 0;
$starred = 0;
$uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
}
- $network_name = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url']);
-
$pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, true);
if (!empty($profile['about'])) {
} elseif (!empty($uinfo[0]["location"])) {
$location = $uinfo[0]["location"];
} else {
- $location = $network_name;
+ $location = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url']);
}
$ret = [
'time_zone' => 'UTC',
'geo_enabled' => false,
'verified' => true,
- 'statuses_count' => intval($countitms),
+ 'statuses_count' => intval($countitems),
'lang' => '',
'contributors_enabled' => false,
'is_translator' => false,
'is_translation_enabled' => false,
- 'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) || ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)),
+ 'following' => (($uinfo[0]['rel'] == Contact::FOLLOWER) || ($uinfo[0]['rel'] == Contact::FRIEND)),
'follow_request_sent' => false,
'statusnet_blocking' => false,
'notifications' => false,
/// @TODO old way?
- //'statusnet_profile_url' => System::baseUrl()."/contacts/".$uinfo[0]['cid'],
+ //'statusnet_profile_url' => System::baseUrl()."/contact/".$uinfo[0]['cid'],
'statusnet_profile_url' => $uinfo[0]['url'],
'uid' => intval($uinfo[0]['uid']),
'cid' => intval($uinfo[0]['cid']),
// If this is a local user and it uses Frio, we can get its color preferences.
if ($ret['self']) {
- $theme_info = dba::selectFirst('user', ['theme'], ['uid' => $ret['uid']]);
+ $theme_info = DBA::selectFirst('user', ['theme'], ['uid' => $ret['uid']]);
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';
$link_color = PConfig::get($ret['uid'], 'frio', 'link_color');
$bgcolor = PConfig::get($ret['uid'], 'frio', 'background_color');
}
- if (!$nav_bg) {
+ if (empty($nav_bg)) {
$nav_bg = "#708fa0";
}
- if (!$link_color) {
+ if (empty($link_color)) {
$link_color = "#6fdbe8";
}
- if (!$bgcolor) {
+ if (empty($bgcolor)) {
$bgcolor = "#ededed";
}
*/
function api_item_get_user(App $a, $item)
{
- $status_user = api_get_user($a, $item["author-id"]);
+ $status_user = api_get_user($a, defaults($item, 'author-id', null));
- $status_user["protected"] = $item["private"];
+ $status_user["protected"] = defaults($item, 'private', 0);
- if ($item['thr-parent'] == $item['uri']) {
- $owner_user = api_get_user($a, $item["owner-id"]);
+ if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) {
+ $owner_user = api_get_user($a, defaults($item, 'owner-id', null));
} else {
$owner_user = $status_user;
}
{
$childname = key($data);
$data2 = array_pop($data);
- $key = key($data2);
$namespaces = ["" => "http://api.twitter.com",
"statusnet" => "http://status.net/schema/api/1/",
}
if (is_array($data2)) {
+ $key = key($data2);
api_walk_recursive($data2, "api_reformat_xml");
- }
- if ($key == "0") {
- $data4 = [];
- $i = 1;
+ if ($key == "0") {
+ $data4 = [];
+ $i = 1;
- foreach ($data2 as $item) {
- $data4[$i++ . ":" . $childname] = $item;
- }
+ foreach ($data2 as $item) {
+ $data4[$i++ . ":" . $childname] = $item;
+ }
- $data2 = $data4;
+ $data2 = $data4;
+ }
}
$data3 = [$root_element => $data2];
function api_account_verify_credentials($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
unset($_REQUEST["screen_name"]);
unset($_GET["screen_name"]);
- $skip_status = (x($_REQUEST, 'skip_status')?$_REQUEST['skip_status'] : false);
+ $skip_status = defaults($_REQUEST, 'skip_status', false);
$user_info = api_get_user($a);
*/
function requestdata($k)
{
- if (x($_POST, $k)) {
+ if (!empty($_POST[$k])) {
return $_POST[$k];
}
- if (x($_GET, $k)) {
+ if (!empty($_GET[$k])) {
return $_GET[$k];
}
return null;
*/
function api_statuses_mediap($type)
{
- $a = get_app();
+ $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);
- $_REQUEST['type'] = 'wall';
$_REQUEST['profile_uid'] = api_user();
$_REQUEST['api_source'] = true;
$txt = requestdata('status');
//$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);
// now that we have the img url in bbcode we can add it to the status and insert the wall item.
$_REQUEST['body'] = $txt . "\n\n" . '[url=' . $picture["albumpage"] . '][img]' . $picture["preview"] . "[/img][/url]";
- item_post($a);
+ $item_id = item_post($a);
- // this should output the last post (the one we just posted).
- return api_status_show($type);
+ // output the post that we just posted.
+ return api_status_show($type, $item_id);
}
/// @TODO move this to top of file or somewhere better!
*/
function api_statuses_update($type)
{
-
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
- logger('api_statuses_update: no user');
+ Logger::log('api_statuses_update: no user');
throw new ForbiddenException();
}
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);
}
$_REQUEST['profile_uid'] = api_user();
- if ($parent) {
- $_REQUEST['type'] = 'net-comment';
- } else {
+ if (!$parent) {
// Check for throttling (maximum posts per day, week and month)
$throttle_day = Config::get('system', 'throttle_limit_day');
if ($throttle_day > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
- $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
- $posts_day = dba::count('item', $condition);
+ $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+ $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));
}
if ($throttle_week > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
- $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
- $posts_week = dba::count('item', $condition);
+ $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+ $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));
}
if ($throttle_month > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
- $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
- $posts_month = dba::count('item', $condition);
+ $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+ $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));
}
}
-
- $_REQUEST['type'] = 'wall';
}
- if (x($_FILES, 'media')) {
+ if (!empty($_FILES['media'])) {
// upload the image if we have one
$picture = wall_upload_post($a, false);
if (is_array($picture)) {
intval(requestdata('media_ids')),
api_user()
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$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['api_source'] = true;
- if (!x($_REQUEST, "source")) {
+ if (empty($_REQUEST['source'])) {
$_REQUEST["source"] = api_source();
}
// call out normal post function
- item_post($a);
+ $item_id = item_post($a);
- // this should output the last post (the one we just posted).
- return api_status_show($type);
+ // output the post that we just posted.
+ return api_status_show($type, $item_id);
}
/// @TODO move to top of file or somewhere better
*/
function api_media_upload()
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
- logger('no user');
+ Logger::log('no user');
throw new ForbiddenException();
}
api_get_user($a);
- if (!x($_FILES, 'media')) {
+ if (empty($_FILES['media'])) {
// Output error
throw new BadRequestException("No media.");
}
"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];
}
*
* @return array|string
*/
-function api_status_show($type)
+function api_status_show($type, $item_id = 0)
{
- $a = get_app();
+ $a = \get_app();
$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`";
$privacy_sql = "";
}
- // get last public wall message
- $condition = ["`owner-id` = ? AND `uid` = ? AND `type` != 'activity' ".$privacy_sql,
- $user_info['pid'], api_user()];
- $lastwall = dba::selectFirst('item', [], $condition, ['order' => ['id' => true]]);
+ if (!empty($item_id)) {
+ // Get the item with the given id
+ $condition = ['id' => $item_id];
+ } else {
+ // get last public wall message
+ $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
+ 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+ }
+ $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
- if (DBM::is_result($lastwall)) {
+ if (DBA::isResult($lastwall)) {
$in_reply_to = api_in_reply_to($lastwall);
$converted = api_convert_item($lastwall);
'in_reply_to_screen_name' => $in_reply_to['screen_name'],
'user' => $user_info,
$geo => null,
- 'coordinates' => "",
- 'place' => "",
- 'contributors' => "",
+ 'coordinates' => '',
+ 'place' => '',
+ 'contributors' => '',
'is_quote_status' => false,
'retweet_count' => 0,
'favorite_count' => 0,
'favorited' => $lastwall['starred'] ? true : false,
'retweeted' => false,
'possibly_sensitive' => false,
- 'lang' => "",
+ 'lang' => '',
'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'],
- 'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
+ 'external_url' => System::baseUrl() . '/display/' . $lastwall['guid'],
];
if (count($converted["attachments"]) > 0) {
}
if ($status_info["source"] == 'web') {
- $status_info["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
- } elseif (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $status_info["source"]) {
- $status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $user_info['url']).')');
+ $status_info["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
+ } elseif (ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) != $status_info["source"]) {
+ $status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']).')');
}
// "uid" and "self" are only needed for some internal stuff, so remove it from here
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;
*/
function api_users_show($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
- $condition = ["`owner-id` = ? AND `uid` = ? AND `verb` = ? AND `type` != 'activity' AND NOT `private`",
- $user_info['pid'], api_user(), ACTIVITY_POST];
- $lastwall = dba::selectFirst('item', [], $condition, ['order' => ['id' => true]]);
+ $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
+ 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => false];
+ $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
- if (DBM::is_result($lastwall)) {
+ if (DBA::isResult($lastwall)) {
$in_reply_to = api_in_reply_to($lastwall);
$converted = api_convert_item($lastwall);
}
if ($user_info["status"]["source"] == 'web') {
- $user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
+ $user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
}
if (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $user_info["status"]["source"]) {
- $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $user_info['url']) . ')');
+ $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) . ')');
}
}
*/
function api_users_search($type)
{
- $a = get_app();
+ $a = \get_app();
$userlist = [];
- if (x($_GET, 'q')) {
- $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"]));
+ if (!empty($_GET['q'])) {
+ $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"]));
- if (!DBM::is_result($r)) {
- $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"]));
+ if (!DBA::isResult($r)) {
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", DBA::escape($_GET["q"]));
}
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$k = 0;
foreach ($r as $user) {
$user_info = api_get_user($a, $user["id"]);
{
$users = [];
- if (x($_REQUEST['user_id'])) {
+ if (!empty($_REQUEST['user_id'])) {
foreach (explode(',', $_REQUEST['user_id']) as $id) {
if (!empty($id)) {
$users[] = api_get_user(get_app(), $id);
*/
function api_search($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
$data = [];
- if (!x($_REQUEST, 'q')) {
+ if (empty($_REQUEST['q'])) {
throw new BadRequestException("q parameter is required.");
}
- if (x($_REQUEST, 'rpp')) {
+ if (!empty($_REQUEST['rpp'])) {
$count = $_REQUEST['rpp'];
- } elseif (x($_REQUEST, 'count')) {
+ } elseif (!empty($_REQUEST['count'])) {
$count = $_REQUEST['count'];
} else {
$count = 15;
}
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+ $since_id = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
+ $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
$start = $page * $count;
- $condition = ["`verb` = ? AND `item`.`id` > ?
+ $condition = ["`gravity` IN (?, ?) AND `item`.`id` > ?
AND (`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))
AND `item`.`body` LIKE CONCAT('%',?,'%')",
- ACTIVITY_POST, $since_id, api_user(), $_REQUEST['q']];
+ GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, api_user(), $_REQUEST['q']];
if ($max_id > 0) {
$condition[0] .= " AND `item`.`id` <= ?";
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $data['status'] = api_format_items(dba::inArray($statuses), $user_info);
+ $data['status'] = api_format_items(Item::inArray($statuses), $user_info);
return api_format_data("statuses", $type, $data);
}
*/
function api_statuses_home_timeline($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
// get last network messages
// params
- $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+ $count = defaults($_REQUEST, 'count', 20);
+ $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
if ($page < 0) {
$page = 0;
}
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_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 = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
+ $exclude_replies = !empty($_REQUEST['exclude_replies']);
+ $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
$start = $page * $count;
- $condition = ["`uid` = ? AND `verb` = ? AND `item`.`id` > ?", api_user(), ACTIVITY_POST, $since_id];
+ $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ?",
+ api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
if ($max_id > 0) {
$condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
}
- if ($exclude_replies > 0) {
+ if ($exclude_replies) {
$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
}
if ($conversation_id > 0) {
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $items = dba::inArray($statuses);
+ $items = Item::inArray($statuses);
$ret = api_format_items($items, $user_info, false, $type);
}
if (!empty($idarray)) {
- $unseen = dba::exists('item', ['unseen' => true, 'id' => $idarray]);
+ $unseen = Item::exists(['unseen' => true, 'id' => $idarray]);
if ($unseen) {
Item::update(['unseen' => false], ['unseen' => true, 'id' => $idarray]);
}
$data = ['status' => $ret];
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
*/
function api_statuses_public_timeline($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
// get last network messages
// params
- $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
+ $count = defaults($_REQUEST, 'count', 20);
+ $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0);
if ($page < 0) {
$page = 0;
}
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_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 = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
+ $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0);
+ $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
$start = $page * $count;
- $sql_extra = '';
if ($exclude_replies && !$conversation_id) {
- $condition = ["`verb` = ? AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
- ACTIVITY_POST, $since_id];
+ $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
+ GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
if ($max_id > 0) {
$condition[0] .= " AND `thread`.`iid` <= ?";
$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
$statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
- $r = dba::inArray($statuses);
+ $r = Item::inArray($statuses);
} else {
- $condition = ["`verb` = ? AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`",
- ACTIVITY_POST, $since_id];
+ $condition = ["`gravity` IN (?, ?) AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`",
+ GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
if ($max_id > 0) {
$condition[0] .= " AND `item`.`id` <= ?";
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $r = dba::inArray($statuses);
+ $r = Item::inArray($statuses);
}
$ret = api_format_items($r, $user_info, false, $type);
$data = ['status' => $ret];
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
*/
function api_statuses_networkpublic_timeline($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
throw new ForbiddenException();
}
- $since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0;
- $max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0;
+ $since_id = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
// pagination
- $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
- $page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
+ $count = defaults($_REQUEST, 'count', 20);
+ $page = defaults($_REQUEST, 'page', 1);
if ($page < 1) {
$page = 1;
}
$start = ($page - 1) * $count;
- $condition = ["`uid` = 0 AND `verb` = ? AND `thread`.`iid` > ? AND NOT `private`",
- ACTIVITY_POST, $since_id];
+ $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `thread`.`iid` > ? AND NOT `private`",
+ GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
if ($max_id > 0) {
$condition[0] .= " AND `thread`.`iid` <= ?";
$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
$statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
- $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
$data = ['status' => $ret];
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
*/
function api_statuses_show($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
}
// params
- $id = intval($a->argv[3]);
+ $id = intval(defaults($a->argv, 3, 0));
if ($id == 0) {
- $id = intval($_REQUEST["id"]);
+ $id = intval(defaults($_REQUEST, 'id', 0));
}
// Hotot workaround
if ($id == 0) {
- $id = intval($a->argv[4]);
+ $id = intval(defaults($a->argv, 4, 0));
}
- logger('API: api_statuses_show: ' . $id);
+ Logger::log('API: api_statuses_show: ' . $id);
- $conversation = (x($_REQUEST, 'conversation') ? 1 : 0);
+ $conversation = !empty($_REQUEST['conversation']);
// try to fetch the item for the local user - or the public item, if there is no local one
- $uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]);
- if (!DBM::is_result($uri_item)) {
+ $uri_item = Item::selectFirst(['uri'], ['id' => $id]);
+ if (!DBA::isResult($uri_item)) {
throw new BadRequestException("There is no status with this id.");
}
- $item = dba::selectFirst('item', ['id'], ['uri' => $uri_item['uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
- if (!DBM::is_result($item)) {
+ $item = Item::selectFirst(['id'], ['uri' => $uri_item['uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+ if (!DBA::isResult($item)) {
throw new BadRequestException("There is no status with this id.");
}
$id = $item['id'];
if ($conversation) {
- $condition = ['parent' => $id, 'verb' => ACTIVITY_POST];
+ $condition = ['parent' => $id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
$params = ['order' => ['id' => true]];
} else {
- $condition = ['id' => $id, 'verb' => ACTIVITY_POST];
+ $condition = ['id' => $id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
$params = [];
}
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
/// @TODO How about copying this to above methods which don't check $r ?
- if (!DBM::is_result($statuses)) {
+ if (!DBA::isResult($statuses)) {
throw new BadRequestException("There is no status with this id.");
}
- $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
if ($conversation) {
$data = ['status' => $ret];
*/
function api_conversation_show($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
}
// params
- $id = intval($a->argv[3]);
- $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+ $id = intval(defaults($a->argv , 3 , 0));
+ $since_id = intval(defaults($_REQUEST, 'since_id', 0));
+ $max_id = intval(defaults($_REQUEST, 'max_id' , 0));
+ $count = intval(defaults($_REQUEST, 'count' , 20));
+ $page = intval(defaults($_REQUEST, 'page' , 1)) - 1;
if ($page < 0) {
$page = 0;
}
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
- $start = $page*$count;
+ $start = $page * $count;
if ($id == 0) {
- $id = intval($_REQUEST["id"]);
+ $id = intval(defaults($_REQUEST, 'id', 0));
}
// Hotot workaround
if ($id == 0) {
- $id = intval($a->argv[4]);
+ $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 = dba::selectFirst('item', ['parent-uri'], ['id' => $id]);
- if (!DBM::is_result($item)) {
+ $item = Item::selectFirst(['parent-uri'], ['id' => $id]);
+ if (!DBA::isResult($item)) {
throw new BadRequestException("There is no status with this id.");
}
- $parent = dba::selectFirst('item', ['id'], ['uri' => $item['parent-uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
- if (!DBM::is_result($parent)) {
+ $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+ if (!DBA::isResult($parent)) {
throw new BadRequestException("There is no status with this id.");
}
$id = $parent['id'];
- $condition = ["`parent` = ? AND `uid` IN (0, ?) AND `verb` = ? AND `item`.`id` > ?",
- $id, api_user(), ACTIVITY_POST, $since_id];
+ $condition = ["`parent` = ? AND `uid` IN (0, ?) AND `gravity` IN (?, ?) AND `item`.`id` > ?",
+ $id, api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
if ($max_id > 0) {
$condition[0] .= " AND `item`.`id` <= ?";
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- if (!DBM::is_result($statuses)) {
+ if (!DBA::isResult($statuses)) {
throw new BadRequestException("There is no status with id $id.");
}
- $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
$data = ['status' => $ret];
return api_format_data("statuses", $type, $data);
{
global $called_api;
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
api_get_user($a);
// params
- $id = intval($a->argv[3]);
+ $id = intval(defaults($a->argv, 3, 0));
if ($id == 0) {
- $id = intval($_REQUEST["id"]);
+ $id = intval(defaults($_REQUEST, 'id', 0));
}
// Hotot workaround
if ($id == 0) {
- $id = intval($a->argv[4]);
+ $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]);
- if (DBM::is_result($item) && $item['body'] != "") {
+ if (DBA::isResult($item) && $item['body'] != "") {
if (strpos($item['body'], "[/share]") !== false) {
$pos = strpos($item['body'], "[share");
$post = substr($item['body'], $pos);
}
$_REQUEST['body'] = $post;
$_REQUEST['profile_uid'] = api_user();
- $_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
- if (!x($_REQUEST, "source")) {
+ if (empty($_REQUEST['source'])) {
$_REQUEST["source"] = api_source();
}
- item_post($a);
+ $item_id = item_post($a);
} else {
throw new ForbiddenException();
}
- // this should output the last post (the one we just posted).
+ // output the post that we just posted.
$called_api = [];
- return api_status_show($type);
+ return api_status_show($type, $item_id);
}
/// @TODO move to top of file or somewhere better
*/
function api_statuses_destroy($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
api_get_user($a);
// params
- $id = intval($a->argv[3]);
+ $id = intval(defaults($a->argv, 3, 0));
if ($id == 0) {
- $id = intval($_REQUEST["id"]);
+ $id = intval(defaults($_REQUEST, 'id', 0));
}
// Hotot workaround
if ($id == 0) {
- $id = intval($a->argv[4]);
+ $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);
*/
function api_statuses_mentions($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
$start = ($page - 1) * $count;
- $condition = ["`uid` = ? AND `verb` = ? AND `item`.`id` > ? AND `author-id` != ?
- AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `uid` = ? AND `mention` AND NOT `ignored`)",
- api_user(), ACTIVITY_POST, $since_id, $user_info['pid'], api_user()];
+ $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `author-id` != ?
+ AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `thread`.`uid` = ? AND `thread`.`mention` AND NOT `thread`.`ignored`)",
+ api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['pid'], api_user()];
if ($max_id > 0) {
$condition[0] .= " AND `item`.`id` <= ?";
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
$data = ['status' => $ret];
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
*/
function api_statuses_user_timeline($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
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;
- $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;
+ $since_id = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
+ $exclude_replies = !empty($_REQUEST['exclude_replies']);
+ $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
// pagination
- $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
- $page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
+ $count = defaults($_REQUEST, 'count', 20);
+ $page = defaults($_REQUEST, 'page', 1);
if ($page < 1) {
$page = 1;
}
$start = ($page - 1) * $count;
- $condition = ["`uid` = ? AND `verb` = ? AND `item`.`id` > ? AND `item`.`contact-id` = ?",
- api_user(), ACTIVITY_POST, $since_id, $user_info['cid']];
+ $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `item`.`contact-id` = ?",
+ api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['cid']];
if ($user_info['self'] == 1) {
$condition[0] .= ' AND `item`.`wall` ';
}
- if ($exclude_replies > 0) {
+ if ($exclude_replies) {
$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
}
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $ret = api_format_items(dba::inArray($statuses), $user_info, true, $type);
+ $ret = api_format_items(Item::inArray($statuses), $user_info, true, $type);
$data = ['status' => $ret];
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
*/
function api_favorites_create_destroy($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// for versioned api.
/// @TODO We need a better global soluton
$action_argv_id = 2;
- if ($a->argv[1] == "1.1") {
+ if (count($a->argv) > 1 && $a->argv[1] == "1.1") {
$action_argv_id = 3;
}
}
$action = str_replace("." . $type, "", $a->argv[$action_argv_id]);
if ($a->argc == $action_argv_id + 2) {
- $itemid = intval($a->argv[$action_argv_id + 1]);
+ $itemid = intval(defaults($a->argv, $action_argv_id + 1, 0));
} else {
- /// @TODO use x() to check if _REQUEST contains 'id'
- $itemid = intval($_REQUEST['id']);
+ $itemid = intval(defaults($_REQUEST, 'id', 0));
}
$item = Item::selectFirstForUser(api_user(), [], ['id' => $itemid, 'uid' => api_user()]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
throw new BadRequestException("Invalid item.");
}
$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);
{
global $called_api;
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
// 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 = [];
} else {
// params
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
- $count = (x($_GET, 'count') ? $_GET['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
+ $since_id = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
+ $count = defaults($_GET, 'count', 20);
+ $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0);
if ($page < 0) {
$page = 0;
}
$start = $page*$count;
- $condition = ["`uid` = ? AND `verb` = ? AND `id` > ? AND `starred`",
- api_user(), ACTIVITY_POST, $since_id];
+ $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `starred`",
+ api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $ret = api_format_items(Item::inArray($statuses), $user_info, false, $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);
{
// standard meta information
$ret = [
- 'id' => $item['id'],
- 'sender_id' => $sender['id'] ,
- 'text' => "",
- 'recipient_id' => $recipient['id'],
- 'created_at' => api_date($item['created']),
- 'sender_screen_name' => $sender['screen_name'],
- 'recipient_screen_name' => $recipient['screen_name'],
- 'sender' => $sender,
- 'recipient' => $recipient,
- 'title' => "",
- 'friendica_seen' => $item['seen'],
- 'friendica_parent_uri' => $item['parent-uri'],
+ 'id' => $item['id'],
+ 'sender_id' => $sender['id'],
+ 'text' => "",
+ 'recipient_id' => $recipient['id'],
+ 'created_at' => api_date(defaults($item, 'created', DateTimeFormat::utcNow())),
+ 'sender_screen_name' => $sender['screen_name'],
+ 'recipient_screen_name' => $recipient['screen_name'],
+ 'sender' => $sender,
+ 'recipient' => $recipient,
+ 'title' => "",
+ 'friendica_seen' => defaults($item, 'seen', 0),
+ 'friendica_parent_uri' => defaults($item, 'parent-uri', ''),
];
// "uid" and "self" are only needed for some internal stuff, so remove it from here
- unset($ret["sender"]["uid"]);
- unset($ret["sender"]["self"]);
- unset($ret["recipient"]["uid"]);
- unset($ret["recipient"]["self"]);
+ if (isset($ret['sender']['uid'])) {
+ unset($ret['sender']['uid']);
+ }
+ if (isset($ret['sender']['self'])) {
+ unset($ret['sender']['self']);
+ }
+ if (isset($ret['recipient']['uid'])) {
+ unset($ret['recipient']['uid']);
+ }
+ if (isset($ret['recipient']['self'])) {
+ unset($ret['recipient']['self']);
+ }
//don't send title to regular StatusNET requests to avoid confusing these apps
- if (x($_GET, 'getText')) {
+ if (!empty($_GET['getText'])) {
$ret['title'] = $item['title'];
if ($_GET['getText'] == 'html') {
$ret['text'] = BBCode::convert($item['body'], false);
} else {
$ret['text'] = $item['title'] . "\n" . HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0);
}
- if (x($_GET, 'getUserObjects') && $_GET['getUserObjects'] == 'false') {
+ if (!empty($_GET['getUserObjects']) && $_GET['getUserObjects'] == 'false') {
unset($ret['sender']);
unset($ret['recipient']);
}
$statustext = trim($statustitle."\n\n".$statusbody);
}
- if (($item["network"] == NETWORK_FEED) && (strlen($statustext)> 1000)) {
- $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
+ if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (strlen($statustext)> 1000)) {
+ $statustext = substr($statustext, 0, 1000) . "... \n" . defaults($item, 'plink', '');
}
$statushtml = BBCode::convert(api_clean_attachments($body), false);
}
// feeds without body should contain the link
- if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) {
+ if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (strlen($item['body']) == 0)) {
$statushtml .= BBCode::convert($item['plink']);
}
}
}
- if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus")) {
+ if (strstr(defaults($_SERVER, 'HTTP_USER_AGENT', ''), "AndStatus")) {
foreach ($images[0] as $orig) {
$body = str_replace($orig, "", $body);
}
*/
function api_get_entitities(&$text, $bbcode)
{
- $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
+ $include_entities = strtolower(defaults($_REQUEST, 'include_entities', "false"));
if ($include_entities != "true") {
preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
foreach ($images[1] as $image) {
- $replace = proxy_url($image);
+ $replace = ProxyUtils::proxifyUrl($image);
$text = str_replace($image, $replace, $text);
}
return [];
// If image cache is activated, then use the following sizes:
// thumb (150), small (340), medium (600) and large (1024)
if (!Config::get("system", "proxy_disabled")) {
- $media_url = proxy_url($url);
+ $media_url = ProxyUtils::proxifyUrl($url);
$sizes = [];
$scale = Image::getScalingDimensions($image[0], $image[1], 150);
"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,
* likes => int count,
* dislikes => int count
*/
-function api_format_items_activities(&$item, $type = "json")
+function api_format_items_activities($item, $type = "json")
{
- $a = get_app();
+ $a = \get_app();
$activities = [
'like' => [],
$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
- while ($i = dba::fetch($ret)) {
+ while ($parent_item = Item::fetch($ret)) {
// not used as result should be structured like other user data
//builtin_activity_puller($i, $activities);
// get user data and add it to the array of the activity
- $user = api_get_user($a, $i['author-id']);
- switch ($i['verb']) {
+ $user = api_get_user($a, $parent_item['author-id']);
+ switch ($parent_item['verb']) {
case ACTIVITY_LIKE:
$activities['like'][] = $user;
break;
}
}
- dba::close($ret);
+ DBA::close($ret);
if ($type == "xml") {
$xml_activities = [];
*/
function api_format_items($r, $user_info, $filter_user = false, $type = "json")
{
- $a = get_app();
+ $a = \get_app();
$ret = [];
'in_reply_to_screen_name' => $in_reply_to['screen_name'],
$geo => null,
'favorited' => $item['starred'] ? true : false,
- 'user' => $status_user ,
+ 'user' => $status_user,
'friendica_owner' => $owner_user,
+ 'friendica_private' => $item['private'] == 1,
//'entities' => NULL,
'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $item['parent'],
}
if ($status["source"] == 'web') {
- $status["source"] = ContactSelector::networkToName($item['network'], $user_info['url']);
- } elseif (ContactSelector::networkToName($item['network'], $user_info['url']) != $status["source"]) {
- $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $user_info['url']).')');
+ $status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']);
+ } elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) {
+ $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
}
if ($item["id"] == $item["parent"]) {
$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) {
*/
function api_lists_ownerships($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
$user_info = api_get_user($a);
$uid = $user_info['uid'];
- $groups = dba::select('group', [], ['deleted' => 0, 'uid' => $uid]);
+ $groups = DBA::select('group', [], ['deleted' => 0, 'uid' => $uid]);
// loop through all groups
$lists = [];
*/
function api_lists_statuses($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
}
// params
- $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+ $count = defaults($_REQUEST, 'count', 20);
+ $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
if ($page < 0) {
$page = 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);
+ $since_id = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
+ $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0);
+ $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
$start = $page * $count;
- $condition = ["`uid` = ? AND `verb` = ? AND `id` > ? AND `group_member`.`gid` = ?",
- api_user(), ACTIVITY_POST, $since_id, $_REQUEST['list_id']];
+ $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `group_member`.`gid` = ?",
+ api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $_REQUEST['list_id']];
if ($max_id > 0) {
$condition[0] .= " AND `item`.`id` <= ?";
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::selectForUser(api_user(), [], $condition, $params);
- $items = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $items = api_format_items(Item::inArray($statuses), $user_info, false, $type);
$data = ['status' => $items];
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
*/
function api_statuses_f($qtype)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
}
// pagination
- $count = x($_GET, 'count') ? $_GET['count'] : 20;
- $page = x($_GET, 'page') ? $_GET['page'] : 1;
+ $count = defaults($_GET, 'count', 20);
+ $page = defaults($_GET, 'page', 1);
if ($page < 1) {
$page = 1;
}
$user_info = api_get_user($a);
- if (x($_GET, 'cursor') && $_GET['cursor'] == 'undefined') {
+ if (!empty($_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
$sql_extra = '';
if ($qtype == 'friends') {
- $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
+ $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(Contact::SHARING), intval(Contact::FRIEND));
} elseif ($qtype == 'followers') {
- $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
+ $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(Contact::FOLLOWER), intval(Contact::FRIEND));
}
// friends and followers only for self
*/
function api_statusnet_config($type)
{
- $a = get_app();
-
- $name = $a->config['sitename'];
- $server = $a->get_hostname();
- $logo = System::baseUrl() . '/images/friendica-64.png';
- $email = $a->config['admin_email'];
- $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
- $private = ((Config::get('system', 'block_public')) ? 'true' : 'false');
- $textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000);
- if ($a->config['api_import_size']) {
- $textlimit = (string) $a->config['api_import_size'];
- }
- $ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false');
- $sslserver = (($ssl === 'true') ? str_replace('http:', 'https:', System::baseUrl()) : '');
+ $a = \get_app();
+
+ $name = Config::get('config', 'sitename');
+ $server = $a->getHostName();
+ $logo = System::baseUrl() . '/images/friendica-64.png';
+ $email = Config::get('config', 'admin_email');
+ $closed = intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 'true' : 'false';
+ $private = Config::get('system', 'block_public') ? 'true' : 'false';
+ $textlimit = (string) Config::get('config', 'api_import_size', Config::get('config', 'max_import_size', 200000));
+ $ssl = Config::get('system', 'have_ssl') ? 'true' : 'false';
+ $sslserver = Config::get('system', 'have_ssl') ? str_replace('http:', 'https:', System::baseUrl()) : '';
$config = [
'site' => ['name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
*/
function api_ff_ids($type)
{
- if (! api_user()) {
+ if (!api_user()) {
throw new ForbiddenException();
}
- $a = get_app();
+ $a = \get_app();
api_get_user($a);
WHERE `contact`.`uid` = %s AND NOT `contact`.`self`",
intval(api_user())
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
return;
}
*/
function api_direct_messages_new($type)
{
-
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
}
- if (!x($_POST, "text") || (!x($_POST, "screen_name") && !x($_POST, "user_id"))) {
+ if (empty($_POST["text"]) || empty($_POST["screen_name"]) && empty($_POST["user_id"])) {
return;
}
$sender = api_get_user($a);
- if ($_POST['screen_name']) {
+ $recipient = null;
+ if (!empty($_POST['screen_name'])) {
$r = q(
"SELECT `id`, `nurl`, `network` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
intval(api_user()),
- dbesc($_POST['screen_name'])
+ DBA::escape($_POST['screen_name'])
);
- // Selecting the id by priority, friendica first
- api_best_nickname($r);
+ if (DBA::isResult($r)) {
+ // Selecting the id by priority, friendica first
+ api_best_nickname($r);
- $recipient = api_get_user($a, $r[0]['nurl']);
+ $recipient = api_get_user($a, $r[0]['nurl']);
+ }
} else {
$recipient = api_get_user($a, $_POST['user_id']);
}
+ if (empty($recipient)) {
+ throw new NotFoundException('Recipient not found');
+ }
+
$replyto = '';
$sub = '';
- if (x($_REQUEST, 'replyto')) {
+ if (!empty($_REQUEST['replyto'])) {
$r = q(
'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
intval(api_user()),
$replyto = $r[0]['parent-uri'];
$sub = $r[0]['title'];
} else {
- if (x($_REQUEST, 'title')) {
+ if (!empty($_REQUEST['title'])) {
$sub = $_REQUEST['title'];
} else {
$sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'], 0, 10)."...":$_POST['text']);
switch ($type) {
case "atom":
+ break;
case "rss":
$data = api_rss_extra($a, $data, $sender);
+ break;
}
return api_format_data("direct-messages", $type, $data);
*/
function api_direct_messages_destroy($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
//required
- $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+ $id = defaults($_REQUEST, 'id', 0);
// optional
- $parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : "");
- $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+ $parenturi = defaults($_REQUEST, 'friendica_parenturi', "");
+ $verbose = (!empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false");
/// @todo optional parameter 'include_entities' from Twitter API not yet implemented
$uid = $user_info['uid'];
}
// add parent-uri to sql command if specified by calling app
- $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . dbesc($parenturi) . "'" : "");
+ $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . DBA::escape($parenturi) . "'" : "");
// get data of the specified message id
$r = q(
);
// error message if specified id is not in database
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
if ($verbose == "true") {
$answer = ['result' => 'error', 'message' => 'message id not in database'];
return api_format_data("direct_messages_delete", $type, ['$result' => $answer]);
/// @TODO move to top of file or somewhere better
api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true, API_METHOD_DELETE);
+/**
+ * Unfollow Contact
+ *
+ * @brief unfollow contact
+ *
+ * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+ * @return string|array
+ * @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/post-friendships-destroy.html
+ */
+function api_friendships_destroy($type)
+{
+ $uid = api_user();
+
+ if ($uid === false) {
+ throw new ForbiddenException();
+ }
+
+ $contact_id = defaults($_REQUEST, 'user_id');
+
+ if (empty($contact_id)) {
+ Logger::log("No user_id specified", Logger::DEBUG);
+ throw new BadRequestException("no user_id specified");
+ }
+
+ // Get Contact by given id
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => 0, 'self' => false]);
+
+ if(!DBA::isResult($contact)) {
+ 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, Strings::normaliseLink($url),
+ Strings::normaliseLink($url), $url];
+ $contact = DBA::selectFirst('contact', [], $condition);
+
+ if (!DBA::isResult($contact)) {
+ Logger::log("Not following Contact", Logger::DEBUG);
+ throw new NotFoundException("Not following Contact");
+ }
+
+ if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+ Logger::log("Not supported", Logger::DEBUG);
+ throw new ExpectationFailedException("Not supported");
+ }
+
+ $dissolve = ($contact['rel'] == Contact::SHARING);
+
+ $owner = User::getOwnerDataById($uid);
+ if ($owner) {
+ Contact::terminateFriendship($owner, $contact, $dissolve);
+ }
+ else {
+ Logger::log("No owner found", Logger::DEBUG);
+ throw new NotFoundException("Error Processing Request");
+ }
+
+ // Sharing-only contacts get deleted as there no relationship any more
+ if ($dissolve) {
+ Contact::remove($contact['id']);
+ } else {
+ DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+ }
+
+ // "uid" and "self" are only needed for some internal stuff, so remove it from here
+ unset($contact["uid"]);
+ unset($contact["self"]);
+
+ // Set screen_name since Twidere requests it
+ $contact["screen_name"] = $contact["nick"];
+
+ return api_format_data("friendships-destroy", $type, ['user' => $contact]);
+}
+api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, API_METHOD_POST);
+
/**
*
* @param string $type Return type (atom, rss, xml, json)
*/
function api_direct_messages_box($type, $box, $verbose)
{
- $a = get_app();
- $user_info = api_get_user($a);
-
- if (api_user() === false || $user_info === false) {
+ $a = \get_app();
+ if (api_user() === false) {
throw new ForbiddenException();
}
-
// params
- $count = (x($_GET, 'count') ? $_GET['count'] : 20);
- $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
+ $count = defaults($_GET, 'count', 20);
+ $page = defaults($_REQUEST, 'page', 1) - 1;
if ($page < 0) {
$page = 0;
}
- $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
- $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
+ $since_id = defaults($_REQUEST, 'since_id', 0);
+ $max_id = defaults($_REQUEST, 'max_id', 0);
- $user_id = (x($_REQUEST, 'user_id') ? $_REQUEST['user_id'] : "");
- $screen_name = (x($_REQUEST, 'screen_name') ? $_REQUEST['screen_name'] : "");
+ $user_id = defaults($_REQUEST, 'user_id', '');
+ $screen_name = defaults($_REQUEST, 'screen_name', '');
// caller user info
unset($_REQUEST["user_id"]);
unset($_REQUEST["screen_name"]);
unset($_GET["screen_name"]);
+ $user_info = api_get_user($a);
+ if ($user_info === false) {
+ throw new ForbiddenException();
+ }
$profile_url = $user_info["url"];
// pagination
// filters
if ($box=="sentbox") {
- $sql_extra = "`mail`.`from-url`='" . dbesc($profile_url) . "'";
+ $sql_extra = "`mail`.`from-url`='" . DBA::escape($profile_url) . "'";
} elseif ($box == "conversation") {
- $sql_extra = "`mail`.`parent-uri`='" . dbesc($_GET["uri"]) . "'";
+ $sql_extra = "`mail`.`parent-uri`='" . DBA::escape(defaults($_GET, 'uri', '')) . "'";
} elseif ($box == "all") {
$sql_extra = "true";
} elseif ($box == "inbox") {
- $sql_extra = "`mail`.`from-url`!='" . dbesc($profile_url) . "'";
+ $sql_extra = "`mail`.`from-url`!='" . DBA::escape($profile_url) . "'";
}
if ($max_id > 0) {
if ($user_id != "") {
$sql_extra .= ' AND `mail`.`contact-id` = ' . intval($user_id);
} elseif ($screen_name !="") {
- $sql_extra .= " AND `contact`.`nick` = '" . dbesc($screen_name). "'";
+ $sql_extra .= " AND `contact`.`nick` = '" . DBA::escape($screen_name). "'";
}
$r = q(
intval($start),
intval($count)
);
- if ($verbose == "true" && !DBM::is_result($r)) {
+ if ($verbose == "true" && !DBA::isResult($r)) {
$answer = ['result' => 'error', 'message' => 'no mails available'];
return api_format_data("direct_messages_all", $type, ['$result' => $answer]);
}
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;
}
$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);
*/
function api_direct_messages_sentbox($type)
{
- $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+ $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
return api_direct_messages_box($type, "sentbox", $verbose);
}
*/
function api_direct_messages_inbox($type)
{
- $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+ $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
return api_direct_messages_box($type, "inbox", $verbose);
}
*/
function api_direct_messages_all($type)
{
- $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+ $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
return api_direct_messages_box($type, "all", $verbose);
}
*/
function api_direct_messages_conversation($type)
{
- $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+ $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
return api_direct_messages_box($type, "conversation", $verbose);
}
throw new ForbiddenException();
}
// input params
- $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : "");
+ $album = defaults($_REQUEST, 'album', "");
// we do not allow calls without album string
if ($album == "") {
$r = q(
"SELECT DISTINCT `resource-id` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
intval(api_user()),
- dbesc($album)
+ DBA::escape($album)
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
throw new BadRequestException("album not available");
}
$condition = ['uid' => local_user(), 'resource-id' => $rr['resource-id'], 'type' => 'photo'];
$photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
- if (!DBM::is_result($photo_item)) {
+ if (!DBA::isResult($photo_item)) {
throw new InternalServerErrorException("problem with deleting items occured");
}
Item::deleteForUser(['id' => $photo_item['id']], api_user());
}
// now let's delete all photos from the album
- $result = dba::delete('photo', ['uid' => api_user(), 'album' => $album]);
+ $result = DBA::delete('photo', ['uid' => api_user(), 'album' => $album]);
// return success of deletion or error message
if ($result) {
throw new ForbiddenException();
}
// input params
- $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : "");
- $album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : "");
+ $album = defaults($_REQUEST, 'album', "");
+ $album_new = defaults($_REQUEST, 'album_new', "");
// we do not allow calls without album string
if ($album == "") {
throw new BadRequestException("no new albumname specified");
}
// check if album is existing
- if (!dba::exists('photo', ['uid' => api_user(), 'album' => $album])) {
+ if (!DBA::exists('photo', ['uid' => api_user(), 'album' => $album])) {
throw new BadRequestException("album not available");
}
// now let's update all photos to the albumname
- $result = dba::update('photo', ['album' => $album_new], ['uid' => api_user(), 'album' => $album]);
+ $result = DBA::update('photo', ['album' => $album_new], ['uid' => api_user(), 'album' => $album]);
// return success of updating or error message
if ($result) {
'image/gif' => 'gif'
];
$data = ['photo'=>[]];
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
$photo = [];
$photo['id'] = $rr['resource-id'];
throw new ForbiddenException();
}
// input params
- $photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null);
- $desc = (x($_REQUEST, 'desc') ? $_REQUEST['desc'] : (array_key_exists('desc', $_REQUEST) ? "" : null)); // extra check necessary to distinguish between 'not provided' and 'empty string'
- $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : null);
- $album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : null);
- $allow_cid = (x($_REQUEST, 'allow_cid') ? $_REQUEST['allow_cid'] : (array_key_exists('allow_cid', $_REQUEST) ? " " : null));
- $deny_cid = (x($_REQUEST, 'deny_cid') ? $_REQUEST['deny_cid'] : (array_key_exists('deny_cid', $_REQUEST) ? " " : null));
- $allow_gid = (x($_REQUEST, 'allow_gid') ? $_REQUEST['allow_gid'] : (array_key_exists('allow_gid', $_REQUEST) ? " " : null));
- $deny_gid = (x($_REQUEST, 'deny_gid') ? $_REQUEST['deny_gid'] : (array_key_exists('deny_gid', $_REQUEST) ? " " : null));
- $visibility = (x($_REQUEST, 'visibility') ? (($_REQUEST['visibility'] == "true" || $_REQUEST['visibility'] == 1) ? true : false) : false);
+ $photo_id = defaults($_REQUEST, 'photo_id', null);
+ $desc = defaults($_REQUEST, 'desc', (array_key_exists('desc', $_REQUEST) ? "" : null)) ; // extra check necessary to distinguish between 'not provided' and 'empty string'
+ $album = defaults($_REQUEST, 'album', null);
+ $album_new = defaults($_REQUEST, 'album_new', null);
+ $allow_cid = defaults($_REQUEST, 'allow_cid', (array_key_exists('allow_cid', $_REQUEST) ? " " : null));
+ $deny_cid = defaults($_REQUEST, 'deny_cid' , (array_key_exists('deny_cid' , $_REQUEST) ? " " : null));
+ $allow_gid = defaults($_REQUEST, 'allow_gid', (array_key_exists('allow_gid', $_REQUEST) ? " " : null));
+ $deny_gid = defaults($_REQUEST, 'deny_gid' , (array_key_exists('deny_gid' , $_REQUEST) ? " " : null));
+ $visibility = !empty($_REQUEST['visibility']) && $_REQUEST['visibility'] !== "false";
// do several checks on input parameters
// we do not allow calls without album string
$mode = "create";
// error if no media posted in create-mode
- if (!x($_FILES, 'media')) {
+ if (empty($_FILES['media'])) {
// Output error
throw new BadRequestException("no media data submitted");
}
$r = q(
"SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' AND `album` = '%s'",
intval(api_user()),
- dbesc($photo_id),
- dbesc($album)
+ DBA::escape($photo_id),
+ DBA::escape($album)
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
throw new BadRequestException("photo not available");
}
}
$sql_extra,
DateTimeFormat::utcNow(), // update edited timestamp
intval(api_user()),
- dbesc($photo_id),
- dbesc($album)
+ DBA::escape($photo_id),
+ DBA::escape($album)
);
} else {
$nothingtodo = true;
}
- if (x($_FILES, 'media')) {
+ if (!empty($_FILES['media'])) {
$nothingtodo = false;
$media = $_FILES['media'];
$data = save_media_to_database("photo", $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, 0, $visibility, $photo_id);
throw new ForbiddenException();
}
// input params
- $photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null);
+ $photo_id = defaults($_REQUEST, 'photo_id', null);
// do several checks on input parameters
// we do not allow calls without photo id
$r = q(
"SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
intval(api_user()),
- dbesc($photo_id)
+ DBA::escape($photo_id)
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
throw new BadRequestException("photo not available");
}
// now we can perform on the deletion of the photo
- $result = dba::delete('photo', ['uid' => api_user(), 'resource-id' => $photo_id]);
+ $result = DBA::delete('photo', ['uid' => api_user(), 'resource-id' => $photo_id]);
// return success of deletion or error message
if ($result) {
$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
$photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
- if (!DBM::is_result($photo_item)) {
+ if (!DBA::isResult($photo_item)) {
throw new InternalServerErrorException("problem with deleting items occured");
}
// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
if (api_user() === false) {
throw new ForbiddenException();
}
- if (!x($_REQUEST, 'photo_id')) {
+ if (empty($_REQUEST['photo_id'])) {
throw new BadRequestException("No photo id.");
}
- $scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false);
+ $scale = (!empty($_REQUEST['scale']) ? intval($_REQUEST['scale']) : false);
$photo_id = $_REQUEST['photo_id'];
// prepare json/xml output with data from database for the requested photo
$profile_id = defaults($_REQUEST, 'profile_id', 0);
// error if image data is missing
- if (!x($_FILES, 'image')) {
+ if (empty($_FILES['image'])) {
throw new BadRequestException("no media data submitted");
}
// check if specified profile id is valid
if ($profile_id != 0) {
- $profile = dba::selectFirst('profile', ['is-default'], ['uid' => api_user(), 'id' => $profile_id]);
+ $profile = DBA::selectFirst('profile', ['is-default'], ['uid' => api_user(), 'id' => $profile_id]);
// error message if specified profile id is not in database
- if (!DBM::is_result($profile)) {
+ if (!DBA::isResult($profile)) {
throw new BadRequestException("profile_id not available");
}
$is_default_profile = $profile['is-default'];
// get mediadata from image or media (Twitter call api/account/update_profile_image provides image)
$media = null;
- if (x($_FILES, 'image')) {
+ if (!empty($_FILES['image'])) {
$media = $_FILES['image'];
- } elseif (x($_FILES, 'media')) {
+ } elseif (!empty($_FILES['media'])) {
$media = $_FILES['media'];
}
// save new profile image
// change specified profile or all profiles to the new resource-id
if ($is_default_profile) {
$condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], api_user()];
- dba::update('photo', ['profile' => false], $condition);
+ DBA::update('photo', ['profile' => false], $condition);
} else {
$fields = ['photo' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $filetype,
'thumb' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $filetype];
- dba::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]);
+ DBA::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]);
}
Contact::updateSelfFromUserID(api_user(), true);
// Update global directory in background
- $url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
+ $url = System::baseUrl() . '/profile/' . \get_app()->user['nickname'];
if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $url);
}
$api_user = api_get_user(get_app());
if (!empty($_POST['name'])) {
- dba::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
- dba::update('user', ['username' => $_POST['name']], ['uid' => $local_user]);
- dba::update('contact', ['name' => $_POST['name']], ['uid' => $local_user, 'self' => 1]);
- dba::update('contact', ['name' => $_POST['name']], ['id' => $api_user['id']]);
+ DBA::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
+ DBA::update('user', ['username' => $_POST['name']], ['uid' => $local_user]);
+ DBA::update('contact', ['name' => $_POST['name']], ['uid' => $local_user, 'self' => 1]);
+ DBA::update('contact', ['name' => $_POST['name']], ['id' => $api_user['id']]);
}
if (isset($_POST['description'])) {
- dba::update('profile', ['about' => $_POST['description']], ['uid' => $local_user]);
- dba::update('contact', ['about' => $_POST['description']], ['uid' => $local_user, 'self' => 1]);
- dba::update('contact', ['about' => $_POST['description']], ['id' => $api_user['id']]);
+ DBA::update('profile', ['about' => $_POST['description']], ['uid' => $local_user]);
+ DBA::update('contact', ['about' => $_POST['description']], ['uid' => $local_user, 'self' => 1]);
+ DBA::update('contact', ['about' => $_POST['description']], ['id' => $api_user['id']]);
}
Worker::add(PRIORITY_LOW, 'ProfileUpdate', $local_user);
foreach ($cid_array as $cid) {
$cid = str_replace("<", "", $cid);
$cid = str_replace(">", "", $cid);
- $contact = q(
- "SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
- intval($cid),
- intval(api_user())
- );
- $contact_not_found |= !DBM::is_result($contact);
+ $condition = ['id' => $cid, 'uid' => api_user()];
+ $contact_not_found |= !DBA::exists('contact', $condition);
}
return $contact_not_found;
}
if ($filetype == "") {
$filetype=Image::guessType($filename);
}
- $imagedata = getimagesize($src);
+ $imagedata = @getimagesize($src);
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
// 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)");
}
// create Photo instance with the data of the image
$imagedata = @file_get_contents($src);
$Image = new Image($imagedata, $filetype);
- if (! $Image->isValid()) {
+ if (!$Image->isValid()) {
throw new InternalServerErrorException("unable to process image data");
}
// check max length of images on server
$max_length = Config::get('system', 'max_image_length');
- if (! $max_length) {
+ if (!$max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
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();
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");
+ if (!$r) {
+ 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");
+ if (!$r) {
+ Logger::log("photo upload: image upload with scale 1 (640x640) failed");
}
}
if ($width > 320 || $height > 320) {
$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");
+ if (!$r) {
+ 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");
+ if (!$r) {
+ Logger::log("photo upload: profile image upload with scale 4 (300x300) failed");
}
}
if ($width > 80 || $height > 80) {
$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 (!$r) {
+ Logger::log("photo upload: profile image upload with scale 5 (80x80) failed");
}
}
if ($width > 48 || $height > 48) {
$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");
+ if (!$r) {
+ 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) {
{
// get data about the api authenticated user
$uri = Item::newURI(intval(api_user()));
- $owner_record = q("SELECT * FROM `contact` WHERE `uid`= %d AND `self` LIMIT 1", intval(api_user()));
+ $owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
$arr = [];
- $arr['guid'] = get_guid(32);
+ $arr['guid'] = System::createUUID();
$arr['uid'] = intval(api_user());
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
$arr['type'] = 'photo';
$arr['wall'] = 1;
$arr['resource-id'] = $hash;
- $arr['contact-id'] = $owner_record[0]['id'];
- $arr['owner-name'] = $owner_record[0]['name'];
- $arr['owner-link'] = $owner_record[0]['url'];
- $arr['owner-avatar'] = $owner_record[0]['thumb'];
- $arr['author-name'] = $owner_record[0]['name'];
- $arr['author-link'] = $owner_record[0]['url'];
- $arr['author-avatar'] = $owner_record[0]['thumb'];
+ $arr['contact-id'] = $owner_record['id'];
+ $arr['owner-name'] = $owner_record['name'];
+ $arr['owner-link'] = $owner_record['url'];
+ $arr['owner-avatar'] = $owner_record['thumb'];
+ $arr['author-name'] = $owner_record['name'];
+ $arr['author-link'] = $owner_record['url'];
+ $arr['author-avatar'] = $owner_record['thumb'];
$arr['title'] = "";
$arr['allow_cid'] = $allow_cid;
$arr['allow_gid'] = $allow_gid;
];
// adds link to the thumbnail scale photo
- $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record[0]['nick'] . '/image/' . $hash . ']'
+ $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nick'] . '/image/' . $hash . ']'
. '[img]' . System::baseUrl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]'
. '[/url]';
*/
function prepare_photo_data($type, $scale, $photo_id)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if ($user_info === false) {
FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY `resource-id`",
$data_sql,
intval(local_user()),
- dbesc($photo_id),
+ DBA::escape($photo_id),
$scale_sql
);
];
// prepare output data for photo
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$data = ['photo' => $r[0]];
$data['photo']['id'] = $data['photo']['resource-id'];
if ($scale !== false) {
$data['photo']['friendica_activities'] = api_format_items_activities($item, $type);
// retrieve comments on photo
- $condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')",
- $item[0]['parent'], api_user(), ACTIVITY_POST];
+ $condition = ["`parent` = ? AND `uid` = ? AND (`gravity` IN (?, ?) OR `type`='photo')",
+ $item[0]['parent'], api_user(), GRAVITY_PARENT, GRAVITY_COMMENT];
$statuses = Item::selectForUser(api_user(), [], $condition);
// prepare output of comments
- $commentData = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+ $commentData = api_format_items(Item::inArray($statuses), $user_info, false, $type);
$comments = [];
if ($type == "xml") {
$k = 0;
*/
function api_friendica_remoteauth()
{
- $url = (x($_GET, 'url') ? $_GET['url'] : '');
- $c_url = (x($_GET, 'c_url') ? $_GET['c_url'] : '');
+ $url = defaults($_GET, 'url', '');
+ $c_url = defaults($_GET, 'c_url', '');
if ($url === '' || $c_url === '') {
throw new BadRequestException("Wrong parameters.");
}
- $c_url = normalise_link($c_url);
+ $c_url = Strings::normaliseLink($c_url);
// traditional DFRN
- $contact = dba::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]);
+ $contact = DBA::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]);
- if (!DBM::is_result($contact) || ($contact['network'] !== NETWORK_DFRN)) {
+ if (!DBA::isResult($contact) || ($contact['network'] !== Protocol::DFRN)) {
throw new BadRequestException("Unknown contact");
}
$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);
+ 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
{
$body = trim($item["body"]);
- if (Diaspora::isReshare($body, false)===false) {
- return false;
+ if (Diaspora::isReshare($body, false) === false) {
+ if ($item['author-id'] == $item['owner-id']) {
+ return false;
+ } else {
+ // Reshares from OStatus, ActivityPub and Twitter
+ $reshared_item = $item;
+ $reshared_item['owner-id'] = $reshared_item['author-id'];
+ $reshared_item['owner-link'] = $reshared_item['author-link'];
+ $reshared_item['owner-name'] = $reshared_item['author-name'];
+ $reshared_item['owner-avatar'] = $reshared_item['author-avatar'];
+ return $reshared_item;
+ }
}
/// @TODO "$1" should maybe mean '$1' ?
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
/*
- * Skip if there is no shared message in there
- * we already checked this in diaspora::isReshare()
- * but better one more than one less...
- */
- if ($body == $attributes) {
+ * Skip if there is no shared message in there
+ * we already checked this in diaspora::isReshare()
+ * but better one more than one less...
+ */
+ if (($body == $attributes) || empty($attributes)) {
return false;
}
-
// build the fake reshared item
$reshared_item = $item;
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8');
}
preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$author = $matches[1];
}
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profile = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profile = $matches[1];
}
$avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$avatar = $matches[1];
}
preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$avatar = $matches[1];
}
$link = "";
preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$link = $matches[1];
}
preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$link = $matches[1];
}
$posted = "";
preg_match("/posted='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$posted = $matches[1];
}
preg_match('/posted="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$posted = $matches[1];
}
}
$reshared_item["body"] = $shared_body;
+ $reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true);
$reshared_item["author-name"] = $author;
$reshared_item["author-link"] = $profile;
$reshared_item["author-avatar"] = $avatar;
$r = q(
"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- dbesc(normalise_link($profile))
+ DBA::escape(Strings::normaliseLink($profile))
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$nick = $r[0]["nick"];
}
if (!$nick == "") {
$r = q(
"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- dbesc(normalise_link($profile))
+ DBA::escape(Strings::normaliseLink($profile))
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$nick = $r[0]["nick"];
}
}
if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) {
$parent = Item::selectFirst(['id'], ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
- if (DBM::is_result($parent)) {
+ if (DBA::isResult($parent)) {
$in_reply_to['status_id'] = intval($parent['id']);
} else {
$in_reply_to['status_id'] = intval($item['parent']);
$fields = ['author-nick', 'author-name', 'author-id', 'author-link'];
$parent = Item::selectFirst($fields, ['id' => $in_reply_to['status_id']]);
- if (DBM::is_result($parent)) {
+ if (DBA::isResult($parent)) {
if ($parent['author-nick'] == "") {
$parent['author-nick'] = api_get_nick($parent['author-link']);
}
// 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;
*/
function api_clean_plain_items($text)
{
- $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
+ $include_entities = strtolower(defaults($_REQUEST, 'include_entities', "false"));
$text = BBCode::cleanPictureLinks($text);
$URLSearchString = "^\[\]";
*/
function api_friendica_group_show($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
+ $gid = defaults($_REQUEST, 'gid', 0);
$uid = $user_info['uid'];
// get data of the specified group id or all groups if not specified
intval($gid)
);
// error message if specified gid is not in database
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
throw new BadRequestException("gid not available");
}
} else {
*/
function api_friendica_group_delete($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
- $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+ $gid = defaults($_REQUEST, 'gid', 0);
+ $name = defaults($_REQUEST, 'name', "");
$uid = $user_info['uid'];
// error if no gid specified
intval($gid)
);
// error message if specified gid is not in database
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
throw new BadRequestException('gid not available');
}
"SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d AND `name` = '%s'",
intval($uid),
intval($gid),
- dbesc($name)
+ DBA::escape($name)
);
// error message if specified gid is not in database
- if (!DBM::is_result($rname)) {
+ if (!DBA::isResult($rname)) {
throw new BadRequestException('wrong group name');
}
*/
function api_lists_destroy($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0);
+ $gid = defaults($_REQUEST, 'list_id', 0);
$uid = $user_info['uid'];
// error if no gid specified
}
// get data of the specified group id
- $group = dba::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
+ $group = DBA::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
// error message if specified gid is not in database
if (!$group) {
throw new BadRequestException('gid not available');
$rname = q(
"SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 0",
intval($uid),
- dbesc($name)
+ DBA::escape($name)
);
// error message if specified group name already exists
- if (DBM::is_result($rname)) {
+ if (DBA::isResult($rname)) {
throw new BadRequestException('group name already exists');
}
$rname = q(
"SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 1",
intval($uid),
- dbesc($name)
+ DBA::escape($name)
);
// error message if specified group name already exists
- if (DBM::is_result($rname)) {
+ if (DBA::isResult($rname)) {
$reactivate_group = true;
}
*/
function api_friendica_group_create($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+ $name = defaults($_REQUEST, 'name', "");
$uid = $user_info['uid'];
$json = json_decode($_POST['json'], true);
$users = $json['user'];
*/
function api_lists_create($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+ $name = defaults($_REQUEST, 'name', "");
$uid = $user_info['uid'];
$success = group_create($name, $uid);
*/
function api_friendica_group_update($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
$uid = $user_info['uid'];
- $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
- $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+ $gid = defaults($_REQUEST, 'gid', 0);
+ $name = defaults($_REQUEST, 'name', "");
$json = json_decode($_POST['json'], true);
$users = $json['user'];
*/
function api_lists_update($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0);
- $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+ $gid = defaults($_REQUEST, 'list_id', 0);
+ $name = defaults($_REQUEST, 'name', "");
$uid = $user_info['uid'];
// error if no gid specified
}
// get data of the specified group id
- $group = dba::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
+ $group = DBA::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
// error message if specified gid is not in database
if (!$group) {
throw new BadRequestException('gid not available');
*/
function api_friendica_activity($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
$verb = strtolower($a->argv[3]);
$verb = preg_replace("|\..*$|", "", $verb);
- $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+ $id = defaults($_REQUEST, 'id', 0);
$res = Item::performLike($id, $verb);
*/
function api_friendica_notification($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
if ($type == "xml") {
$xmlnotes = [];
- foreach ($notes as $note) {
- $xmlnotes[] = ["@attributes" => $note];
+ if (!empty($notes)) {
+ foreach ($notes as $note) {
+ $xmlnotes[] = ["@attributes" => $note];
+ }
}
$notes = $xmlnotes;
*/
function api_friendica_notification_seen($type)
{
- $a = get_app();
+ $a = \get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
throw new BadRequestException("Invalid argument count");
}
- $id = (x($_REQUEST, 'id') ? intval($_REQUEST['id']) : 0);
+ $id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0);
$nm = new NotificationsManager();
$note = $nm->getByID($id);
if ($note['otype']=='item') {
// would be really better with an ItemsManager and $im->getByID() :-P
$item = Item::selectFirstForUser(api_user(), [], ['id' => $note['iid'], 'uid' => api_user()]);
- if (DBM::is_result($$item)) {
+ if (DBA::isResult($item)) {
// we found the item, return it to the user
$ret = api_format_items([$item], $user_info, false, $type);
$data = ['status' => $ret];
*/
function api_friendica_direct_messages_setseen($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
}
// params
$user_info = api_get_user($a);
$uid = $user_info['uid'];
- $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+ $id = defaults($_REQUEST, 'id', 0);
// return error if id is zero
if ($id == "") {
}
// error message if specified id is not in database
- if (!dba::exists('mail', ['id' => $id, 'uid' => $uid])) {
+ if (!DBA::exists('mail', ['id' => $id, 'uid' => $uid])) {
$answer = ['result' => 'error', 'message' => 'message id not in database'];
return api_format_data("direct_messages_setseen", $type, ['$result' => $answer]);
}
// update seen indicator
- $result = dba::update('mail', ['seen' => true], ['id' => $id]);
+ $result = DBA::update('mail', ['seen' => true], ['id' => $id]);
if ($result) {
// return success
*/
function api_friendica_direct_messages_search($type, $box = "")
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
// params
$user_info = api_get_user($a);
- $searchstring = (x($_REQUEST, 'searchstring') ? $_REQUEST['searchstring'] : "");
+ $searchstring = defaults($_REQUEST, 'searchstring', "");
$uid = $user_info['uid'];
// error if no searchstring specified
$r = q(
"SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND `body` LIKE '%s' ORDER BY `mail`.`id` DESC",
intval($uid),
- dbesc('%'.$searchstring.'%')
+ DBA::escape('%'.$searchstring.'%')
);
$profile_url = $user_info["url"];
// message if nothing was found
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$success = ['success' => false, 'search_results' => 'problem with query'];
} elseif (count($r) == 0) {
$success = ['success' => false, 'search_results' => 'nothing found'];
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;
}
*/
function api_friendica_profile_show($type)
{
- $a = get_app();
+ $a = \get_app();
if (api_user() === false) {
throw new ForbiddenException();
}
// input params
- $profile_id = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0);
+ $profile_id = defaults($_REQUEST, 'profile_id', 0);
// retrieve general information about profiles for user
$multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles');
);
// error message if specified gid is not in database
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
throw new BadRequestException("profile_id not available");
}
} else {
$nurls = q(
"SELECT `id`, `nurl` FROM `contact` WHERE `uid`= %d AND `profile-id` = %d",
intval(api_user()),
- intval($rr['profile_id'])
+ intval($rr['id'])
);
foreach ($nurls as $nurl) {
}
// return settings, authenticated user and profiles data
- $self = q("SELECT `nurl` FROM `contact` WHERE `uid`= %d AND `self` LIMIT 1", intval(api_user()));
+ $self = DBA::selectFirst('contact', ['nurl'], ['uid' => api_user(), 'self' => true]);
$result = ['multi_profiles' => $multi_profiles ? true : false,
'global_dir' => $directory,
- 'friendica_owner' => api_get_user($a, $self[0]['nurl']),
+ 'friendica_owner' => api_get_user($a, $self['nurl']),
'profiles' => $profiles];
return api_format_data("friendica_profiles", $type, ['$result' => $result]);
}
*/
function api_saved_searches_list($type)
{
- $terms = dba::select('search', ['id', 'term'], ['uid' => local_user()]);
+ $terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
$result = [];
while ($term = $terms->fetch()) {
];
}
- dba::close($terms);
+ DBA::close($terms);
return api_format_data("terms", $type, ['terms' => $result]);
}