X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FModPlus%2FModPlusPlugin.php;h=2e1077c22532972b8f73bad13e2a1516ba7265ec;hb=a39f51c0441b22951412b2c00d88c34f39cb39c9;hp=d66ec6054a629724df0d7816bee66b96fdecc0e0;hpb=de55d8f83bb2ecf9461510768fe7147aec592055;p=quix0rs-gnu-social.git

diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index d66ec6054a..2e1077c225 100644
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Some UI extras for now...
@@ -32,7 +30,7 @@ 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' =>
@@ -43,40 +41,19 @@ class ModPlusPlugin extends Plugin
     }
 
     /**
-     * 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'));
-        }
-        return true;
-    }
-
-    function onEndShowStatusNetStyles($action) {
-        $action->cssLink($this->path('modplus.css'));
+        $action->script($this->path('js/modplus.js'));
         return true;
     }
 
-    /**
-     * Add ModPlus-related paths to the router table
-     *
-     * Hook for RouterInitialized event.
-     *
-     * @param Net_URL_Mapper $m URL mapper
-     *
-     * @return boolean hook return
-     */
-    function onStartInitializeRouter($m)
-    {
-        $m->connect('user/remote/:id',
-                array('action' => 'remoteprofile'),
-                array('id' => '[\d]+'));
-
+    public function onEndShowStylesheets(Action $action) {
+        $action->cssLink($this->path('css/modplus.css'));
         return true;
     }
 
@@ -86,9 +63,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;
     }
 
@@ -99,7 +76,7 @@ class ModPlusPlugin extends Plugin
      */
     function onStartProfileListItemProfile($item)
     {
-        $this->showProfileOptions($item->out, $item->profile);
+        $this->showProfileOptions($item->out, $item->profile->getProfile());
         return true;
     }
 
@@ -108,13 +85,12 @@ 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::getKV('id', $profile->id));
-        if ($isRemote) {
-            $target = common_local_url('remoteprofile', array('id' => $profile->id));
+        if (!$profile->isGroup() && !$profile->isLocal()) {
+            $target = common_local_url('userbyid', array('id' => $profile->getID()));
             // TRANS: Label for access to remote profile options.
             $label = _m('Remote profile options...');
             $out->elementStart('div', 'remote-profile-options');