start working on User and Group classes

- User and Group has been moved to 'models' directory
- removed UserPass struct (passwords fields were put to User struct)
not working yet, we need support for binary blobs in morm

winixd/templates/env.cpp

@@ -147,8 +147,40 @@ void env_admin_tab_has_next(Info & i)
 
 
 
+static size_t req_id = 0;
+static User * puser = nullptr;
 
 
+/*
+ * IMPROVEME
+ * in the future the user pointer will be set by the env controller
+ * a new struct will be added and put to templates (when new ezc object templates will be ready)
+ *
+ */
+User * env_get_user()
+{
+	if( cur->request->id != req_id )
+	{
+		req_id  = cur->request->id;
+		puser   = 0;
+
+		if( cur->session->puser )
+		{
+			if( cur->session->puser->super_user && cur->request->IsPostVar(L"userid") )
+			{
+				long id = Tol(cur->request->PostVar(L"userid"));
+				puser   = system->users.GetUser(id);
+			}
+			else
+			{
+				puser = cur->session->puser;
+			}
+		}
+	}
+
+	return puser;
+}
+
 
 void env_user_admin_env_str(Info & i)
 {
@@ -156,7 +188,7 @@ void env_user_admin_env_str(Info & i)
 
 	if( cur->session->puser && cur->session->puser->super_user )
 	{
-		User * puser = functions->fun_env.GetUser();
+		User * puser = env_get_user();
 
 		if( puser )
 			i.out << puser->aenv;
@@ -166,7 +198,7 @@ void env_user_admin_env_str(Info & i)
 
 void env_user_env_str(Info & i)
 {
-	User * puser = functions->fun_env.GetUser();
+	User * puser = env_get_user();
 
 	if( puser )
 		i.out << puser->env;
@@ -175,7 +207,7 @@ void env_user_env_str(Info & i)
 
 void env_user_id(Info & i)
 {
-	User * puser = functions->fun_env.GetUser();
+	User * puser = env_get_user();
 
 	if( puser )
 		i.out << puser->id;
@@ -184,7 +216,7 @@ void env_user_id(Info & i)
 
 void env_user_name(Info & i)
 {
-	User * puser = functions->fun_env.GetUser();
+	User * puser = env_get_user();
 
 	if( puser )
 		i.out << puser->name;
@@ -247,7 +279,7 @@ void env_user_tab_is_current(Info & i)
 {
 	if( env_user_tab_init() )
 	{
-		User * puser = functions->fun_env.GetUser();
+		User * puser = env_get_user();
 	
 		if( puser )
 			i.res = (user_iter->id == puser->id );

winixd/templates/misc.cpp

@@ -36,7 +36,7 @@
 #include "misc.h"
 #include "core/misc.h"
 #include "core/request.h"
-#include "core/user.h"
+#include "models/user.h"
 
 namespace Winix
 {