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\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';
define('API_METHOD_ANY', '*');
return "Twidere";
}
- logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
+ Logger::log("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], Logger::DEBUG);
} else {
- logger("Empty user-agent", LOGGER_DEBUG);
+ Logger::log("Empty user-agent", Logger::DEBUG);
}
return "api";
var_dump($consumer, $token);
die();
} catch (Exception $e) {
- logger($e);
+ Logger::log($e);
}
// workaround for HTTP-auth in CGI mode
}
if (!x($_SERVER, 'PHP_AUTH_USER')) {
- logger('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+ Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
throw new UnauthorizedException("This API requires login");
}
}
if (!DBA::isResult($record)) {
- logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+ Logger::log('API_login failure: ' . print_r($_SERVER, true), Logger::DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
//header('HTTP/1.0 401 Unauthorized');
//die('This api requires login');
throw new UnauthorizedException("This API requires login");
}
- authenticate_success($record);
+ Authentication::setAuthenticatedSessionForUser($record);
$_SESSION["allow_api"] = true;
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);
}
}
}
}
- 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}");
$extra_query = "";
$url = "";
- logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);
+ Logger::log("api_get_user: Fetching user data for user ".$contact_id, Logger::DEBUG);
// Searching for contact URL
if (!is_null($contact_id) && (intval($contact_id) == 0)) {
- $user = DBA::escape(normalise_link($contact_id));
+ $user = DBA::escape(Strings::normaliseLink($contact_id));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user() !== false) {
}
if (is_null($user) && x($_GET, 'profileurl')) {
- $user = DBA::escape(normalise_link($_GET['profileurl']));
+ $user = DBA::escape(Strings::normaliseLink($_GET['profileurl']));
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user() !== false) {
$extra_query .= "AND `contact`.`uid`=".intval(api_user());
}
}
- 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(
throw new BadRequestException("User not found.");
}
- $contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => normalise_link($url)]);
+ $contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
if (DBA::isResult($contact)) {
$network_name = ContactSelector::networkToName($contact['network'], $contact['url']);
'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']),
$status_user["protected"] = defaults($item, 'private', 0);
if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) {
- $owner_user = api_get_user($a, defaults($item, 'author-id', null));
+ $owner_user = api_get_user($a, defaults($item, 'owner-id', null));
} else {
$owner_user = $status_user;
}
$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);
//$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);
$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);
$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));
}
$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));
}
$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));
}
$a = get_app();
if (api_user() === false) {
- logger('no user');
+ Logger::log('no user');
throw new ForbiddenException();
}
"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];
}
$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`";
}
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;
}
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']) . ')');
}
}
$id = intval(defaults($a->argv, 4, 0));
}
- logger('API: api_statuses_show: ' . $id);
+ Logger::log('API: api_statuses_show: ' . $id);
$conversation = !empty($_REQUEST['conversation']);
$id = intval(defaults($a->argv, 4, 0));
}
- logger('API: api_conversation_show: '.$id);
+ Logger::log('API: api_conversation_show: '.$id);
// try to fetch the item for the local user - or the public item, if there is no local one
$item = Item::selectFirst(['parent-uri'], ['id' => $id]);
$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]);
$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);
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;
// 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 = [];
// standard meta information
$ret = [
'id' => $item['id'],
- 'sender_id' => $sender['id'] ,
+ 'sender_id' => $sender['id'],
'text' => "",
'recipient_id' => $recipient['id'],
'created_at' => api_date(defaults($item, 'created', DateTimeFormat::utcNow())),
"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();
$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
- while ($item = Item::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, $item['author-id']);
- switch ($item['verb']) {
+ $user = api_get_user($a, $parent_item['author-id']);
+ switch ($parent_item['verb']) {
case ACTIVITY_LIKE:
$activities['like'][] = $user;
break;
'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,
}
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"]) {
$a = get_app();
$name = Config::get('config', 'sitename');
- $server = $a->get_hostname();
+ $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';
*/
function api_ff_ids($type)
{
- if (! api_user()) {
+ if (!api_user()) {
throw new ForbiddenException();
}
/// @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)
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;
}
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) {
$owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
$arr = [];
- $arr['guid'] = System::createGUID(32);
+ $arr['guid'] = System::createUUID();
$arr['uid'] = intval(api_user());
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
throw new BadRequestException("Wrong parameters.");
}
- $c_url = normalise_link($c_url);
+ $c_url = Strings::normaliseLink($c_url);
// traditional DFRN
$dfrn_id = '0:' . $orig_id;
}
- $sec = random_string();
+ $sec = Strings::getRandomHex();
$fields = ['uid' => api_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
'sec' => $sec, 'expire' => time() + 45];
DBA::insert('profile_check', $fields);
- logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+ Logger::log($contact['name'] . ' ' . $sec, Logger::DEBUG);
$dest = ($url ? '&destination_url=' . $url : '');
- goaway(
+
+ System::externalRedirect(
$contact['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&type=profile&sec=' . $sec . $dest
{
$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];
}
$r = q(
"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- DBA::escape(normalise_link($profile))
+ DBA::escape(Strings::normaliseLink($profile))
);
if (DBA::isResult($r)) {
if (!$nick == "") {
$r = q(
"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- DBA::escape(normalise_link($profile))
+ DBA::escape(Strings::normaliseLink($profile))
);
if (DBA::isResult($r)) {
// 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;
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;
}