changed: added Cur structure

we have there two pointers: 
 Request * request;
 Session * session;
these are the current request and the current session


the session GC was moved to SessionManager (was in SessionContainer)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@708 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-01-23 14:15:30 +00:00
parent 61ac29b2de
commit 915cabdf97
171 changed files with 2822 additions and 2650 deletions

View File

@@ -12,13 +12,13 @@
#include "log.h"
#include "rebus.h"
#include "misc.h"
#include "request.h"
#include "cur.h"
void Rebus::SetRequest(Request * prequest)
void Rebus::SetCur(Cur * pcur)
{
request = prequest;
cur = pcur;
}
@@ -128,29 +128,29 @@ return result;
bool Rebus::CheckRebus()
{
if( !request->session )
if( !cur->session )
return false;
if( request->session->puser )
if( cur->session->puser )
// logged users don't have to use the rebus
return true;
if( request->session->rebus_checked )
if( cur->session->rebus_checked )
return true;
request->session->rebus_checked = true;
cur->session->rebus_checked = true;
if( !request->session->rebus_item )
if( !cur->session->rebus_item )
{
log << log1 << "Rebus: rebus not set" << logend;
return false;
}
if( IsAnswerOk(request->session->rebus_item, request->PostVar(L"rebus")) )
if( IsAnswerOk(cur->session->rebus_item, cur->request->PostVar(L"rebus")) )
return true;
log << log1 << "Rebus: rebus has an incorrect answer" << logend;
// don't add request->session->spam_score when the rebus has incorrect answer
// don't add cur->session->spam_score when the rebus has incorrect answer
// a user could have made a mistake
return false;