Commit Graph

140 Commits

Author SHA1 Message Date
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
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -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
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -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
Evan Prodromou
d51d83434d check and show max bio length in profilesettings 2009-08-21 07:48:30 -04:00
Craig Andrews
83ff1cecd3 Use NICKNAME_FMT everywhere consistently 2009-08-05 16:26:19 -04:00
Robin Millette
362cac0a96 Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm. 2009-04-16 17:34:19 +00:00
Robin Millette
c2905085c1 trac #1155 ++ replace strlen with mb_strlen for all utf8 strings. 2009-02-07 19:33:18 +00:00
Sarven Capadisli
f9403ae99a Keeping HTML consistent throughout the site. 2009-01-27 06:21:36 +00:00
sarven
0b5f0f4faa Renamed form_datas to form_data 2009-01-19 03:09:13 +00:00
sarven
0ecdd5363d Profile settings styles 2009-01-17 23:49:12 +00:00
Evan Prodromou
97c98cf59a Break up settings into two tabset
Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
2009-01-17 22:30:44 +00:00
Evan Prodromou
4b0cf99e56 Convert use of common_server_error and common_user_error to methods on Action 2009-01-15 23:03:38 +00:00
Evan Prodromou
eaa81d25fa Convert all actions to use new UI functions
I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step
2009-01-15 22:57:15 +00:00
Zach Copley
5e061d2060 Some fixups of patches not already migrated to trunk to bring inline with PEAR coding stds
darcs-hash:20081225144601-7b5ce-4846f3d036c36037836d15ed672c10ba33f9f84c.gz
2008-12-25 09:46:01 -05:00
csarven
33196c24f4 Jcrop v2 (POST cropping to be completed)
darcs-hash:20081210021607-eefa4-c3590f3e734255faf098bf5ca09fc17901a6db70.gz
2008-12-09 21:16:07 -05:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
2008-12-23 14:49:23 -05:00
Evan Prodromou
7ad2f2a371 TRUE
More PEAR coding standards global changes. Here, I've changed all
instances of TRUE to true and FALSE to false.

darcs-hash:20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
2008-12-23 14:44:28 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
2008-12-23 14:33:23 -05:00
Evan Prodromou
eb2f9c98ac replace NULL with null
Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.

darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
2008-12-23 14:21:29 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
2008-12-23 14:19:07 -05:00
millette
2c7518873e moving delete profile to its own space.
darcs-hash:20081203192658-099f7-37d26abf7409ab2996a22de4aa71cb7a5f68d205.gz
2008-12-03 14:26:58 -05:00
millette
51dda41211 delete user and all traces from the db.
darcs-hash:20081203164942-099f7-ea511948139c9c18b1c8b7de018aa4f0ee5ff624.gz
2008-12-03 11:49:42 -05:00
millette
4fca9960cd only expand URLs we shortened ourselves + only shorten if notice > 140 chars
darcs-hash:20081128200004-099f7-085c833e3e34b2a13b5b3ec3b1316e7948ff196f.gz
2008-11-28 15:00:04 -05:00
millette
aa29ebf9f4 a step closer to deleting a user and hosts posts from the db
darcs-hash:20081124005054-099f7-a7b20c1e15900e1c696a33902a6612b8be2387fa.gz
2008-11-23 19:50:54 -05:00
millette
daf14886b3 trac155 first step to delete account
darcs-hash:20081123215059-099f7-a0a969229b20fc01ca54f15b166333b3e5a32137.gz
2008-11-23 16:50:59 -05:00
Evan Prodromou
fb312a9de9 fix problems with blank tag strings (!)
darcs-hash:20081125000556-5ed1f-d19f3a1e723695122a8e75fb881846bcbc48ebda.gz
2008-11-24 19:05:56 -05:00
Evan Prodromou
73bf014fa4 correct tags method for user
darcs-hash:20081120215222-84dde-340269eb99daff7815bb2e17a04341f603eef438.gz
2008-11-20 16:52:22 -05:00
Evan Prodromou
6f31f25105 let users set their own profile tags from profilesettings
darcs-hash:20081120214821-84dde-c8569ef645b389de545f78bf01a270f28b871f02.gz
2008-11-20 16:48:21 -05:00
millette
15c1d4f5e4 trac31 url_auto_shortening by sgmurphy
darcs-hash:20081106205926-099f7-6bcfd7969a159a12b1ba6a9ee254e44a07b94761.gz
2008-11-06 15:59:26 -05:00
Evan Prodromou
7ff02bb7d4 try to clean up user-without-profile errors
darcs-hash:20080926145008-5ed1f-8a60ed3c5adbfe75aa044732e8d10dbdb9b93089.gz
2008-09-26 10:50:08 -04:00
Zach Copley
9eca4e0874 Fold password form into profile settings
darcs-hash:20080907053604-7b5ce-4e01cefdbab4cc73a28960b265c23abf5e2f2b0a.gz
2008-09-07 01:36:04 -04:00
Zach Copley
4f19a9462c Moved avatar upload down below timezone on profile settings
darcs-hash:20080906070651-7b5ce-23c17932cc9c474dfbeb530d29b1bd1adb3a4260.gz
2008-09-06 03:06:51 -04:00
Zach Copley
4f1c30fd88 Conflated Avatar and Profile settings + removed a bunch of unnecessary whitespace
darcs-hash:20080905194732-7b5ce-2797acd4d04f3b02c4ad67be629badbae469e8ed.gz
2008-09-05 15:47:32 -04:00
Evan Prodromou
6afb7f576e add csrf protection to profile settings
darcs-hash:20080829043909-84dde-c70a633c93ab89560bc300817bda66eebf6176cf.gz
2008-08-29 00:39:09 -04:00
Evan Prodromou
4c8dfadf2d make init of lang environment happen earlier, or when user language may have changed
darcs-hash:20080806034515-84dde-e32cbfec2890f50b610d0441659180038b060473.gz
2008-08-05 23:45:15 -04:00
mikec
a4fa34cecb Resolve conflicts after pull from evan
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
2008-07-21 09:56:37 -04:00
Mike Cochrane
88717d8805 User definable timezones. Work in UTC internally and display per user/site default. http://laconi.ca/PITS/00011
darcs-hash:20080720141325-533db-87cb60501434c9dc0ac13716ba5d8b17754431f5.gz
2008-07-20 10:13:25 -04:00
matthew.gregg
6dd211530f Patch for PITS 00032, 00033, 00034
darcs-hash:20080719003417-982e4-7004f8a4dfb447f941457c30b0b2289eee5582e6.gz
2008-07-18 20:34:17 -04:00
Evan Prodromou
27d5118b6d fixup autosubscribe save
darcs-hash:20080720233712-84dde-dda5de6fec9d1d48f61139c1cce8a6e8aa2e0055.gz
2008-07-20 19:37:12 -04:00
Evan Prodromou
f4936d7c58 too much merlot on the airplane, dumb syntax mistake
darcs-hash:20080720202832-84dde-918fb1d27d1dd1f06e3bceeb5217c136e6d78ac5.gz
2008-07-20 16:28:32 -04:00
Evan Prodromou
3ffe57c7e2 add autosubscribe to profile settings
darcs-hash:20080720202705-84dde-da40ebc8bcb9bd438e891c5a103211ebd67fd2c7.gz
2008-07-20 16:27:05 -04:00
Evan Prodromou
12615c8e36 remove email settings from profile settings ahead of having its own tab
darcs-hash:20080715220144-84dde-9b4c8338b8acf0c1268947cb4a9b8cbdb9751a7f.gz
2008-07-15 18:01:44 -04:00
Mike Cochrane
b104da04fb Colapse a lot of strings to make like easier for translators and more consisitant for users
darcs-hash:20080713053748-533db-1cdb0cf3a9e4102eb139b74a7a9d4f97dadb20b8.gz
2008-07-13 01:37:48 -04:00
Mike Cochrane
87b494f1eb Convert _t() to _() for gettext.
darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
2008-07-08 05:45:31 -04:00
Evan Prodromou
721d6f94c7 method
darcs-hash:20080702131507-84dde-507a6380fcab66c1fbcbaad6d1399c8a2f210acf.gz
2008-07-02 09:15:07 -04:00
Evan Prodromou
c64f137497 refactor common behaviour in settings pages
darcs-hash:20080630170342-84dde-5d7feb88a0a707b24c8070802a7ec99dd1f35687.gz
2008-06-30 13:03:42 -04:00
Evan Prodromou
960a092a9c don't validate email if none provided
darcs-hash:20080624014642-34904-7d4b1b91a3163add6a99146f92360913e172a39a.gz
2008-06-23 21:46:42 -04:00
Evan Prodromou
1899d09cd1 forgot to return on invalid nickname
darcs-hash:20080622181550-34904-7970919db30ccfc3979fa6c118c29af9eac0c550.gz
2008-06-22 14:15:50 -04:00
Evan Prodromou
d758c11784 disallow nicknames on a blacklist
darcs-hash:20080622180437-34904-4b6313f6fd8845232031663c5c2df00dff725183.gz
2008-06-22 14:04:37 -04:00
Evan Prodromou
b4d8bbdad7 allow blank email address (I think)
darcs-hash:20080622165453-34904-a3bdd2557622e6db3aef88371c22586e2d2fed07.gz
2008-06-22 12:54:53 -04:00
Evan Prodromou
29014487d7 UNDO: move profile update to front
darcs-hash:20080622164928-34904-04e381d2ac562a31fb3ed3dce300e2c2c456b0d7.gz
2008-06-22 12:49:28 -04:00
Evan Prodromou
c1a5e54e67 move profile update to front
darcs-hash:20080622164928-34904-77df2f698c617e2788cc0db2d902238a5dd522d1.gz
2008-06-22 12:49:28 -04:00
Evan Prodromou
71456d596a debugging for profile update
darcs-hash:20080622164542-34904-e6945828677580ee30b5fb85101928633708f605.gz
2008-06-22 12:45:42 -04:00
Evan Prodromou
8a170ed8fd special function for generating confirmation codes
darcs-hash:20080622163241-34904-199b3654328d78c0b9fe2fa85a3ecc1ab0b1262a.gz
2008-06-22 12:32:41 -04:00
Evan Prodromou
1906237ddc confirm address
darcs-hash:20080622161917-34904-32528c78b43d501d5994c4f5c74b977ca4d9c618.gz
2008-06-22 12:19:17 -04:00
Evan Prodromou
4fd1f6246d correctly use Confirm_address
darcs-hash:20080622161607-34904-d8e042b80fe6acd3cb6ad763216a0b1817752cac.gz
2008-06-22 12:16:07 -04:00
Evan Prodromou
0239802682 more debugging
darcs-hash:20080622153754-34904-b722aa6d0ffa52242b06a8eec1eaa5216d216a4f.gz
2008-06-22 11:37:54 -04:00
Evan Prodromou
1cab6c7d50 strcmp for comparison
darcs-hash:20080622153220-34904-119cea6c5dbe20e33569287cf9632c07e9768b10.gz
2008-06-22 11:32:20 -04:00
Evan Prodromou
7bf88079a9 nickname update
darcs-hash:20080622152628-34904-9974209ebe964058d00337bc602ef20c10b83f66.gz
2008-06-22 11:26:28 -04:00
Evan Prodromou
785ea92bb7 better logic in profile settings, missing method in all
darcs-hash:20080622152306-34904-3d3ab7c02c33efac17d02692a10b4fee2fb013f1.gz
2008-06-22 11:23:06 -04:00
Evan Prodromou
acf562b3dd use updateKeys() for updating the user
darcs-hash:20080622151611-34904-1d952df08b5247ab391bb76fd50d7b90498f0c96.gz
2008-06-22 11:16:11 -04:00
Evan Prodromou
e69f28faab add confirm email to profile settings
darcs-hash:20080622142015-34904-00feabce7fe73360319d8a9c1372478879bb203a.gz
2008-06-22 10:20:15 -04:00
Evan Prodromou
7258969cd4 use query method to do some transactions
darcs-hash:20080619033619-84dde-e4fcc00f5d86cb0d11feff5f88f719ea72d3318e.gz
2008-06-18 23:36:19 -04:00
Evan Prodromou
4aedce6864 do some commits
darcs-hash:20080619033212-84dde-2f7227fe16c7015b03121424520ebd74d4b96762.gz
2008-06-18 23:32:12 -04:00
Evan Prodromou
56de872740 move instructions up to the "whats up" area
darcs-hash:20080618035739-84dde-a562cffe186780d5f03cf53798ea249b2bda9fb1.gz
2008-06-17 23:57:39 -04:00
Evan Prodromou
e468474fe8 more debugging on profile update
darcs-hash:20080615153123-84dde-6153ed4ad0cce6908a103a507e6f6ffcf23620f2.gz
2008-06-15 11:31:23 -04:00
Evan Prodromou
1a591681b0 what exactly are we updating
darcs-hash:20080615152047-84dde-eca46b9a1e3e0adb81a29d1b43bf87ee93e4f535.gz
2008-06-15 11:20:47 -04:00
Evan Prodromou
c2a170da10 broadcast profile and change subscription input id
darcs-hash:20080612184028-84dde-1f919ab373e5731efd403986ae760116769566d9.gz
2008-06-12 14:40:28 -04:00
Evan Prodromou
2354faf7ac add instructions to each form entry in forms
darcs-hash:20080612165201-84dde-1abc45a0b2fd24002bc6f3449e9fc521d4f02eac.gz
2008-06-12 12:52:01 -04:00
Evan Prodromou
d0f8fd20fb push notice form and sub-menu into header div
darcs-hash:20080611183634-84dde-97119e7ef1abb01f6ce8723955dc5d6e06e644a8.gz
2008-06-11 14:36:34 -04:00
Evan Prodromou
f81b4421fe instructions
darcs-hash:20080611163308-84dde-c918f04fe6bba3dd382b822ef59cb70a57bb9504.gz
2008-06-11 12:33:08 -04:00
Evan Prodromou
53eeee70e7 change measurement of updated profiles
darcs-hash:20080521121307-84dde-1a2908c4bb85e9e9e55524f591ba02d38c8ecbc2.gz
2008-05-21 08:13:07 -04:00
Evan Prodromou
764a391d19 validation in form handlers
Moved validation code from classes to form handlers. Probably better
in the classes, but I can't quite grok the validate() method in
DB_DataObject, so for now I'm going to do it the old-fashioned way.

