Added configuration options to enable/disable SMS and Twitter integration.
This disables the IM, SMS and Twitter settings pages and queue handlers depending on the config options.
This commit is contained in:
parent
c8c2d9d7c9
commit
93f585446e
16
README
16
README
|
@ -1228,6 +1228,22 @@ enabled: Set to true to enable. Default false.
|
||||||
server: a string with the hostname of the sphinx server.
|
server: a string with the hostname of the sphinx server.
|
||||||
port: an integer with the port number of the sphinx server.
|
port: an integer with the port number of the sphinx server.
|
||||||
|
|
||||||
|
sms
|
||||||
|
---
|
||||||
|
|
||||||
|
For SMS integration.
|
||||||
|
|
||||||
|
enabled: Whether to enable SMS integration. Defaults to true. Queues
|
||||||
|
should also be enabled.
|
||||||
|
|
||||||
|
twitter
|
||||||
|
-------
|
||||||
|
|
||||||
|
For Twitter integration
|
||||||
|
|
||||||
|
enabled: Whether to enable Twitter integration. Defaults to true.
|
||||||
|
Queues should also be enabled.
|
||||||
|
|
||||||
integration
|
integration
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,12 @@ class ImsettingsAction extends ConnectSettingsAction
|
||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
|
if (!common_config('xmpp', 'enabled')) {
|
||||||
|
$this->element('div', array('class' => 'error'),
|
||||||
|
_('IM is not available.'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
$this->elementStart('form', array('method' => 'post',
|
$this->elementStart('form', array('method' => 'post',
|
||||||
'id' => 'form_settings_im',
|
'id' => 'form_settings_im',
|
||||||
|
|
|
@ -80,6 +80,12 @@ class SmssettingsAction extends ConnectSettingsAction
|
||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
|
if (!common_config('sms', 'enabled')) {
|
||||||
|
$this->element('div', array('class' => 'error'),
|
||||||
|
_('SMS is not available.'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
|
|
||||||
$this->elementStart('form', array('method' => 'post',
|
$this->elementStart('form', array('method' => 'post',
|
||||||
|
|
|
@ -85,6 +85,12 @@ class TwittersettingsAction extends ConnectSettingsAction
|
||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
|
if (!common_config('twitter', 'enabled')) {
|
||||||
|
$this->element('div', array('class' => 'error'),
|
||||||
|
_('Twitter is not available.'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
|
|
||||||
$profile = $user->getProfile();
|
$profile = $user->getProfile();
|
||||||
|
|
|
@ -164,6 +164,12 @@ $config['sphinx']['port'] = 3312;
|
||||||
// $config['memcached']['server'] = 'localhost';
|
// $config['memcached']['server'] = 'localhost';
|
||||||
// $config['memcached']['port'] = 11211;
|
// $config['memcached']['port'] = 11211;
|
||||||
|
|
||||||
|
// Disable SMS
|
||||||
|
// $config['sms']['enabled'] = false;
|
||||||
|
|
||||||
|
// Disable Twitter integration
|
||||||
|
// $config['twitter']['enabled'] = false;
|
||||||
|
|
||||||
// Twitter integration source attribute. Note: default is Laconica
|
// Twitter integration source attribute. Note: default is Laconica
|
||||||
// $config['integration']['source'] = 'Laconica';
|
// $config['integration']['source'] = 'Laconica';
|
||||||
|
|
||||||
|
|
|
@ -402,6 +402,14 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
function showPrimaryNav()
|
function showPrimaryNav()
|
||||||
{
|
{
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
|
$connect = '';
|
||||||
|
if (common_config('xmpp', 'enabled')) {
|
||||||
|
$connect = 'imsettings';
|
||||||
|
} else if (common_config('sms', 'enabled')) {
|
||||||
|
$connect = 'smssettings';
|
||||||
|
} else if (common_config('twitter', 'enabled')) {
|
||||||
|
$connect = 'twittersettings';
|
||||||
|
}
|
||||||
|
|
||||||
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
|
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
|
||||||
$this->element('dt', null, _('Primary site navigation'));
|
$this->element('dt', null, _('Primary site navigation'));
|
||||||
|
@ -413,12 +421,9 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
_('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
|
_('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
|
||||||
$this->menuItem(common_local_url('profilesettings'),
|
$this->menuItem(common_local_url('profilesettings'),
|
||||||
_('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
|
_('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
|
||||||
if (common_config('xmpp', 'enabled')) {
|
if ($connect) {
|
||||||
$this->menuItem(common_local_url('imsettings'),
|
$this->menuItem(common_local_url($connect),
|
||||||
_('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
|
_('Connect'), _('Connect to services'), false, 'nav_connect');
|
||||||
} else {
|
|
||||||
$this->menuItem(common_local_url('smssettings'),
|
|
||||||
_('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
|
|
||||||
}
|
}
|
||||||
if (common_config('invite', 'enabled')) {
|
if (common_config('invite', 'enabled')) {
|
||||||
$this->menuItem(common_local_url('invite'),
|
$this->menuItem(common_local_url('invite'),
|
||||||
|
|
|
@ -183,6 +183,10 @@ $config =
|
||||||
array('piddir' => '/var/run',
|
array('piddir' => '/var/run',
|
||||||
'user' => false,
|
'user' => false,
|
||||||
'group' => false),
|
'group' => false),
|
||||||
|
'sms' =>
|
||||||
|
array('enabled' => false),
|
||||||
|
'twitter' =>
|
||||||
|
array('enabled' => false),
|
||||||
'twitterbridge' =>
|
'twitterbridge' =>
|
||||||
array('enabled' => false),
|
array('enabled' => false),
|
||||||
'integration' =>
|
'integration' =>
|
||||||
|
|
|
@ -99,25 +99,27 @@ class ConnectSettingsNav extends Widget
|
||||||
function show()
|
function show()
|
||||||
{
|
{
|
||||||
# action => array('prompt', 'title')
|
# action => array('prompt', 'title')
|
||||||
$menu =
|
$menu = array();
|
||||||
array('imsettings' =>
|
if (common_config('xmpp', 'enabled')) {
|
||||||
|
$menu['imsettings'] =
|
||||||
array(_('IM'),
|
array(_('IM'),
|
||||||
_('Updates by instant messenger (IM)')),
|
_('Updates by instant messenger (IM)'));
|
||||||
'smssettings' =>
|
}
|
||||||
|
if (common_config('sms', 'enabled')) {
|
||||||
|
$menu['smssettings'] =
|
||||||
array(_('SMS'),
|
array(_('SMS'),
|
||||||
_('Updates by SMS')),
|
_('Updates by SMS'));
|
||||||
'twittersettings' =>
|
}
|
||||||
|
if (common_config('twitter', 'enabled')) {
|
||||||
|
$menu['twittersettings'] =
|
||||||
array(_('Twitter'),
|
array(_('Twitter'),
|
||||||
_('Twitter integration options')));
|
_('Twitter integration options'));
|
||||||
|
}
|
||||||
|
|
||||||
$action_name = $this->action->trimmed('action');
|
$action_name = $this->action->trimmed('action');
|
||||||
$this->action->elementStart('ul', array('class' => 'nav'));
|
$this->action->elementStart('ul', array('class' => 'nav'));
|
||||||
|
|
||||||
foreach ($menu as $menuaction => $menudesc) {
|
foreach ($menu as $menuaction => $menudesc) {
|
||||||
if ($menuaction == 'imsettings' &&
|
|
||||||
!common_config('xmpp', 'enabled')) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$this->action->menuItem(common_local_url($menuaction),
|
$this->action->menuItem(common_local_url($menuaction),
|
||||||
$menudesc[0],
|
$menudesc[0],
|
||||||
$menudesc[1],
|
$menudesc[1],
|
||||||
|
|
|
@ -43,7 +43,11 @@ if(common_config('twitterbridge','enabled')) {
|
||||||
echo "twitterstatusfetcher.php ";
|
echo "twitterstatusfetcher.php ";
|
||||||
}
|
}
|
||||||
echo "ombqueuehandler.php ";
|
echo "ombqueuehandler.php ";
|
||||||
echo "twitterqueuehandler.php ";
|
if (common_config('twitter', 'enabled')) {
|
||||||
|
echo "twitterqueuehandler.php ";
|
||||||
|
}
|
||||||
echo "facebookqueuehandler.php ";
|
echo "facebookqueuehandler.php ";
|
||||||
echo "pingqueuehandler.php ";
|
echo "pingqueuehandler.php ";
|
||||||
echo "smsqueuehandler.php ";
|
if (common_config('sms', 'enabled')) {
|
||||||
|
echo "smsqueuehandler.php ";
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user