projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapts upgrade scripts to domain.
[platal.git]
/
modules
/
register.php
diff --git
a/modules/register.php
b/modules/register.php
index
39e1034
..
6a1defc
100644
(file)
--- a/
modules/register.php
+++ b/
modules/register.php
@@
-29,7
+29,7
@@
class RegisterModule extends PLModule
);
}
);
}
- function handler_register(
&
$page, $hash = null)
+ function handler_register($page, $hash = null)
{
$alert = null;
$subState = new PlDict(S::v('subState', array()));
{
$alert = null;
$subState = new PlDict(S::v('subState', array()));
@@
-249,13
+249,12
@@
class RegisterModule extends PLModule
}
$page->changeTpl('register/step' . $subState->i('step') . '.tpl');
}
$page->changeTpl('register/step' . $subState->i('step') . '.tpl');
- $page->addJsLink('password.js');
if (isset($error)) {
$page->trigError($error);
}
}
if (isset($error)) {
$page->trigError($error);
}
}
- function handler_end(
&
$page, $hash = null)
+ function handler_end($page, $hash = null)
{
global $globals;
$_SESSION['subState'] = array('step' => 5);
{
global $globals;
$_SESSION['subState'] = array('step' => 5);
@@
-309,7
+308,6
@@
class RegisterModule extends PLModule
// Prepare the template for display.
$page->changeTpl('register/end.tpl');
// Prepare the template for display.
$page->changeTpl('register/end.tpl');
- $page->addJsLink('do_challenge_response_logged.js');
$page->assign('forlife', $forlife);
$page->assign('firstname', $firstname);
$page->assign('forlife', $forlife);
$page->assign('firstname', $firstname);
@@
-358,10
+356,13
@@
class RegisterModule extends PLModule
// Subscribe the user to the services she did request at registration time.
foreach (explode(',', $services) as $service) {
// Subscribe the user to the services she did request at registration time.
foreach (explode(',', $services) as $service) {
+ require_once 'newsletter.inc.php';
switch ($service) {
case 'ax_letter':
switch ($service) {
case 'ax_letter':
- Platal::load('axletter', 'axletter.inc.php');
- AXLetter::subscribe($uid);
+ NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user);
+ break;
+ case 'nl':
+ NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe($user);
break;
case 'imap':
$storage = new EmailStorage($user, 'imap');
break;
case 'imap':
$storage = new EmailStorage($user, 'imap');
@@
-383,10
+384,6
@@
class RegisterModule extends PLModule
}
}
break;
}
}
break;
- case 'nl':
- require_once 'newsletter.inc.php';
- NewsLetter::subscribe($uid);
- break;
}
}
}
}