Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

3 files changed, 245 insertions, 0 deletions

diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
new file mode 100644
index 000000000..3e7a8c745
--- /dev/null
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Some UI extras for now...
+ *
+ * @package ModPlusPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+class ModPlusPlugin extends Plugin
+{
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'ModPlus',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:ModPlus',
+                            'rawdescription' =>
+                            _m('UI extensions for profile moderation actions.'));
+
+        return true;
+    }
+
+    /**
+     * Load JS at runtime if we're logged in.
+     *
+     * @param Action $action
+     * @return boolean hook result
+     */
+    function onEndShowScripts($action)
+    {
+        $user = common_current_user();
+        if ($user) {
+            $action->script('plugins/ModPlus/modplus.js');
+        }
+        return true;
+    }
+
+    function onEndShowStatusNetStyles($action) {
+        $action->cssLink('plugins/ModPlus/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
+     *
+     * 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]+'));
+
+        return true;
+    }
+
+    function onStartShowNoticeItem($item)
+    {
+        $profile = $item->profile;
+        $isRemote = !(User::staticGet('id', $profile->id));
+        if ($isRemote) {
+            $target = common_local_url('remoteprofile', array('id' => $profile->id));
+            $label = _m('Remote profile options...');
+            $item->out->elementStart('div', 'remote-profile-options');
+            $item->out->element('a', array('href' => $target), $label);
+            $item->out->elementEnd('div');
+        }
+    }
+}
diff --git a/plugins/ModPlus/modplus.css b/plugins/ModPlus/modplus.css
new file mode 100644
index 000000000..8d2fc8fba
--- /dev/null
+++ b/plugins/ModPlus/modplus.css
@@ -0,0 +1,23 @@
+.remote-profile-options {
+    position: absolute;
+    z-index: 999;
+
+    background: url(../../theme/base/images/icons/twotone/green/admin.gif) no-repeat 8px 8px white;
+    border: solid 1px #c0c0c0;
+
+    margin-top: 56px;
+
+    padding: 6px 16px;
+    padding-left: 32px;
+
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    -msie-border-radius: 8px;
+    border-radius: 8px;
+
+    box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+    -moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+    -webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+
+    display: none;
+}
diff --git a/plugins/ModPlus/remoteprofileaction.php b/plugins/ModPlus/remoteprofileaction.php
new file mode 100644
index 000000000..caa5e6fbf
--- /dev/null
+++ b/plugins/ModPlus/remoteprofileaction.php
@@ -0,0 +1,106 @@
+<?php
+/* 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+class RemoteProfileAction extends ShowstreamAction
+{
+    function prepare($args)
+    {
+        OwnerDesignAction::prepare($args); // skip the ProfileAction code and replace it...
+
+        $id = $this->arg('id');
+        $this->user = false;
+        $this->profile = Profile::staticGet('id', $id);
+
+        if (!$this->profile) {
+            $this->serverError(_('User has no profile.'));
+            return false;
+        }
+
+        $user = User::staticGet('id', $this->profile->id);
+        if ($user) {
+            // This is a local user -- send to their regular profile.
+            $url = common_local_url('showstream', array('nickname' => $user->nickname));
+            common_redirect($url);
+            return false;
+        }
+
+        $this->tag = $this->trimmed('tag');
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        common_set_returnto($this->selfUrl());
+        return true;
+    }
+
+    function handle($args)
+    {
+        // skip yadis thingy
+        $this->showPage();
+    }
+
+    function title()
+    {
+        // maybe fixed in 0.9.x
+        if (!empty($this->profile->fullname)) {
+            $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
+        } else {
+            $base = $this->profile->nickname;
+        }
+        $host = parse_url($this->profile->profileurl, PHP_URL_HOST);
+        return sprintf(_m('%s on %s'), $base, $host);
+    }
+
+    /**
+     * Instead of showing notices, link to the original offsite profile.
+     */
+    function showNotices()
+    {
+        $url = $this->profile->profileurl;
+        $host = parse_url($url, PHP_URL_HOST);
+        $markdown = sprintf(
+                _m('This remote profile is registered on another site; see [%s\'s original profile page on %s](%s).'),
+                $this->profile->nickname,
+                $host,
+                $url);
+        $html = common_markup_to_html($markdown);
+        $this->raw($html);
+
+        if ($this->profile->hasRole(Profile_role::SILENCED)) {
+            $markdown = _m('Site moderators have silenced this profile, which prevents delivery of new messages to any users on this site.');
+            $this->raw(common_markup_to_html($markdown));
+        }
+    }
+
+    function getFeeds()
+    {
+        // none
+    }
+
+    /**
+     * Don't do various extra stuff, and also trim some things to avoid crawlers.
+     */
+    function extraHead()
+    {
+        $this->element('meta', array('name' => 'robots',
+                                     'content' => 'noindex,nofollow'));
+    }
+
+    function showLocalNav()
+    {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
+    }
+
+    function showSections()
+    {
+        ProfileAction::showSections();
+        // skip tag cloud
+    }
+
+    function showStatistics()
+    {
+        // skip
+    }
+
+}
\ No newline at end of file