Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / ModHelper / ModHelperPlugin.php

diff --git a/plugins/ModHelper/ModHelperPlugin.php b/plugins/ModHelper/ModHelperPlugin.php
index c2757bbeae5cb4c0a974866e140cca788e7bd773..b37ea445788aa651a7172ec0dad28bcaebb62199 100644 (file)
--- a/plugins/ModHelper/ModHelperPlugin.php
+++ b/plugins/ModHelper/ModHelperPlugin.php
@@ -27,10 +27,12 @@ if (!defined('STATUSNET')) {
  */
 class ModHelperPlugin extends Plugin
 {
-    function onPluginVersion(&$versions)
+    static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM);
+
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModHelper',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:ModHelper',
                             'rawdescription' =>
@@ -40,9 +42,9 @@ class ModHelperPlugin extends Plugin
         return true;
     }
 
-    function onUserRightsCheck($profile, $right, &$result)
+    function onUserRightsCheck(Profile $profile, $right, &$result)
     {
-        if ($right == Right::SILENCEUSER) {
+        if (in_array($right, self::$rights)) {
             // Hrm.... really we should confirm that the *other* user isn't privleged. :)
             if ($profile->hasRole('modhelper')) {
                 $result = true;