Commit Graph

1481 Commits

Author SHA1 Message Date
Evan Prodromou 85eb53247d change static in router to var 2009-02-20 16:48:49 -05:00
Leslie Michael Orchard 76d506cf16 NOTICES_PER_SECTION already defined in lib/noticesection.php, causing a warning 2009-02-20 16:39:08 -05:00
Leslie Michael Orchard 5bb32ccfd0 Attempt to access non-existent OPENID_COOKIE_KEY cookie causing a warning 2009-02-20 16:38:47 -05:00
Leslie Michael Orchard 17a6e66030 PROFILES_PER_PAGE already defined in lib/common.php 2009-02-20 16:37:39 -05:00
Evan Prodromou 5ec5a22dc7 make tagother work with router 2009-02-20 10:04:28 -05:00
Evan Prodromou 673e7d2559 Merge branch '0.7.x' of evan@dev.controlyourself.ca:/var/www/evan into 0.7.x 2009-02-20 09:59:02 -05:00
Evan Prodromou 1abeaf931e handle if-modified-since in RSS feeds 2009-02-20 14:58:38 +00:00
Evan Prodromou a0ddbecfbc Merge branch '0.7.x' of evan@dev.controlyourself.ca:/var/www/evan into 0.7.x 2009-02-20 09:54:17 -05:00
Evan Prodromou c9def4a876 more correct handling of etags and last-modified 2009-02-18 23:43:26 +00:00
Evan Prodromou d8b6762e6d move peoplesearchresults to its own module 2009-02-18 09:35:59 -05:00
Meitar Moscovitz cca1d77748 Merge branch 'dev-0.7.x' into framebusting
Conflicts:
	lib/action.php
2009-02-18 13:01:52 +11:00
Sarven Capadisli 2eb6a6a9b0 Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review
Conflicts:

	lib/action.php
2009-02-17 20:32:19 +00:00
Evan Prodromou 175c4665cc send mail when @-replies are received 2009-02-16 18:26:15 -05:00
Evan Prodromou c8e71d359c error in hashtag link generation 2009-02-16 18:02:04 -05:00
Evan Prodromou 05ef06d5f2 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-16 13:34:31 -05:00
Robin Millette 9c9b6790ce trac #201 Add flowplayer to enable multimedia playback capability. 2009-02-16 17:46:24 +00:00
Meitar Moscovitz 9d81cef5cc Add framebusting JavaScript to help avoid clickjacking attacks. 2009-02-16 15:45:18 +11:00
Evan Prodromou da2348fbbe Optionally ignore some notice sources for public page
We optionally ignore some notice sources from the public page.
Typically these are automatic notice sources like twitterfeed that
don't usually represent the community on the site very well.
2009-02-14 21:55:25 -05:00
Evan Prodromou 32fc71b432 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-14 21:28:45 -05:00
Evan Prodromou 9b31571449 Merge branch 'master' into 0.7.x 2009-02-14 21:28:30 -05:00
Evan Prodromou 3db9c134a0 Fix More... URL for featured user section 2009-02-14 17:53:11 -05:00
Evan Prodromou b9fc7334a8 Fix the More... link for popular notices section 2009-02-14 17:48:08 -05:00
Zach Copley 02184df7c8 Fixed arguments to syslog (LOG_ERR, not LOG_ERROR) and removed unused function 2009-02-13 10:08:11 -08:00
Evan Prodromou 47c5d508b3 remove debugging info from local_url 2009-02-13 10:47:22 -05:00
Zach Copley c0af950276 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-13 05:45:06 +00:00
Zach Copley 4b7ee5455f We have a FacebookQueueHandler now. The update_facebook.php cron
script is totally deprecated.
2009-02-13 05:42:00 +00:00
Sarven Capadisli 070d1a3f24 Hooks for: custom, laconica, UA specific stylesheets 2009-02-13 04:33:43 +00:00
Zach Copley 47e595b092 Merge branch 'queuehandlers' into 0.7.x 2009-02-12 14:41:27 -08:00
Zach Copley f8e2ad0677 The fabled twitterqueuehandler 2009-02-12 14:39:21 -08:00
Sarven Capadisli dac8d103e6 Hooks for: header, contentblock, footer 2009-02-12 22:16:48 +00:00
Evan Prodromou 3b5fd8fb6b Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
This reverts commit 9f035e2847.

