Commit Graph

2580 Commits

Author SHA1 Message Date
Craig Andrews
d41a0a5ed0 Use inlineScript() instead of element() to write inline javascript 2009-12-04 20:33:41 -05:00
Craig Andrews
b3086d3c68 Add style function to output style() tags
Add 2 new events: StartStyleElement and EndStyleElement
2009-12-04 20:19:55 -05:00
Craig Andrews
7ddf911f5d Add 2 new events: StartInlineScriptElement and EndInlineScriptElement 2009-12-04 19:51:44 -05:00
Craig Andrews
847013db69 only write the javascript CDATA blocks if the type is javascript (it's not the correct syntax for other languages) 2009-12-04 19:44:45 -05:00
Craig Andrews
4c8bed8ba0 Use inlineScript() everywhere inline scripts are written 2009-12-04 19:41:51 -05:00
Zach Copley
1fd7e5e379 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-04 22:43:34 +00:00
Zach Copley
4881be47c7 Don't depend on a User being available when looking up Design and timezone
for a profile (because some profiles are remote, etc.)
2009-12-04 22:42:09 +00:00
Evan Prodromou
5c973876ac Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-04 16:30:33 -05:00
Evan Prodromou
e074fe6599 add logging utilities to Plugin class 2009-12-04 15:34:25 -05:00
Brion Vibber
4afe07f0c3 Merge commit 'refs/merge-requests/108' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-12-04 12:23:33 -08:00
Evan Prodromou
2c07d4a530 utility function to output inline JavaScript 2009-12-04 13:39:51 -05:00
Craig Andrews
40afc7e987 Add 4 new events: StartCssLinkElement, EndCssLinkElement, StartScriptElement, EndScriptElement 2009-12-04 01:57:14 -05:00
Zach Copley
aef4cc0a59 Make it impossible to block (and thus unsubscribe from your
self-subscription) via the API.  Additionally, make it impossible
to block yourself or unsubscribe from yourself, period.

I also made User use the subs.php helper function for unsubscribing
during a block.

Hopefully, these changes will get rid of the problem of people
accidentally deleting their self-subscriptions once and for all
(knock on wood).
2009-12-03 17:06:58 -08:00
Brion Vibber
c89b10ffe4 Code style cleanup: dropped some unnecessary =& reference assignments where they're used only out of habit for PHP 4-style object semantics 2009-12-03 12:58:48 -08:00
Zach Copley
4f359d2a8b Delete design when user chooses to restore default design, instead
of saving a design with site defaults.
2009-12-02 16:44:23 -08:00
Brion Vibber
15a9c86979 Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library 2009-12-01 14:50:18 -08:00
Zach Copley
7591439451 Add missing rule for /api/users/show.:format 2009-12-01 10:02:22 -08:00
Zach Copley
4003e51b91 Revert "Fix problem where screen_name and user_id parameters are being"
The problem this was trying to fix is actually caused by a missing
routing rule.  Silly me.

This reverts commit 2451192415.
2009-12-01 09:57:47 -08:00
Zach Copley
2451192415 Fix problem where screen_name and user_id parameters are being
ignored due to the router sending in '[a-zA-Z0-9]+' for the id
parameter when no id is specified as part of the URL.
2009-11-30 13:08:55 -08:00
Brion Vibber
9d58b3763e Include group memberships count & user groups management page link in profile sidebar to match subscribers & subscribees lists. This is the only obvious way to reach the user group membership details page if there are fewer group subs than the max number of icons to show. 2009-11-30 10:41:24 -08:00
Zach Copley
9dc888894b Merge branch 'master' into 0.9.x
* master: (67 commits)
  Ticket 2038: fix bad bug tracker link
  Fix regression in group posting: bug introduced in commit 1319002e15. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D
  Log database errors when saving notice_inbox entries
  Drop the username from the log id for now; seems to trigger an error loop in some circumstances
  request id on logs... pid + random id per web request + username + method + url
  Add OpenID ini info back into statusnet.ini as a stopgap until we can
  Some changes to the OpenID DataObjects to make them emit the exact same
  OpenID plugin should set 'user_openid.display' as unique key
  Remove relationship: user_openid.user_id -> user.id. I don't think this
  Have OpenID plugin DataObjects emit their own .ini info
  Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
  Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die.
  Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
  Fix fatal error on OMB subscription for first-timers
  Remove annoying log msg
  Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up.
  Catch uncaught exception
  Fixed bug where reply-sync bit wasn't getting saved
  Forgot to render the nav menu when on FB Connect login tab
  Facebook plugin no longer takes over Login and Connect settings nav menus
  ...

Conflicts:
	db/08to09_pg.sql
	db/statusnet_pg.sql
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	plugins/Mapstraction/MapstractionPlugin.php
2009-11-30 10:28:58 -08:00
Siebrand Mazeland
dff5103399 Add new user language hsb / Upper Sorbian 2009-11-28 20:53:05 +01:00
Brion Vibber
914242e224 Drop the username from the log id for now; seems to trigger an error loop in some circumstances 2009-11-27 13:30:21 -08:00
Brion Vibber
9f075a6898 Drop the username from the log id for now; seems to trigger an error loop in some circumstances 2009-11-27 13:29:33 -08:00
Brion Vibber
b933f5bb15 request id on logs... pid + random id per web request + username + method + url 2009-11-27 12:32:55 -08:00
Brion Vibber
5bacd98905 request id on logs... pid + random id per web request + username + method + url 2009-11-27 12:28:15 -08:00
Siebrand Mazeland
c6b1ca3765 * Mb -> MB (for megabyte)
* i18n for MB and kB
2009-11-26 23:28:16 +01:00
Sarven Capadisli
5f5a107991 Init UI to show/hide a group of moderation actions. 2009-11-26 18:46:11 +00:00
Brenda Wallace
45dbdc8c4d and a typo in column name fixed 2009-11-26 20:41:47 +13:00
Brenda Wallace
09a5c313ba added missing space after new group by fields 2009-11-26 20:39:51 +13:00
Brenda Wallace
d50a813eb1 added more fields to the group by. 2009-11-26 20:28:20 +13:00
Brenda Wallace
c3110ec8ac check there is an array of notices to display, before doing a foreach() 2009-11-26 18:54:52 +13:00
Zach Copley
2b6cf0d8b6 Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
This reverts commit a373d07ae0.

Conflicts:

	classes/statusnet.ini
	lib/schema.php
	plugins/Authentication/AuthenticationPlugin.php
	plugins/OpenID/OpenIDPlugin.php
	plugins/UserFlag/UserFlagPlugin.php
2009-11-25 23:54:36 +00:00
Zach Copley
bd4a613c38 Merge branch 'fix-openid' into 0.9.x 2009-11-25 23:33:13 +00:00
Brion Vibber
11abd4bfb7 Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die. 2009-11-25 15:23:11 -08:00
Brion Vibber
2dc62d21f7 Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die. 2009-11-25 15:21:51 -08:00
Brion Vibber
b771a8bb21 Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
DB_DataObject hides errors by silently returning null for any non-existent method call, making it harder to tell what the heck's going on... the rights check for blocked remote users returned null for the check for subscribe rights, thus eval'ing to false. We now log a note in this circumstance, which would have cut about 3 hours off of the debug time.
2009-11-25 22:23:21 +00:00
Brion Vibber
4d71dbe98c Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
DB_DataObject hides errors by silently returning null for any non-existent method call, making it harder to tell what the heck's going on... the rights check for blocked remote users returned null for the check for subscribe rights, thus eval'ing to false. We now log a note in this circumstance, which would have cut about 3 hours off of the debug time.
2009-11-25 22:22:21 +00:00
Zach Copley
8acc1587b1 Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
This reverts commit a373d07ae0.

Conflicts:

	classes/statusnet.ini
	lib/schema.php
	plugins/Authentication/AuthenticationPlugin.php
	plugins/OpenID/OpenIDPlugin.php
	plugins/UserFlag/UserFlagPlugin.php
2009-11-25 13:38:59 -08:00
Brion Vibber
6d5d63636a Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up. 2009-11-25 11:23:11 -08:00
Brion Vibber
4ef515973a Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up. 2009-11-25 11:20:41 -08:00
Brion Vibber
4b59cf0e3f Fix regression in OMB sending with queues enabled -- items never got dequeued, leading to ever-growing queue and big delays.
Success return code from omb_broadcast_message was dropped in commit ec88d2650e (Aug 10 2009) which switched us to libomb backend. With queues enabled, this would lead to the notice being readded to the outgoing OMB queue for redelivery as the queue system thought the send failed. The resends caused extra load and confusion for third-party sites, and more worryingly just plugged up our own queue so legit messages were badly delayed.

This commit should restore the previous state, where we fire-and-forget; that is, we're not actually checking to see if all remote subscribers received the message successfully and there will be no resends.
2009-11-24 15:33:26 -08:00
Brion Vibber
a9bbfd1852 Fix regression in OMB sending with queues enabled -- items never got dequeued, leading to ever-growing queue and big delays.
Success return code from omb_broadcast_message was dropped in commit ec88d2650e (Aug 10 2009) which switched us to libomb backend. With queues enabled, this would lead to the notice being readded to the outgoing OMB queue for redelivery as the queue system thought the send failed. The resends caused extra load and confusion for third-party sites, and more worryingly just plugged up our own queue so legit messages were badly delayed.

This commit should restore the previous state, where we fire-and-forget; that is, we're not actually checking to see if all remote subscribers received the message successfully and there will be no resends.
2009-11-24 15:29:47 -08:00
Zach Copley
3556861596 Fix SSL options for Twitter bridge HTTP requests 2009-11-24 19:12:57 +00:00
Zach Copley
b20b59e9ea Fix SSL options for Twitter bridge HTTP requests 2009-11-24 19:11:34 +00:00
Brion Vibber
2fabf586c7 Break TableDef, ColumnDef classes to separate files so autoloader can find them.
With $config['db']['schemacheck'] set to 'script' in live deployment, Schema class wasn't being preloaded for us; the uses of TableDef by plugins for DataObject configuration would then fail because the class wasn't loaded. Broken to separate files, the autoloader can find all classes in either case.

PHP Fatal error:  Class 'TableDef' not found in /var/www/statusnet/plugins/OpenID/User_openid.php on line 43, referer: http://identi.ca/brionv/all
2009-11-24 09:40:47 -08:00
Brion Vibber
2da531d7d6 Break TableDef, ColumnDef classes to separate files so autoloader can find them.
With $config['db']['schemacheck'] set to 'script' in live deployment, Schema class wasn't being preloaded for us; the uses of TableDef by plugins for DataObject configuration would then fail because the class wasn't loaded. Broken to separate files, the autoloader can find all classes in either case.

PHP Fatal error:  Class 'TableDef' not found in /var/www/statusnet/plugins/OpenID/User_openid.php on line 43, referer: http://identi.ca/brionv/all
2009-11-24 09:38:16 -08:00
Brion Vibber
4bd17a7f59 Ticket 2007: make search tabs grammar forms consistent (People, Notices, Groups) 2009-11-23 06:42:02 -08:00
Craig Andrews
bdc0d2dc78 Use sprintf and gettext to output the DMS version of the location. More translator-friendly. 2009-11-21 22:34:54 -05:00
Siebrand Mazeland
df6796763d i18n for "Search" button text 2009-11-21 16:04:20 +01:00