Merge mmn's 'nightly' changes

[quix0rs-gnu-social.git] / plugins / ModPlus / ModPlusPlugin.php

diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index ed478c27b83a7c2f97db1689edc75709f2a14bc3..945a649f304c11a814a5508ada031662844983c5 100644 (file)
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -32,57 +32,33 @@ class ModPlusPlugin extends Plugin
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'ModPlus',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:ModPlus',
                             'rawdescription' =>
-                            _m('UI extensions for profile moderation actions.'));
+                            // TRANS: Plugin description.
+                            _m('UI extension for profile moderation actions.'));
 
         return true;
     }
 
     /**
-     * Load JS at runtime if we're logged in.
+     * Load JS at runtime.
      *
      * @param Action $action
      * @return boolean hook result
      */
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
-        $user = common_current_user();
-        if ($user) {
-            $action->script($this->path('modplus.js'));
-        }
+        $action->script($this->path('js/modplus.js'));
         return true;
     }
 
-    function onEndShowStatusNetStyles($action) {
-        $action->cssLink($this->path('modplus.css'));
+    public function onEndShowStylesheets(Action $action) {
+        $action->cssLink($this->path('css/modplus.css'));
         return true;
     }
 
-    /**
-     * Autoloader
-     *
-     * Loads our classes if they're requested.
-     *
-     * @param string $cls Class requested
-     *
-     * @return boolean hook return
-     */
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-        case 'RemoteprofileAction':
-        case 'RemoteProfileAction':
-            require_once dirname(__FILE__) . '/remoteprofileaction.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     /**
      * Add ModPlus-related paths to the router table
      *
@@ -107,9 +83,9 @@ class ModPlusPlugin extends Plugin
      * @param NoticeListItem $item
      * @return boolean hook value
      */
-    function onStartShowNoticeItem($item)
+    function onEndShowNoticeItemAuthor(Profile $profile, HTMLOutputter $out)
     {
-        $this->showProfileOptions($item->out, $item->profile);
+        $this->showProfileOptions($out, $profile);
         return true;
     }
 
@@ -120,7 +96,7 @@ class ModPlusPlugin extends Plugin
      */
     function onStartProfileListItemProfile($item)
     {
-        $this->showProfileOptions($item->out, $item->profile);
+        $this->showProfileOptions($item->out, $item->profile->getProfile());
         return true;
     }
 
@@ -129,13 +105,13 @@ class ModPlusPlugin extends Plugin
      * Currently only adds output for remote profiles, nothing for local users.
      *
      * @param HTMLOutputter $out
-     * @param Profile $profile (may also be an ArrayWrapper... sigh)
+     * @param Profile $profile
      */
-    protected function showProfileOptions(HTMLOutputter $out, $profile)
+    protected function showProfileOptions(HTMLOutputter $out, Profile $profile)
     {
-        $isRemote = !(User::staticGet('id', $profile->id));
-        if ($isRemote) {
+        if (!$profile->isGroup() && !$profile->isLocal()) {
             $target = common_local_url('remoteprofile', array('id' => $profile->id));
+            // TRANS: Label for access to remote profile options.
             $label = _m('Remote profile options...');
             $out->elementStart('div', 'remote-profile-options');
             $out->element('a', array('href' => $target), $label);