GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-10-12 14:54:04 -07:00
commit bc0d7f14db
3 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/installer.php
View File

@ -85,7 +85,11 @@ abstract class Installer
$config = INSTALLDIR.'/config.php';
if (file_exists($config)) {
if (!is_writable($config) || filesize($config) > 0) {
$this->warning('Config file "config.php" already exists.');
if (filesize($config) == 0) {
$this->warning('Config file "config.php" already exists and is empty, but is not writable.');
} else {
$this->warning('Config file "config.php" already exists.');
}
$pass = false;
}
}

7
lib/statusnet.php
View File

@ -336,8 +336,11 @@ class StatusNet
foreach ($config_files as $_config_file) {
if (@file_exists($_config_file)) {
include($_config_file);
self::$have_config = true;
// Ignore 0-byte config files
if (filesize($_config_file) > 0) {
include($_config_file);
self::$have_config = true;
}
}
}

54
plugins/ModHelper/ModHelperPlugin.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 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')) {
exit(1);
}
/**
* @package ModHelperPlugin
* @maintainer Brion Vibber <brion@status.net>
*/
class ModHelperPlugin extends Plugin
{
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'ModHelper',
'version' => STATUSNET_VERSION,
'author' => 'Brion Vibber',
'homepage' => 'http://status.net/wiki/Plugin:ModHelper',
'rawdescription' =>
_m('Lets users who have been manually marked as "modhelper"s silence accounts.'));
return true;
}
function onUserRightsCheck($profile, $right, &$result)
{
if ($right == Right::SILENCEUSER || $right == Right::SANDBOXUSER) {
// Hrm.... really we should confirm that the *other* user isn't privleged. :)
if ($profile->hasRole('modhelper')) {
$result = true;
return false;
}
}
return true;
}
}