Index: trunk/kernel/frontaction.php =================================================================== diff -u -r3282 -r3576 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 3282) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 3576) @@ -61,7 +61,8 @@ $var_list['t'] = 'index'; } - $application->HandleEvent( new kEvent('u:OnInpLogin') ); + $event_params = Array('user' => $_POST['login_user'], 'pass' => $_POST['login_password']); + $application->HandleEvent( new kEvent('u:OnInpLogin', $event_params) ); $redirect_template = getArrayValue($var_list_update, 't') ? $var_list_update['t'] : $var_list['t']; $application->Redirect($redirect_template); @@ -98,7 +99,7 @@ $u->Set("PwRequestTime", 0); if ($exp_time > adodb_mktime()) { - $m_var_list_update['codevalidationresult'] = 'lu_resetpw_confirm_text'; + $objSession->SetVariable('codevalidationresult', 'lu_resetpw_confirm_text'); $newpw = makepassword(); SetVar('user_password', $newpw); $u->Set("Password",$newpw); @@ -112,10 +113,10 @@ $u->Update(); $u->Clean(); } else { - $m_var_list_update['codevalidationresult'] = 'lu_code_expired'; + $objSession->SetVariable('codevalidationresult', 'lu_code_expired'); } } else { - $m_var_list_update['codevalidationresult'] = 'lu_code_is_not_valid'; + $objSession->SetVariable('codevalidationresult', 'lu_code_is_not_valid'); } break; @@ -217,7 +218,7 @@ if(!ValidEmail($SubscribeAddress)&& strlen($SubscribeAddress)) { $t = $_GET["Error"]; - $SubscribeError = "lu_invalid_emailaddress"; + $objSession->SetVariable('SubscribeError', 'lu_invalid_emailaddress'); } else { @@ -236,7 +237,7 @@ if($u->CheckBanned()) { $t = $_GET["Error"]; - $SubscribeError ="lu_subscribe_banned"; + $objSession->SetVariable('SubscribeError', 'lu_subscribe_banned'); } else { @@ -254,22 +255,22 @@ else { $t = $_GET["Error"]; - $SubscribeError ="lu_subscribe_no_address"; + $objSession->SetVariable('SubscribeError', 'lu_subscribe_no_address'); } } else { $t = $_GET["Error"]; - $SubscribeError ="lu_subscribe_unknown_error"; + $objSession->SetVariable('SubscribeError', 'lu_subscribe_unknown_error'); } } } if(strlen($t)) { $var_list["t"] = $t; $var_list_update["t"] = $t; - } - + } + $objSession->SetVariable('SubscribeAddress', $SubscribeAddress); break; case "m_subscribe": @@ -829,6 +830,7 @@ } DeleteModuleTagCache('kernel'); break; + case "m_suggest_email": $cutoff = adodb_mktime()+(int)$objConfig->Get("Suggest_MinInterval"); $email = inp_striptags($_POST["suggest_email"]); @@ -847,7 +849,7 @@ { if(strlen($_GET["Error"])>0) $var_list["t"] = $_GET["Error"]; - $suggest_result = "$email ".language("lu_already_suggested ")." ".LangDate($rs->fields["sent"]); + $objSession->SetVariable('suggest_result', "$email ".language("lu_already_suggested ")." ".LangDate($rs->fields["sent"]) ); } else { @@ -862,7 +864,7 @@ $sql = "INSERT INTO ".GetTablePrefix()."SuggestMail (email,sent) VALUES ('".$email."','".adodb_mktime()."')"; $rs = $adodbConnection->Execute($sql); - $suggest_result=language("lu_suggest_success")." ".$email; + $objSession->SetVariable('suggest_result', language("lu_suggest_success")." ".$email); } } $e =& $objMessageList->GetEmailEventObject("USER.SUGGEST",1); @@ -878,14 +880,14 @@ { if(strlen($_GET["Error"])>0) $var_list["t"] = $_GET["Error"]; - $suggest_result=language("lu_invalid_emailaddress"); + $objSession->SetVariable('suggest_result', language("lu_invalid_emailaddress")); } } else { if(strlen($_GET["Error"])>0) $var_list["t"] = $_GET["Error"]; - $suggest_result=language("lu_suggest_no_address"); + $objSession->SetVariable('suggest_result', language("lu_suggest_no_address")); } break; case "m_simple_search":