summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/groupsearch.php107
-rw-r--r--actions/twittersettings.php2
-rw-r--r--htaccess.sample1
-rw-r--r--lib/facebookaction.php2
-rw-r--r--lib/facebookutil.php2
-rw-r--r--lib/searchgroupnav.php2
-rw-r--r--lib/twitter.php2
-rw-r--r--lib/util.php2
8 files changed, 117 insertions, 3 deletions
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
new file mode 100644
index 000000000..66f5c87b3
--- /dev/null
+++ b/actions/groupsearch.php
@@ -0,0 +1,107 @@
+<?php
+
+
+// define('GROUPS_PER_PAGE', 20);
+
+
+/**
+ * Group search action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Robin Millette <millette@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://laconi.ca/
+ *
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, 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('LACONICA')) {
+ exit(1);
+}
+
+//require_once INSTALLDIR.'/lib/searchaction.php';
+//require_once INSTALLDIR.'/lib/profilelist.php';
+
+/**
+ * Group search action class.
+ *
+ * @category Action
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Robin Millette <millette@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://laconi.ca/
+ */
+class GroupsearchAction extends SearchAction
+{
+ function getInstructions()
+ {
+ return _('Search for groups on %%site.name%% by their name, location, or description. ' .
+ 'Separate the terms by spaces; they must be 3 characters or more.');
+ }
+
+ function title()
+ {
+ return _('Group search');
+ }
+
+ function showResults($q, $page)
+ {
+ $user_group = new User_group;
+ $user_group->limit((($page-1)*GROUPS_PER_PAGE), GROUPS_PER_PAGE + 1);
+ $wheres = array('nickname', 'fullname', 'homepage', 'description', 'location');
+ foreach ($wheres as $where) {
+ $where_q = "$where like '%" . trim($user_group->escape($q), '\'') . '%\'';
+ $user_group->whereAdd($where_q, 'OR');
+ }
+ $cnt = $user_group->find();
+ if ($cnt > 0) {
+ $terms = preg_split('/[\s,]+/', $q);
+ $results = new GroupSearchResults($user_group, $terms, $this);
+ $results->show();
+ } else {
+ $this->element('p', 'error', _('No results'));
+ }
+ $user_group->free();
+ $this->pagination($page > 1, $cnt > GROUPS_PER_PAGE,
+ $page, 'groupsearch', array('q' => $q));
+ }
+}
+
+class GroupSearchResults extends GroupList
+{
+ var $terms = null;
+ var $pattern = null;
+
+ function __construct($user_group, $terms, $action)
+ {
+ parent::__construct($user_group, $terms, $action);
+ $this->terms = array_map('preg_quote',
+ array_map('htmlspecialchars', $terms));
+ $this->pattern = '/('.implode('|',$terms).')/i';
+ }
+
+ function highlight($text)
+ {
+ return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
+ }
+}
+
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index efc8215cd..0c109ab53 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -472,7 +472,7 @@ class TwittersettingsAction extends ConnectSettingsAction
function verifyCredentials($screen_name, $password)
{
- $uri = 'http://twitter.com/account/verifyCredentials.json';
+ $uri = 'http://twitter.com/account/verify_credentials.json';
$data = get_twitter_data($uri, $screen_name, $password);
diff --git a/htaccess.sample b/htaccess.sample
index b80dd88fe..d94652bfd 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -65,6 +65,7 @@ RewriteRule ^settings/sms$ index.php?action=smssettings [L,QSA]
RewriteRule ^settings/twitter$ index.php?action=twittersettings [L,QSA]
RewriteRule ^settings/other$ index.php?action=othersettings [L,QSA]
+RewriteRule ^search/group$ index.php?action=groupsearch [L,QSA]
RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
RewriteRule ^search/notice/rss$ index.php?action=noticesearchrss [L,QSA]
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index a20e618d3..2dbe15970 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -68,6 +68,8 @@ class FacebookAction extends Action
$this->fbuid = $flink->foreign_id;
$this->user = $flink->getUser();
}
+
+ $this->args = array();
}
function prepare($argarray)
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 81737e4d5..a2a2d7cb1 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -57,7 +57,7 @@ function getFacebookBaseCSS()
{
# Add a timestamp to the CSS file so Facebook cache wont ignore our changes
$ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css');
- $cssurl = INSTALLDIR.'/theme/base/css/facebookapp.base.css' . "?ts=$ts";
+ $cssurl = theme_path('css/facebookapp.base.css', 'base') . "?ts=$ts";
return $cssurl;
}
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 4ea226692..9fe3c2379 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -81,6 +81,8 @@ class SearchGroupNav extends Widget
_('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
$this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
_('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
+ $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
+ _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_notice');
$this->action->elementEnd('ul');
}
}
diff --git a/lib/twitter.php b/lib/twitter.php
index 5eb15005a..197298549 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -42,7 +42,7 @@ function get_twitter_data($uri, $screen_name, $password)
$errmsg = curl_error($ch);
if ($errmsg) {
- common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $twit_user.",
+ common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $screen_name.",
__FILE__);
}
diff --git a/lib/util.php b/lib/util.php
index 0b5abfa48..4b77f7c19 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -823,6 +823,8 @@ function common_fancy_url($action, $args=null)
return common_path('settings/im');
case 'avatarsettings':
return common_path('settings/avatar');
+ case 'groupsearch':
+ return common_path('search/group' . (($args) ? ('?' . http_build_query($args)) : ''));
case 'peoplesearch':
return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
case 'noticesearch':
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-10 00:39:25 +0000