wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #187 from mmn/settings_should_be_static

Browse Source 
QvitterPlugin::settings should be declared static
This commit is contained in:
Hannes Mannerheim 2015-06-07 10:38:19 +02:00
commit 2ff0f8ac7b
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
QvitterPlugin.php
View File

@ -38,7 +38,9 @@ const QVITTERDIR = __DIR__;
class QvitterPlugin extends Plugin {
public function settings($setting)
protected $hijack_ui = true;
static function settings($setting)
{
/* · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
@ -113,7 +115,25 @@ class QvitterPlugin extends Plugin {
return false;
}
}
public function initialize()
{
// check if we should reroute UI to qvitter
$scoped = Profile::current();
$qvitter_enabled_by_user = false;
$qvitter_disabled_by_user = false;
if ($scoped instanceof Profile) {
$qvitter_enabled_by_user = $scoped->getPref('qvitter', 'enable_qvitter', false);
$qvitter_disabled_by_user = $scoped->getPref('qvitter', 'disable_qvitter', false);
}
$this->hijack_ui = (self::settings('enabledbydefault') && !$logged_in_user)
|| (self::settings('enabledbydefault') && !$qvitter_disabled_by_user)
|| (!self::settings('enabledbydefault') && $qvitter_enabled_by_user);
// show qvitter link in the admin panel
common_config_append('admin', 'panels', 'qvitteradm');
}
// make sure we have a notifications table
function onCheckSchema()
@ -163,31 +183,10 @@ class QvitterPlugin extends Plugin {
array('action' => 'qvittersettings'));
$m->connect('panel/qvitter',
array('action' => 'qvitteradminsettings'));
common_config_append('admin', 'panels', 'qvitteradm');
$m->connect('main/qlogin',
array('action' => 'qvitterlogin'));
// check if we should reroute UI to qvitter
$logged_in_user = common_current_user();
$qvitter_enabled_by_user = false;
$qvitter_disabled_by_user = false;
if($logged_in_user) {
try {
$qvitter_enabled_by_user = Profile_prefs::getData($logged_in_user->getProfile(), 'qvitter', 'enable_qvitter');
} catch (NoResultException $e) {
$qvitter_enabled_by_user = false;
}
try {
$qvitter_disabled_by_user = Profile_prefs::getData($logged_in_user->getProfile(), 'qvitter', 'disable_qvitter');
} catch (NoResultException $e) {
$qvitter_disabled_by_user = false;
}
}
if((self::settings('enabledbydefault') && !$logged_in_user) ||
(self::settings('enabledbydefault') && !$qvitter_disabled_by_user) ||
(!self::settings('enabledbydefault') && $qvitter_enabled_by_user)) {
if ($this->hijack_ui) {
$m->connect('', array('action' => 'qvitter'));
$m->connect('main/all', array('action' => 'qvitter'));
$m->connect('search/notice', array('action' => 'qvitter'));
@ -249,9 +248,9 @@ class QvitterPlugin extends Plugin {
}
// if qvitter is opt-out, disable the default register page (if we don't have a valid invitation code)
if(isset($_POST['code'])) {
$valid_code = Invitation::getKV('code', $_POST['code']);
}
$valid_code = isset($_POST['code'])
? Invitation::getKV('code', $_POST['code'])
: null;
if(self::settings('enabledbydefault') && empty($valid_code)) {
$m->connect('main/register',
array('action' => 'qvitter'));
@ -799,7 +798,7 @@ class QvitterPlugin extends Plugin {
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Qvitter',
'version' => '4',