StatusNet class renamed GNUsocial
also added backward compatible StatusNet class for the two calls I know third party plugins use, isHTTPS and getActivePlugins
This commit is contained in:
parent
f25e5e3860
commit
8fac7a9f6c
@ -70,7 +70,7 @@ class CancelsubscriptionAction extends FormAction
|
|||||||
common_debug('Tried to cancel a non-existing pending subscription');
|
common_debug('Tried to cancel a non-existing pending subscription');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StatusNet::isAjax()) {
|
if (GNUsocial::isAjax()) {
|
||||||
$this->startHTML('text/xml;charset=utf-8');
|
$this->startHTML('text/xml;charset=utf-8');
|
||||||
$this->elementStart('head');
|
$this->elementStart('head');
|
||||||
// TRANS: Title after unsubscribing from a group.
|
// TRANS: Title after unsubscribing from a group.
|
||||||
|
@ -110,7 +110,7 @@ class NewnoticeAction extends FormAction
|
|||||||
$cmd = $inter->handle_command($user, $content);
|
$cmd = $inter->handle_command($user, $content);
|
||||||
|
|
||||||
if ($cmd) {
|
if ($cmd) {
|
||||||
if (StatusNet::isAjax()) {
|
if (GNUsocial::isAjax()) {
|
||||||
$cmd->execute(new AjaxWebChannel($this));
|
$cmd->execute(new AjaxWebChannel($this));
|
||||||
} else {
|
} else {
|
||||||
$cmd->execute(new WebChannel($this));
|
$cmd->execute(new WebChannel($this));
|
||||||
@ -195,7 +195,7 @@ class NewnoticeAction extends FormAction
|
|||||||
|
|
||||||
Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options));
|
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));
|
$url = common_local_url('shownotice', array('notice' => $this->stored->id));
|
||||||
common_redirect($url, 303);
|
common_redirect($url, 303);
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ class ShownoticeAction extends ManagedAction
|
|||||||
{
|
{
|
||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->notice = $this->getNotice();
|
$this->notice = $this->getNotice();
|
||||||
|
@ -325,7 +325,7 @@ class File extends Managed_DataObject
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StatusNet::useHTTPS()) {
|
if (GNUsocial::useHTTPS()) {
|
||||||
|
|
||||||
$sslserver = common_config('attachments', 'sslserver');
|
$sslserver = common_config('attachments', 'sslserver');
|
||||||
|
|
||||||
|
@ -265,7 +265,7 @@ function main()
|
|||||||
$site_ssl = common_config('site', 'ssl');
|
$site_ssl = common_config('site', 'ssl');
|
||||||
|
|
||||||
// If the request is HTTP and it should be HTTPS...
|
// 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));
|
common_redirect(common_local_url($args['action'], $args));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,8 +158,8 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$this->action = strtolower($this->trimmed('action'));
|
$this->action = strtolower($this->trimmed('action'));
|
||||||
|
|
||||||
if ($this->ajax || $this->boolean('ajax')) {
|
if ($this->ajax || $this->boolean('ajax')) {
|
||||||
// check with StatusNet::isAjax()
|
// check with GNUsocial::isAjax()
|
||||||
StatusNet::setAjax(true);
|
GNUsocial::setAjax(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->needLogin) {
|
if ($this->needLogin) {
|
||||||
@ -208,7 +208,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
*/
|
*/
|
||||||
function showPage()
|
function showPage()
|
||||||
{
|
{
|
||||||
if (StatusNet::isAjax()) {
|
if (GNUsocial::isAjax()) {
|
||||||
self::showAjax();
|
self::showAjax();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -328,7 +328,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
} else {
|
} else {
|
||||||
// favicon.ico should be HTTPS if the rest of the page is
|
// favicon.ico should be HTTPS if the rest of the page is
|
||||||
$this->element('link', array('rel' => 'shortcut icon',
|
$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')) {
|
if (common_config('site', 'mobile')) {
|
||||||
@ -417,7 +417,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$this->script('extlib/jquery.form.js');
|
$this->script('extlib/jquery.form.js');
|
||||||
$this->script('extlib/jquery-ui/jquery-ui.js');
|
$this->script('extlib/jquery-ui/jquery-ui.js');
|
||||||
$this->script('extlib/jquery.cookie.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');
|
$this->script('extlib/jquery.infieldlabel.js');
|
||||||
|
|
||||||
Event::handle('EndShowJQueryScripts', array($this));
|
Event::handle('EndShowJQueryScripts', array($this));
|
||||||
@ -640,7 +640,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
$this->elementStart('a', array('class' => 'home bookmark',
|
$this->elementStart('a', array('class' => 'home bookmark',
|
||||||
'href' => $url));
|
'href' => $url));
|
||||||
|
|
||||||
if (StatusNet::isHTTPS()) {
|
if (GNUsocial::isHTTPS()) {
|
||||||
$logoUrl = common_config('site', 'ssllogo');
|
$logoUrl = common_config('site', 'ssllogo');
|
||||||
if (empty($logoUrl)) {
|
if (empty($logoUrl)) {
|
||||||
// if logo is an uploaded file, try to fall back to HTTPS file URL
|
// 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');
|
$image = common_config('license', 'image');
|
||||||
$sslimage = common_config('license', 'sslimage');
|
$sslimage = common_config('license', 'sslimage');
|
||||||
|
|
||||||
if (StatusNet::isHTTPS()) {
|
if (GNUsocial::isHTTPS()) {
|
||||||
if (!empty($sslimage)) {
|
if (!empty($sslimage)) {
|
||||||
$url = $sslimage;
|
$url = $sslimage;
|
||||||
} else if (preg_match('#^http://i.creativecommons.org/#', $image)) {
|
} else if (preg_match('#^http://i.creativecommons.org/#', $image)) {
|
||||||
|
@ -144,7 +144,7 @@ class ApiAction extends Action
|
|||||||
*/
|
*/
|
||||||
protected function prepare(array $args=array())
|
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);
|
parent::prepare($args);
|
||||||
|
|
||||||
$this->format = $this->arg('format');
|
$this->format = $this->arg('format');
|
||||||
|
@ -163,7 +163,7 @@ class AttachmentListItem extends Widget
|
|||||||
|
|
||||||
case 'text/html':
|
case 'text/html':
|
||||||
if (!empty($this->attachment->filename)
|
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.
|
// Locally-uploaded HTML. Scrub and display inline.
|
||||||
$this->showHtmlFile($this->attachment);
|
$this->showHtmlFile($this->attachment);
|
||||||
break;
|
break;
|
||||||
|
@ -127,7 +127,7 @@ class Cache
|
|||||||
|
|
||||||
$names = array();
|
$names = array();
|
||||||
|
|
||||||
foreach (StatusNet::getActivePlugins() as $plugin=>$attrs) {
|
foreach (GNUsocial::getActivePlugins() as $plugin=>$attrs) {
|
||||||
$names[] = $plugin;
|
$names[] = $plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
|||||||
require_once INSTALLDIR . '/lib/framework.php';
|
require_once INSTALLDIR . '/lib/framework.php';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
StatusNet::init(@$server, @$path, @$conffile);
|
GNUsocial::init(@$server, @$path, @$conffile);
|
||||||
} catch (NoConfigException $e) {
|
} catch (NoConfigException $e) {
|
||||||
// XXX: Throw a conniption if database not installed
|
// XXX: Throw a conniption if database not installed
|
||||||
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
|
// 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/',
|
$paths = array(INSTALLDIR.'/local/doc-src/',
|
||||||
INSTALLDIR.'/doc-src/');
|
INSTALLDIR.'/doc-src/');
|
||||||
|
|
||||||
$site = StatusNet::currentSite();
|
$site = GNUsocial::currentSite();
|
||||||
|
|
||||||
if (!empty($site)) {
|
if (!empty($site)) {
|
||||||
array_unshift($paths, INSTALLDIR.'/local/doc-src/'.$site.'/');
|
array_unshift($paths, INSTALLDIR.'/local/doc-src/'.$site.'/');
|
||||||
@ -127,7 +127,7 @@ class DocFile
|
|||||||
$paths = array(INSTALLDIR.'/local/mail-src/',
|
$paths = array(INSTALLDIR.'/local/mail-src/',
|
||||||
INSTALLDIR.'/mail-src/');
|
INSTALLDIR.'/mail-src/');
|
||||||
|
|
||||||
$site = StatusNet::currentSite();
|
$site = GNUsocial::currentSite();
|
||||||
|
|
||||||
if (!empty($site)) {
|
if (!empty($site)) {
|
||||||
array_unshift($paths, INSTALLDIR.'/local/mail-src/'.$site.'/');
|
array_unshift($paths, INSTALLDIR.'/local/mail-src/'.$site.'/');
|
||||||
|
@ -56,7 +56,7 @@ class ErrorAction extends InfoAction
|
|||||||
|
|
||||||
$this->code = $code;
|
$this->code = $code;
|
||||||
$this->message = $message;
|
$this->message = $message;
|
||||||
$this->minimal = StatusNet::isApi();
|
$this->minimal = GNUsocial::isApi();
|
||||||
|
|
||||||
// XXX: hack alert: usually we aren't going to
|
// XXX: hack alert: usually we aren't going to
|
||||||
// call this page directly, but because it's
|
// call this page directly, but because it's
|
||||||
@ -66,7 +66,7 @@ class ErrorAction extends InfoAction
|
|||||||
|
|
||||||
function showPage()
|
function showPage()
|
||||||
{
|
{
|
||||||
if (StatusNet::isAjax()) {
|
if (GNUsocial::isAjax()) {
|
||||||
$this->extraHeaders();
|
$this->extraHeaders();
|
||||||
$this->ajaxErrorMsg();
|
$this->ajaxErrorMsg();
|
||||||
exit();
|
exit();
|
||||||
|
@ -97,12 +97,12 @@ require_once(INSTALLDIR.'/lib/plugin.php');
|
|||||||
|
|
||||||
function addPlugin($name, array $attrs=array())
|
function addPlugin($name, array $attrs=array())
|
||||||
{
|
{
|
||||||
return StatusNet::addPlugin($name, $attrs);
|
return GNUsocial::addPlugin($name, $attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
function _have_config()
|
function _have_config()
|
||||||
{
|
{
|
||||||
return StatusNet::haveConfig();
|
return GNUsocial::haveConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
function GNUsocial_class_autoload($cls)
|
function GNUsocial_class_autoload($cls)
|
||||||
|
449
lib/gnusocial.php
Normal file
449
lib/gnusocial.php
Normal file
@ -0,0 +1,449 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* StatusNet - the distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2009-2010 StatusNet, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
|
|
||||||
|
global $config, $_server, $_path;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Global configuration setup and management.
|
||||||
|
*/
|
||||||
|
class GNUsocial
|
||||||
|
{
|
||||||
|
protected static $have_config;
|
||||||
|
protected static $is_api;
|
||||||
|
protected static $is_ajax;
|
||||||
|
protected static $plugins = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure and instantiate a plugin into the current configuration.
|
||||||
|
* Class definitions will be loaded from standard paths if necessary.
|
||||||
|
* Note that initialization events won't be fired until later.
|
||||||
|
*
|
||||||
|
* @param string $name class name & plugin file/subdir name
|
||||||
|
* @param array $attrs key/value pairs of public attributes to set on plugin instance
|
||||||
|
*
|
||||||
|
* @throws ServerException if plugin can't be found
|
||||||
|
*/
|
||||||
|
public static function addPlugin($name, array $attrs=array())
|
||||||
|
{
|
||||||
|
$name = ucfirst($name);
|
||||||
|
|
||||||
|
if (isset(self::$plugins[$name])) {
|
||||||
|
// We have already loaded this plugin. Don't try to
|
||||||
|
// do it again with (possibly) different values.
|
||||||
|
// Försten till kvarn får mala.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$pluginclass = "{$name}Plugin";
|
||||||
|
|
||||||
|
if (!class_exists($pluginclass)) {
|
||||||
|
|
||||||
|
$files = array("local/plugins/{$pluginclass}.php",
|
||||||
|
"local/plugins/{$name}/{$pluginclass}.php",
|
||||||
|
"local/{$pluginclass}.php",
|
||||||
|
"local/{$name}/{$pluginclass}.php",
|
||||||
|
"plugins/{$pluginclass}.php",
|
||||||
|
"plugins/{$name}/{$pluginclass}.php");
|
||||||
|
|
||||||
|
foreach ($files as $file) {
|
||||||
|
$fullpath = INSTALLDIR.'/'.$file;
|
||||||
|
if (@file_exists($fullpath)) {
|
||||||
|
include_once($fullpath);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!class_exists($pluginclass)) {
|
||||||
|
throw new ServerException("Plugin $name not found.", 500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Doesn't this $inst risk being garbage collected or something?
|
||||||
|
// TODO: put into a static array that makes sure $inst isn't lost.
|
||||||
|
$inst = new $pluginclass();
|
||||||
|
foreach ($attrs as $aname => $avalue) {
|
||||||
|
$inst->$aname = $avalue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Record activated plugins for later display/config dump
|
||||||
|
self::$plugins[$name] = $attrs;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function delPlugin($name)
|
||||||
|
{
|
||||||
|
// Remove our plugin if it was previously loaded
|
||||||
|
$name = ucfirst($name);
|
||||||
|
if (isset(self::$plugins[$name])) {
|
||||||
|
unset(self::$plugins[$name]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// make sure initPlugins will avoid this
|
||||||
|
common_config_set('plugins', 'disable-'.$name, true);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a list of activated plugins in this process.
|
||||||
|
* @return array of (string $name, array $args) pairs
|
||||||
|
*/
|
||||||
|
public static function getActivePlugins()
|
||||||
|
{
|
||||||
|
return self::$plugins;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize, or re-initialize, GNU social global configuration
|
||||||
|
* and plugins.
|
||||||
|
*
|
||||||
|
* If switching site configurations during script execution, be
|
||||||
|
* careful when working with leftover objects -- global settings
|
||||||
|
* affect many things and they may not behave as you expected.
|
||||||
|
*
|
||||||
|
* @param $server optional web server hostname for picking config
|
||||||
|
* @param $path optional URL path for picking config
|
||||||
|
* @param $conffile optional configuration file path
|
||||||
|
*
|
||||||
|
* @throws NoConfigException if config file can't be found
|
||||||
|
*/
|
||||||
|
public static function init($server=null, $path=null, $conffile=null)
|
||||||
|
{
|
||||||
|
Router::clear();
|
||||||
|
|
||||||
|
self::initDefaults($server, $path);
|
||||||
|
self::loadConfigFile($conffile);
|
||||||
|
|
||||||
|
$sprofile = common_config('site', 'profile');
|
||||||
|
if (!empty($sprofile)) {
|
||||||
|
self::loadSiteProfile($sprofile);
|
||||||
|
}
|
||||||
|
// Load settings from database; note we need autoload for this
|
||||||
|
Config::loadSettings();
|
||||||
|
|
||||||
|
self::initPlugins();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get identifier of the currently active site configuration
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function currentSite()
|
||||||
|
{
|
||||||
|
return common_config('site', 'nickname');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Change site configuration to site specified by nickname,
|
||||||
|
* if set up via Status_network. If not, sites other than
|
||||||
|
* the current will fail horribly.
|
||||||
|
*
|
||||||
|
* May throw exception or trigger a fatal error if the given
|
||||||
|
* site is missing or configured incorrectly.
|
||||||
|
*
|
||||||
|
* @param string $nickname
|
||||||
|
*/
|
||||||
|
public static function switchSite($nickname)
|
||||||
|
{
|
||||||
|
if ($nickname == self::currentSite()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$sn = Status_network::getKV('nickname', $nickname);
|
||||||
|
if (empty($sn)) {
|
||||||
|
return false;
|
||||||
|
throw new Exception("No such site nickname '$nickname'");
|
||||||
|
}
|
||||||
|
|
||||||
|
$server = $sn->getServerName();
|
||||||
|
self::init($server);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pull all local sites from status_network table.
|
||||||
|
*
|
||||||
|
* Behavior undefined if site is not configured via Status_network.
|
||||||
|
*
|
||||||
|
* @return array of nicknames
|
||||||
|
*/
|
||||||
|
public static function findAllSites()
|
||||||
|
{
|
||||||
|
$sites = array();
|
||||||
|
$sn = new Status_network();
|
||||||
|
$sn->find();
|
||||||
|
while ($sn->fetch()) {
|
||||||
|
$sites[] = $sn->nickname;
|
||||||
|
}
|
||||||
|
return $sites;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fire initialization events for all instantiated plugins.
|
||||||
|
*/
|
||||||
|
protected static function initPlugins()
|
||||||
|
{
|
||||||
|
// User config may have already added some of these plugins, with
|
||||||
|
// maybe configured parameters. The self::addPlugin function will
|
||||||
|
// ignore the new call if it has already been instantiated.
|
||||||
|
|
||||||
|
// Load core plugins
|
||||||
|
foreach (common_config('plugins', 'core') as $name => $params) {
|
||||||
|
call_user_func('self::addPlugin', $name, $params);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load default plugins
|
||||||
|
foreach (common_config('plugins', 'default') as $name => $params) {
|
||||||
|
$key = 'disable-' . $name;
|
||||||
|
if (common_config('plugins', $key)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: We should be able to avoid this is_null and assume $params
|
||||||
|
// is an array, since that's how it is typed in addPlugin
|
||||||
|
if (is_null($params)) {
|
||||||
|
self::addPlugin($name);
|
||||||
|
} else if (is_array($params)) {
|
||||||
|
if (count($params) == 0) {
|
||||||
|
self::addPlugin($name);
|
||||||
|
} else {
|
||||||
|
$keys = array_keys($params);
|
||||||
|
if (is_string($keys[0])) {
|
||||||
|
self::addPlugin($name, $params);
|
||||||
|
} else {
|
||||||
|
foreach ($params as $paramset) {
|
||||||
|
self::addPlugin($name, $paramset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// XXX: if plugins should check the schema at runtime, do that here.
|
||||||
|
if (common_config('db', 'schemacheck') == 'runtime') {
|
||||||
|
Event::handle('CheckSchema');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Give plugins a chance to initialize in a fully-prepared environment
|
||||||
|
Event::handle('InitializePlugin');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Quick-check if configuration has been established.
|
||||||
|
* Useful for functions which may get used partway through
|
||||||
|
* initialization to back off from fancier things.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public static function haveConfig()
|
||||||
|
{
|
||||||
|
return self::$have_config;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isApi()
|
||||||
|
{
|
||||||
|
return self::$is_api;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function setApi($mode)
|
||||||
|
{
|
||||||
|
self::$is_api = $mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isAjax()
|
||||||
|
{
|
||||||
|
return self::$is_ajax;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function setAjax($mode)
|
||||||
|
{
|
||||||
|
self::$is_ajax = $mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build default configuration array
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected static function defaultConfig()
|
||||||
|
{
|
||||||
|
global $_server, $_path;
|
||||||
|
require(INSTALLDIR.'/lib/default.php');
|
||||||
|
return $default;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Establish default configuration based on given or default server and path
|
||||||
|
* Sets global $_server, $_path, and $config
|
||||||
|
*/
|
||||||
|
public static function initDefaults($server, $path)
|
||||||
|
{
|
||||||
|
global $_server, $_path, $config, $_PEAR;
|
||||||
|
|
||||||
|
Event::clearHandlers();
|
||||||
|
self::$plugins = array();
|
||||||
|
|
||||||
|
// try to figure out where we are. $server and $path
|
||||||
|
// can be set by including module, else we guess based
|
||||||
|
// on HTTP info.
|
||||||
|
|
||||||
|
if (isset($server)) {
|
||||||
|
$_server = $server;
|
||||||
|
} else {
|
||||||
|
$_server = array_key_exists('SERVER_NAME', $_SERVER) ?
|
||||||
|
strtolower($_SERVER['SERVER_NAME']) :
|
||||||
|
null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($path)) {
|
||||||
|
$_path = $path;
|
||||||
|
} else {
|
||||||
|
$_path = (array_key_exists('SERVER_NAME', $_SERVER) && array_key_exists('SCRIPT_NAME', $_SERVER)) ?
|
||||||
|
self::_sn_to_path($_SERVER['SCRIPT_NAME']) :
|
||||||
|
null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set config values initially to default values
|
||||||
|
$default = self::defaultConfig();
|
||||||
|
$config = $default;
|
||||||
|
|
||||||
|
// default configuration, overwritten in config.php
|
||||||
|
// Keep DB_DataObject's db config synced to ours...
|
||||||
|
|
||||||
|
$config['db'] = &$_PEAR->getStaticProperty('DB_DataObject','options');
|
||||||
|
|
||||||
|
$config['db'] = $default['db'];
|
||||||
|
|
||||||
|
if (function_exists('date_default_timezone_set')) {
|
||||||
|
/* Work internally in UTC */
|
||||||
|
date_default_timezone_set('UTC');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function loadSiteProfile($name)
|
||||||
|
{
|
||||||
|
global $config;
|
||||||
|
$settings = SiteProfile::getSettings($name);
|
||||||
|
$config = array_replace_recursive($config, $settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static function _sn_to_path($sn)
|
||||||
|
{
|
||||||
|
$past_root = substr($sn, 1);
|
||||||
|
$last_slash = strrpos($past_root, '/');
|
||||||
|
if ($last_slash > 0) {
|
||||||
|
$p = substr($past_root, 0, $last_slash);
|
||||||
|
} else {
|
||||||
|
$p = '';
|
||||||
|
}
|
||||||
|
return $p;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load the default or specified configuration file.
|
||||||
|
* Modifies global $config and may establish plugins.
|
||||||
|
*
|
||||||
|
* @throws NoConfigException
|
||||||
|
*/
|
||||||
|
protected static function loadConfigFile($conffile=null)
|
||||||
|
{
|
||||||
|
global $_server, $_path, $config;
|
||||||
|
|
||||||
|
// From most general to most specific:
|
||||||
|
// server-wide, then vhost-wide, then for a path,
|
||||||
|
// finally for a dir (usually only need one of the last two).
|
||||||
|
|
||||||
|
if (isset($conffile)) {
|
||||||
|
$config_files = array($conffile);
|
||||||
|
} else {
|
||||||
|
$config_files = array('/etc/statusnet/statusnet.php',
|
||||||
|
'/etc/statusnet/laconica.php',
|
||||||
|
'/etc/laconica/laconica.php',
|
||||||
|
'/etc/statusnet/'.$_server.'.php',
|
||||||
|
'/etc/laconica/'.$_server.'.php');
|
||||||
|
|
||||||
|
if (strlen($_path) > 0) {
|
||||||
|
$config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
|
||||||
|
$config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
|
||||||
|
}
|
||||||
|
|
||||||
|
$config_files[] = INSTALLDIR.'/config.php';
|
||||||
|
}
|
||||||
|
|
||||||
|
self::$have_config = false;
|
||||||
|
|
||||||
|
foreach ($config_files as $_config_file) {
|
||||||
|
if (@file_exists($_config_file)) {
|
||||||
|
// Ignore 0-byte config files
|
||||||
|
if (filesize($_config_file) > 0) {
|
||||||
|
common_log(LOG_INFO, "Including config file: " . $_config_file);
|
||||||
|
include($_config_file);
|
||||||
|
self::$have_config = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!self::$have_config) {
|
||||||
|
throw new NoConfigException("No configuration file found.",
|
||||||
|
$config_files);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for database server; must exist!
|
||||||
|
|
||||||
|
if (empty($config['db']['database'])) {
|
||||||
|
throw new ServerException("No database server for this site.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Are we running from the web with HTTPS?
|
||||||
|
*
|
||||||
|
* @return boolean true if we're running with HTTPS; else false
|
||||||
|
*/
|
||||||
|
|
||||||
|
static function isHTTPS()
|
||||||
|
{
|
||||||
|
// There are some exceptions to this; add them here!
|
||||||
|
if (empty($_SERVER['HTTPS'])) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If it is _not_ "off", it is on, so "true".
|
||||||
|
return strtolower($_SERVER['HTTPS']) !== 'off';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Can we use HTTPS? Then do! Only return false if it's not configured ("never").
|
||||||
|
*/
|
||||||
|
static function useHTTPS()
|
||||||
|
{
|
||||||
|
return self::isHTTPS() || common_config('site', 'ssl') != 'never';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class NoConfigException extends Exception
|
||||||
|
{
|
||||||
|
public $configFiles;
|
||||||
|
|
||||||
|
function __construct($msg, $configFiles) {
|
||||||
|
parent::__construct($msg);
|
||||||
|
$this->configFiles = $configFiles;
|
||||||
|
}
|
||||||
|
}
|
@ -386,11 +386,11 @@ class HTMLOutputter extends XMLOutputter
|
|||||||
|
|
||||||
if (strpos($src, 'plugins/') === 0 || strpos($src, 'local/') === 0) {
|
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 {
|
} else {
|
||||||
|
|
||||||
if (StatusNet::isHTTPS()) {
|
if (GNUsocial::isHTTPS()) {
|
||||||
|
|
||||||
$sslserver = common_config('javascript', 'sslserver');
|
$sslserver = common_config('javascript', 'sslserver');
|
||||||
|
|
||||||
@ -493,7 +493,7 @@ class HTMLOutputter extends XMLOutputter
|
|||||||
if(file_exists(Theme::file($src,$theme))){
|
if(file_exists(Theme::file($src,$theme))){
|
||||||
$src = Theme::path($src, $theme);
|
$src = Theme::path($src, $theme);
|
||||||
}else{
|
}else{
|
||||||
$src = common_path($src, StatusNet::isHTTPS());
|
$src = common_path($src, GNUsocial::isHTTPS());
|
||||||
}
|
}
|
||||||
$src.= '?version=' . GNUSOCIAL_VERSION;
|
$src.= '?version=' . GNUSOCIAL_VERSION;
|
||||||
}
|
}
|
||||||
|
@ -551,7 +551,7 @@ abstract class Installer
|
|||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR . '/lib/framework.php';
|
require_once INSTALLDIR . '/lib/framework.php';
|
||||||
StatusNet::initDefaults($this->server, $this->path);
|
GNUsocial::initDefaults($this->server, $this->path);
|
||||||
|
|
||||||
if ($this->siteProfile == "singleuser") {
|
if ($this->siteProfile == "singleuser") {
|
||||||
// Until we use ['site']['profile']==='singleuser' everywhere
|
// Until we use ['site']['profile']==='singleuser' everywhere
|
||||||
|
@ -196,7 +196,7 @@ class Plugin
|
|||||||
|
|
||||||
static function staticPath($plugin, $relative)
|
static function staticPath($plugin, $relative)
|
||||||
{
|
{
|
||||||
$isHTTPS = StatusNet::isHTTPS();
|
$isHTTPS = GNUsocial::isHTTPS();
|
||||||
|
|
||||||
if ($isHTTPS) {
|
if ($isHTTPS) {
|
||||||
$server = common_config('plugins', 'sslserver');
|
$server = common_config('plugins', 'sslserver');
|
||||||
|
@ -1,451 +1,20 @@
|
|||||||
<?php
|
<?php
|
||||||
/**
|
|
||||||
* StatusNet - the distributed open-source microblogging tool
|
|
||||||
* Copyright (C) 2009-2010 StatusNet, Inc.
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
global $config, $_server, $_path;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Global configuration setup and management.
|
* Backwards compatible class for plugins for GNU social <1.2
|
||||||
|
* and thus only have the class StatusNet defined.
|
||||||
*/
|
*/
|
||||||
class StatusNet
|
class StatusNet
|
||||||
{
|
{
|
||||||
protected static $have_config;
|
|
||||||
protected static $is_api;
|
|
||||||
protected static $is_ajax;
|
|
||||||
protected static $plugins = array();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure and instantiate a plugin into the current configuration.
|
|
||||||
* Class definitions will be loaded from standard paths if necessary.
|
|
||||||
* Note that initialization events won't be fired until later.
|
|
||||||
*
|
|
||||||
* @param string $name class name & plugin file/subdir name
|
|
||||||
* @param array $attrs key/value pairs of public attributes to set on plugin instance
|
|
||||||
*
|
|
||||||
* @throws ServerException if plugin can't be found
|
|
||||||
*/
|
|
||||||
public static function addPlugin($name, array $attrs=array())
|
|
||||||
{
|
|
||||||
$name = ucfirst($name);
|
|
||||||
|
|
||||||
if (isset(self::$plugins[$name])) {
|
|
||||||
// We have already loaded this plugin. Don't try to
|
|
||||||
// do it again with (possibly) different values.
|
|
||||||
// Försten till kvarn får mala.
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$pluginclass = "{$name}Plugin";
|
|
||||||
|
|
||||||
if (!class_exists($pluginclass)) {
|
|
||||||
|
|
||||||
$files = array("local/plugins/{$pluginclass}.php",
|
|
||||||
"local/plugins/{$name}/{$pluginclass}.php",
|
|
||||||
"local/{$pluginclass}.php",
|
|
||||||
"local/{$name}/{$pluginclass}.php",
|
|
||||||
"plugins/{$pluginclass}.php",
|
|
||||||
"plugins/{$name}/{$pluginclass}.php");
|
|
||||||
|
|
||||||
foreach ($files as $file) {
|
|
||||||
$fullpath = INSTALLDIR.'/'.$file;
|
|
||||||
if (@file_exists($fullpath)) {
|
|
||||||
include_once($fullpath);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!class_exists($pluginclass)) {
|
|
||||||
throw new ServerException("Plugin $name not found.", 500);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Doesn't this $inst risk being garbage collected or something?
|
|
||||||
// TODO: put into a static array that makes sure $inst isn't lost.
|
|
||||||
$inst = new $pluginclass();
|
|
||||||
foreach ($attrs as $aname => $avalue) {
|
|
||||||
$inst->$aname = $avalue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Record activated plugins for later display/config dump
|
|
||||||
self::$plugins[$name] = $attrs;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function delPlugin($name)
|
|
||||||
{
|
|
||||||
// Remove our plugin if it was previously loaded
|
|
||||||
$name = ucfirst($name);
|
|
||||||
if (isset(self::$plugins[$name])) {
|
|
||||||
unset(self::$plugins[$name]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// make sure initPlugins will avoid this
|
|
||||||
common_config_set('plugins', 'disable-'.$name, true);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a list of activated plugins in this process.
|
|
||||||
* @return array of (string $name, array $args) pairs
|
|
||||||
*/
|
|
||||||
public static function getActivePlugins()
|
public static function getActivePlugins()
|
||||||
{
|
{
|
||||||
return self::$plugins;
|
return GNUsocial::getActivePlugins();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public static function isHTTPS()
|
||||||
* Initialize, or re-initialize, StatusNet global configuration
|
|
||||||
* and plugins.
|
|
||||||
*
|
|
||||||
* If switching site configurations during script execution, be
|
|
||||||
* careful when working with leftover objects -- global settings
|
|
||||||
* affect many things and they may not behave as you expected.
|
|
||||||
*
|
|
||||||
* @param $server optional web server hostname for picking config
|
|
||||||
* @param $path optional URL path for picking config
|
|
||||||
* @param $conffile optional configuration file path
|
|
||||||
*
|
|
||||||
* @throws NoConfigException if config file can't be found
|
|
||||||
*/
|
|
||||||
public static function init($server=null, $path=null, $conffile=null)
|
|
||||||
{
|
{
|
||||||
Router::clear();
|
return GNUsocial::isHTTPS();
|
||||||
|
|
||||||
self::initDefaults($server, $path);
|
|
||||||
self::loadConfigFile($conffile);
|
|
||||||
|
|
||||||
$sprofile = common_config('site', 'profile');
|
|
||||||
if (!empty($sprofile)) {
|
|
||||||
self::loadSiteProfile($sprofile);
|
|
||||||
}
|
|
||||||
// Load settings from database; note we need autoload for this
|
|
||||||
Config::loadSettings();
|
|
||||||
|
|
||||||
self::initPlugins();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get identifier of the currently active site configuration
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public static function currentSite()
|
|
||||||
{
|
|
||||||
return common_config('site', 'nickname');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Change site configuration to site specified by nickname,
|
|
||||||
* if set up via Status_network. If not, sites other than
|
|
||||||
* the current will fail horribly.
|
|
||||||
*
|
|
||||||
* May throw exception or trigger a fatal error if the given
|
|
||||||
* site is missing or configured incorrectly.
|
|
||||||
*
|
|
||||||
* @param string $nickname
|
|
||||||
*/
|
|
||||||
public static function switchSite($nickname)
|
|
||||||
{
|
|
||||||
if ($nickname == StatusNet::currentSite()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$sn = Status_network::getKV('nickname', $nickname);
|
|
||||||
if (empty($sn)) {
|
|
||||||
return false;
|
|
||||||
throw new Exception("No such site nickname '$nickname'");
|
|
||||||
}
|
|
||||||
|
|
||||||
$server = $sn->getServerName();
|
|
||||||
StatusNet::init($server);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pull all local sites from status_network table.
|
|
||||||
*
|
|
||||||
* Behavior undefined if site is not configured via Status_network.
|
|
||||||
*
|
|
||||||
* @return array of nicknames
|
|
||||||
*/
|
|
||||||
public static function findAllSites()
|
|
||||||
{
|
|
||||||
$sites = array();
|
|
||||||
$sn = new Status_network();
|
|
||||||
$sn->find();
|
|
||||||
while ($sn->fetch()) {
|
|
||||||
$sites[] = $sn->nickname;
|
|
||||||
}
|
|
||||||
return $sites;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fire initialization events for all instantiated plugins.
|
|
||||||
*/
|
|
||||||
protected static function initPlugins()
|
|
||||||
{
|
|
||||||
// User config may have already added some of these plugins, with
|
|
||||||
// maybe configured parameters. The self::addPlugin function will
|
|
||||||
// ignore the new call if it has already been instantiated.
|
|
||||||
|
|
||||||
// Load core plugins
|
|
||||||
foreach (common_config('plugins', 'core') as $name => $params) {
|
|
||||||
call_user_func('self::addPlugin', $name, $params);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load default plugins
|
|
||||||
foreach (common_config('plugins', 'default') as $name => $params) {
|
|
||||||
$key = 'disable-' . $name;
|
|
||||||
if (common_config('plugins', $key)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: We should be able to avoid this is_null and assume $params
|
|
||||||
// is an array, since that's how it is typed in addPlugin
|
|
||||||
if (is_null($params)) {
|
|
||||||
self::addPlugin($name);
|
|
||||||
} else if (is_array($params)) {
|
|
||||||
if (count($params) == 0) {
|
|
||||||
self::addPlugin($name);
|
|
||||||
} else {
|
|
||||||
$keys = array_keys($params);
|
|
||||||
if (is_string($keys[0])) {
|
|
||||||
self::addPlugin($name, $params);
|
|
||||||
} else {
|
|
||||||
foreach ($params as $paramset) {
|
|
||||||
self::addPlugin($name, $paramset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// XXX: if plugins should check the schema at runtime, do that here.
|
|
||||||
if (common_config('db', 'schemacheck') == 'runtime') {
|
|
||||||
Event::handle('CheckSchema');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Give plugins a chance to initialize in a fully-prepared environment
|
|
||||||
Event::handle('InitializePlugin');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Quick-check if configuration has been established.
|
|
||||||
* Useful for functions which may get used partway through
|
|
||||||
* initialization to back off from fancier things.
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function haveConfig()
|
|
||||||
{
|
|
||||||
return self::$have_config;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function isApi()
|
|
||||||
{
|
|
||||||
return self::$is_api;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function setApi($mode)
|
|
||||||
{
|
|
||||||
self::$is_api = $mode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function isAjax()
|
|
||||||
{
|
|
||||||
return self::$is_ajax;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function setAjax($mode)
|
|
||||||
{
|
|
||||||
self::$is_ajax = $mode;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build default configuration array
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
protected static function defaultConfig()
|
|
||||||
{
|
|
||||||
global $_server, $_path;
|
|
||||||
require(INSTALLDIR.'/lib/default.php');
|
|
||||||
return $default;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Establish default configuration based on given or default server and path
|
|
||||||
* Sets global $_server, $_path, and $config
|
|
||||||
*/
|
|
||||||
public static function initDefaults($server, $path)
|
|
||||||
{
|
|
||||||
global $_server, $_path, $config, $_PEAR;
|
|
||||||
|
|
||||||
Event::clearHandlers();
|
|
||||||
self::$plugins = array();
|
|
||||||
|
|
||||||
// try to figure out where we are. $server and $path
|
|
||||||
// can be set by including module, else we guess based
|
|
||||||
// on HTTP info.
|
|
||||||
|
|
||||||
if (isset($server)) {
|
|
||||||
$_server = $server;
|
|
||||||
} else {
|
|
||||||
$_server = array_key_exists('SERVER_NAME', $_SERVER) ?
|
|
||||||
strtolower($_SERVER['SERVER_NAME']) :
|
|
||||||
null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($path)) {
|
|
||||||
$_path = $path;
|
|
||||||
} else {
|
|
||||||
$_path = (array_key_exists('SERVER_NAME', $_SERVER) && array_key_exists('SCRIPT_NAME', $_SERVER)) ?
|
|
||||||
self::_sn_to_path($_SERVER['SCRIPT_NAME']) :
|
|
||||||
null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set config values initially to default values
|
|
||||||
$default = self::defaultConfig();
|
|
||||||
$config = $default;
|
|
||||||
|
|
||||||
// default configuration, overwritten in config.php
|
|
||||||
// Keep DB_DataObject's db config synced to ours...
|
|
||||||
|
|
||||||
$config['db'] = &$_PEAR->getStaticProperty('DB_DataObject','options');
|
|
||||||
|
|
||||||
$config['db'] = $default['db'];
|
|
||||||
|
|
||||||
if (function_exists('date_default_timezone_set')) {
|
|
||||||
/* Work internally in UTC */
|
|
||||||
date_default_timezone_set('UTC');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function loadSiteProfile($name)
|
|
||||||
{
|
|
||||||
global $config;
|
|
||||||
$settings = SiteProfile::getSettings($name);
|
|
||||||
$config = array_replace_recursive($config, $settings);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static function _sn_to_path($sn)
|
|
||||||
{
|
|
||||||
$past_root = substr($sn, 1);
|
|
||||||
$last_slash = strrpos($past_root, '/');
|
|
||||||
if ($last_slash > 0) {
|
|
||||||
$p = substr($past_root, 0, $last_slash);
|
|
||||||
} else {
|
|
||||||
$p = '';
|
|
||||||
}
|
|
||||||
return $p;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load the default or specified configuration file.
|
|
||||||
* Modifies global $config and may establish plugins.
|
|
||||||
*
|
|
||||||
* @throws NoConfigException
|
|
||||||
*/
|
|
||||||
protected static function loadConfigFile($conffile=null)
|
|
||||||
{
|
|
||||||
global $_server, $_path, $config;
|
|
||||||
|
|
||||||
// From most general to most specific:
|
|
||||||
// server-wide, then vhost-wide, then for a path,
|
|
||||||
// finally for a dir (usually only need one of the last two).
|
|
||||||
|
|
||||||
if (isset($conffile)) {
|
|
||||||
$config_files = array($conffile);
|
|
||||||
} else {
|
|
||||||
$config_files = array('/etc/statusnet/statusnet.php',
|
|
||||||
'/etc/statusnet/laconica.php',
|
|
||||||
'/etc/laconica/laconica.php',
|
|
||||||
'/etc/statusnet/'.$_server.'.php',
|
|
||||||
'/etc/laconica/'.$_server.'.php');
|
|
||||||
|
|
||||||
if (strlen($_path) > 0) {
|
|
||||||
$config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
|
|
||||||
$config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
$config_files[] = INSTALLDIR.'/config.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
self::$have_config = false;
|
|
||||||
|
|
||||||
foreach ($config_files as $_config_file) {
|
|
||||||
if (@file_exists($_config_file)) {
|
|
||||||
// Ignore 0-byte config files
|
|
||||||
if (filesize($_config_file) > 0) {
|
|
||||||
common_log(LOG_INFO, "Including config file: " . $_config_file);
|
|
||||||
include($_config_file);
|
|
||||||
self::$have_config = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!self::$have_config) {
|
|
||||||
throw new NoConfigException("No configuration file found.",
|
|
||||||
$config_files);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for database server; must exist!
|
|
||||||
|
|
||||||
if (empty($config['db']['database'])) {
|
|
||||||
throw new ServerException("No database server for this site.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Are we running from the web with HTTPS?
|
|
||||||
*
|
|
||||||
* @return boolean true if we're running with HTTPS; else false
|
|
||||||
*/
|
|
||||||
|
|
||||||
static function isHTTPS()
|
|
||||||
{
|
|
||||||
// There are some exceptions to this; add them here!
|
|
||||||
if (empty($_SERVER['HTTPS'])) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it is _not_ "off", it is on, so "true".
|
|
||||||
return strtolower($_SERVER['HTTPS']) !== 'off';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Can we use HTTPS? Then do! Only return false if it's not configured ("never").
|
|
||||||
*/
|
|
||||||
static function useHTTPS()
|
|
||||||
{
|
|
||||||
return self::isHTTPS() || common_config('site', 'ssl') != 'never';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class NoConfigException extends Exception
|
|
||||||
{
|
|
||||||
public $configFiles;
|
|
||||||
|
|
||||||
function __construct($msg, $configFiles) {
|
|
||||||
parent::__construct($msg);
|
|
||||||
$this->configFiles = $configFiles;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -638,9 +638,9 @@ class StompQueueManager extends QueueManager
|
|||||||
*/
|
*/
|
||||||
function switchSite($site)
|
function switchSite($site)
|
||||||
{
|
{
|
||||||
if ($site != StatusNet::currentSite()) {
|
if ($site != GNUsocial::currentSite()) {
|
||||||
$this->stats('switch');
|
$this->stats('switch');
|
||||||
StatusNet::switchSite($site);
|
GNUsocial::switchSite($site);
|
||||||
$this->initialize();
|
$this->initialize();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -683,7 +683,7 @@ class StompQueueManager extends QueueManager
|
|||||||
protected function queueName($queue)
|
protected function queueName($queue)
|
||||||
{
|
{
|
||||||
$group = $this->queueGroup($queue);
|
$group = $this->queueGroup($queue);
|
||||||
$site = StatusNet::currentSite();
|
$site = GNUsocial::currentSite();
|
||||||
|
|
||||||
$specs = array("$group/$queue/$site",
|
$specs = array("$group/$queue/$site",
|
||||||
"$group/$queue");
|
"$group/$queue");
|
||||||
|
@ -130,7 +130,7 @@ class Theme
|
|||||||
*/
|
*/
|
||||||
protected function relativeThemePath($group, $fallbackSubdir, $name)
|
protected function relativeThemePath($group, $fallbackSubdir, $name)
|
||||||
{
|
{
|
||||||
if (StatusNet::isHTTPS()) {
|
if (GNUsocial::isHTTPS()) {
|
||||||
$sslserver = common_config($group, 'sslserver');
|
$sslserver = common_config($group, 'sslserver');
|
||||||
|
|
||||||
if (empty($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);
|
$path = $r->build($action, $args, $params, $fragment);
|
||||||
|
|
||||||
$ssl = common_config('site', 'ssl') === 'always'
|
$ssl = common_config('site', 'ssl') === 'always'
|
||||||
|| StatusNet::isHTTPS()
|
|| GNUsocial::isHTTPS()
|
||||||
|| common_is_sensitive($action);
|
|| common_is_sensitive($action);
|
||||||
|
|
||||||
if (common_config('site','fancy')) {
|
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')."/" : '';
|
$pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
|
||||||
|
|
||||||
if (($ssl && (common_config('site', 'ssl') === 'sometimes'))
|
if (($ssl && (common_config('site', 'ssl') === 'sometimes'))
|
||||||
|| StatusNet::isHTTPS()
|
|| GNUsocial::isHTTPS()
|
||||||
|| common_config('site', 'ssl') === 'always') {
|
|| common_config('site', 'ssl') === 'always') {
|
||||||
$proto = 'https';
|
$proto = 'https';
|
||||||
if (is_string(common_config('site', 'sslserver')) &&
|
if (is_string(common_config('site', 'sslserver')) &&
|
||||||
|
@ -92,7 +92,7 @@ class AutocompleteAction extends Action
|
|||||||
protected function prepare(array $args=array())
|
protected function prepare(array $args=array())
|
||||||
{
|
{
|
||||||
// If we die, show short error messages.
|
// If we die, show short error messages.
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
|
|
||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ class NewbookmarkAction extends Action
|
|||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
|
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->user = common_current_user();
|
$this->user = common_current_user();
|
||||||
|
@ -66,7 +66,7 @@ class DomainStatusNetworkPlugin extends Plugin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$nickname = StatusNet::currentSite();
|
$nickname = GNUsocial::currentSite();
|
||||||
|
|
||||||
if (empty($nickname)) {
|
if (empty($nickname)) {
|
||||||
$this->log(LOG_WARNING, "No current site");
|
$this->log(LOG_WARNING, "No current site");
|
||||||
@ -212,7 +212,7 @@ class DomainStatusNetworkPlugin extends Plugin
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusNet::switchSite($sn->nickname);
|
GNUsocial::switchSite($sn->nickname);
|
||||||
|
|
||||||
$user = User::getKV('email', $email);
|
$user = User::getKV('email', $email);
|
||||||
|
|
||||||
@ -242,7 +242,7 @@ class DomainStatusNetworkPlugin extends Plugin
|
|||||||
Status_network::$wildcard = $config['WILDCARD'];
|
Status_network::$wildcard = $config['WILDCARD'];
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusNet::switchSite($sn->nickname);
|
GNUsocial::switchSite($sn->nickname);
|
||||||
|
|
||||||
$confirm = EmailRegistrationPlugin::registerEmail($email);
|
$confirm = EmailRegistrationPlugin::registerEmail($email);
|
||||||
|
|
||||||
@ -259,7 +259,7 @@ class DomainStatusNetworkPlugin extends Plugin
|
|||||||
throw new ClientException(_("No such site."));
|
throw new ClientException(_("No such site."));
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusNet::switchSite($sn->nickname);
|
GNUsocial::switchSite($sn->nickname);
|
||||||
|
|
||||||
$user = common_check_user($email, $password);
|
$user = common_check_user($email, $password);
|
||||||
|
|
||||||
@ -294,7 +294,7 @@ class DomainStatusNetworkPlugin extends Plugin
|
|||||||
throw new NoSuchUserException(array('email' => $email));
|
throw new NoSuchUserException(array('email' => $email));
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusNet::switchSite($sn->nickname);
|
GNUsocial::switchSite($sn->nickname);
|
||||||
|
|
||||||
$user = User::getKV('email', $email);
|
$user = User::getKV('email', $email);
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ class GlobalApiAction extends Action
|
|||||||
|
|
||||||
function prepare($args)
|
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);
|
parent::prepare($args);
|
||||||
|
|
||||||
|
@ -212,7 +212,7 @@ class DomainStatusNetworkInstaller extends Installer
|
|||||||
|
|
||||||
Status_network::$wildcard = $config['WILDCARD'];
|
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
|
// 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()) {
|
while ($sn->fetch()) {
|
||||||
try {
|
try {
|
||||||
$server = $sn->getServerName();
|
$server = $sn->getServerName();
|
||||||
StatusNet::init($server);
|
GNUsocial::init($server);
|
||||||
// Different queue manager, maybe!
|
// Different queue manager, maybe!
|
||||||
$qm = QueueManager::get();
|
$qm = QueueManager::get();
|
||||||
foreach ($reminders as $reminder) {
|
foreach ($reminders as $reminder) {
|
||||||
|
@ -40,7 +40,7 @@ if (have_option('u', 'universe')) {
|
|||||||
if ($sn->find()) {
|
if ($sn->find()) {
|
||||||
while ($sn->fetch()) {
|
while ($sn->fetch()) {
|
||||||
$server = $sn->getServerName();
|
$server = $sn->getServerName();
|
||||||
StatusNet::init($server);
|
GNUsocial::init($server);
|
||||||
// Different queue manager, maybe!
|
// Different queue manager, maybe!
|
||||||
$qm = QueueManager::get();
|
$qm = QueueManager::get();
|
||||||
$qm->enqueue(1, 'sitesum');
|
$qm->enqueue(1, 'sitesum');
|
||||||
|
@ -72,7 +72,7 @@ class CancelrsvpAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true); // short error results!
|
GNUsocial::setApi(true); // short error results!
|
||||||
}
|
}
|
||||||
|
|
||||||
$rsvpId = $this->trimmed('rsvp');
|
$rsvpId = $this->trimmed('rsvp');
|
||||||
|
@ -72,7 +72,7 @@ class NewrsvpAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true); // short error results!
|
GNUsocial::setApi(true); // short error results!
|
||||||
}
|
}
|
||||||
|
|
||||||
$eventId = $this->trimmed('event');
|
$eventId = $this->trimmed('event');
|
||||||
|
@ -74,7 +74,7 @@ class DisfavorAction extends FormAction
|
|||||||
$this->serverError(_('Could not delete favorite.'));
|
$this->serverError(_('Could not delete favorite.'));
|
||||||
}
|
}
|
||||||
Fave::blowCacheForProfileId($this->scoped->id);
|
Fave::blowCacheForProfileId($this->scoped->id);
|
||||||
if (StatusNet::isAjax()) {
|
if (GNUsocial::isAjax()) {
|
||||||
$this->startHTML('text/xml;charset=utf-8');
|
$this->startHTML('text/xml;charset=utf-8');
|
||||||
$this->elementStart('head');
|
$this->elementStart('head');
|
||||||
// TRANS: Title for page on which favorites can be added.
|
// TRANS: Title for page on which favorites can be added.
|
||||||
|
@ -49,7 +49,7 @@ class OembedproxyAction extends OembedAction
|
|||||||
function handle($args)
|
function handle($args)
|
||||||
{
|
{
|
||||||
// Trigger short error responses; not a human-readable web page.
|
// 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.
|
// We're not a general oEmbed proxy service; limit to valid sessions.
|
||||||
$token = $this->trimmed('token');
|
$token = $this->trimmed('token');
|
||||||
|
@ -102,7 +102,7 @@ class MapstractionPlugin extends Plugin
|
|||||||
urlencode($this->apikey)));
|
urlencode($this->apikey)));
|
||||||
break;
|
break;
|
||||||
case 'microsoft':
|
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;
|
break;
|
||||||
case 'openlayers':
|
case 'openlayers':
|
||||||
// Use our included stripped & minified OpenLayers.
|
// Use our included stripped & minified OpenLayers.
|
||||||
|
@ -30,7 +30,7 @@ class PushCallbackAction extends Action
|
|||||||
{
|
{
|
||||||
protected function handle()
|
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();
|
parent::handle();
|
||||||
if ($this->isPost()) {
|
if ($this->isPost()) {
|
||||||
return $this->handlePost();
|
return $this->handlePost();
|
||||||
|
@ -49,7 +49,7 @@ class PushHubAction extends Action
|
|||||||
|
|
||||||
protected function prepare(array $args=array())
|
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);
|
return parent::prepare($args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ class SalmonAction extends Action
|
|||||||
|
|
||||||
protected function prepare(array $args=array())
|
protected function prepare(array $args=array())
|
||||||
{
|
{
|
||||||
StatusNet::setApi(true); // Send smaller error pages
|
GNUsocial::setApi(true); // Send smaller error pages
|
||||||
|
|
||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ class OembedPlugin extends Plugin
|
|||||||
case 'video':
|
case 'video':
|
||||||
case 'link':
|
case 'link':
|
||||||
if (!empty($oembed->html)
|
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';
|
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
|
||||||
$config = array(
|
$config = array(
|
||||||
'safe'=>1,
|
'safe'=>1,
|
||||||
|
@ -125,7 +125,7 @@ class NewPollAction extends Action
|
|||||||
function newPoll()
|
function newPoll()
|
||||||
{
|
{
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (empty($this->question)) {
|
if (empty($this->question)) {
|
||||||
|
@ -74,7 +74,7 @@ class RespondPollAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->user = common_current_user();
|
$this->user = common_current_user();
|
||||||
|
@ -74,7 +74,7 @@ class QnaclosequestionAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->user = common_current_user();
|
$this->user = common_current_user();
|
||||||
|
@ -74,7 +74,7 @@ class QnanewanswerAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
common_debug("in qnanewanswer");
|
common_debug("in qnanewanswer");
|
||||||
$this->user = common_current_user();
|
$this->user = common_current_user();
|
||||||
|
@ -121,7 +121,7 @@ class QnanewquestionAction extends Action
|
|||||||
function newQuestion()
|
function newQuestion()
|
||||||
{
|
{
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (empty($this->title)) {
|
if (empty($this->title)) {
|
||||||
|
@ -73,7 +73,7 @@ class QnareviseanswerAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->user = common_current_user();
|
$this->user = common_current_user();
|
||||||
|
@ -74,7 +74,7 @@ class Qnavote extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($argarray);
|
parent::prepare($argarray);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->user = common_current_user();
|
$this->user = common_current_user();
|
||||||
|
@ -62,7 +62,7 @@ if (have_option('u', 'universe')) {
|
|||||||
if ($sn->find()) {
|
if ($sn->find()) {
|
||||||
while ($sn->fetch()) {
|
while ($sn->fetch()) {
|
||||||
$server = $sn->getServerName();
|
$server = $sn->getServerName();
|
||||||
StatusNet::init($server);
|
GNUsocial::init($server);
|
||||||
cleanupChannels();
|
cleanupChannels();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ class RecaptchaPlugin extends Plugin
|
|||||||
{
|
{
|
||||||
if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
|
if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
|
||||||
// Load the AJAX API
|
// Load the AJAX API
|
||||||
if (StatusNet::isHTTPS()) {
|
if (GNUsocial::isHTTPS()) {
|
||||||
$url = "https://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
|
$url = "https://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
|
||||||
} else {
|
} else {
|
||||||
$url = "http://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
|
$url = "http://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
|
||||||
|
@ -67,7 +67,7 @@ class SearchsubAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only allow POST requests
|
// Only allow POST requests
|
||||||
|
@ -67,7 +67,7 @@ class TagsubAction extends Action
|
|||||||
{
|
{
|
||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
if ($this->boolean('ajax')) {
|
if ($this->boolean('ajax')) {
|
||||||
StatusNet::setApi(true);
|
GNUsocial::setApi(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only allow POST requests
|
// Only allow POST requests
|
||||||
|
Loading…
Reference in New Issue
Block a user