X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=dd24a92c9b105bf22e2bbc25532fc7f258e24d78;hb=cbe4e2bf8c7b6fea2e700811a15b427e6141c9dd;hp=b879f8e427911836b852eb95f0bc4ad3d192c235;hpb=26d5746d997f9109dffb9b8b444994c8656c247a;p=friendica.git
diff --git a/include/api.php b/include/api.php
index b879f8e427..dd24a92c9b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -7,6 +7,9 @@
require_once("include/conversation.php");
require_once("include/oauth.php");
require_once("include/html2plain.php");
+ require_once("mod/share.php");
+ require_once("include/Photo.php");
+
/*
* Twitter-Like API
*
@@ -96,24 +99,52 @@
}
$user = $_SERVER['PHP_AUTH_USER'];
- $encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
+ $password = $_SERVER['PHP_AUTH_PW'];
+ $encrypted = hash('whirlpool',trim($password));
+ // allow "user@server" login (but ignore 'server' part)
+ $at=strstr($user, "@", true);
+ if ( $at ) $user=$at;
/**
* next code from mod/auth.php. needs better solution
*/
+ $record = null;
- // process normal login request
-
- $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
- AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
- dbesc(trim($user)),
- dbesc(trim($user)),
- dbesc($encrypted)
+ $addon_auth = array(
+ 'username' => trim($user),
+ 'password' => trim($password),
+ 'authenticated' => 0,
+ 'user_record' => null
);
- if(count($r)){
- $record = $r[0];
- } else {
+
+ /**
+ *
+ * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
+ * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
+ * and later plugins should not interfere with an earlier one that succeeded.
+ *
+ */
+
+ call_hooks('authenticate', $addon_auth);
+
+ if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) {
+ $record = $addon_auth['user_record'];
+ }
+ else {
+ // process normal login request
+
+ $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
+ AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
+ dbesc(trim($user)),
+ dbesc(trim($user)),
+ dbesc($encrypted)
+ );
+ if(count($r))
+ $record = $r[0];
+ }
+
+ if((! $record) || (! count($record))) {
logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
header('HTTP/1.0 401 Unauthorized');
@@ -708,8 +739,7 @@
$_REQUEST['body'] = html2bbcode($txt);
}
- }
- else
+ } else
$_REQUEST['body'] = requestdata('status');
$_REQUEST['title'] = requestdata('title');
@@ -786,13 +816,26 @@
}
$_REQUEST['type'] = 'wall';
- if(x($_FILES,'media')) {
- // upload the image if we have one
- $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
- require_once('mod/wall_upload.php');
- $media = wall_upload_post($a);
- if(strlen($media)>0)
- $_REQUEST['body'] .= "\n\n".$media;
+ }
+
+ if(x($_FILES,'media')) {
+ // upload the image if we have one
+ $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+ require_once('mod/wall_upload.php');
+ $media = wall_upload_post($a);
+ if(strlen($media)>0)
+ $_REQUEST['body'] .= "\n\n".$media;
+ }
+
+ // To-Do: Multiple IDs
+ if (requestdata('media_ids')) {
+ $r = q("SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
+ intval(requestdata('media_ids')), api_user());
+ if ($r) {
+ $phototypes = Photo::supportedTypes();
+ $ext = $phototypes[$r[0]['type']];
+ $_REQUEST['body'] .= "\n\n".'[url='.$a->get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']';
+ $_REQUEST['body'] .= '[img]'.$a->get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]";
}
}
@@ -815,6 +858,41 @@
api_register_func('api/statuses/update_with_media','api_statuses_update', true);
+ function api_media_upload(&$a, $type) {
+ if (api_user()===false) {
+ logger('no user');
+ return false;
+ }
+
+ $user_info = api_get_user($a);
+
+ if(!x($_FILES,'media')) {
+ // Output error
+ return false;
+ }
+
+ require_once('mod/wall_upload.php');
+ $media = wall_upload_post($a, false);
+ if(!$media) {
+ // Output error
+ return false;
+ }
+
+ $returndata = array();
+ $returndata["media_id"] = $media["id"];
+ $returndata["media_id_string"] = (string)$media["id"];
+ $returndata["size"] = $media["size"];
+ $returndata["image"] = array("w" => $media["width"],
+ "h" => $media["height"],
+ "image_type" => $media["type"]);
+
+ logger("Media uploaded: ".print_r($returndata, true), LOGGER_DEBUG);
+
+ return array("media" => $returndata);
+ }
+
+ api_register_func('api/media/upload','api_media_upload', true);
+
function api_status_show(&$a, $type){
$user_info = api_get_user($a);
@@ -823,7 +901,7 @@
// get last public wall message
$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
FROM `item`, `item` as `i`
- WHERE `item`.`contact-id` = %d
+ WHERE `item`.`contact-id` = %d AND `item`.`uid` = %d
AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
AND `i`.`id` = `item`.`parent`
AND `item`.`type`!='activity'
@@ -831,6 +909,7 @@
ORDER BY `item`.`created` DESC
LIMIT 1",
intval($user_info['cid']),
+ intval(api_user()),
dbesc($user_info['url']),
dbesc(normalise_link($user_info['url'])),
dbesc($user_info['url']),
@@ -872,8 +951,10 @@
$in_reply_to_screen_name = NULL;
}
+ $converted = api_convert_item($item);
+
$status_info = array(
- 'text' => trim(html2plain(bbcode(api_clean_plain_items($lastwall['body']), false, false, 2, true), 0)),
+ 'text' => $converted["text"],
'truncated' => false,
'created_at' => api_date($lastwall['created']),
'in_reply_to_status_id' => $in_reply_to_status_id,
@@ -886,21 +967,16 @@
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => NULL,
'favorited' => $lastwall['starred'] ? true : false,
- 'attachments' => api_get_attachments($lastwall['body']),
'user' => $user_info,
- 'statusnet_html' => trim(bbcode($lastwall['body'], false, false)),
+ 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'],
);
- if (!$status_info["attachments"])
- unset($status_info["attachments"]);
+ if (count($converted["attachments"]) > 0)
+ $status_info["attachments"] = $converted["attachments"];
- if ($lastwall['title'] != "")
- $status_info['statusnet_html'] = "
".bbcode($lastwall['title'])."
\n".$status_info['statusnet_html'];
-
- $entities = api_get_entitities($status_info['text'], $lastwall['body']);
- if (count($entities) > 0)
- $status_info['entities'] = $entities;
+ if (count($converted["entities"]) > 0)
+ $status_info["entities"] = $converted["entities"];
if (($lastwall['item_network'] != "") AND ($status["source"] == 'web'))
$status_info["source"] = network_to_name($lastwall['item_network']);
@@ -974,8 +1050,11 @@
}
}
}
+
+ $converted = api_convert_item($item);
+
$user_info['status'] = array(
- 'text' => trim(html2plain(bbcode(api_clean_plain_items($lastwall['body']), false, false, 2, true), 0)),
+ 'text' => $converted["text"],
'truncated' => false,
'created_at' => api_date($lastwall['created']),
'in_reply_to_status_id' => $in_reply_to_status_id,
@@ -988,20 +1067,15 @@
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => NULL,
'favorited' => $lastwall['starred'] ? true : false,
- 'attachments' => api_get_attachments($lastwall['body']),
- 'statusnet_html' => trim(bbcode($lastwall['body'], false, false)),
+ 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'],
);
- if (!$user_info["attachments"])
- unset($user_info["attachments"]);
-
- if ($lastwall['title'] != "")
- $user_info['statusnet_html'] = "".bbcode($lastwall['title'])."
\n".$user_info['statusnet_html'];
+ if (count($converted["attachments"]) > 0)
+ $user_info["status"]["attachments"] = $converted["attachments"];
- $entities = api_get_entitities($user_info['text'], $lastwall['body']);
- if (count($entities) > 0)
- $user_info['entities'] = $entities;
+ if (count($converted["entities"]) > 0)
+ $user_info["status"]["entities"] = $converted["entities"];
if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web'))
$user_info["status"]["source"] = network_to_name($lastwall['item_network']);
@@ -1108,15 +1182,15 @@
$ret = api_format_items($r,$user_info);
- // We aren't going to try to figure out at the item, group, and page
- // level which items you've seen and which you haven't. If you're looking
- // at the network timeline just mark everything seen.
+ // Set all posts from the query above to seen
+ $idarray = array();
+ foreach ($r AS $item)
+ $idarray[] = intval($item["id"]);
- $r = q("UPDATE `item` SET `unseen` = 0
- WHERE `unseen` = 1 AND `uid` = %d",
- //intval($user_info['uid'])
- intval(api_user())
- );
+ $idlist = implode(",", $idarray);
+
+ if ($idlist != "")
+ $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` AND `id` IN (%s)", $idlist);
$data = array('$statuses' => $ret);
@@ -1369,10 +1443,8 @@
$pos = strpos($r[0]['body'], "[share");
$post = substr($r[0]['body'], $pos);
} else {
- $post = "[share author='".str_replace("'", "'", $r[0]['author-name']).
- "' profile='".$r[0]['author-link'].
- "' avatar='".$r[0]['author-avatar'].
- "' link='".$r[0]['plink']."']";
+ $post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
+
$post .= $r[0]['body'];
$post .= "[/share]";
}
@@ -1597,7 +1669,6 @@
} else {
$itemid = intval($_REQUEST['id']);
}
- if ($action!="create" && $action!="destroy") die(api_error($a, $type, t("Invalid action. ".$action)));
$item = q("SELECT * FROM item WHERE id=%d AND uid=%d",
$itemid, api_user());
@@ -1606,22 +1677,26 @@
switch($action){
case "create":
- $r = q("UPDATE item SET starred=1 WHERE id=%d AND uid=%d",
- $itemid, api_user());
$item[0]['starred']=1;
break;
case "destroy":
- $r = q("UPDATE item SET starred=0 WHERE id=%d AND uid=%d",
- $itemid, api_user());
$item[0]['starred']=0;
break;
+ default:
+ die(api_error($a, $type, t("Invalid action. ".$action)));
}
+ $r = q("UPDATE item SET starred=%d WHERE id=%d AND uid=%d",
+ $item[0]['starred'], $itemid, api_user());
+
+ q("UPDATE thread SET starred=%d WHERE iid=%d AND uid=%d",
+ $item[0]['starred'], $itemid, api_user());
if ($r===false) die(api_error($a, $type, t("DB error")));
$user_info = api_get_user($a);
- $ret = api_format_items($item,$user_info)[0];
+ $rets = api_format_items($item,$user_info);
+ $ret = $rets[0];
$data = array('$status' => $ret);
switch($type){
@@ -1630,7 +1705,7 @@
$data = api_rss_extra($a, $data, $user_info);
}
- return api_apply_template("status", $type, $data);
+ return api_apply_template("status", $type, $data);
}
api_register_func('api/favorites/create', 'api_favorites_create_destroy', true);
@@ -1810,8 +1885,41 @@
return $ret;
}
- function api_get_attachments($text) {
+ function api_convert_item($item) {
+
+ $body = $item['body'];
+ $attachments = api_get_attachments($body);
+
+ // Workaround for ostatus messages where the title is identically to the body
+ $html = bbcode(api_clean_plain_items($body), false, false, 2, true);
+ $statusbody = trim(html2plain($html, 0));
+ // handle data: images
+ $statusbody = api_format_items_embeded_images($item,$statusbody);
+
+ $statustitle = trim($item['title']);
+
+ if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
+ $statustext = trim($statusbody);
+ else
+ $statustext = trim($statustitle."\n\n".$statusbody);
+
+ if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
+ $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
+
+ $statushtml = trim(bbcode($body, false, false));
+
+ if ($item['title'] != "")
+ $statushtml = "".bbcode($item['title'])."
\n".$statushtml;
+
+ $entities = api_get_entitities($statustext, $body);
+
+ return(array("text" => $statustext, "html" => $statushtml, "attachments" => $attachments, "entities" => $entities));
+ }
+
+ function api_get_attachments(&$body) {
+
+ $text = $body;
$text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $text);
$URLSearchString = "^\[\]";
@@ -1820,8 +1928,6 @@
if (!$ret)
return false;
- require_once("include/Photo.php");
-
$attachments = array();
foreach ($images[1] AS $image) {
@@ -1831,6 +1937,10 @@
$attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]);
}
+ if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus"))
+ foreach ($images[0] AS $orig)
+ $body = str_replace($orig, "", $body);
+
return $attachments;
}
@@ -1943,7 +2053,6 @@
$start = iconv_strpos($text, $url, $offset, "UTF-8");
if (!($start === false)) {
- require_once("include/Photo.php");
$image = get_photo_info($url);
if ($image) {
// If image cache is activated, then use the following sizes:
@@ -2008,7 +2117,7 @@
$ret = Array();
foreach($r as $item) {
- api_share_as_retweet($a, api_user(), $item);
+ api_share_as_retweet($item);
localize_item($item);
$status_user = api_item_get_user($a,$item);
@@ -2055,29 +2164,10 @@
$in_reply_to_status_id_str = NULL;
}
- // Workaround for ostatus messages where the title is identically to the body
- //$statusbody = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 5, true), 0));
- $html = bbcode(api_clean_plain_items($item['body']), false, false, 2, true);
- $statusbody = trim(html2plain($html, 0));
-
- // handle data: images
- $statusbody = api_format_items_embeded_images($item,$statusbody);
-
- $statustitle = trim($item['title']);
-
- if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
- $statustext = trim($statusbody);
- else
- $statustext = trim($statustitle."\n\n".$statusbody);
-
- if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
- $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
-
- $statushtml = trim(bbcode($item['body'], false, false));
-
+ $converted = api_convert_item($item);
$status = array(
- 'text' => $statustext,
+ 'text' => $converted["text"],
'truncated' => False,
'created_at'=> api_date($item['created']),
'in_reply_to_status_id' => $in_reply_to_status_id,
@@ -2090,22 +2180,17 @@
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => NULL,
'favorited' => $item['starred'] ? true : false,
- 'attachments' => api_get_attachments($item["body"]),
'user' => $status_user ,
//'entities' => NULL,
- 'statusnet_html' => $statushtml,
+ 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $item['parent'],
);
- if (!$status["attachments"])
- unset($status["attachments"]);
+ if (count($converted["attachments"]) > 0)
+ $status["attachments"] = $converted["attachments"];
- if ($item['title'] != "")
- $status['statusnet_html'] = "".bbcode($item['title'])."
\n".$status['statusnet_html'];
-
- $entities = api_get_entitities($status['text'], $item['body']);
- if (count($entities) > 0)
- $status['entities'] = $entities;
+ if (count($converted["entities"]) > 0)
+ $status["entities"] = $converted["entities"];
if (($item['item_network'] != "") AND ($status["source"] == 'web'))
$status["source"] = network_to_name($item['item_network']);
@@ -2584,7 +2669,71 @@
-function api_share_as_retweet($a, $uid, &$item) {
+ /**
+ * similar as /mod/redir.php
+ * redirect to 'url' after dfrn auth
+ *
+ * why this when there is mod/redir.php already?
+ * This use api_user() and api_login()
+ *
+ * params
+ * c_url: url of remote contact to auth to
+ * url: string, url to redirect after auth
+ */
+ function api_friendica_remoteauth(&$a) {
+ $url = ((x($_GET,'url')) ? $_GET['url'] : '');
+ $c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : '');
+
+ if ($url === '' || $c_url === '')
+ die((api_error($a, 'json', "Wrong parameters")));
+
+ $c_url = normalise_link($c_url);
+
+ // traditional DFRN
+
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `nurl` = '%s' LIMIT 1",
+ dbesc($c_url),
+ intval(api_user())
+ );
+
+ if ((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+ die((api_error($a, 'json', "Unknown contact")));
+
+ $cid = $r[0]['id'];
+
+ $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+ if($r[0]['duplex'] && $r[0]['issued-id']) {
+ $orig_id = $r[0]['issued-id'];
+ $dfrn_id = '1:' . $orig_id;
+ }
+ if($r[0]['duplex'] && $r[0]['dfrn-id']) {
+ $orig_id = $r[0]['dfrn-id'];
+ $dfrn_id = '0:' . $orig_id;
+ }
+
+ $sec = random_string();
+
+ q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
+ VALUES( %d, %s, '%s', '%s', %d )",
+ intval(api_user()),
+ intval($cid),
+ dbesc($dfrn_id),
+ dbesc($sec),
+ intval(time() + 45)
+ );
+
+ logger($r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+ $dest = (($url) ? '&destination_url=' . $url : '');
+ goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+ . '&type=profile&sec=' . $sec . $dest . $quiet );
+ }
+ api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true);
+
+
+
+function api_share_as_retweet(&$item) {
$body = trim($item["body"]);
// Skip if it isn't a pure repeated messages
@@ -2628,6 +2777,15 @@ function api_share_as_retweet($a, $uid, &$item) {
if ($matches[1] != "")
$avatar = $matches[1];
+ $link = "";
+ preg_match("/link='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $link = $matches[1];
+
+ preg_match('/link="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $link = $matches[1];
+
$shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body);
if (($shared_body == "") OR ($profile == "") OR ($author == "") OR ($avatar == ""))
@@ -2637,6 +2795,7 @@ function api_share_as_retweet($a, $uid, &$item) {
$item["author-name"] = $author;
$item["author-link"] = $profile;
$item["author-avatar"] = $avatar;
+ $item["plink"] = $link;
return(true);
@@ -2792,6 +2951,7 @@ function api_best_nickname(&$contacts) {
$contacts = array($contacts[0]);
}
+
/*
Not implemented by now:
statuses/retweets_of_me