It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou b09eb06dae Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
This reverts commit 616bdd43a9.

Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Evan Prodromou ab8d27b8d1 don't over specialize URLs 2009-02-12 09:22:45 -05:00
Evan Prodromou eaae456222 Add XMLStringer for building XML strings
We had a bunch of
2009-02-12 08:38:43 -05:00
Evan Prodromou 99773e3b5e wrap multiline regexp in quotes so it doesn't mess up my editor's indenting 2009-02-12 07:58:36 -05:00
Zach Copley 986068d6e7 Merge branch '0.7.x' into queuehandlers 2009-02-11 23:07:49 -08:00
Zach Copley 616bdd43a9 Just discovered the PEAR_Error handling function in index.php. Duh.
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley 9f035e2847 Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Zach Copley 7155cf813d Move/reorg Twitter broadcast code to lib/twitter.php in prep for
making a twitterqueuehandler.
2009-02-11 17:46:53 -08:00
Evan Prodromou 9d07032334 fix command classes 2009-02-11 15:48:30 -05:00
Evan Prodromou 5127396325 Move Commands stuff out of classes
The classes/ subdir is primarily for the DB_DataObject classes. Stuff
in there can get stomped by various generation scripts.

I've moved the lurkers there -- related to command-handling -- to
lib/. Since auto-loading works fine with lib/, there shouldn't be much
of a visible change here.
2009-02-11 15:46:29 -05:00
Evan Prodromou 1d5296e596 change htmloutputter to use exception instead of common_user_error 2009-02-11 15:39:49 -05:00
Evan Prodromou ab37f84b5a Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-11 14:46:47 -05:00
Evan Prodromou b5cc7e4aab Handle DB_DataObject errors better
We try to handle DB_DataObject errors a little bit better. Previously,
they just spit out a cryptic string to the browser with a suggestion
to turn on debugging (not a good idea!). So, we catch the error, write
the full error message to the log, and then tell users that the can
contact the admins if they need to.
2009-02-11 14:45:06 -05:00
Sarven Capadisli 012288bdf6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-11 16:53:01 +00:00
Sarven Capadisli fc293545be Minor. Changed from @class location to label 2009-02-11 16:50:07 +00:00
Evan Prodromou 22b10399aa Unify feeds definition in actions
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.

I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.

