}
$user = $_SERVER['PHP_AUTH_USER'];
- $encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
+ $password = $_SERVER['PHP_AUTH_PW'];
+ $encrypted = hash('whirlpool',trim($password));
/**
* 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');
// 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'
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']),
$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,
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => NULL,
'favorited' => $lastwall['starred'] ? true : false,
- // attachments
'user' => $user_info,
- 'statusnet_html' => trim(bbcode($lastwall['body'], false, false)),
+ 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'],
);
- if ($lastwall['title'] != "")
- $status_info['statusnet_html'] = "<h4>".bbcode($lastwall['title'])."</h4>\n".$status_info['statusnet_html'];
+ if (count($converted["attachments"]) > 0)
+ $status_info["attachments"] = $converted["attachments"];
- $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']);
}
}
}
+
+ $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,
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => NULL,
'favorited' => $lastwall['starred'] ? true : false,
- 'statusnet_html' => trim(bbcode($lastwall['body'], false, false)),
+ 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'],
);
- if ($lastwall['title'] != "")
- $user_info['statusnet_html'] = "<h4>".bbcode($lastwall['title'])."</h4>\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']);
} 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());
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){
$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);
return $ret;
}
+ 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 = "<h4>".bbcode($item['title'])."</h4>\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 = "^\[\]";
+ $ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images);
+
+ if (!$ret)
+ return false;
+
+ require_once("include/Photo.php");
+
+ $attachments = array();
+
+ foreach ($images[1] AS $image) {
+ $imagedata = get_photo_info($image);
+
+ if ($imagedata)
+ $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;
+ }
+
function api_get_entitities(&$text, $bbcode) {
/*
To-Do:
$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);
$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,
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => NULL,
'favorited' => $item['starred'] ? true : false,
- //'attachments' => array(),
'user' => $status_user ,
//'entities' => NULL,
- 'statusnet_html' => $statushtml,
+ 'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $item['parent'],
);
- if ($item['title'] != "")
- $status['statusnet_html'] = "<h4>".bbcode($item['title'])."</h4>\n".$status['statusnet_html'];
+ if (count($converted["attachments"]) > 0)
+ $status["attachments"] = $converted["attachments"];
- $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']);
-function api_share_as_retweet($a, $uid, &$item) {
+function api_share_as_retweet(&$item) {
$body = trim($item["body"]);
// Skip if it isn't a pure repeated messages
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 == ""))
$item["author-name"] = $author;
$item["author-link"] = $profile;
$item["author-avatar"] = $avatar;
+ $item["plink"] = $link;
return(true);
projects / friendica.git / blobdiff