From 2daa31f142862265f80cdf52d2aa02e40fc303d7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 19 Nov 2009 12:34:56 -0500 Subject: show maps on inbox and personal page --- plugins/Mapstraction/MapstractionPlugin.php | 94 ++++++++++++++++++++- plugins/Mapstraction/allmap.php | 125 ++++++++++++++++++++++++++++ plugins/Mapstraction/usermap.php | 51 ------------ 3 files changed, 218 insertions(+), 52 deletions(-) create mode 100644 plugins/Mapstraction/allmap.php (limited to 'plugins/Mapstraction') diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 4b80ff979..eabd0d0f0 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -109,8 +109,9 @@ class MapstractionPlugin extends Plugin function onEndShowScripts($action) { + $actionName = $action->trimmed('action'); // These are the ones that have maps on 'em - if (!in_array($action->trimmed('action'), + if (!in_array($actionName, array('showstream', 'all', 'allmap', 'usermap'))) { return true; } @@ -144,10 +145,101 @@ class MapstractionPlugin extends Plugin common_path('plugins/Mapstraction/js/mxn.js'), $this->provider)); + $action->script(common_path('plugins/Mapstraction/usermap.js')); + $action->elementStart('script', array('type' => 'text/javascript')); $action->raw(sprintf('var _provider = "%s";', $this->provider)); $action->elementEnd('script'); + switch ($actionName) { + case 'usermap': + case 'showstream': + $notice = empty($action->tag) + ? $action->user->getNotices(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) + : $action->user->getTaggedNotices($action->tag, ($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); + break; + case 'all': + case 'allmap': + $cur = common_current_user(); + if (!empty($cur) && $cur->id == $action->user->id) { + $notice = $action->user->noticeInbox(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } else { + $notice = $action->user->noticesWithFriends(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } + break; + } + + $jsonArray = array(); + + while ($notice->fetch()) { + if (!empty($notice->lat) && !empty($notice->lon)) { + $jsonNotice = $this->noticeAsJson($notice); + $jsonArray[] = $jsonNotice; + } + } + + $action->elementStart('script', array('type' => 'text/javascript')); + $action->raw('var _notices = ' . json_encode($jsonArray)); + $action->elementEnd('script'); + return true; } + + function onEndShowSections($action) + { + $actionName = $action->trimmed('action'); + // These are the ones that have maps on 'em + if (!in_array($actionName, + array('showstream', 'all'))) { + return true; + } + + $action->elementStart('div', array('id' => 'entity_map', + 'class' => 'section')); + + $action->element('h2', null, _('Map')); + + $action->element('div', array('id' => 'map_canvas', + 'class' => 'gray smallmap', + 'style' => "width: 100%; height: 240px")); + + $mapAct = ($actionName == 'showstream') ? 'usermap' : 'allmap'; + $mapUrl = common_local_url($mapAct, + array('nickname' => $action->trimmed('nickname'))); + + $action->element('a', array('href' => $mapUrl), + _("Full size")); + + $action->elementEnd('div'); + } + + function noticeAsJson($notice) + { + // FIXME: this code should be abstracted to a neutral third + // party, like Notice::asJson(). I'm not sure of the ethics + // of refactoring from within a plugin, so I'm just abusing + // the ApiAction method. Don't do this unless you're me! + + require_once(INSTALLDIR.'/lib/api.php'); + + $act = new ApiAction('/dev/null'); + + $arr = $act->twitterStatusArray($notice, true); + $arr['url'] = $notice->bestUrl(); + $arr['html'] = htmlspecialchars($notice->rendered); + $arr['source'] = htmlspecialchars($arr['source']); + + if (!empty($notice->reply_to)) { + $reply_to = Notice::staticGet('id', $notice->reply_to); + if (!empty($reply_to)) { + $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); + } + $reply_to = null; + } + + $profile = $notice->getProfile(); + $arr['user']['profile_url'] = $profile->profileurl; + + return $arr; + } } diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php new file mode 100644 index 000000000..6a48b141f --- /dev/null +++ b/plugins/Mapstraction/allmap.php @@ -0,0 +1,125 @@ +. + * + * @category Mapstraction + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Show a map of user's notices + * + * @category Mapstraction + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class AllmapAction extends OwnerDesignAction +{ + var $profile = null; + var $page = null; + var $notices = null; + + public $plugin = null; + + function prepare($args) + { + parent::prepare($args); + + $nickname_arg = $this->arg('nickname'); + $nickname = common_canonical_nickname($nickname_arg); + + // Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + if ($this->arg('page') && $this->arg('page') != 1) { + $args['page'] = $this->arg['page']; + } + common_redirect(common_local_url($this->trimmed('action'), $args), 301); + return false; + } + + $this->user = User::staticGet('nickname', $nickname); + + if (!$this->user) { + $this->clientError(_('No such user.'), 404); + return false; + } + + $this->profile = $this->user->getProfile(); + + if (!$this->profile) { + $this->serverError(_('User has no profile.')); + return false; + } + + $page = $this->trimmed('page'); + + if (!empty($page) && Validate::number($page)) { + $this->page = $page+0; + } else { + $this->page = 1; + } + + return true; + } + + function title() + { + if (!empty($this->profile->fullname)) { + $base = $this->profile->fullname . ' (' . $this->user->nickname . ') '; + } else { + $base = $this->user->nickname; + } + + if ($this->page == 1) { + return sprintf(_("%s friends map"), + $base); + } else { + return sprintf(_("%s friends map, page %d"), + $base, + $this->page); + } + } + + function handle($args) + { + parent::handle($args); + $this->showPage(); + } + + function showContent() + { + $this->element('div', array('id' => 'map_canvas', + 'class' => 'gray smallmap', + 'style' => "width: 100%; height: 400px")); + } +} \ No newline at end of file diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php index 3f020f943..fbf1469c3 100644 --- a/plugins/Mapstraction/usermap.php +++ b/plugins/Mapstraction/usermap.php @@ -123,55 +123,4 @@ class UsermapAction extends OwnerDesignAction 'class' => 'gray smallmap', 'style' => "width: 100%; height: 400px")); } - - function showScripts() - { - parent::showScripts(); - - $this->script(common_path('plugins/Mapstraction/usermap.js')); - - $jsonArray = array(); - - while ($this->notices->fetch()) { - if (!empty($this->notices->lat) && !empty($this->notices->lon)) { - $jsonNotice = $this->noticeAsJson($this->notices); - $jsonArray[] = $jsonNotice; - } - } - - $this->elementStart('script', array('type' => 'text/javascript')); - $this->raw('var _notices = ' . json_encode($jsonArray)); - $this->elementEnd('script'); - } - - function noticeAsJson($notice) - { - // FIXME: this code should be abstracted to a neutral third - // party, like Notice::asJson(). I'm not sure of the ethics - // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Don't do this unless you're me! - - require_once(INSTALLDIR.'/lib/api.php'); - - $act = new ApiAction('/dev/null'); - - $arr = $act->twitterStatusArray($notice, true); - $arr['url'] = $notice->bestUrl(); - $arr['html'] = htmlspecialchars($notice->rendered); - $arr['source'] = htmlspecialchars($arr['source']); - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } - - $profile = $notice->getProfile(); - $arr['user']['profile_url'] = $profile->profileurl; - - return $arr; - } - } \ No newline at end of file -- cgit v1.2.3-54-g00ecf