diff options
| author | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
| commit | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch) | |
| tree | 5c37812ef7baeadc17fce088c4394d25f75b593c /mod/api.php | |
| parent | c993ddd86ee25832e35e65333fa25b396e7aefdf (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2 volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip | |
Merge branch 'master' into pocorate
Diffstat (limited to 'mod/api.php')
| -rw-r--r-- | mod/api.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/api.php b/mod/api.php index 4fa911f14..08978ee96 100644 --- a/mod/api.php +++ b/mod/api.php @@ -22,12 +22,12 @@ function oauth_get_client($request){ function api_post(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } - if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { + if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -57,8 +57,8 @@ function api_content(&$a) { if (is_null($app)) return "Invalid request. Unknown token."; $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); - $verifier = md5($app['secret'].local_user()); - set_config("oauth", $verifier, local_user()); + $verifier = md5($app['secret'].local_channel()); + set_config("oauth", $verifier, local_channel()); if ($consumer->callback_url!=null) { @@ -84,7 +84,7 @@ function api_content(&$a) { } - if(! local_user()) { + if(! local_channel()) { //TODO: we need login form to redirect to this page notice( t('Please login to continue.') . EOL ); return login(false,'api-login',$request->get_parameters()); |