diff options
| author | friendica <info@friendica.com> | 2012-01-15 13:57:00 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-15 13:57:00 -0800 |
| commit | e12341b71654d26aa17101229176d5aa8b67a001 (patch) | |
| tree | 7749896d0b002caddfdb7bf54d91cba59fe117f9 | |
| parent | a1dc3185be63f174b53692e6a79492717c561c76 (diff) | |
| download | volse-hubzilla-e12341b71654d26aa17101229176d5aa8b67a001.tar.gz volse-hubzilla-e12341b71654d26aa17101229176d5aa8b67a001.tar.bz2 volse-hubzilla-e12341b71654d26aa17101229176d5aa8b67a001.zip | |
api post broken with recent change to use REQUEST vars in mod_item
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/api.php | 26 | ||||
| -rw-r--r-- | mod/item.php | 2 |
3 files changed, 17 insertions, 13 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1224' ); +define ( 'FRIENDICA_VERSION', '2.3.1227' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1115 ); diff --git a/include/api.php b/include/api.php index aa05f0ad5..08b28265c 100644 --- a/include/api.php +++ b/include/api.php @@ -26,6 +26,7 @@ /** * Simple HTTP Login */ + function api_login(&$a){ // login with oauth try{ @@ -56,7 +57,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { 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'); die('This api requires login'); } @@ -454,7 +455,10 @@ // TODO - media uploads 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); // convert $_POST array items to the form we use for web posts. @@ -477,30 +481,30 @@ $purifier = new HTMLPurifier($config); $txt = $purifier->purify($txt); - $_POST['body'] = html2bbcode($txt); + $_REQUEST['body'] = html2bbcode($txt); } } else - $_POST['body'] = urldecode(requestdata('status')); + $_REQUEST['body'] = urldecode(requestdata('status')); $parent = requestdata('in_reply_to_status_id'); if(ctype_digit($parent)) - $_POST['parent'] = $parent; + $_REQUEST['parent'] = $parent; else - $_POST['parent_uri'] = $parent; + $_REQUEST['parent_uri'] = $parent; if(requestdata('lat') && requestdata('long')) - $_POST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); - $_POST['profile_uid'] = local_user(); + $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); + $_REQUEST['profile_uid'] = local_user(); if(requestdata('parent')) - $_POST['type'] = 'net-comment'; + $_REQUEST['type'] = 'net-comment'; else - $_POST['type'] = 'wall'; + $_REQUEST['type'] = 'wall'; // 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 diff --git a/mod/item.php b/mod/item.php index b5db29db0..f7eb0961c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -38,7 +38,7 @@ function item_post(&$a) { call_hooks('post_local_start', $_REQUEST); // 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); $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); |