I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Evan Prodromou 27e23f2dd3 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-11 10:11:26 -05:00
Evan Prodromou 26b0bc3aab Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-11 09:54:23 -05:00
Evan Prodromou 880d0b477b Merge branch 'urlroute' into 0.7.x 2009-02-11 09:53:54 -05:00
Evan Prodromou c640b747f7 add related link to Atom for feeds for some downstream users 2009-02-11 08:35:09 -05:00
Evan Prodromou d345c746b9 add related link to Atom for feeds for some downstream users 2009-02-11 08:34:21 -05:00
Evan Prodromou bba1dbdb40 Use a router singleton 2009-02-11 00:45:11 -05:00
Evan Prodromou fbecbcb693 Build urls using Net_URL_Mapper, too 2009-02-10 22:49:25 -05:00
Evan Prodromou 7b9e69eb89 integrate URL routing into core code 2009-02-10 22:32:38 -05:00
Sean Murphy 646fdea1bf Fixed 1174: schemeless URL auto-linking bug 2009-02-10 17:42:58 -05:00
Robin Millette 7763f804ca trac #233 Explicitely show we have an rss feed for notice searches. 2009-02-10 22:04:47 +00:00
Meitar Moscovitz beddf90663 Trigger only on handheld device screens, not on browser screens, d'oh! 2009-02-11 03:12:14 +11:00
Meitar Moscovitz c9e8b1e5c3 Add streamlined mobile device-friendly styles when enabled in config.
A new mobile-specific style sheet is added and loaded only if the
`$config['site']['mobile']` configuration variable is set to true.
2009-02-11 03:03:16 +11:00
Sean Murphy cf29ef2bc4 Fixed remaining substr_replace with multibyte equivalent. 2009-02-09 19:15:30 -05:00
Robin Millette 0d58652487 trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown. 2009-02-09 17:40:01 -05:00
Sean Murphy bdd9f6ce1d Merge commit 'upstream/0.7.x' into 0.7.x 2009-02-09 17:29:39 -05:00
Sean Murphy f6705f06c0 Fixed #1170: Auto-linking bug when URL cotains special chars. 2009-02-09 17:29:27 -05:00
Evan Prodromou 32744124bc Add a hook for showing sidebar sections 2009-02-09 16:56:38 -05:00
Zach Copley 3e005f2d1b "Change your email address..." msg was printing out \n instead of a newline 2009-02-09 12:45:23 -05:00
Evan Prodromou c87a0c3f58 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-09 12:09:44 -05:00
Evan Prodromou c1bc77efd9 whitespace and formatting 2009-02-09 12:06:06 -05:00
Evan Prodromou 73b8de7c4c Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-09 12:03:45 -05:00
Evan Prodromou 9e23b5c5d7 Change action autoloading to allow actions in plugins
Since plugins may define custom actions, we shouldn't require that
there be a file in our actions/ subdir for every action. So, I changed
the (admittedly hackish) auto-loading code in index.php so it instead
checks whether a class exists with the expected name. This, in turn,
uses the increasingly hacking __autoload() function, which I changed
to auto-load stuff named "BlahblahAction" from the actions subdir if
available.
2009-02-09 11:46:26 -05:00
Robin Millette 43888b5239 trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown. 2009-02-09 15:35:38 +00:00
Evan Prodromou ee4ee388ff include plugin.php early so config can use it 2009-02-09 08:49:28 -05:00
Evan Prodromou dce975e33b allow events without arguments 2009-02-09 08:48:50 -05:00
Evan Prodromou 175f1e7395 utility superclass for plugins 2009-02-09 08:47:11 -05:00
Evan Prodromou f4e8cc6d9f Add InitializePlugin and CleanupPlugin events
We add two events to allow plugins to initialize and cleanup.
2009-02-09 08:44:30 -05:00
Evan Prodromou 5d246299b6 add hooks for JavaScript handling 2009-02-09 08:24:23 -05:00
Evan Prodromou 05991e2206 First events for adding menu items 2009-02-09 08:02:23 -05:00
Evan Prodromou e40d503dfb had the logic on event handler reversed 2009-02-09 08:02:08 -05:00
Evan Prodromou 55cba5007e Fix indentation in lib/action.php 2009-02-09 07:51:23 -05:00
Evan Prodromou e29ebc18c7 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-09 07:26:17 -05:00
Evan Prodromou 5466f6a6d0 Better exception handling in index
Some better exception handling in Web entry point.
2009-02-09 07:25:35 -05:00
Evan Prodromou aa06d760b3 Index and Action use Exceptions
Main Web entry point accepts exceptions, and main code in Action
throws them.
2009-02-09 07:15:52 -05:00
Evan Prodromou 9152c0bdc8 First steps to using exceptions for error handling
Added two exception classes: one for client errors (= user can fix) and
one for server errors (only admin or coder can fix). The web entry point
now tries to catch exceptions and show them in the browser. The main
code for showing errors in Action class now throws an exception and lets
top-level handle it.
2009-02-09 07:12:08 -05:00
Evan Prodromou 12d7c30ef7 Add event.php before config.php is called 2009-02-09 06:52:39 -05:00
Evan Prodromou b1f9dec20e First events code
Add the basic code for adding events.
2009-02-09 06:51:08 -05:00
Sarven Capadisli a64a888609 Using rel="external" instead of class="exlink" 2009-02-07 23:47:37 +00:00
Sean Murphy 805560677b Fixed references to common_avatar_*. 2009-02-07 11:10:46 -05:00
Sean Murphy a3d5e00f64 Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:

	actions/showstream.php
2009-02-07 11:02:10 -05:00
Sean Murphy d900893149 Fixed #1152: Needless image scaling and poor JPG quality 2009-02-07 10:01:08 -05:00
Zach Copley 08db50b24e "Change your email address..." msg was printing out \n instead of a newline 2009-02-06 21:17:45 -08:00
Evan Prodromou 60f737dc1e Update README and version number
README and version number.
2009-02-06 15:35:29 -05:00
Evan Prodromou be6ce27538 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
Conflicts:

	lib/util.php
