X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FBlacklist%2FBlacklistPlugin.php;h=d1ee2912afa8f1b965cc53cb0656cd60fbe34628;hb=dd93420b08910a8bf9967dad7906351695d1ac55;hp=142ec2d056d4c0adfa572d8ee3bcf5b5085c1c04;hpb=747fe9d59bc03413be3d02d9ba1fadf460ba4758;p=quix0rs-gnu-social.git diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index 142ec2d056..d1ee2912af 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(); @@ -122,7 +122,7 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onStartRegisterUser(&$user, &$profile) + function onStartRegisterUser(User &$user, Profile &$profile) { $homepage = strtolower($profile->homepage); @@ -274,11 +274,11 @@ 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('panel/blacklist', array('action' => 'blacklistadminpanel')); return true; @@ -291,7 +291,7 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Blacklist', 'version' => self::VERSION, @@ -330,7 +330,7 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onEndAdminPanelNav($nav) + function onEndAdminPanelNav(Menu $nav) { if (AdminPanelAction::canAdmin('blacklist')) { @@ -348,7 +348,7 @@ class BlacklistPlugin extends Plugin return true; } - function onEndDeleteUserForm($action, $user) + function onEndDeleteUserForm(Action $action, User $user) { $cur = common_current_user(); @@ -386,7 +386,7 @@ class BlacklistPlugin extends Plugin $action->elementEnd('ul'); } - function onEndDeleteUser($action, $user) + function onEndDeleteUser(Action $action, User $user) { if ($action->boolean('blacklisthomepage')) { $pattern = $action->trimmed('blacklisthomepagepattern'); @@ -401,7 +401,7 @@ class BlacklistPlugin extends Plugin return true; } - function checkboxAndText($action, $checkID, $label, $textID, $value) + private function checkboxAndText(Action $action, $checkID, $label, $textID, $value) { $action->element('input', array('name' => $checkID, 'type' => 'checkbox', @@ -433,17 +433,17 @@ class BlacklistPlugin extends Plugin return $hostname; } - function onStartHandleFeedEntry($activity) + function onStartHandleFeedEntry(Activity $activity) { return $this->_checkActivity($activity); } - function onStartHandleSalmon($activity) + function onStartHandleSalmon(Activity $activity) { return $this->_checkActivity($activity); } - function _checkActivity($activity) + function _checkActivity(Activity $activity) { $actor = $activity->actor;