Merged stuff from upstream/master

[quix0rs-gnu-social.git] / plugins / Blacklist / BlacklistPlugin.php

diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index 46eecb7dc81f65c340876ee783497e6b7b160546..d1ee2912afa8f1b965cc53cb0656cd60fbe34628 100644 (file)
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -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;
@@ -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;