From 8114676bd4fd783ba9580a5dbf8bf0029a1554c9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 23 Jan 2009 07:22:01 +0000 Subject: [PATCH 1/3] trac750 Let's try that again - fix for base css href --- lib/facebookaction.php | 2 ++ lib/facebookutil.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/facebookaction.php b/lib/facebookaction.php index a20e618d3a..2dbe159708 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 81737e4d53..a2a2d7cb1b 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; } From 965d4db26560892024503f538f107604b0f1bb45 Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Fri, 23 Jan 2009 07:50:55 +0000 Subject: [PATCH 2/3] Group search --- actions/groupsearch.php | 107 ++++++++++++++++++++++++++++++++++++++++ htaccess.sample | 1 + lib/searchgroupnav.php | 2 + lib/util.php | 2 + 4 files changed, 112 insertions(+) create mode 100644 actions/groupsearch.php diff --git a/actions/groupsearch.php b/actions/groupsearch.php new file mode 100644 index 0000000000..66f5c87b3f --- /dev/null +++ b/actions/groupsearch.php @@ -0,0 +1,107 @@ + + * @author Robin Millette + * @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 . + */ + +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 + * @author Robin Millette + * @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, '\\1', htmlspecialchars($text)); + } +} + diff --git a/htaccess.sample b/htaccess.sample index 2a64e80604..f187395ec8 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -62,6 +62,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/searchgroupnav.php b/lib/searchgroupnav.php index 4ea2266926..9fe3c2379a 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/util.php b/lib/util.php index 0b5abfa480..4b77f7c19c 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': From 85321cede0abba7a5d08fad7fcb348d1bacc98b3 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 23 Jan 2009 00:11:05 -0800 Subject: [PATCH 3/3] Fix for Twitter bridge bug introduced by uiredesign merge --- actions/twittersettings.php | 2 +- lib/twitter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/twittersettings.php b/actions/twittersettings.php index efc8215cdf..0c109ab53a 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/lib/twitter.php b/lib/twitter.php index 5eb15005a6..1972985493 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__); }