Index: branches/unlabeled/unlabeled-1.60.2/kernel/units/users/users_event_handler.php =================================================================== diff -u -r5359 -r5414 --- branches/unlabeled/unlabeled-1.60.2/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5359) +++ branches/unlabeled/unlabeled-1.60.2/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5414) @@ -263,6 +263,11 @@ { $sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('LoginUser', $event->getEventParam('user'), $event->getEventParam('pass') ); + + if ($event->redirect && is_string($event->redirect)) { + // some real template specified instead of true + $this->Application->Redirect($event->redirect, $event->redirect_params); + } } /** Index: branches/unlabeled/unlabeled-1.5.20/themes/default/login/login_form.tpl =================================================================== diff -u -r3331 -r5414 --- branches/unlabeled/unlabeled-1.5.20/themes/default/login/login_form.tpl (.../login_form.tpl) (revision 3331) +++ branches/unlabeled/unlabeled-1.5.20/themes/default/login/login_form.tpl (.../login_form.tpl) (revision 5414) @@ -1,6 +1,6 @@
Index: branches/unlabeled/unlabeled-1.60.2/core/units/users/users_event_handler.php
===================================================================
diff -u -r5359 -r5414
--- branches/unlabeled/unlabeled-1.60.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5359)
+++ branches/unlabeled/unlabeled-1.60.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5414)
@@ -263,6 +263,11 @@
{
$sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
$sync_manager->performAction('LoginUser', $event->getEventParam('user'), $event->getEventParam('pass') );
+
+ if ($event->redirect && is_string($event->redirect)) {
+ // some real template specified instead of true
+ $this->Application->Redirect($event->redirect, $event->redirect_params);
+ }
}
/**
Index: branches/unlabeled/unlabeled-1.49.2/kernel/include/usersession.php
===================================================================
diff -u -r5188 -r5414
--- branches/unlabeled/unlabeled-1.49.2/kernel/include/usersession.php (.../usersession.php) (revision 5188)
+++ branches/unlabeled/unlabeled-1.49.2/kernel/include/usersession.php (.../usersession.php) (revision 5414)
@@ -475,6 +475,7 @@
{
$application =& kApplication::Instance();
$application->setVisitField('PortalUserId', $this->Get('PortalUserId') );
+ $application->SetVar('u_id', $this->Get('PortalUserId'));
}
// unset($this->CurrentUser);
@@ -510,20 +511,19 @@
$extra_groups = implode(',', $GroupList);
$this->SetVariable('UserGroups', $extra_groups);
-
+
$this->Set('GroupId', $PersonalGroup ? $PersonalGroup : $PrimaryGroup);
$this->Set('GroupList', $extra_groups);
$this->SetVariable('UserGroups', $this->Get('GroupList') );
- if( class_exists('kApplication') )
- {
- $app = kApplication::Instance();
- $kSession = $app->recallObject('Session');
- $kSession->SetField('GroupList', $extra_groups);
- $app->StoreVar('UserGroups', $this->Get('GroupList') );
- $app->setVisitField('PortalUserId', $this->Get('PortalUserId') );
- }
+
+ $app = kApplication::Instance();
+ $kSession = $app->recallObject('Session');
+ $kSession->SetField('GroupList', $extra_groups);
+ $app->StoreVar('UserGroups', $this->Get('GroupList') );
+ $app->setVisitField('PortalUserId', $this->Get('PortalUserId') );
+
$this->Set('LastAccessed', adodb_date('U') );
$this_login = $this->GetPersistantVariable("ThisLogin");
Index: branches/unlabeled/unlabeled-1.7.38/themes/default/misc/right_login.tpl
===================================================================
diff -u -r2482 -r5414
--- branches/unlabeled/unlabeled-1.7.38/themes/default/misc/right_login.tpl (.../right_login.tpl) (revision 2482)
+++ branches/unlabeled/unlabeled-1.7.38/themes/default/misc/right_login.tpl (.../right_login.tpl) (revision 5414)
@@ -34,7 +34,7 @@
|