X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FBlacklist%2FBlacklistPlugin.php;h=fc26cd77c631e63a21351005408a1555e133a2cd;hb=2b78eb1735921fd3fa81f6743bc3bea303c3b9fe;hp=15545f03cb8da85ac6b200aaf04cea2e5d11920e;hpb=e7c7fd39fc948f1169512916077185dd29973b60;p=quix0rs-gnu-social.git diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index 15545f03cb..fc26cd77c6 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -42,7 +42,7 @@ if (!defined('STATUSNET')) { */ class BlacklistPlugin extends Plugin { - const VERSION = STATUSNET_VERSION; + const VERSION = GNUSOCIAL_VERSION; public $nicknames = array(); public $urls = array(); @@ -80,27 +80,8 @@ class BlacklistPlugin extends Plugin $schema = Schema::get(); // For storing blacklist patterns for nicknames - $schema->ensureTable('nickname_blacklist', - array(new ColumnDef('pattern', - 'varchar', - 255, - false, - 'PRI'), - new ColumnDef('created', - 'datetime', - null, - false))); - - $schema->ensureTable('homepage_blacklist', - array(new ColumnDef('pattern', - 'varchar', - 255, - false, - 'PRI'), - new ColumnDef('created', - 'datetime', - null, - false))); + $schema->ensureTable('nickname_blacklist', Nickname_blacklist::schemaDef()); + $schema->ensureTable('homepage_blacklist', Homepage_blacklist::schemaDef()); return true; } @@ -126,7 +107,9 @@ class BlacklistPlugin extends Plugin } else if (is_string($config)) { return explode("\r\n", $config); } else { - throw new Exception("Unknown data type for config $section + $setting"); + // TRANS: Exception thrown if the Blacklist plugin configuration is incorrect. + // TRANS: %1$s is a configuration section, %2$s is a configuration setting. + throw new Exception(sprintf(_m('Unknown data type for config %1$s + %2$s.'),$section, $setting)); } } @@ -139,9 +122,9 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onStartRegistrationTry($action) + function onStartRegisterUser(&$user, &$profile) { - $homepage = strtolower($action->trimmed('homepage')); + $homepage = strtolower($profile->homepage); if (!empty($homepage)) { if (!$this->_checkUrl($homepage)) { @@ -152,7 +135,7 @@ class BlacklistPlugin extends Plugin } } - $nickname = strtolower($action->trimmed('nickname')); + $nickname = strtolower($profile->nickname); if (!empty($nickname)) { if (!$this->_checkNickname($nickname)) { @@ -291,40 +274,16 @@ class BlacklistPlugin extends Plugin /** * Add our actions to the URL router * - * @param Net_URL_Mapper $m URL mapper for this hit + * @param URLMapper $m URL mapper for this hit * * @return boolean hook return */ - function onRouterInitialized($m) + public function onRouterInitialized(URLMapper $m) { - $m->connect('admin/blacklist', array('action' => 'blacklistadminpanel')); + $m->connect('panel/blacklist', array('action' => 'blacklistadminpanel')); return true; } - /** - * Auto-load our classes if called - * - * @param string $cls Class to load - * - * @return boolean hook return - */ - function onAutoload($cls) - { - switch (strtolower($cls)) - { - case 'nickname_blacklist': - case 'homepage_blacklist': - include_once INSTALLDIR.'/plugins/Blacklist/'.ucfirst($cls).'.php'; - return false; - case 'blacklistadminpanelaction': - $base = strtolower(mb_substr($cls, 0, -6)); - include_once INSTALLDIR.'/plugins/Blacklist/'.$base.'.php'; - return false; - default: - return true; - } - } - /** * Plugin version data * @@ -340,6 +299,7 @@ class BlacklistPlugin extends Plugin 'homepage' => 'http://status.net/wiki/Plugin:Blacklist', 'description' => + // TRANS: Plugin description. _m('Keeps a blacklist of forbidden nickname '. 'and URL patterns.')); return true; @@ -380,7 +340,7 @@ class BlacklistPlugin extends Plugin // TRANS: Menu item in admin panel. _m('MENU','Blacklist'), // TRANS: Tooltip for menu item in admin panel. - _m('TOOLTIP','Blacklist configuration'), + _m('TOOLTIP','Blacklist configuration.'), $action_name == 'blacklistadminpanel', 'nav_blacklist_admin_panel'); } @@ -406,7 +366,7 @@ class BlacklistPlugin extends Plugin $action->elementStart('li'); $this->checkboxAndText($action, 'blacklistnickname', - // TRANS: Checkbox with text label in the delete user form. + // TRANS: Checkbox label in the blacklist user form. _m('Add this nickname pattern to blacklist'), 'blacklistnicknamepattern', $this->patternizeNickname($user->nickname)); @@ -416,7 +376,7 @@ class BlacklistPlugin extends Plugin $action->elementStart('li'); $this->checkboxAndText($action, 'blacklisthomepage', - // TRANS: Checkbox with text label in the delete user form. + // TRANS: Checkbox label in the blacklist user form. _m('Add this homepage pattern to blacklist'), 'blacklisthomepagepattern', $this->patternizeHomepage($profile->homepage)); @@ -496,20 +456,22 @@ class BlacklistPlugin extends Plugin if (!empty($homepage)) { if (!$this->_checkUrl($homepage)) { // TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL. - $msg = sprintf(_m("Users from \"%s\" blocked."), + $msg = sprintf(_m("Users from \"%s\" are blocked."), $homepage); throw new ClientException($msg); } } - $nickname = strtolower($actor->poco->preferredUsername); + if (!empty($actor->poco)) { + $nickname = strtolower($actor->poco->preferredUsername); - if (!empty($nickname)) { - if (!$this->_checkNickname($nickname)) { - // TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname. - $msg = sprintf(_m("Posts from nickname \"%s\" disallowed."), - $nickname); - throw new ClientException($msg); + if (!empty($nickname)) { + if (!$this->_checkNickname($nickname)) { + // TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname. + $msg = sprintf(_m("Notices from nickname \"%s\" are disallowed."), + $nickname); + throw new ClientException($msg); + } } } @@ -519,7 +481,7 @@ class BlacklistPlugin extends Plugin /** * Check URLs and homepages for blacklisted users. */ - function onStartSubscribe($subscriber, $other) + function onStartSubscribe(Profile $subscriber, Profile $other) { foreach (array($other->profileurl, $other->homepage) as $url) { @@ -531,7 +493,7 @@ class BlacklistPlugin extends Plugin if (!$this->_checkUrl($url)) { // TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL. - $msg = sprintf(_m("Users from \"%s\" blocked."), + $msg = sprintf(_m("Users from \"%s\" are blocked."), $url); throw new ClientException($msg); } @@ -542,7 +504,7 @@ class BlacklistPlugin extends Plugin if (!empty($nickname)) { if (!$this->_checkNickname($nickname)) { // TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname. - $msg = sprintf(_m("Can't subscribe to nickname \"%s\"."), + $msg = sprintf(_m("Cannot subscribe to nickname \"%s\"."), $nickname); throw new ClientException($msg); }