2009-02-06 14:28:17 -05:00
Evan Prodromou adcbb48362 Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 2009-02-06 14:27:06 -05:00
Sean Murphy 56d7348ec2 Fixed #1149: URL auto-linking bug when following colon. 2009-02-06 12:18:15 -05:00
Evan Prodromou 343cd6f205 Move common_avatar_* functions to Avatar
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
Evan Prodromou d3ff8bfec6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-06 01:07:09 -05:00
Evan Prodromou c47bfcef65 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-06 01:06:54 -05:00
Evan Prodromou de4ed67b7a Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 2009-02-06 01:05:30 -05:00
Zach Copley ab82978b2d Trac #894 and #1013 - fixed bad redirects after delete notice 2009-02-05 16:16:10 -08:00
Sean Murphy e08b7f7205 Fix for unicode string auto-linking bug 2009-02-05 17:29:58 -05:00
Evan Prodromou 8775e79e35 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-05 16:35:19 -05:00
Evan Prodromou 99d520b351 Two different functions for file size
Made two different functions for file size in ImageFile; one uses the
other.

Also, use sprintf() for gettext msgs.
2009-02-05 16:32:58 -05:00
Evan Prodromou 383e6c730d Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 2009-02-05 16:02:19 -05:00
Sean Murphy d4bdb2dc19 Better fix for displaying max file size. 2009-02-05 15:01:44 -05:00
Sean Murphy 746a5d7507 Fixed #905: Presenting image size limit to user. 2009-02-05 14:11:50 -05:00
Robin Millette 9febe8ce39 trac #1142 fix tag rss 2009-02-05 18:10:47 +00:00
Evan Prodromou 7ea136ee1b Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
Conflicts:

	actions/avatarsettings.php
