git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 8fac7a9f authored by mmn's avatar mmn

StatusNet class renamed GNUsocial

also added backward compatible StatusNet class for the two calls I know
third party plugins use, isHTTPS and getActivePlugins
parent f25e5e38
......@@ -70,7 +70,7 @@ class CancelsubscriptionAction extends FormAction
common_debug('Tried to cancel a non-existing pending subscription');
}
if (StatusNet::isAjax()) {
if (GNUsocial::isAjax()) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Title after unsubscribing from a group.
......
......@@ -110,7 +110,7 @@ class NewnoticeAction extends FormAction
$cmd = $inter->handle_command($user, $content);
if ($cmd) {
if (StatusNet::isAjax()) {
if (GNUsocial::isAjax()) {
$cmd->execute(new AjaxWebChannel($this));
} else {
$cmd->execute(new WebChannel($this));
......@@ -195,7 +195,7 @@ class NewnoticeAction extends FormAction
Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options));
if (!StatusNet::isAjax()) {
if (!GNUsocial::isAjax()) {
$url = common_local_url('shownotice', array('notice' => $this->stored->id));
common_redirect($url, 303);
}
......
......@@ -70,7 +70,7 @@ class ShownoticeAction extends ManagedAction
{
parent::prepare($args);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
$this->notice = $this->getNotice();
......
......@@ -325,7 +325,7 @@ class File extends Managed_DataObject
}
if (StatusNet::useHTTPS()) {
if (GNUsocial::useHTTPS()) {
$sslserver = common_config('attachments', 'sslserver');
......
......@@ -265,7 +265,7 @@ function main()
$site_ssl = common_config('site', 'ssl');
// If the request is HTTP and it should be HTTPS...
if ($site_ssl != 'never' && !StatusNet::isHTTPS() && common_is_sensitive($args['action'])) {
if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) {
common_redirect(common_local_url($args['action'], $args));
}
......
......@@ -158,8 +158,8 @@ class Action extends HTMLOutputter // lawsuit
$this->action = strtolower($this->trimmed('action'));
if ($this->ajax || $this->boolean('ajax')) {
// check with StatusNet::isAjax()
StatusNet::setAjax(true);
// check with GNUsocial::isAjax()
GNUsocial::setAjax(true);
}
if ($this->needLogin) {
......@@ -208,7 +208,7 @@ class Action extends HTMLOutputter // lawsuit
*/
function showPage()
{
if (StatusNet::isAjax()) {
if (GNUsocial::isAjax()) {
self::showAjax();
return;
}
......@@ -328,7 +328,7 @@ class Action extends HTMLOutputter // lawsuit
} else {
// favicon.ico should be HTTPS if the rest of the page is
$this->element('link', array('rel' => 'shortcut icon',
'href' => common_path('favicon.ico', StatusNet::isHTTPS())));
'href' => common_path('favicon.ico', GNUsocial::isHTTPS())));
}
if (common_config('site', 'mobile')) {
......@@ -417,7 +417,7 @@ class Action extends HTMLOutputter // lawsuit
$this->script('extlib/jquery.form.js');
$this->script('extlib/jquery-ui/jquery-ui.js');
$this->script('extlib/jquery.cookie.js');
$this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/extlib/json2.js', StatusNet::isHTTPS()).'"); }');
$this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/extlib/json2.js', GNUsocial::isHTTPS()).'"); }');
$this->script('extlib/jquery.infieldlabel.js');
Event::handle('EndShowJQueryScripts', array($this));
......@@ -640,7 +640,7 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('a', array('class' => 'home bookmark',
'href' => $url));
if (StatusNet::isHTTPS()) {
if (GNUsocial::isHTTPS()) {
$logoUrl = common_config('site', 'ssllogo');
if (empty($logoUrl)) {
// if logo is an uploaded file, try to fall back to HTTPS file URL
......@@ -1146,7 +1146,7 @@ class Action extends HTMLOutputter // lawsuit
$image = common_config('license', 'image');
$sslimage = common_config('license', 'sslimage');
if (StatusNet::isHTTPS()) {
if (GNUsocial::isHTTPS()) {
if (!empty($sslimage)) {
$url = $sslimage;
} else if (preg_match('#^http://i.creativecommons.org/#', $image)) {
......
......@@ -144,7 +144,7 @@ class ApiAction extends Action
*/
protected function prepare(array $args=array())
{
StatusNet::setApi(true); // reduce exception reports to aid in debugging
GNUsocial::setApi(true); // reduce exception reports to aid in debugging
parent::prepare($args);
$this->format = $this->arg('format');
......
......@@ -163,7 +163,7 @@ class AttachmentListItem extends Widget
case 'text/html':
if (!empty($this->attachment->filename)
&& (StatusNet::isAjax() || common_config('attachments', 'show_html'))) {
&& (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
// Locally-uploaded HTML. Scrub and display inline.
$this->showHtmlFile($this->attachment);
break;
......
......@@ -127,7 +127,7 @@ class Cache
$names = array();
foreach (StatusNet::getActivePlugins() as $plugin=>$attrs) {
foreach (GNUsocial::getActivePlugins() as $plugin=>$attrs) {
$names[] = $plugin;
}
......
......@@ -24,7 +24,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR . '/lib/framework.php';
try {
StatusNet::init(@$server, @$path, @$conffile);
GNUsocial::init(@$server, @$path, @$conffile);
} catch (NoConfigException $e) {
// XXX: Throw a conniption if database not installed
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
......
......@@ -113,7 +113,7 @@ class DocFile
$paths = array(INSTALLDIR.'/local/doc-src/',
INSTALLDIR.'/doc-src/');
$site = StatusNet::currentSite();
$site = GNUsocial::currentSite();
if (!empty($site)) {
array_unshift($paths, INSTALLDIR.'/local/doc-src/'.$site.'/');
......@@ -127,7 +127,7 @@ class DocFile
$paths = array(INSTALLDIR.'/local/mail-src/',
INSTALLDIR.'/mail-src/');
$site = StatusNet::currentSite();
$site = GNUsocial::currentSite();
if (!empty($site)) {
array_unshift($paths, INSTALLDIR.'/local/mail-src/'.$site.'/');
......
......@@ -56,7 +56,7 @@ class ErrorAction extends InfoAction
$this->code = $code;
$this->message = $message;
$this->minimal = StatusNet::isApi();
$this->minimal = GNUsocial::isApi();
// XXX: hack alert: usually we aren't going to
// call this page directly, but because it's
......@@ -66,7 +66,7 @@ class ErrorAction extends InfoAction
function showPage()
{
if (StatusNet::isAjax()) {
if (GNUsocial::isAjax()) {
$this->extraHeaders();
$this->ajaxErrorMsg();
exit();
......
......@@ -97,12 +97,12 @@ require_once(INSTALLDIR.'/lib/plugin.php');
function addPlugin($name, array $attrs=array())
{
return StatusNet::addPlugin($name, $attrs);
return GNUsocial::addPlugin($name, $attrs);
}
function _have_config()
{
return StatusNet::haveConfig();
return GNUsocial::haveConfig();
}
function GNUsocial_class_autoload($cls)
......
This diff is collapsed.
......@@ -386,11 +386,11 @@ class HTMLOutputter extends XMLOutputter
if (strpos($src, 'plugins/') === 0 || strpos($src, 'local/') === 0) {
$src = common_path($src, StatusNet::isHTTPS()) . '?version=' . GNUSOCIAL_VERSION;
$src = common_path($src, GNUsocial::isHTTPS()) . '?version=' . GNUSOCIAL_VERSION;
} else {
if (StatusNet::isHTTPS()) {
if (GNUsocial::isHTTPS()) {
$sslserver = common_config('javascript', 'sslserver');
......@@ -493,7 +493,7 @@ class HTMLOutputter extends XMLOutputter
if(file_exists(Theme::file($src,$theme))){
$src = Theme::path($src, $theme);
}else{
$src = common_path($src, StatusNet::isHTTPS());
$src = common_path($src, GNUsocial::isHTTPS());
}
$src.= '?version=' . GNUSOCIAL_VERSION;
}
......
......@@ -551,7 +551,7 @@ abstract class Installer
}
require_once INSTALLDIR . '/lib/framework.php';
StatusNet::initDefaults($this->server, $this->path);
GNUsocial::initDefaults($this->server, $this->path);
if ($this->siteProfile == "singleuser") {
// Until we use ['site']['profile']==='singleuser' everywhere
......
......@@ -196,7 +196,7 @@ class Plugin
static function staticPath($plugin, $relative)
{
$isHTTPS = StatusNet::isHTTPS();
$isHTTPS = GNUsocial::isHTTPS();
if ($isHTTPS) {
$server = common_config('plugins', 'sslserver');
......
This diff is collapsed.
......@@ -638,9 +638,9 @@ class StompQueueManager extends QueueManager
*/
function switchSite($site)
{
if ($site != StatusNet::currentSite()) {
if ($site != GNUsocial::currentSite()) {
$this->stats('switch');
StatusNet::switchSite($site);
GNUsocial::switchSite($site);
$this->initialize();
}
}
......@@ -683,7 +683,7 @@ class StompQueueManager extends QueueManager
protected function queueName($queue)
{
$group = $this->queueGroup($queue);
$site = StatusNet::currentSite();
$site = GNUsocial::currentSite();
$specs = array("$group/$queue/$site",
"$group/$queue");
......
......@@ -130,7 +130,7 @@ class Theme
*/
protected function relativeThemePath($group, $fallbackSubdir, $name)
{
if (StatusNet::isHTTPS()) {
if (GNUsocial::isHTTPS()) {
$sslserver = common_config($group, 'sslserver');
if (empty($sslserver)) {
......
......@@ -1260,7 +1260,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
$path = $r->build($action, $args, $params, $fragment);
$ssl = common_config('site', 'ssl') === 'always'
|| StatusNet::isHTTPS()
|| GNUsocial::isHTTPS()
|| common_is_sensitive($action);
if (common_config('site','fancy')) {
......@@ -1304,7 +1304,7 @@ function common_path($relative, $ssl=false, $addSession=true)
$pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
if (($ssl && (common_config('site', 'ssl') === 'sometimes'))
|| StatusNet::isHTTPS()
|| GNUsocial::isHTTPS()
|| common_config('site', 'ssl') === 'always') {
$proto = 'https';
if (is_string(common_config('site', 'sslserver')) &&
......
......@@ -92,7 +92,7 @@ class AutocompleteAction extends Action
protected function prepare(array $args=array())
{
// If we die, show short error messages.
StatusNet::setApi(true);
GNUsocial::setApi(true);
parent::prepare($args);
......
......@@ -76,7 +76,7 @@ class NewbookmarkAction extends Action
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
$this->user = common_current_user();
......
......@@ -66,7 +66,7 @@ class DomainStatusNetworkPlugin extends Plugin
}
}
$nickname = StatusNet::currentSite();
$nickname = GNUsocial::currentSite();
if (empty($nickname)) {
$this->log(LOG_WARNING, "No current site");
......@@ -212,7 +212,7 @@ class DomainStatusNetworkPlugin extends Plugin
return false;
}
StatusNet::switchSite($sn->nickname);
GNUsocial::switchSite($sn->nickname);
$user = User::getKV('email', $email);
......@@ -242,7 +242,7 @@ class DomainStatusNetworkPlugin extends Plugin
Status_network::$wildcard = $config['WILDCARD'];
}
StatusNet::switchSite($sn->nickname);
GNUsocial::switchSite($sn->nickname);
$confirm = EmailRegistrationPlugin::registerEmail($email);
......@@ -259,7 +259,7 @@ class DomainStatusNetworkPlugin extends Plugin
throw new ClientException(_("No such site."));
}
StatusNet::switchSite($sn->nickname);
GNUsocial::switchSite($sn->nickname);
$user = common_check_user($email, $password);
......@@ -294,7 +294,7 @@ class DomainStatusNetworkPlugin extends Plugin
throw new NoSuchUserException(array('email' => $email));
}
StatusNet::switchSite($sn->nickname);
GNUsocial::switchSite($sn->nickname);
$user = User::getKV('email', $email);
......
......@@ -59,7 +59,7 @@ class GlobalApiAction extends Action
function prepare($args)
{
StatusNet::setApi(true); // reduce exception reports to aid in debugging
GNUsocial::setApi(true); // reduce exception reports to aid in debugging
parent::prepare($args);
......
......@@ -212,7 +212,7 @@ class DomainStatusNetworkInstaller extends Installer
Status_network::$wildcard = $config['WILDCARD'];
StatusNet::switchSite($this->nickname);
GNUsocial::switchSite($this->nickname);
// We need to initialize the schema_version stuff to make later setup easier
......
......@@ -95,7 +95,7 @@ if (have_option('u', 'universe')) {
while ($sn->fetch()) {
try {
$server = $sn->getServerName();
StatusNet::init($server);
GNUsocial::init($server);
// Different queue manager, maybe!
$qm = QueueManager::get();
foreach ($reminders as $reminder) {
......
......@@ -40,7 +40,7 @@ if (have_option('u', 'universe')) {
if ($sn->find()) {
while ($sn->fetch()) {
$server = $sn->getServerName();
StatusNet::init($server);
GNUsocial::init($server);
// Different queue manager, maybe!
$qm = QueueManager::get();
$qm->enqueue(1, 'sitesum');
......
......@@ -72,7 +72,7 @@ class CancelrsvpAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true); // short error results!
GNUsocial::setApi(true); // short error results!
}
$rsvpId = $this->trimmed('rsvp');
......
......@@ -72,7 +72,7 @@ class NewrsvpAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true); // short error results!
GNUsocial::setApi(true); // short error results!
}
$eventId = $this->trimmed('event');
......
......@@ -74,7 +74,7 @@ class DisfavorAction extends FormAction
$this->serverError(_('Could not delete favorite.'));
}
Fave::blowCacheForProfileId($this->scoped->id);
if (StatusNet::isAjax()) {
if (GNUsocial::isAjax()) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Title for page on which favorites can be added.
......
......@@ -49,7 +49,7 @@ class OembedproxyAction extends OembedAction
function handle($args)
{
// Trigger short error responses; not a human-readable web page.
StatusNet::setApi(true);
GNUsocial::setApi(true);
// We're not a general oEmbed proxy service; limit to valid sessions.
$token = $this->trimmed('token');
......
......@@ -102,7 +102,7 @@ class MapstractionPlugin extends Plugin
urlencode($this->apikey)));
break;
case 'microsoft':
$action->script((StatusNet::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
$action->script((GNUsocial::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
break;
case 'openlayers':
// Use our included stripped & minified OpenLayers.
......
......@@ -30,7 +30,7 @@ class PushCallbackAction extends Action
{
protected function handle()
{
StatusNet::setApi(true); // Minimize error messages to aid in debugging
GNUsocial::setApi(true); // Minimize error messages to aid in debugging
parent::handle();
if ($this->isPost()) {
return $this->handlePost();
......
......@@ -49,7 +49,7 @@ class PushHubAction extends Action
protected function prepare(array $args=array())
{
StatusNet::setApi(true); // reduce exception reports to aid in debugging
GNUsocial::setApi(true); // reduce exception reports to aid in debugging
return parent::prepare($args);
}
......
......@@ -37,7 +37,7 @@ class SalmonAction extends Action
protected function prepare(array $args=array())
{
StatusNet::setApi(true); // Send smaller error pages
GNUsocial::setApi(true); // Send smaller error pages
parent::prepare($args);
......
......@@ -182,7 +182,7 @@ class OembedPlugin extends Plugin
case 'video':
case 'link':
if (!empty($oembed->html)
&& (StatusNet::isAjax() || common_config('attachments', 'show_html'))) {
&& (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
$config = array(
'safe'=>1,
......
......@@ -125,7 +125,7 @@ class NewPollAction extends Action
function newPoll()
{
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
try {
if (empty($this->question)) {
......
......@@ -74,7 +74,7 @@ class RespondPollAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
$this->user = common_current_user();
......
......@@ -74,7 +74,7 @@ class QnaclosequestionAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
$this->user = common_current_user();
......
......@@ -74,7 +74,7 @@ class QnanewanswerAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
common_debug("in qnanewanswer");
$this->user = common_current_user();
......
......@@ -121,7 +121,7 @@ class QnanewquestionAction extends Action
function newQuestion()
{
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
try {
if (empty($this->title)) {
......
......@@ -73,7 +73,7 @@ class QnareviseanswerAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
$this->user = common_current_user();
......
......@@ -74,7 +74,7 @@ class Qnavote extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
$this->user = common_current_user();
......
......@@ -62,7 +62,7 @@ if (have_option('u', 'universe')) {
if ($sn->find()) {
while ($sn->fetch()) {
$server = $sn->getServerName();
StatusNet::init($server);
GNUsocial::init($server);
cleanupChannels();
}
}
......
......@@ -71,7 +71,7 @@ class RecaptchaPlugin extends Plugin
{
if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
// Load the AJAX API
if (StatusNet::isHTTPS()) {
if (GNUsocial::isHTTPS()) {
$url = "https://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
} else {
$url = "http://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
......
......@@ -67,7 +67,7 @@ class SearchsubAction extends Action
{
parent::prepare($args);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
// Only allow POST requests
......
......@@ -67,7 +67,7 @@ class TagsubAction extends Action
{
parent::prepare($args);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
GNUsocial::setApi(true);
}
// Only allow POST requests
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment