2a4dc77a63
I used this hacky sed-command (run it from your GNU Social root, or change the first grep's path to where it actually lies) to do a rough fix on all ::staticGet calls and rename them to ::getKV sed -i -s -e '/DataObject::staticGet/I!s/::staticGet/::getKV/Ig' $(grep -R ::staticGet `pwd`/* | grep -v -e '^extlib' | grep -v DataObject:: |grep -v "function staticGet"|cut -d: -f1 |sort |uniq) If you're applying this, remember to change the Managed_DataObject and Memcached_DataObject function definitions of staticGet to getKV! This might of course take some getting used to, or modification fo StatusNet plugins, but the result is that all the static calls (to staticGet) are now properly made without breaking PHP Strict Standards. Standards are there to be followed (and they caused some very bad confusion when used with get_called_class) Reasonably any plugin or code that tests for the definition of 'GNUSOCIAL' or similar will take this change into consideration.
156 lines
4.1 KiB
PHP
156 lines
4.1 KiB
PHP
<?php
|
|
/**
|
|
* Data class for nickname blacklisting
|
|
*
|
|
* PHP version 5
|
|
*
|
|
* @category Data
|
|
* @package StatusNet
|
|
* @author Evan Prodromou <evan@status.net>
|
|
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
|
|
* @link http://status.net/
|
|
*
|
|
* StatusNet - the distributed open-source microblogging tool
|
|
* Copyright (C) 2009, 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);
|
|
}
|
|
|
|
require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
|
|
|
|
/**
|
|
* Data class for Nickname blacklist
|
|
*
|
|
* @category Action
|
|
* @package StatusNet
|
|
* @author Evan Prodromou <evan@status.net>
|
|
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
|
|
* @link http://status.net/
|
|
*
|
|
* @see DB_DataObject
|
|
*/
|
|
class Nickname_blacklist extends Managed_DataObject
|
|
{
|
|
public $__table = 'nickname_blacklist'; // table name
|
|
public $pattern; // string pattern
|
|
public $created; // datetime
|
|
|
|
/**
|
|
* return table definition for DB_DataObject
|
|
*
|
|
* @return array array of column definitions
|
|
*/
|
|
function table()
|
|
{
|
|
return array('pattern' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
|
|
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
|
|
}
|
|
|
|
/**
|
|
* return key definitions for DB_DataObject
|
|
*
|
|
* @return array key definitions
|
|
*/
|
|
function keys()
|
|
{
|
|
return array_keys($this->keyTypes());
|
|
}
|
|
|
|
/**
|
|
* return key definitions for Memcached_DataObject
|
|
*
|
|
* @return array key definitions
|
|
*/
|
|
function keyTypes()
|
|
{
|
|
return array('pattern' => 'K');
|
|
}
|
|
|
|
/**
|
|
* Return a list of patterns to check
|
|
*
|
|
* @return array string patterns to check
|
|
*/
|
|
static function getPatterns()
|
|
{
|
|
$patterns = self::cacheGet('nickname_blacklist:patterns');
|
|
|
|
if ($patterns === false) {
|
|
|
|
$patterns = array();
|
|
|
|
$nb = new Nickname_blacklist();
|
|
|
|
$nb->find();
|
|
|
|
while ($nb->fetch()) {
|
|
$patterns[] = $nb->pattern;
|
|
}
|
|
|
|
self::cacheSet('nickname_blacklist:patterns', $patterns);
|
|
}
|
|
|
|
return $patterns;
|
|
}
|
|
|
|
/**
|
|
* Save new list of patterns
|
|
*
|
|
* @return array of patterns to check
|
|
*/
|
|
static function saveNew($newPatterns)
|
|
{
|
|
$oldPatterns = self::getPatterns();
|
|
|
|
// Delete stuff that's old that not in new
|
|
$toDelete = array_diff($oldPatterns, $newPatterns);
|
|
|
|
// Insert stuff that's in new and not in old
|
|
$toInsert = array_diff($newPatterns, $oldPatterns);
|
|
|
|
foreach ($toDelete as $pattern) {
|
|
$nb = Nickname_blacklist::getKV('pattern', $pattern);
|
|
if (!empty($nb)) {
|
|
$nb->delete();
|
|
}
|
|
}
|
|
|
|
foreach ($toInsert as $pattern) {
|
|
$nb = new Nickname_blacklist();
|
|
$nb->pattern = $pattern;
|
|
$nb->created = common_sql_now();
|
|
$nb->insert();
|
|
}
|
|
|
|
self::blow('nickname_blacklist:patterns');
|
|
}
|
|
|
|
static function ensurePattern($pattern)
|
|
{
|
|
$nb = Nickname_blacklist::getKV('pattern', $pattern);
|
|
|
|
if (empty($nb)) {
|
|
$nb = new Nickname_blacklist();
|
|
$nb->pattern = $pattern;
|
|
$nb->created = common_sql_now();
|
|
$nb->insert();
|
|
self::blow('nickname_blacklist:patterns');
|
|
}
|
|
}
|
|
}
|