updates for invitations

Add the code to registration to handle invitation codes.

Some edge cases on invitations: is the user already subbed to this
person? Tell them. Is the person already on the system? Sub the user
to them, then, and tell the user.

Add some code to User to auto-sub invitees whenever the email address
changes. Call it from a new registration with an invite code, and also
from confirmaddress.

Some whitespace cleanup in the files touched.

darcs-hash:20080827001927-84dde-b50e5d921ca3f2fb894821730ff93cac09d2ba66.gz
This commit is contained in:
Evan Prodromou
2008-08-26 20:19:27 -04:00
parent c2839a80f0
commit e248066b74
6 changed files with 175 additions and 118 deletions

View File

@@ -136,7 +136,7 @@ function common_init_language() {
$language = common_language();
# So we don't have to make people install the gettext locales
putenv('LANGUAGE='.$language);
putenv('LANG='.$language);
putenv('LANG='.$language);
$locale_set = setlocale(LC_ALL, $language . ".utf8",
$language . ".UTF8",
$language . ".utf-8",
@@ -816,11 +816,16 @@ function common_fancy_url($action, $args=NULL) {
return common_path('doc/'.$args['title']);
case 'login':
case 'logout':
case 'register':
case 'subscribe':
case 'unsubscribe':
case 'invite':
return common_path('main/'.$action);
case 'register':
if ($args && $args['code']) {
return common_path('main/register/'.$args['code']);
} else {
return common_path('main/register');
}
case 'remotesubscribe':
if ($args && $args['nickname']) {
return common_path('main/remote?nickname=' . $args['nickname']);