darcs-hash:20080521112707-84dde-38e27199b977ae81171b8391fbdb93ebb54494f9.gz
2008-05-21 07:27:07 -04:00
Evan Prodromou
48eaede398 extract textarea code and make bio a textarea
darcs-hash:20080520211945-84dde-06c9f0884b3dba3e01fe7e0d71662da162c34418.gz
2008-05-20 17:19:45 -04:00
Evan Prodromou
52600ce0b0 trim whitespace
darcs-hash:20080520191412-84dde-a607dbe848279639630edd1ab4616d05cc2318d1.gz
2008-05-20 15:14:12 -04:00
Evan Prodromou
3f5ededc01 call validate before saving objects
darcs-hash:20080520191032-84dde-64197121c93cd4cf3cbc614badff0bd44547f9f9.gz
2008-05-20 15:10:32 -04:00
Evan Prodromou
6f6aed8213 better forms for new theme
darcs-hash:20080520174759-84dde-7206aeef3246b2304d463b121a6b17c7f3f2f6d5.gz
2008-05-20 13:47:59 -04:00
Evan Prodromou
3a2d17f9f6 all updates use original now
darcs-hash:20080519122708-84dde-78ec2e47aeb4b33fb83c7d8f5e7f3735d66055ae.gz
2008-05-19 08:27:08 -04:00
Evan Prodromou
2080f52cb1 try to fix updating in profile
darcs-hash:20080519122445-84dde-b6505e0b8ea310eee50eb6e638238fb7cf93bead.gz
2008-05-19 08:24:45 -04:00
Evan Prodromou
793d48dc9e smaller packet
darcs-hash:20080518015551-84dde-65964e140ed0b6c23aeee368fcffccdc14d71c61.gz
2008-05-17 21:55:51 -04:00
Evan Prodromou
1950efda80 save profile url
darcs-hash:20080517202132-84dde-78c7fe9f22aa28f33e9e00432f5cf6436b64e6b5.gz
2008-05-17 16:21:32 -04:00
Evan Prodromou
07eb05157a require once for settings actions
darcs-hash:20080517175416-84dde-b83a41de70a48671e0a251c645cf67b81c54bda6.gz
2008-05-17 13:54:16 -04:00
Evan Prodromou
1a15570339 common_start_element -> common_element_start
darcs-hash:20080517170430-84dde-74f42b52695699f646b65b939f78fbbe95a05c7e.gz
2008-05-17 13:04:30 -04:00
Evan Prodromou
3b14b7901c fixes to make it all lint
Ran everything through php -l, found out that it didn't compile.

So: fixed the am-I-running-in-Laconica check at the top of each file.
Some syntax fixes in shownotice, showstream, common.

darcs-hash:20080517154701-84dde-8d38da89c5b9cb3b40704adb04a4de880c204181.gz
2008-05-17 11:47:01 -04:00
Evan Prodromou
3803cf2153 upload and change avatars
code to upload and change avatars.

combined some code in the settings area, too.

darcs-hash:20080517122045-84dde-8e13994e627805f29679c9533c2f62db81dc0925.gz
2008-05-17 08:20:45 -04:00
Evan Prodromou
fac522f4d7 settings and avatars
Did considerable work on the settings section.

Redesigned the DB to allow avatars. Each avatar image has a size and
an URL. There can be multiple avatars per profile, just different sizes.

Added accessors in Profile for avatar. Show the avatar in lots of
places, where it makes sense. Constants for avatar sizes in common.php.

darcs-hash:20080515162844-84dde-fe0630366e247c02ca8ca9d1cc6b963cfce57a26.gz
2008-05-15 12:28:44 -04:00