summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/personalgroupnav.php68
-rw-r--r--lib/searchaction.php2
-rw-r--r--lib/tagcloudsection.php124
-rw-r--r--lib/twitterapi.php2
-rw-r--r--lib/util.php1
5 files changed, 38 insertions, 159 deletions
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 63e6138df..acc033667 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -93,43 +93,45 @@ class PersonalGroupNav extends Widget
$this->out->elementStart('ul', array('class' => 'nav'));
- $this->out->menuItem(common_local_url('all', array('nickname' =>
- $nickname)),
- _('Personal'),
- sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
- $action == 'all', 'nav_timeline_personal');
- $this->out->menuItem(common_local_url('replies', array('nickname' =>
- $nickname)),
- _('Replies'),
- sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
- $action == 'replies', 'nav_timeline_replies');
- $this->out->menuItem(common_local_url('showstream', array('nickname' =>
- $nickname)),
- _('Profile'),
- ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
- $action == 'showstream', 'nav_profile');
- $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
- $nickname)),
- _('Favorites'),
- sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
- $action == 'showfavorites', 'nav_timeline_favorites');
+ if (Event::handle('StartPersonalGroupNav', array($this))) {
+ $this->out->menuItem(common_local_url('all', array('nickname' =>
+ $nickname)),
+ _('Personal'),
+ sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+ $action == 'all', 'nav_timeline_personal');
+ $this->out->menuItem(common_local_url('replies', array('nickname' =>
+ $nickname)),
+ _('Replies'),
+ sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+ $action == 'replies', 'nav_timeline_replies');
+ $this->out->menuItem(common_local_url('showstream', array('nickname' =>
+ $nickname)),
+ _('Profile'),
+ ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
+ $action == 'showstream', 'nav_profile');
+ $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
+ $nickname)),
+ _('Favorites'),
+ sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+ $action == 'showfavorites', 'nav_timeline_favorites');
- $cur = common_current_user();
+ $cur = common_current_user();
- if ($cur && $cur->id == $user->id) {
+ if ($cur && $cur->id == $user->id) {
- $this->out->menuItem(common_local_url('inbox', array('nickname' =>
- $nickname)),
- _('Inbox'),
- _('Your incoming messages'),
- $action == 'inbox');
- $this->out->menuItem(common_local_url('outbox', array('nickname' =>
- $nickname)),
- _('Outbox'),
- _('Your sent messages'),
- $action == 'outbox');
+ $this->out->menuItem(common_local_url('inbox', array('nickname' =>
+ $nickname)),
+ _('Inbox'),
+ _('Your incoming messages'),
+ $action == 'inbox');
+ $this->out->menuItem(common_local_url('outbox', array('nickname' =>
+ $nickname)),
+ _('Outbox'),
+ _('Your sent messages'),
+ $action == 'outbox');
+ }
+ Event::handle('EndPersonalGroupNav', array($this));
}
-
$this->out->elementEnd('ul');
}
}
diff --git a/lib/searchaction.php b/lib/searchaction.php
index e74450e11..e7ad4affd 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -51,7 +51,7 @@ class SearchAction extends Action
*
* @return boolean true
*/
- function isReadOnly($args)
+ function isReadOnly()
{
return true;
}
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
deleted file mode 100644
index ff2aca6d6..000000000
--- a/lib/tagcloudsection.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Laconica, the distributed open-source microblogging tool
- *
- * Base class for sections showing tag clouds
- *
- * PHP version 5
- *
- * LICENCE: 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/>.
- *
- * @category Widget
- * @package Laconica
- * @author Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://laconi.ca/
- */
-
-if (!defined('LACONICA')) {
- exit(1);
-}
-
-define('TAGS_PER_SECTION', 20);
-
-/**
- * Base class for sections
- *
- * These are the widgets that show interesting data about a person
- * group, or site.
- *
- * @category Widget
- * @package Laconica
- * @author Evan Prodromou <evan@controlyourself.ca>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://laconi.ca/
- */
-
-class TagCloudSection extends Section
-{
- function showContent()
- {
- $tags = $this->getTags();
-
- if (!$tags) {
- $this->out->element('p', null, _('None'));
- return false;
- }
-
- $cnt = 0;
-
- $tw = array();
- $sum = 0;
-
- while ($tags->fetch() && ++$cnt <= TAGS_PER_SECTION) {
- $tw[$tags->tag] = $tags->weight;
- $sum += $tags->weight;
- }
-
- if ($cnt == 0) {
- $this->out->element('p', null, _('(None)'));
- return false;
- }
-
- ksort($tw);
-
- $this->out->elementStart('ul', 'tags xoxo tag-cloud');
- foreach ($tw as $tag => $weight) {
- $this->showTag($tag, $weight, ($sum == 0) ? 0 : $weight/$sum);
- }
- $this->out->elementEnd('ul');
-
- return ($cnt > TAGS_PER_SECTION);
- }
-
- function getTags()
- {
- return null;
- }
-
- function showTag($tag, $weight, $relative)
- {
- if ($relative > 0.1) {
- $rel = 'tag-cloud-7';
- } else if ($relative > 0.05) {
- $rel = 'tag-cloud-6';
- } else if ($relative > 0.02) {
- $rel = 'tag-cloud-5';
- } else if ($relative > 0.01) {
- $rel = 'tag-cloud-4';
- } else if ($relative > 0.005) {
- $rel = 'tag-cloud-3';
- } else if ($relative > 0.002) {
- $rel = 'tag-cloud-2';
- } else {
- $rel = 'tag-cloud-1';
- }
-
- $this->out->elementStart('li', $rel);
- $this->out->element('a', array('href' => $this->tagUrl($tag)),
- $tag);
- $this->out->elementEnd('li');
- }
-
- function tagUrl($tag)
- {
- return common_local_url('tag', array('tag' => $tag));
- }
-
- function divId()
- {
- return 'tagcloud';
- }
-}
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index b8357c688..6a90b4e28 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -418,7 +418,7 @@ class TwitterapiAction extends Action
function date_twitter($dt)
{
$t = strtotime($dt);
- return date("D M d G:i:s O Y", $t);
+ return date("D M d H:i:s O Y", $t);
}
// XXX: Candidate for a general utility method somewhere?
diff --git a/lib/util.php b/lib/util.php
index 888765548..da009682b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1392,3 +1392,4 @@ function common_database_tablename($tablename)
//table prefixes could be added here later
return $tablename;
}
+
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 19:56:38 +0000