diff options
| author | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
| commit | 051346325609f5f2e78ef0deaf182c65d7823bbc (patch) | |
| tree | f3660377b3daf6599623d2e4fb95b4d33c30d8cc /include/api.php | |
| parent | 53a796afcc0cff6f9e3f51457df4506a43db1945 (diff) | |
| parent | 8a9d743f6f518d3af35014130dcef8f148148113 (diff) | |
| download | volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.gz volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.bz2 volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.zip | |
Merge pull request #9 from redmatrix/master
updating from original codebase
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/api.php b/include/api.php index 24176884c..e60583a01 100644 --- a/include/api.php +++ b/include/api.php @@ -9,6 +9,7 @@ require_once('include/security.php'); require_once('include/photos.php'); require_once('include/items.php'); require_once('include/attach.php'); +require_once('include/api_auth.php'); /* * @@ -381,7 +382,6 @@ require_once('include/attach.php'); function api_item_get_user(&$a, $item) { - global $usercache; // The author is our direct contact, in a conversation with us. @@ -395,11 +395,11 @@ require_once('include/attach.php'); $name = $item['author']['xchan_name']; // Generating a random ID - if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache)) - $usercache[$nick] = mt_rand(2000000, 2100000); + if (! $nick) + $nick = mt_rand(2000000, 2100000); $ret = array( - 'id' => $usercache[$nick], + 'id' => $nick, 'name' => $name, 'screen_name' => $nick, 'location' => '', //$uinfo[0]['default-location'], @@ -741,6 +741,8 @@ require_once('include/attach.php'); } $user_info = api_get_user($a); +// logger('status_with_media: ' . print_r($_REQUEST,true), LOGGER_DEBUG); + $_REQUEST['type'] = 'wall'; $_REQUEST['profile_uid'] = api_user(); $_REQUEST['api_source'] = true; @@ -908,7 +910,7 @@ require_once('include/attach.php'); function red_item(&$a, $type) { if (api_user() === false) { - logger('api_red_item_new: no user'); + logger('api_red_item_full: no user'); return false; } @@ -2195,7 +2197,7 @@ require_once('include/attach.php'); } } - $id = send_message($recipient['id'], $_POST['text'], $sub, $replyto); + $id = send_message(api_user(),$recipient['guid'], $_POST['text'], $sub, $replyto); if ($id>-1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); |