X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fapi.php;h=f8197521672264a8ed8d7ae5e06aa7e89bc1071b;hb=cc256aaa67a2fe009f818874a79901d921085905;hp=707e4ac21a421ee75260fc4bb950e43c7727c8af;hpb=2b10e359fea9d6aabc5ab35557954a503bea730b;p=quix0rs-gnu-social.git
diff --git a/lib/api.php b/lib/api.php
index 707e4ac21a..f819752167 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -53,6 +53,9 @@ if (!defined('STATUSNET')) {
class ApiAction extends Action
{
+ const READ_ONLY = 1;
+ const READ_WRITE = 2;
+
var $format = null;
var $user = null;
var $auth_user = null;
@@ -62,6 +65,8 @@ class ApiAction extends Action
var $since_id = null;
var $since = null;
+ var $access = self::READ_ONLY; // read (default) or read-write
+
/**
* Initialization.
*
@@ -293,7 +298,7 @@ class ApiAction extends Action
}
}
- if ($include_user) {
+ if ($include_user && $profile) {
# Don't get notice (recursive!)
$twitter_user = $this->twitterUserArray($profile, false);
$twitter_status['user'] = $twitter_user;
@@ -1244,10 +1249,27 @@ class ApiAction extends Action
case 'api':
break;
default:
+
+ $name = null;
+ $url = null;
+
$ns = Notice_source::staticGet($source);
+
if ($ns) {
- $source_name = '' . $ns->name . '';
+ $name = $ns->name;
+ $url = $ns->url;
+ } else {
+ $app = Oauth_application::staticGet('name', $source);
+ if ($app) {
+ $name = $app->name;
+ $url = $app->source_url;
+ }
}
+
+ if (!empty($name) && !empty($url)) {
+ $source_name = '' . $name . '';
+ }
+
break;
}
return $source_name;