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:
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
|
||||
#include "templates.h"
|
||||
#include "../core/request.h"
|
||||
#include "../core/misc.h"
|
||||
#include "core/request.h"
|
||||
#include "core/misc.h"
|
||||
|
||||
|
||||
|
||||
@@ -21,16 +21,16 @@ namespace TemplatesFunctions
|
||||
|
||||
void user_logged(Info & i)
|
||||
{
|
||||
i.res = request->session->puser != 0;
|
||||
i.res = cur->session->puser != 0;
|
||||
}
|
||||
|
||||
|
||||
void user_name(Info & i)
|
||||
{
|
||||
if( !request->session->puser )
|
||||
if( !cur->session->puser )
|
||||
return;
|
||||
|
||||
i.out << request->session->puser->name;
|
||||
i.out << cur->session->puser->name;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,14 +38,14 @@ void user_name(Info & i)
|
||||
// !! moze lepsza nazwa?
|
||||
void user_is_in_group(Info & i)
|
||||
{
|
||||
if( !request->session->puser || i.params.empty() )
|
||||
if( !cur->session->puser || i.params.empty() )
|
||||
return;
|
||||
|
||||
for(size_t a=0 ; a<i.params.size() ; ++a)
|
||||
{
|
||||
long gid = system->groups.GetGroupId(i.params[a]);
|
||||
|
||||
if( gid!=-1 && request->session->puser->IsMemberOf(gid) )
|
||||
if( gid!=-1 && cur->session->puser->IsMemberOf(gid) )
|
||||
{
|
||||
i.res = true;
|
||||
break;
|
||||
@@ -57,14 +57,14 @@ void user_is_in_group(Info & i)
|
||||
// !! moze lepsza nazwa?
|
||||
void user_is_in_all_groups(Info & i)
|
||||
{
|
||||
if( !request->session->puser || i.params.empty() )
|
||||
if( !cur->session->puser || i.params.empty() )
|
||||
return;
|
||||
|
||||
for(size_t a=0 ; a<i.params.size() ; ++a)
|
||||
{
|
||||
long gid = system->groups.GetGroupId(i.params[a]);
|
||||
|
||||
if( gid==-1 || !request->session->puser->IsMemberOf(gid) )
|
||||
if( gid==-1 || !cur->session->puser->IsMemberOf(gid) )
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -74,35 +74,35 @@ void user_is_in_all_groups(Info & i)
|
||||
|
||||
void user_super_user(Info & i)
|
||||
{
|
||||
if( request->session->puser && request->session->puser->super_user )
|
||||
if( cur->session->puser && cur->session->puser->super_user )
|
||||
i.res = true;
|
||||
}
|
||||
|
||||
|
||||
void user_can_use_html(Info & i)
|
||||
{
|
||||
if( !request->session->puser )
|
||||
if( !cur->session->puser )
|
||||
i.res = false;
|
||||
else
|
||||
i.res = system->CanUseHtml(request->session->puser->id);
|
||||
i.res = system->CanUseHtml(cur->session->puser->id);
|
||||
}
|
||||
|
||||
|
||||
void user_can_use_bbcode(Info & i)
|
||||
{
|
||||
if( !request->session->puser )
|
||||
if( !cur->session->puser )
|
||||
i.res = false;
|
||||
else
|
||||
i.res = system->CanUseBBCode(request->session->puser->id);
|
||||
i.res = system->CanUseBBCode(cur->session->puser->id);
|
||||
}
|
||||
|
||||
|
||||
void user_can_use_raw(Info & i)
|
||||
{
|
||||
if( !request->session->puser )
|
||||
if( !cur->session->puser )
|
||||
i.res = false;
|
||||
else
|
||||
i.res = system->CanUseRaw(request->session->puser->id);
|
||||
i.res = system->CanUseRaw(cur->session->puser->id);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user