Commit Graph

61 Commits

Author SHA1 Message Date
Evan Prodromou
a55939f3b1 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-06 23:23:30 -08:00
Evan Prodromou
e1c7851a06 pass through keys() as keyTypes() for UserFlag 2010-01-06 23:22:49 -08:00
Brion Vibber
4e2acd153b ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Brion Vibber
b93244395f Fix for broken profile flag admin UI: delete stray flag entries when users are deleted so broken entries don't litter the lookups.
* added ProfileDeleteRelated event to match UserDeleteRelated, to allow plugins to add extra related tables on profile deletion
* UserFlagPlugin: deleting flags when target profile is deleted
* UserFlagPlugin: deleting flags when flagging user is deleted
* UserFlagPlugin: fix for autoloader -- class names are case-insensitive. We may get lowercase class names coming in at times, such as when creating DB objects programatically from a table name.

Note that any already-existing bogus entries need to be removed from the database:
select * from user_flag_profile where (select id from profile where id=profile_id) is null;
select * from user_flag_profile where (select id from user where id=user_id) is null;
2010-01-06 11:10:33 -08:00
Evan Prodromou
1e3fea17af don't add flag if it's already there at block time 2009-12-28 16:35:29 -08:00
Evan Prodromou
d9efeb6ac3 optionally flag a profile for review when blocked 2009-12-28 11:02:44 -08:00
Evan Prodromou
6d3e6b4284 move flag creation to a method of data object 2009-12-28 10:58:49 -08:00
Evan Prodromou
a80fa17872 phpcs-clean User_flag_profile as best as possible 2009-12-28 09:15:07 -08:00
Evan Prodromou
4a5bac43c3 phpcs-clean flagprofile.php 2009-12-28 09:08:28 -08:00
Evan Prodromou
df98ddff0c phpcs-clean clearflag.php 2009-12-28 09:06:38 -08:00
Evan Prodromou
c8fd5403e5 PHPCS-clean adminprofileflags.php 2009-12-28 08:45:21 -08:00
Evan Prodromou
ea23111a56 PHPCS-clean UserFlagPlugin 2009-12-28 08:37:30 -08:00
Evan Prodromou
85b8b35f53 clear flags and show flaggers in adminflagprofile 2009-12-28 08:19:56 -08:00
Evan Prodromou
2c2a82fda0 add stuff for clearing flags to UserFlagPlugin 2009-12-28 08:19:22 -08:00
Evan Prodromou
75fbec2fa3 Add tools to clear flags
Added a form to clear all flags for a profile, when showed on
adminprofileflags list. Add an action to handle the form, and a right
for the action.
2009-12-28 07:58:33 -08:00
Evan Prodromou
4b7835caa5 pagination works for flagged profiles 2009-12-27 11:47:54 -08:00
Evan Prodromou
5d6b6bfd34 admin page checks for right to review flags 2009-12-27 11:04:53 -08:00
Craig Andrews
4c8bed8ba0 Use inlineScript() everywhere inline scripts are written 2009-12-04 19:41:51 -05:00
Craig Andrews
35ff3961e8 Remove unnecessary pass by reference indicators 2009-12-03 19:59:31 -05: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
Sarven Capadisli
6d29f3f2de Bind for UserFlag only if there is a form for it 2009-11-28 20:54:32 +01:00
Sarven Capadisli
2755a6d3cf Moved moderation styles out of UserFlag and put it into core. Updated
icons.
2009-11-26 20:38:06 +00:00
Sarven Capadisli
5f5a107991 Init UI to show/hide a group of moderation actions. 2009-11-26 18:46:11 +00:00
Sarven Capadisli
cde4d866eb Updated the cross line on silence icon 2009-11-26 13:20:08 +00:00
Sarven Capadisli
e9d27dc96e Updated moderation (sandbox, silence, delete) icons for UserFlag 2009-11-26 13:07:59 +00:00
Sarven Capadisli
385573f174 Moved CSS out to its own file for UserFlag 2009-11-26 13:03:01 +00:00
Sarven Capadisli
b16cabc3bc Renamed icon file 2009-11-26 12:57:52 +00: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
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
Zach Copley
50827d5e81 Don't show flag user button your own profile 2009-11-19 19:56:24 -08:00
Zach Copley
3d2a2d4173 Fixed HXR response for flag user 2009-11-19 19:29:55 -08:00
Sarven Capadisli
2eed928837 Using the right form class name 2009-11-20 03:06:12 +00:00
Sarven Capadisli
8df388ce12 Added li for entity_flag 2009-11-17 16:45:51 +00:00
Evan Prodromou
6a1afda259 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	classes/statusnet.ini
2009-11-17 06:25:07 -05:00
Brion Vibber
6f9b909211 Fix for PHP spewing notices from commit a373d07ae0
Please test with error_reporting set to E_ALL!

Classnames and function names aren't first-class objects in PHP and need to be referenced as strings here. :(
2009-11-16 15:36:30 -08:00
Craig Andrews
a373d07ae0 Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them 2009-11-16 15:24:25 -05:00
Evan Prodromou
02cc7af1b6 try to return to the correct page from FlagProfileForm 2009-11-16 18:29:13 +01:00
Evan Prodromou
55d00a3a90 make profile flag actions work like other profile actions 2009-11-16 18:24:59 +01:00
Evan Prodromou
bea580873f use return-to method for adminprofileflag 2009-11-16 17:55:00 +01:00
Evan Prodromou
84e427c6c1 start showing actions for flagged profiles 2009-11-16 17:43:15 +01:00
Sarven Capadisli
686c2e5e06 Added XHR for form_entity_flag 2009-11-11 13:43:21 +00:00
Evan Prodromou
22310d17a4 shorten flag notification and include a class 2009-11-09 13:45:10 -05:00
Sarven Capadisli
2577c85a38 Added flag icon for UserFlag plugin 2009-11-09 11:11:06 +00:00
Sarven Capadisli
cb1013fa59 Fixed Flagged for review view 2009-11-08 20:31:53 +00:00
Sarven Capadisli
1b902bcc45 Fixed alignment for entity action anchors and responses 2009-11-08 19:05:07 +00:00
Evan Prodromou
5cd385fe4f fixup key definition for User_flag_profile 2009-11-07 13:39:55 -05:00
Evan Prodromou
0668520a8d fixup database interface and correct the flagged notice 2009-11-07 13:39:26 -05:00
Evan Prodromou
509109a71a make sure FlagprofileAction without Profile_flag 2009-11-07 13:22:07 -05:00
Evan Prodromou
285745d2fd make sure UserFlagPlugin works without Profile_flag 2009-11-07 13:21:40 -05:00
Evan Prodromou
55c7c943e7 Simply flag a profile for review
Instead of trying to have lots of different flags on different
objects, cut to the core of this functionality: flag a profile for
moderator review.
2009-11-07 13:10:22 -05:00