Naming stuff GNUsocial rather than StatusNet
This commit is contained in:
Mikael Nordfeldth
parent
019b8880f5
commit
9be368006c
|
|
@ -20,33 +20,31 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @category API
|
||||
* @package StatusNet
|
||||
* @package GNUsocial
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @author Zach Copley <zach@status.net>
|
||||
* @copyright 2009 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
* @link http://www.gnu.org/software/social/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET')) {
|
||||
exit(1);
|
||||
}
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* Gives a full dump of configuration variables for this instance
|
||||
* of StatusNet, minus variables that may be security-sensitive (like
|
||||
* of GNU social, minus variables that may be security-sensitive (like
|
||||
* passwords).
|
||||
* URL: http://identi.ca/api/statusnet/config.(xml|json)
|
||||
* URL: https://example.com/api/gnusocial/config.(xml|json)
|
||||
* Formats: xml, json
|
||||
*
|
||||
* @category API
|
||||
* @package StatusNet
|
||||
* @package GNUsocial
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @author Zach Copley <zach@status.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
* @link http://www.gnu.org/software/social/
|
||||
*/
|
||||
class ApiStatusnetConfigAction extends ApiAction
|
||||
class ApiGNUsocialConfigAction extends ApiAction
|
||||
{
|
||||
var $keys = array(
|
||||
'site' => array('name', 'server', 'theme', 'path', 'logo', 'fancy', 'language',
|
||||
|
|
@ -64,29 +62,9 @@ class ApiStatusnetConfigAction extends ApiAction
|
|||
'url' => array('maxurllength', 'maxnoticelength'),
|
||||
);
|
||||
|
||||
/**
|
||||
* Take arguments for running
|
||||
*
|
||||
* @param array $args $_REQUEST args
|
||||
*
|
||||
* @return boolean success flag
|
||||
*/
|
||||
function prepare($args)
|
||||
protected function handle()
|
||||
{
|
||||
parent::prepare($args);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle the request
|
||||
*
|
||||
* @param array $args $_REQUEST data (unused)
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
parent::handle();
|
||||
|
||||
switch ($this->format) {
|
||||
case 'xml':
|
||||
|
|
@ -20,57 +20,34 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @category API
|
||||
* @package StatusNet
|
||||
* @package GNUsocial
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @author Zach Copley <zach@status.net>
|
||||
* @copyright 2009 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
* @link http://www.gnu.org/software/social/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET')) {
|
||||
exit(1);
|
||||
}
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* Returns a version number for this version of StatusNet, which
|
||||
* Returns a version number for this version of GNU social, which
|
||||
* should make things a bit easier for upgrades.
|
||||
* URL: http://identi.ca/api/statusnet/version.(xml|json)
|
||||
* Formats: xml, js
|
||||
*
|
||||
* @category API
|
||||
* @package StatusNet
|
||||
* @package GNUsocial
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @author Zach Copley <zach@status.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
* @link http://www.gnu.org/software/social/
|
||||
*/
|
||||
class ApiStatusnetVersionAction extends ApiPrivateAuthAction
|
||||
class ApiGNUsocialVersionAction extends ApiPrivateAuthAction
|
||||
{
|
||||
/**
|
||||
* Take arguments for running
|
||||
*
|
||||
* @param array $args $_REQUEST args
|
||||
*
|
||||
* @return boolean success flag
|
||||
*
|
||||
*/
|
||||
function prepare($args)
|
||||
protected function handle()
|
||||
{
|
||||
parent::prepare($args);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle the request
|
||||
*
|
||||
* @param array $args $_REQUEST data (unused)
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
parent::handle();
|
||||
|
||||
switch ($this->format) {
|
||||
case 'xml':
|
||||
|
|
@ -113,8 +113,7 @@ class ApiAuthAction extends ApiAction
|
|||
// TRANS: Client error 401.
|
||||
$msg = _('API resource requires read-write access, ' .
|
||||
'but you only have read access.');
|
||||
$this->clientError($msg, 401, $this->format);
|
||||
exit;
|
||||
$this->clientError($msg, 401);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -242,8 +241,7 @@ class ApiAuthAction extends ApiAction
|
|||
} catch (OAuthException $e) {
|
||||
$this->logAuthFailure($e->getMessage());
|
||||
common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage());
|
||||
$this->clientError($e->getMessage(), 401, $this->format);
|
||||
exit;
|
||||
$this->clientError($e->getMessage(), 401);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -252,7 +250,7 @@ class ApiAuthAction extends ApiAction
|
|||
*
|
||||
* @return boolean true
|
||||
*/
|
||||
function requiresAuth()
|
||||
public function requiresAuth()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
@ -278,8 +276,7 @@ class ApiAuthAction extends ApiAction
|
|||
|
||||
// show error if the user clicks 'cancel'
|
||||
// TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
|
||||
$this->clientError(_('Could not authenticate you.'), 401, $this->format);
|
||||
exit;
|
||||
$this->clientError(_('Could not authenticate you.'), 401);
|
||||
|
||||
} else {
|
||||
|
||||
|
|
@ -309,8 +306,7 @@ class ApiAuthAction extends ApiAction
|
|||
);
|
||||
$this->logAuthFailure($msg);
|
||||
// TRANS: Client error thrown when authentication fails.
|
||||
$this->clientError(_('Could not authenticate you.'), 401, $this->format);
|
||||
exit;
|
||||
$this->clientError(_('Could not authenticate you.'), 401);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,20 +60,6 @@ if (!defined('STATUSNET')) {
|
|||
*/
|
||||
class ApiBareAuthAction extends ApiAuthAction
|
||||
{
|
||||
/**
|
||||
* Take arguments for running
|
||||
*
|
||||
* @param array $args $_REQUEST args
|
||||
*
|
||||
* @return boolean success flag
|
||||
*
|
||||
*/
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Does this API resource require authentication?
|
||||
*
|
||||
|
|
|
|||
|
|
@ -651,21 +651,21 @@ class Router
|
|||
// statusnet
|
||||
|
||||
$m->connect('api/statusnet/version.:format',
|
||||
array('action' => 'ApiStatusnetVersion',
|
||||
array('action' => 'ApiGNUsocialVersion',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
$m->connect('api/statusnet/config.:format',
|
||||
array('action' => 'ApiStatusnetConfig',
|
||||
array('action' => 'ApiGNUsocialConfig',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
// For older methods, we provide "laconica" base action
|
||||
// For our current software name, we provide "gnusocial" base action
|
||||
|
||||
$m->connect('api/laconica/version.:format',
|
||||
array('action' => 'ApiStatusnetVersion',
|
||||
$m->connect('api/gnusocial/version.:format',
|
||||
array('action' => 'ApiGNUsocialVersion',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
$m->connect('api/laconica/config.:format',
|
||||
array('action' => 'ApiStatusnetConfig',
|
||||
$m->connect('api/gnusocial/config.:format',
|
||||
array('action' => 'ApiGNUsocialConfig',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
// Groups and tags are newer than 0.8.1 so no backward-compatibility
|
||||
|
|
|
|||
Loading…
Reference in New Issue