clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api post broken with recent change to use REQUEST vars in mod_item

This commit is contained in:
friendica 2012-01-15 13:57:00 -08:00
parent a1dc3185be
commit e12341b716
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1224' ); define ( 'FRIENDICA_VERSION', '2.3.1227' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1115 ); define ( 'DB_UPDATE_VERSION', 1115 );

26
include/api.php
View File

@ -26,6 +26,7 @@
/** /**
* Simple HTTP Login * Simple HTTP Login
*/ */
function api_login(&$a){ function api_login(&$a){
// login with oauth // login with oauth
try{ try{
@ -56,7 +57,7 @@
if (!isset($_SERVER['PHP_AUTH_USER'])) { if (!isset($_SERVER['PHP_AUTH_USER'])) {
logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG); logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendika"'); header('WWW-Authenticate: Basic realm="Friendica"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
die('This api requires login'); die('This api requires login');
} }
@ -454,7 +455,10 @@
// TODO - media uploads // TODO - media uploads
function api_statuses_update(&$a, $type) { function api_statuses_update(&$a, $type) {
if (local_user()===false) return false; if (local_user()===false) {
logger('api_statuses_update: no user');
return false;
}
$user_info = api_get_user($a); $user_info = api_get_user($a);
// convert $_POST array items to the form we use for web posts. // convert $_POST array items to the form we use for web posts.
@ -477,30 +481,30 @@
$purifier = new HTMLPurifier($config); $purifier = new HTMLPurifier($config);
$txt = $purifier->purify($txt); $txt = $purifier->purify($txt);
$_POST['body'] = html2bbcode($txt); $_REQUEST['body'] = html2bbcode($txt);
} }
} }
else else
$_POST['body'] = urldecode(requestdata('status')); $_REQUEST['body'] = urldecode(requestdata('status'));
$parent = requestdata('in_reply_to_status_id'); $parent = requestdata('in_reply_to_status_id');
if(ctype_digit($parent)) if(ctype_digit($parent))
$_POST['parent'] = $parent; $_REQUEST['parent'] = $parent;
else else
$_POST['parent_uri'] = $parent; $_REQUEST['parent_uri'] = $parent;
if(requestdata('lat') && requestdata('long')) if(requestdata('lat') && requestdata('long'))
$_POST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
$_POST['profile_uid'] = local_user(); $_REQUEST['profile_uid'] = local_user();
if(requestdata('parent')) if(requestdata('parent'))
$_POST['type'] = 'net-comment'; $_REQUEST['type'] = 'net-comment';
else else
$_POST['type'] = 'wall'; $_REQUEST['type'] = 'wall';
// set this so that the item_post() function is quiet and doesn't redirect or emit json // set this so that the item_post() function is quiet and doesn't redirect or emit json
$_POST['api_source'] = true; $_REQUEST['api_source'] = true;
// call out normal post function // call out normal post function

2
mod/item.php
View File

@ -38,7 +38,7 @@ function item_post(&$a) {
call_hooks('post_local_start', $_REQUEST); call_hooks('post_local_start', $_REQUEST);
// logger('postinput ' . file_get_contents('php://input')); // logger('postinput ' . file_get_contents('php://input'));
logger('postvars' . print_r($_REQUEST,true), LOGGER_DATA); logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false); $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');