2009-02-05 12:04:06 -05:00
Evan Prodromou 43feee783b Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-05 11:47:47 -05:00
Evan Prodromou 7ad3ff4a2c Allow re-authentication with OpenID
"Rememberme" logins aren't allowed to make changes to an account
(since cookie-stealing is too easy). Users have to re-authenticate.
Previously, it was impossible to do so without having a username and
password; this change lets you do it with OpenID, too.
2009-02-05 11:46:17 -05:00
Sarven Capadisli 7bc764fdc0 Facebook profile box CSS and a link back to the app page. 2009-02-05 07:07:36 +00:00
Sarven Capadisli e5b075b912 Matching Facebook app UI to identi.ca. Fixed tabs, add to profile,
widths, font-size, and some HTML markup.
2009-02-05 04:54:42 +00:00
Sean Murphy 4090471ebe Forgot to replace URL shortening regex with new function. 2009-02-04 23:18:45 -05:00
Sean Murphy 8053adc60e Fixed #779 & #588; Better URL auto-linking. 2009-02-04 23:11:40 -05:00
Sean Murphy 0f12d6135e Fixed #732; Hashtags inside parens and brackets. 2009-02-04 20:02:50 -05:00
Sean Murphy 7e975b17c5 Fixed #1134; Consolidated image scaling functions. 2009-02-04 19:32:15 -05:00
Zach Copley 68152dcf3a Facebook app - reorganized some stuff; better HTML output 2009-02-04 22:54:07 +00:00
Sarven Capadisli b8e10428d3 Changed error and facebookaction wrap selector from @class to @id. 2009-02-04 17:03:59 +00:00
Evan Prodromou e8d3615b3f Allow HTML in site notice (Bug#1002) 2009-02-04 08:49:42 -05:00
Evan Prodromou 92c6034b25 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-04 07:26:14 -05:00
Evan Prodromou 355d438cee Merge branch '0.7.x' of git://gitorious.org/laconica/meitar into meitar/0.7.x 2009-02-04 07:25:36 -05:00
Zach Copley 19724a51b3 trac533 Removed redundant calls to htmlspecialcharacters().
XMLWriter::writeAttribute() already takes care of the escaping for
us, although that doesn't seem to be well documented.
2009-02-03 21:22:41 -08:00
Evan Prodromou 0356953cf8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x 2009-02-03 15:12:55 -05:00
Meitar Moscovitz 3b6d2653fb Fixes ticket:1087; correctly paginate group members list in fancy URLs. 2009-02-04 04:02:30 +11:00
Evan Prodromou ab16bb876b Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-02 16:46:51 -05:00
Evan Prodromou daa5797809 Merge branch 'master' of git://gitorious.org/laconica/adrianlang-clone into adrianlang/master 2009-02-02 16:42:27 -05:00
Robin Millette b6f0f72a09 trac #569 and trac #711 add missing utf-8 headers and removed extraneous argument in startHTML calls 2009-02-02 21:08:33 +00:00
Robin Millette f9edd1101b trac #1099: main menu should not lead to IM settings when IM is disabled 2009-02-02 20:20:21 +00:00
Sarven Capadisli 99fba4932d Ticket 1044 -- Removed border-top, reduced padding, changed notice
count from 6 to 5, removed nickname.
2009-02-02 17:02:58 +00:00
Robin Millette d3b30164be added primary menu to error pages 2009-02-02 14:51:23 +00:00
Sarven Capadisli 4f1345620a Better cross-browser support for page and text zoom-in/out. 2009-02-02 14:14:14 +00:00
Meitar Moscovitz a381bff4da Link rtsp, mms & tel URI schemes, correct pseudo-protocol ones.
This patch builds on the work of user `candrews` at http://laconi.ca/trac/ticket/529#comment:2
2009-02-02 19:59:48 +11:00
Sarven Capadisli 18593afee7 If user is not logged in, then notice-options container shouldn't be
outputted.
2009-02-01 23:37:54 +00:00
Adrian Lang 2f37539967 Fixes #1088: Show number of group members. Unlike the bugreport requested, the stats are displayed similar to userstream stats in a section in the sidebar. Additionaly, I removed a redundant notnull if check in ShowgroupAction->showMembers, fixed a SQL error in User_group->getMembers when no limit is passed, removed return value storing of void function and added an usage of Profile->getBestName. 2009-02-01 22:24:54 +01:00
Sarven Capadisli d309fd27c5 Rearraned stylesheet order for IE and fixed path to files for base IE stylesheets 2009-02-01 20:05:13 +00:00
Evan Prodromou 87b99540ef Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into cyi/master 2009-02-01 14:33:18 -05:00
Sarven Capadisli add0b7f329 Resaved identica logo as transparent PNG24 in order to handle various
background colours without having to explicitly apply anti-aliasing.

Updated colour information in identica theme.

Removed ie7 base stylesheet that's no longer required.

Added ie identica stylesheet to handle solid background colour for
2009-02-01 18:04:56 +00:00
Evan Prodromou 74bf2bf672 Enable configuration files in /etc/laconica/
Enable storing config files in /etc/laconica/, which makes it much
easier to have a single installation with multiple mublogs supported.
2009-01-31 09:38:39 -05:00
Ciaran Gultnieks 53274a6d93 PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries 2009-01-30 01:12:58 +00:00
Zach Copley c7d06519f0 trac750 update Facebook status when posting to Identi.ca from Facebook 2009-01-29 05:58:27 +00:00
Evan Prodromou 04b3add162 only send group notices through Jabber to users with notices enabled 2009-01-28 23:03:03 -05:00
Greg Grossmeier 62fd9369ec fix email notification link 2009-01-28 09:22:54 -05:00
Evan Prodromou d86622da33 don't show reply for anon user 2009-01-28 09:17:12 -05:00
Evan Prodromou f761031d0a Merge branch 'master' of root@laconi.ca:/var/www/laconi.ca/software/laconica 2009-01-28 08:24:29 -05:00
Evan Prodromou c4097750ad Revert "Fixup already-subscribed string"
This reverts commit 6055516aaf.
2009-01-27 20:34:57 -05:00
Sarven Capadisli f9403ae99a Keeping HTML consistent throughout the site. 2009-01-27 06:21:36 +00:00
Zach Copley 1c60afb940 trac750 140 character countdown for FB app 2009-01-27 01:55:36 +00:00
Zach Copley 26f9bf540e Fixed bad query causing facebook_update to fail 2009-01-26 12:22:52 -08:00
Evan Prodromou 69e7811d01 Add some more useless HTML 2009-01-26 17:30:32 +01:00
Evan Prodromou 91e63866fb move block form 2009-01-26 17:14:08 +01:00
Meitar Moscovitz 44162e07c3 Fix scrolling for groups 2009-01-26 16:16:51 +01:00
Evan Prodromou f3db32d151 Fix direct addressing of messages 2009-01-26 15:45:54 +01:00