Merge from chimo: Catch GeoCookie JSON parsing error

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

diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index d2b7c09346ba4a8758d820812b7dad1eab5b0c52..5ca2e7714221be769b0acae3a09641c8e8c03f16 100644 (file)
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -32,11 +32,12 @@ 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;
     }
@@ -56,35 +57,13 @@ class ModPlusPlugin extends Plugin
         return true;
     }
 
-    function onEndShowStatusNetStyles($action) {
+    public function onEndShowStylesheets(Action $action) {
         $action->cssLink($this->path('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 OpenID-related paths to the router table
+     * Add ModPlus-related paths to the router table
      *
      * Hook for RouterInitialized event.
      *
@@ -101,16 +80,46 @@ class ModPlusPlugin extends Plugin
         return true;
     }
 
+    /**
+     * Add per-profile info popup menu for author on notice lists.
+     *
+     * @param NoticeListItem $item
+     * @return boolean hook value
+     */
     function onStartShowNoticeItem($item)
     {
-        $profile = $item->profile;
-        $isRemote = !(User::staticGet('id', $profile->id));
+        $this->showProfileOptions($item->out, $item->profile);
+        return true;
+    }
+
+    /**
+     * Add per-profile info popup menu on profile lists.
+     *
+     * @param ProfileListItem $item
+     */
+    function onStartProfileListItemProfile($item)
+    {
+        $this->showProfileOptions($item->out, $item->profile);
+        return true;
+    }
+
+    /**
+     * Build common remote-profile options structure.
+     * Currently only adds output for remote profiles, nothing for local users.
+     *
+     * @param HTMLOutputter $out
+     * @param Profile $profile (may also be an ArrayWrapper... sigh)
+     */
+    protected function showProfileOptions(HTMLOutputter $out, $profile)
+    {
+        $isRemote = !(User::getKV('id', $profile->id));
         if ($isRemote) {
             $target = common_local_url('remoteprofile', array('id' => $profile->id));
+            // TRANS: Label for access to remote profile options.
             $label = _m('Remote profile options...');
-            $item->out->elementStart('div', 'remote-profile-options');
-            $item->out->element('a', array('href' => $target), $label);
-            $item->out->elementEnd('div');
+            $out->elementStart('div', 'remote-profile-options');
+            $out->element('a', array('href' => $target), $label);
+            $out->elementEnd('div');
         }
     }
 }