Commit Graph

2222 Commits

Author SHA1 Message Date
Evan Prodromou
0056b635c6 reformat curry() to make my editor happy 2009-08-27 20:06:03 -07:00
Craig Andrews
6ff00c9404 Implement the is_member and membership group api's 2009-08-27 22:55:32 -04:00
Evan Prodromou
a08c76a434 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
Conflicts:
	classes/laconica.ini
2009-08-27 14:52:32 -07:00
Evan Prodromou
bbb830e14c Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-27 14:18:51 -07:00
Evan Prodromou
5d09b6b3f0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
a84c4e3518 add api/laconica for backwards compatibility 2009-08-27 09:34:32 -07:00
Craig Andrews
2dd5a5f86d Do not used named capturing groups
I'm not sure all php 5.2's are compiled with a PCRE library that supported named captures.
2009-08-27 12:06:45 -04:00
Evan Prodromou
089148d286 update version in, and add codename to, lib/common 2009-08-27 08:02:41 -07:00
Evan Prodromou
f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Craig Andrews
eb667d09d9 allow oEmbed resources to be facebook attachments 2009-08-26 22:09:46 -04:00
Craig Andrews
3e362233ee Merge commit 'laconica/0.8.x' into 0.9.x 2009-08-26 21:56:59 -04:00
Craig Andrews
b7beac36c2 Support multiple attachments per facebook update 2009-08-26 21:54:57 -04:00
Craig Andrews
6d60d74093 Display linked oembed resources as enclosures if they are of non-html mime types 2009-08-26 15:40:51 -04:00
Evan Prodromou
b04bc29c3a change hidden label for site content license link 2009-08-26 10:51:44 -04:00
Evan Prodromou
6d0a26a407 define LACONICA_VERSION for backwards compatibility 2009-08-26 10:43:44 -04:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Zach Copley
937a05fb5d Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-26 14:35:25 +00:00
Evan Prodromou
434abed511 add back in /etc/laconica/* for compatibility 2009-08-26 10:34:50 -04:00
Zach Copley
cbdf8e51aa Facebook app wasn't loading the theme css 2009-08-26 14:34:41 +00:00
Evan Prodromou
379c80e26e add *Laconica* events back in for backwards compatibility 2009-08-26 10:33:04 -04:00
Evan Prodromou
c5cf2c4c94 Merge branch '0.8.x' into testing 2009-08-26 10:27:53 -04:00
Evan Prodromou
fd53fba114 more logging in xmppqueuehandler 2009-08-26 05:50:20 -04:00
Evan Prodromou
e1b5ca85f9 more log output in queue handlers 2009-08-26 05:46:41 -04:00
Evan Prodromou
e3a53251c0 last scrub of Laconica -> StatusNet 2009-08-26 03:33:43 -04:00
Evan Prodromou
3567b9d708 global search and replace for laconica -> statusnet 2009-08-25 18:53:24 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou
4737563b95 a distributed -> the distributed 2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou
d0baab6978 Merge branch '0.8.x' into testing 2009-08-25 18:01:46 -04:00
Craig Andrews
a2117961be Allow ({['" to preceded #tags 2009-08-25 17:54:08 -04:00
Sarven Capadisli
ada615d3ca Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-25 21:50:38 +00:00
Sarven Capadisli
fc89c345ed userdesign.go.js was incorrectly removed in commit
304db1d30b
2009-08-25 21:48:55 +00:00
Craig Andrews
31329c33ae Handle grouping symbols ()[]{} correctly. Now passing all tests! 2009-08-25 16:41:44 -04:00
Craig Andrews
ff836eb38a Add UTF-8 encodings of the IDN TLDs 2009-08-25 14:19:05 -04:00
Craig Andrews
210bc4248b All tests pass except for those that require matching parens or brackets 2009-08-25 14:12:31 -04:00
Craig Andrews
6a3a25b5a2 Improved the URL tests, and improve the matcher so more tests are passed. The remaining failing tests I believe are incorrect. 2009-08-25 11:21:45 -04:00
Evan Prodromou
ce442c049b remove some merge cruft from the end of twitter.php 2009-08-24 17:44:19 -04:00
Evan Prodromou
ff87732053 Merge branch '0.8.x' into testing
Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php
2009-08-24 16:55:49 -04:00
Zach Copley
aa4066bac6 Use ssl for fetching frinds_timeline from Twitter since it requires auth and is a protected resource 2009-08-24 11:54:35 -04:00
Zach Copley
fd9d653eb3 Make TwitterStatusFetcher daemon work with OAuth 2009-08-24 11:53:43 -04:00
Zach Copley
ee006dbb0e Moved some stuff to a base class 2009-08-24 11:53:21 -04:00
Zach Copley
500f0c7072 Make the TwitterQueuehandler post to Twitter using OAuth 2009-08-24 11:52:28 -04:00
Zach Copley
e9edaab358 Twitter OAuth server dance working 2009-08-24 11:52:15 -04:00
Evan Prodromou
77f303c2be Merge branch 'master' into testing
Conflicts:
	lib/rssaction.php
	lib/twitterapi.php
2009-08-24 11:28:16 -04:00
Craig Andrews
86ba7b13c2 Finally got the IPv6 regex right in the url finder 2009-08-21 22:58:43 -04:00
Craig Andrews
579a41b56f Improve url finding more. Properly end urls when a space is caught. 2009-08-21 21:11:23 -04:00
Craig Andrews
0615fda25e URLs surrounded by (),{}, and [] are correctly handled now! 2009-08-21 20:01:33 -04:00
Evan Prodromou
59beff6b46 Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183.

This functionality will need to be rewritten to work with the new
OpenIDPlugin.

Conflicts:

	index.php
	lib/logingroupnav.php
2009-08-21 16:45:42 -04:00
Evan Prodromou
bacef32aac Revert "Added a configuration option to disable OpenID."
This reverts commit 7dc3a90d12.

Conflicts:

	actions/login.php
	actions/register.php
	lib/accountsettingsaction.php
	lib/common.php
	lib/logingroupnav.php
2009-08-21 16:38:39 -04:00
Evan Prodromou
9f356b55c6 Merge branch '0.9.x' into openidplugin
Conflicts:
	actions/login.php
	actions/register.php
2009-08-21 16:27:43 -04:00
Evan Prodromou
8236037bf0 Merge branch 'dbconfig' into 0.9.x
Conflicts:
	lib/common.php
2009-08-21 16:17:06 -04:00
Evan Prodromou
538dcf2eef load configuration options from database at runtime 2009-08-21 16:14:32 -04:00
Brion Vibber
5c21a371d6 Include php-gettext 1.0.7 into extlibs; loading it up if native gettext extension is not present.
This provides a pure PHP implementation of the gettext functions.

This should help get laconica running on shared hosting environments where PHP's gettext module may not be installed.
Also gets us one step closer to running on Mac OS X 10.5 with Apple's preinstalled PHP, which doesn't provide an easy way to add modules.

Source: http://savannah.nongnu.org/projects/php-gettext
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
GPLv2 or later
2009-08-21 16:01:51 -04:00
Craig Andrews
871903a319 Linkifier support many more urls, and less mismatches 2009-08-21 15:56:15 -04:00
Evan Prodromou
b2664e1ae2 Merge branch '0.8.x' into 0.9.x
Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php
2009-08-21 15:42:11 -04:00
Craig Andrews
70ca03f336 Use currying to call the url callbacks, and use preg_replace_callback
This definitely looks neater than the string maniplation it replaces
2009-08-21 12:47:01 -04:00
Evan Prodromou
d1cc159a04 facebook action correctly checks max notice length 2009-08-21 08:23:52 -04:00
Evan Prodromou
35bf388204 url-shortening check correctly checks max notice length 2009-08-21 08:16:08 -04:00
Evan Prodromou
3eeb9deffb Web UI for notices correctly shows and checks max content length 2009-08-21 08:13:17 -04:00
Evan Prodromou
de5382d4ca message input form correctly shows and check max length 2009-08-21 07:23:27 -04:00
Evan Prodromou
eb309f788b correctly check Message length for d-commands 2009-08-21 07:21:29 -04:00
Evan Prodromou
7a68272580 correct instructions for length in groupeditform 2009-08-21 06:37:22 -04:00
Evan Prodromou
a28bbdfb0f configuration options for text limits 2009-08-21 06:33:22 -04:00
Evan Prodromou
c8b3557802 make common_config() handle nulls correctly 2009-08-21 06:33:12 -04:00
Evan Prodromou
3acdda4327 reformat groupeditform.php 2009-08-21 06:17:13 -04:00
Evan Prodromou
4b2aa51750 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x 2009-08-20 17:13:40 -04:00
Marcel van der Boom
418a5a95ab Change the notice type defines all into class constants and adapt all files. 2009-08-20 13:11:22 -04:00
Francois Marier
986d95b31e Fix the default value of ['server']['path'] when running from command line scripts
The logic in _sn_to_path() doesn't make sense when not running via a remote server.

Default to the empty string if running from the command line and ['server']['path']
is not set manually in config.php
2009-08-20 17:46:26 +12:00
Craig Andrews
f4e4a8dd8a Removed all the redundant logic in common_replace_urls_callback
Modified the regex so that strings such as /usr/share/perl5/HTML/Mason/ApacheHandler.pm as not turned into links
2009-08-18 20:42:06 -04:00
Craig Andrews
ce004083d9 IPv4 and IPv6 addresses are picked up in URLs
Added ".onion" as a possible TLD
2009-08-18 14:15:55 -04:00
Craig Andrews
136a69a387 Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x 2009-08-16 19:50:37 -04:00
Jeffery To
75a0a3e18b Fixed OpenID appearing in primary nav when OpenID is enabled but not OpenID-only 2009-08-15 00:17:00 +08:00
Evan Prodromou
2cf50ea432 whitespace in error.php 2009-08-14 08:04:03 -07:00
Jeffery To
7dc3a90d12 Added a configuration option to disable OpenID.
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.

If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
2009-08-13 22:18:06 +08:00
Evan Prodromou
a0f6b4f078 ServerErrorAction always logs 2009-08-12 11:16:57 -07:00
Evan Prodromou
347f74d650 ServerErrorAction always logs 2009-08-12 11:16:31 -07:00
Craig Andrews
853b6d38b3 Define the member variable N
N is defined in the DB_DataObject class, which this class kind of extends. So to keep a consistent interface for consumers, we need to have N defined here.
2009-08-12 11:53:46 -04:00
Craig Andrews
7eda7295e4 oEmbed provider does not use the twitter api library classes any more 2009-08-11 21:15:42 -04:00
Craig Andrews
b93df1ccbc Merge commit 'jeff-themovie/0.8.x-private-search' into 0.8.x 2009-08-11 10:39:44 -04:00
Evan Prodromou
2d29800b6f Merge branch 'master' into 0.8.x
Conflicts:
	lib/mail.php
	lib/rssaction.php
	lib/twitterapi.php
2009-08-11 10:23:11 -04:00
Jeffery To
4d37e919ec Don't show Search in the primary nav if the user isn't logged in and the site is private 2009-08-11 20:47:41 +08:00
Brett Taylor
d6bcc635bb two variables $public and $system were generating notices in lib/htmloutputter.php, removed because these two parameters are null by default. 2009-08-11 15:53:37 +12:00
Evan Prodromou
3cdefe9983 Revert "Typo, session_name is a function."
This reverts commit d0793c0f44.
2009-08-10 16:42:10 -04:00
Craig Andrews
e9ed20a69d Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x 2009-08-10 11:53:35 -04:00
Adrian Lang
d0793c0f44 Typo, session_name is a function. 2009-08-10 15:24:27 +02:00
Adrian Lang
ec88d2650e Replace own OMB stack with libomb. 2009-08-10 14:48:50 +02:00
Zach Copley
17dcf1c317 Merge branch 'twitter-oauth' into 0.8.x
Conflicts:

	scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
Zach Copley
27548c6903 I forgot that we don't do database upgrades for point releases. So I've
changed Twitter OAuth to store token and token secret in the same field
in foreign_link (credentials).  This should be changed in 0.9.
2009-08-10 07:00:59 +00:00
Zach Copley
fa8433308f Moved some stuff around. More comments and phpcs compliance. 2009-08-10 06:05:43 +00:00
Jeffery To
14b46e2183 Added configuration option to only allow OpenID logins.
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.

The user will still need to set a password to access the API and RSS
feeds.
2009-08-10 13:57:39 +08:00
Craig Andrews
060d5c4b8e Fix logic that determines if a URL is relative or absolute in script() and cssLink() 2009-08-08 22:56:42 -04:00
Zach Copley
e3bb64cd6c Merge branch '0.8.x' into twitter-oauth 2009-08-08 18:11:47 +00:00
Zach Copley
9ec022df93 Only populate attachments array element if there are attachments 2009-08-08 00:57:49 +00:00
Zach Copley
348fa35c6b Also show XML representation of attachments in the API 2009-08-08 00:57:41 +00:00
Zach Copley
0cfdc2b91b Post to Facebook user's stream if notice has an attachment, otherwise post notice as a status update 2009-08-08 00:57:29 +00:00
Zach Copley
2399908138 Better error handling when updating Facebook 2009-08-08 00:57:21 +00:00
Brenda Wallace
4e7546fbe2 Call $this->getNotices() always, becuase $this will be the right class.
e.g.
TagrssAction
 or
PublicrssAction
2009-08-08 00:56:01 +00:00
anontwit
468252ee6a bug 1770 conversation link for email 2009-08-07 18:32:15 -04:00
Craig Andrews
a7a87913be Redirect instead of showing an error when the user visits a non-local notice's url
Use consistent logic in display non-local notice links

Fixes http://laconi.ca/trac/ticket/1788
2009-08-07 18:26:12 -04:00
Craig Andrews
11086c7823 Implemented the list_all and list groups API methods as defined at http://laconi.ca/trac/wiki/ProposedGroupsAPI
Made the Autocomplete plugin also autocomplete groups
2009-08-07 18:00:04 -04:00
Craig Andrews
f917485a0d Merge commit 'jeff-themovie/0.8.x-jsonsearchresultslist' into 0.8.x 2009-08-06 22:39:38 -04:00
Craig Andrews
1c3a1360a9 Merge commit 'jeff-themovie/0.8.x-subsystems-enabled' into 0.8.x 2009-08-06 22:38:06 -04:00
Zach Copley
c03d593287 Make TwitterStatusFetcher extend ParallelizingDaemon 2009-08-06 22:52:58 +00:00
Craig Andrews
04ed583cc5 remove redundant/unnecessary lines 2009-08-06 18:05:46 -04:00
Craig Andrews
26b608d914 Support the 'lite' parameter to statuses/friends and statuses/followers twitter api methods.
http://laconi.ca/trac/ticket/1786
2009-08-06 15:14:27 -04:00
Jeffery To
7c9e12a0b8 Fixed IM and SMS enabled options to default to true. 2009-08-07 01:57:43 +08:00
Jeffery To
5f293f0e2f Added configuration option to disable post-by-email.
This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled.
2009-08-07 01:55:31 +08:00
Jeffery To
93f585446e Added configuration options to enable/disable SMS and Twitter integration.
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
2009-08-07 01:18:17 +08:00
Craig Andrews
e386a75d1b Check theme first for CSS files, then use the non-theme path.
Fixes CSS links in plugins
2009-08-06 13:07:14 -04:00
Jeffery To
ad1c91a1cf Fixed missing/null values from JSON search results 2009-08-07 00:03:50 +08:00
Craig Andrews
c8c2d9d7c9 Make 2nd and 3rd cssLink() arguments optional 2009-08-06 11:18:57 -04:00
Zach Copley
421e33f145 - Rewrote SyncTwitterFriends as a daemon
- Made it use OAuth
- Code clean up
2009-08-06 07:03:05 +00:00
Zach Copley
6d29592ec7 Abstract out the parallelizing daemon stuff 2009-08-06 01:15:08 +00:00
Craig Andrews
2eaf738bf7 Handle relative and absolute url parameters to script() and cssLink() 2009-08-05 20:28:46 -04:00
Craig Andrews
304db1d30b Use script() and cssLink() methods everywhere instead of manually writing out javascript and css each time 2009-08-05 19:45:12 -04:00
Craig Andrews
6a76addbe8 Added cssLink() and script() functions to htmloutputter 2009-08-05 19:35:42 -04:00
Craig Andrews
feac024348 Accidentally caused the DOCTYPE to never be rendered - fix that. 2009-08-05 19:24:34 -04:00
Craig Andrews
b975a6a0e5 Don't start HTML responses with <?xml if the document is served as text/html.
Starting a text/html mime type document with <?xml causes some browsers (previous version of Opera and IE) to switch to Quirks Mode.
2009-08-05 18:55:47 -04:00
Craig Andrews
95ba22c5d7 Switch DOCTYPE's to the XHTML 5 DOCTYPE 2009-08-05 18:27:27 -04:00
Evan Prodromou
7a61b0737d update version to 0.8.1pre1 2009-08-05 16:06:15 -04:00
Zach Copley
3ebbc1c388 Merge branch '0.8.x' into twitter-oauth 2009-08-05 19:01:15 +00:00
Zach Copley
43eb19910f Post to Facebook user's stream if notice has an attachment, otherwise post notice as a status update 2009-08-04 20:49:18 +00:00
Zach Copley
0685b85d8d Use ssl for fetching frinds_timeline from Twitter since it requires auth and is a protected resource 2009-08-04 17:19:05 +00:00
Evan Prodromou
622c0b24c3 move redirect-to-openid code to OpenID plugin 2009-08-04 13:17:43 -04:00
Evan Prodromou
000e21be19 Merge branch '0.9.x' into openidplugin 2009-08-04 13:10:43 -04:00
Evan Prodromou
8f122dd71e new action for when we redirect to login page 2009-08-04 13:10:37 -04:00
Evan Prodromou
3997682d26 incorrectly moved user xrds to OpenID plugin; fixing 2009-08-04 13:01:23 -04:00
Evan Prodromou
0616ea0205 move check for SSL from util.php to OpenIDPlugin 2009-08-04 13:01:23 -04:00
Evan Prodromou
3245357749 add account settings menu item for OpenID 2009-08-04 13:01:23 -04:00
Evan Prodromou
7a742a0572 show OpenID action in login nav 2009-08-04 13:01:23 -04:00
Evan Prodromou
6d64882270 OpenIDPlugin sets up actions for router 2009-08-04 13:01:23 -04:00
Evan Prodromou
2b79b4d21f Move OpenID-related files to OpenID plugin directory
As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
2009-08-04 13:01:23 -04:00
Evan Prodromou
9421b36498 add an event for head children 2009-08-04 13:01:06 -04:00
Evan Prodromou
c378cc976f add an event for determining if an action is sensitive 2009-08-04 08:58:24 -04:00
Evan Prodromou
6937704ebd give plugins a chance to autoload their classes 2009-08-04 07:34:58 -04:00
Evan Prodromou
58f85463ef error in EndLoginGroupNav arguments 2009-08-04 07:17:14 -04:00
Evan Prodromou
84ca1482ff add hook for showing account settings menu 2009-08-04 07:08:10 -04:00
Evan Prodromou
b3ba7669df Add hooks for Start/End LoginGroupNav 2009-08-04 06:52:57 -04:00
Jeffery To
0155d02cec Fixed PHP Notice "Undefined property: Profile::$value" 2009-08-04 18:45:11 +08:00
Evan Prodromou
b995370d4a 0.9.0 dev version 2009-08-04 06:05:04 -04:00
Zach Copley
fe9fc15286 Make TwitterStatusFetcher daemon work with OAuth 2009-08-04 02:21:18 +00:00
Zach Copley
f94ee5597d Moved some stuff to a base class 2009-08-04 00:46:18 +00:00
Zach Copley
dccd4aa68d Merge branch '0.8.x' into twitter-oauth 2009-08-03 22:47:57 +00:00
Zach Copley
981fa1b33a Make the TwitterQueuehandler post to Twitter using OAuth 2009-08-03 22:46:01 +00:00
Jeffery To
e670e4306b Fixed PHP Notices:
Undefined index:  HTTP_X_FORWARDED_FOR
    Undefined index:  HTTP_CLIENT_IP
    Undefined variable: proxy

Also fixed the return value order to match calls to common_client_ip() in actions/api.php and lib/rssaction.php
2009-08-02 20:10:31 +08:00
Jeffery To
6c1bd67591 Fixed PHP Notice "Undefined index: enclosures" (and a possible one for 'tags') 2009-08-02 19:38:03 +08:00
Jeffery To
b2d2b19d3a Fixed PHP Notice "Use of undefined constant session_name - assumed 'session_name'" 2009-08-02 19:36:09 +08:00
Zach Copley
6f4b2f0ac2 Twitter OAuth server dance working 2009-08-01 08:20:44 +00:00