diff --git a/apps/aqhome-cgi/0BUILD b/apps/aqhome-cgi/0BUILD index 2f65c35..9e04d3c 100644 --- a/apps/aqhome-cgi/0BUILD +++ b/apps/aqhome-cgi/0BUILD @@ -51,7 +51,6 @@ aqhomecgi - aqhcgi_service aqhome @@ -121,7 +120,6 @@ aqhome - aqhcgi_service aqhcgi_modules @@ -133,7 +131,6 @@ - service modules diff --git a/apps/aqhome-cgi/main.c b/apps/aqhome-cgi/main.c index 53aa7e7..7930a07 100644 --- a/apps/aqhome-cgi/main.c +++ b/apps/aqhome-cgi/main.c @@ -38,7 +38,7 @@ */ static void _handleRequest(AQCGI_REQUEST *rq, const char *sPathStaticFiles, const char *sPathRuntimeFiles, const char *sBaseUrl); -static int _handlePath(AQH_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles); +static int _handlePath(AQCGI_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles); static void logStart(void); static int _init(const char *sPathRuntimeFiles, const char *sBaseUrl); @@ -126,26 +126,26 @@ int main(int argc, char **argv) void _handleRequest(AQCGI_REQUEST *rq, const char *sPathStaticFiles, const char *sPathRuntimeFiles, const char *sBaseUrl) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; int rv; sv=AQH_ServiceFiles_new(sPathRuntimeFiles, sBaseUrl); - AQH_Service_SetLoginUrl(sv, "/aqhome/login"); + AQCGI_Service_SetLoginUrl(sv, "/aqhome/login"); rv=_handlePath(sv, rq, sPathStaticFiles); if (rv<0) { DBG_INFO(NULL, "here (%d)", rv); } - AQH_Service_free(sv); + AQCGI_Service_free(sv); } -int _handlePath(AQH_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles) +int _handlePath(AQCGI_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles) { - AQH_MODULE *mRoot; - AQH_MODULE *mParent; - AQH_SESSION *session; + AQCGI_MODULE *mRoot; + AQCGI_MODULE *mParent; + AQCGI_SESSION *session; const GWEN_STRINGLIST *sl; mRoot=AQH_ModRoot_new(sv, sPathStaticFiles); @@ -166,13 +166,13 @@ int _handlePath(AQH_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles s=GWEN_StringListEntry_Data(se); if (s && *s) { if (seNext) { - AQH_MODULE *m; + AQCGI_MODULE *m; DBG_ERROR(NULL, "Entry: %s (%s)", s, seNext?"not last":"last"); m=AQH_ModService_LoadSubModule(mParent, rq, session, s); if (m==NULL) { - AQH_Session_free(session); - AQH_Module_free(mRoot); + AQCGI_Session_free(session); + AQCGI_Module_free(mRoot); return GWEN_ERROR_GENERIC; } mParent=m; @@ -185,8 +185,8 @@ int _handlePath(AQH_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles rv=AQH_ModService_HandleRequest(mParent, rq, session, s); if (rv<0) { DBG_INFO(NULL, "here (%d)", rv); - AQH_Session_free(session); - AQH_Module_free(mRoot); + AQCGI_Session_free(session); + AQCGI_Module_free(mRoot); return rv; } break; @@ -195,13 +195,13 @@ int _handlePath(AQH_SERVICE *sv, AQCGI_REQUEST *rq, const char *sPathStaticFiles se=seNext; } - AQH_Session_free(session); - AQH_Module_free(mRoot); + AQCGI_Session_free(session); + AQCGI_Module_free(mRoot); return 0; } else { - AQH_Session_free(session); - AQH_Module_free(mRoot); + AQCGI_Session_free(session); + AQCGI_Module_free(mRoot); return GWEN_ERROR_GENERIC; } } @@ -223,7 +223,7 @@ void logStart() int _init(const char *sPathRuntimeFiles, const char *sBaseUrl) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; int rv; DBG_ERROR(NULL, "Creating aqhome-cgi environment in \"%s\"", sPathRuntimeFiles); @@ -231,32 +231,32 @@ int _init(const char *sPathRuntimeFiles, const char *sBaseUrl) rv=AQH_ModAdmin_Create(sv); if (rv<0) { DBG_ERROR(NULL, "Error creating module \"admin\""); - AQH_Service_free(sv); + AQCGI_Service_free(sv); return rv; } rv=AQH_ModAdmModules_Create(sv); if (rv<0) { DBG_ERROR(NULL, "Error creating module \"modules\""); - AQH_Service_free(sv); + AQCGI_Service_free(sv); return rv; } rv=AQH_ModAdmUsers_Create(sv); if (rv<0) { DBG_ERROR(NULL, "Error creating module \"users\""); - AQH_Service_free(sv); + AQCGI_Service_free(sv); return rv; } rv=AQH_ModDevices_Create(sv); if (rv<0) { DBG_ERROR(NULL, "Error creating module \"devices\""); - AQH_Service_free(sv); + AQCGI_Service_free(sv); return rv; } - AQH_Service_free(sv); + AQCGI_Service_free(sv); return 0; } diff --git a/apps/aqhome-cgi/modules/0BUILD b/apps/aqhome-cgi/modules/0BUILD index 435afe9..c20e903 100644 --- a/apps/aqhome-cgi/modules/0BUILD +++ b/apps/aqhome-cgi/modules/0BUILD @@ -6,6 +6,7 @@ $(gwenhywfar_cflags) + $(aqcgi_cflags) -I$(topsrcdir) -I$(topbuilddir) -I$(topsrcdir)/apps diff --git a/apps/aqhome-cgi/modules/common/0BUILD b/apps/aqhome-cgi/modules/common/0BUILD index 431bbd0..b3767c1 100644 --- a/apps/aqhome-cgi/modules/common/0BUILD +++ b/apps/aqhome-cgi/modules/common/0BUILD @@ -6,6 +6,7 @@ $(gwenhywfar_cflags) + $(aqcgi_cflags) -I$(topsrcdir) -I$(topbuilddir) -I$(topsrcdir)/apps diff --git a/apps/aqhome-cgi/modules/common/madmin.c b/apps/aqhome-cgi/modules/common/madmin.c index ff27e1d..aea9c29 100644 --- a/apps/aqhome-cgi/modules/common/madmin.c +++ b/apps/aqhome-cgi/modules/common/madmin.c @@ -13,10 +13,11 @@ #include "./madmin.h" -#include "aqhome-cgi/service/module.h" #include "aqhome-cgi/modules/common/mmodules.h" #include "aqhome-cgi/modules/common/musers.h" +#include + #include #include @@ -37,12 +38,12 @@ * ------------------------------------------------------------------------------------------------ */ -static void _createPermDefList(AQH_MODULE *m); -static void _createRoleList(AQH_MODULE *m); +static void _createPermDefList(AQCGI_MODULE *m); +static void _createRoleList(AQCGI_MODULE *m); -static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); -static int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); +static AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +static int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); +static int _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); /* ------------------------------------------------------------------------------------------------ @@ -50,7 +51,7 @@ static int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); * ------------------------------------------------------------------------------------------------ */ -void AQH_ModAdmin_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) +void AQH_ModAdmin_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder) { AQH_ModService_Extend(m, sv, baseFolder); AQH_ModService_SetHandleRequestFn(m, _handleRequest); @@ -59,65 +60,65 @@ void AQH_ModAdmin_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) -int AQH_ModAdmin_Create(AQH_SERVICE *sv) +int AQH_ModAdmin_Create(AQCGI_SERVICE *sv) { - AQH_MODULE *m; + AQCGI_MODULE *m; int rv; - m=AQH_Module_new(); - AQH_Module_SetName(m, "admin"); - AQH_Module_SetDescr(m, "administration module"); - AQH_Module_SetGuestPerms(m, 0); + m=AQCGI_Module_new(); + AQCGI_Module_SetName(m, "admin"); + AQCGI_Module_SetDescr(m, "administration module"); + AQCGI_Module_SetGuestPerms(m, 0); _createPermDefList(m); _createRoleList(m); - rv=AQH_Service_AddModule(sv, m); + rv=AQCGI_Service_AddModule(sv, m); if (rv<0) { DBG_INFO(NULL, "here (%d)", rv); } - AQH_Module_free(m); + AQCGI_Module_free(m); return rv; } -void _createPermDefList(AQH_MODULE *m) +void _createPermDefList(AQCGI_MODULE *m) { - AQH_PERMDEF_LIST *permDefList; + AQCGI_PERMDEF_LIST *permDefList; - permDefList=AQH_PermDef_List_new(); + permDefList=AQCGI_PermDef_List_new(); AQH_ModService_AddPermDef(permDefList, "AdminUsers", 0x001, "User Administration"); AQH_ModService_AddPermDef(permDefList, "AdminModules", 0x002, "Module Administration"); - AQH_Module_SetPermDefList(m, permDefList); + AQCGI_Module_SetPermDefList(m, permDefList); } -void _createRoleList(AQH_MODULE *m) +void _createRoleList(AQCGI_MODULE *m) { - AQH_ROLE_LIST *roleList; + AQCGI_ROLE_LIST *roleList; int id=1; - roleList=AQH_Role_List_new(); + roleList=AQCGI_Role_List_new(); AQH_ModService_AddRole(roleList, id++, "userAdmin", AQH_MODADM_PERMS_ADMINUSERS, "User administrator"); AQH_ModService_AddRole(roleList, id++, "moduleAdmin", AQH_MODADM_PERMS_ADMINMODULES, "Module administrator"); - AQH_Module_SetRoleList(m, roleList); + AQCGI_Module_SetRoleList(m, roleList); } -AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName) +AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; sv=AQH_ModService_GetService(m); if (strcasecmp(sModuleName, "modules")==0) { - AQH_MODULE *mSub; + AQCGI_MODULE *mSub; - mSub=AQH_Service_LoadModule(sv, sModuleName); + mSub=AQCGI_Service_LoadModule(sv, sModuleName); if (mSub) { const char *s; GWEN_BUFFER *nbuf; @@ -127,15 +128,15 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio GWEN_Buffer_AppendArgs(nbuf, "%s/modules", s?s:"."); AQH_ModAdmModules_Extend(mSub, AQH_ModService_GetService(m), GWEN_Buffer_GetStart(nbuf)); - AQH_Module_Tree2_AddChild(m, mSub); + AQCGI_Module_Tree2_AddChild(m, mSub); GWEN_Buffer_free(nbuf); return mSub; } } else if (strcasecmp(sModuleName, "users")==0) { - AQH_MODULE *mSub; + AQCGI_MODULE *mSub; - mSub=AQH_Service_LoadModule(sv, sModuleName); + mSub=AQCGI_Service_LoadModule(sv, sModuleName); if (mSub) { const char *s; GWEN_BUFFER *nbuf; @@ -145,7 +146,7 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio GWEN_Buffer_AppendArgs(nbuf, "%s/modules", s?s:"."); AQH_ModAdmUsers_Extend(mSub, AQH_ModService_GetService(m), GWEN_Buffer_GetStart(nbuf)); - AQH_Module_Tree2_AddChild(m, mSub); + AQCGI_Module_Tree2_AddChild(m, mSub); GWEN_Buffer_free(nbuf); return mSub; } @@ -155,7 +156,7 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio -int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem) +int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem) { GWEN_BUFFER *dbuf; int rv=0; @@ -182,7 +183,7 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const -int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) +int _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) { if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET) { uint32_t userPerms; diff --git a/apps/aqhome-cgi/modules/common/madmin.h b/apps/aqhome-cgi/modules/common/madmin.h index 64ed707..15efcf2 100644 --- a/apps/aqhome-cgi/modules/common/madmin.h +++ b/apps/aqhome-cgi/modules/common/madmin.h @@ -20,9 +20,9 @@ #define AQH_MODADM_PERMS_ADMINMODULES 0x002 -void AQH_ModAdmin_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder); +void AQH_ModAdmin_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder); -int AQH_ModAdmin_Create(AQH_SERVICE *sv); +int AQH_ModAdmin_Create(AQCGI_SERVICE *sv); diff --git a/apps/aqhome-cgi/modules/common/mmodules.c b/apps/aqhome-cgi/modules/common/mmodules.c index 8d3eba5..378e9f0 100644 --- a/apps/aqhome-cgi/modules/common/mmodules.c +++ b/apps/aqhome-cgi/modules/common/mmodules.c @@ -35,33 +35,33 @@ * ------------------------------------------------------------------------------------------------ */ -static void _createPermDefList(AQH_MODULE *m); -static void _createRoleList(AQH_MODULE *m); +static void _createPermDefList(AQCGI_MODULE *m); +static void _createRoleList(AQCGI_MODULE *m); -static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); -static void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); +static AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +static int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); +static void _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqEditModGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqEditModPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqEditModGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqEditModPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqAddRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqAddRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqAddRoleGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqAddRolePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqEditRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqEditRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static int _getHighestUsedRoleId(const AQH_ROLE_LIST *roleList); +static void _handleRqEditRoleGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqEditRolePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static int _getHighestUsedRoleId(const AQCGI_ROLE_LIST *roleList); -static void _handleRqDeleteRole(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqDeleteRole(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); -static void _writeEditModForm(const AQH_MODULE *currentMod, const char *sModName, GWEN_BUFFER *dbuf); -static void _writeRoleListToForm(const AQH_ROLE_LIST *roleList, +static void _writeEditModForm(const AQCGI_MODULE *currentMod, const char *sModName, GWEN_BUFFER *dbuf); +static void _writeRoleListToForm(const AQCGI_ROLE_LIST *roleList, const char *sModName, - const AQH_PERMDEF_LIST *permDefList, + const AQCGI_PERMDEF_LIST *permDefList, GWEN_BUFFER *dbuf); static void _setLocationHeaderForMod(AQCGI_REQUEST *rq, const char *page, const char *sModName); -static void _writeEnabledPermissions(const AQH_PERMDEF_LIST *permDefList, uint32_t perms, GWEN_BUFFER *dbuf); +static void _writeEnabledPermissions(const AQCGI_PERMDEF_LIST *permDefList, uint32_t perms, GWEN_BUFFER *dbuf); @@ -89,7 +89,7 @@ static AQH_MODSERVICE_HANDLER_ENTRY _requestTable[]={ * ------------------------------------------------------------------------------------------------ */ -void AQH_ModAdmModules_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) +void AQH_ModAdmModules_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder) { AQH_ModService_Extend(m, sv, baseFolder); AQH_ModService_SetHandleRequestFn(m, _handleRequest); @@ -98,63 +98,63 @@ void AQH_ModAdmModules_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFo -int AQH_ModAdmModules_Create(AQH_SERVICE *sv) +int AQH_ModAdmModules_Create(AQCGI_SERVICE *sv) { - AQH_MODULE *m; + AQCGI_MODULE *m; int rv; - m=AQH_Module_new(); - AQH_Module_SetName(m, "modules"); - AQH_Module_SetDescr(m, "modules administration module"); - AQH_Module_SetGuestPerms(m, 0); + m=AQCGI_Module_new(); + AQCGI_Module_SetName(m, "modules"); + AQCGI_Module_SetDescr(m, "modules administration module"); + AQCGI_Module_SetGuestPerms(m, 0); _createPermDefList(m); _createRoleList(m); - rv=AQH_Service_AddModule(sv, m); + rv=AQCGI_Service_AddModule(sv, m); if (rv<0) { DBG_INFO(NULL, "here (%d)", rv); } - AQH_Module_free(m); + AQCGI_Module_free(m); return rv; } -void _createPermDefList(AQH_MODULE *m) +void _createPermDefList(AQCGI_MODULE *m) { - AQH_PERMDEF_LIST *permDefList; + AQCGI_PERMDEF_LIST *permDefList; - permDefList=AQH_PermDef_List_new(); + permDefList=AQCGI_PermDef_List_new(); AQH_ModService_AddPermDef(permDefList, "ModuleRead", 0x001, "Read modules"); AQH_ModService_AddPermDef(permDefList, "ModuleWrite", 0x002, "Modify modules"); AQH_ModService_AddPermDef(permDefList, "ModuleAdd", 0x004, "Add modules"); AQH_ModService_AddPermDef(permDefList, "ModuleDel", 0x008, "Remove modules"); - AQH_Module_SetPermDefList(m, permDefList); + AQCGI_Module_SetPermDefList(m, permDefList); } -void _createRoleList(AQH_MODULE *m) +void _createRoleList(AQCGI_MODULE *m) { - AQH_ROLE_LIST *roleList; + AQCGI_ROLE_LIST *roleList; int id=1; - roleList=AQH_Role_List_new(); + roleList=AQCGI_Role_List_new(); AQH_ModService_AddRole(roleList, id++, "admin", AQH_MODADMMODULES_PERMS_MODULESREAD | AQH_MODADMMODULES_PERMS_MODULESWRITE | AQH_MODADMMODULES_PERMS_MODULESADD | AQH_MODADMMODULES_PERMS_MODULESDEL, "Administrator Role"); - AQH_Module_SetRoleList(m, roleList); + AQCGI_Module_SetRoleList(m, roleList); } -AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName) +AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName) { /* no sub-modules */ return NULL; @@ -162,7 +162,7 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio -int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem) +int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem) { AQH_ModService_HandleRequestWithTable(m, rq, session, sLastPathElem, _requestTable); return AQCGI_SendResponse(rq); @@ -170,15 +170,15 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const -void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_STRINGLIST *slModules; uint32_t perms; perms=AQH_ModService_GetUserPerms(m); sv=AQH_ModService_GetService(m); - slModules=AQH_Service_ListModules(sv); + slModules=AQCGI_Service_ListModules(sv); if (slModules) { GWEN_STRINGLISTENTRY *se; @@ -195,18 +195,18 @@ void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN sModName=GWEN_StringListEntry_Data(se); if (sModName && *sModName) { - AQH_MODULE *currentMod; + AQCGI_MODULE *currentMod; - currentMod=AQH_Service_LoadModule(sv, sModName); + currentMod=AQCGI_Service_LoadModule(sv, sModName); if (currentMod) { const char *s; const char *sName; - sName=AQH_Module_GetName(currentMod); + sName=AQCGI_Module_GetName(currentMod); GBAS(dbuf, ""); - GBAA(dbuf, "%lu", (unsigned long int) AQH_Module_GetId(currentMod)); + GBAA(dbuf, "%lu", (unsigned long int) AQCGI_Module_GetId(currentMod)); GBAA(dbuf, "%s", sName?sName:""); - s=AQH_Module_GetDescr(currentMod); + s=AQCGI_Module_GetDescr(currentMod); GBAA(dbuf, "%s", s?s:""); GBAS(dbuf, ""); @@ -214,7 +214,7 @@ void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN GBAA(dbuf, "", sName?sName:""); GBAA(dbuf, "\n"); GBAA(dbuf, "\n"); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); } } se=GWEN_StringListEntry_Next(se); @@ -230,20 +230,20 @@ void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN -void _handleRqEditModGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqEditModGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbQuery; const char *sModName; - AQH_MODULE *currentMod; + AQCGI_MODULE *currentMod; sv=AQH_ModService_GetService(m); dbQuery=AQCGI_Request_GetDbQuery(rq); sModName=dbQuery?GWEN_DB_GetCharValue(dbQuery, "name", 0, NULL):NULL; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; if (currentMod) { _writeEditModForm(currentMod, sModName, dbuf); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); } else { AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html"); @@ -254,42 +254,42 @@ void _handleRqEditModGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, -void _handleRqEditModPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqEditModPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sModName; - AQH_MODULE *currentMod; + AQCGI_MODULE *currentMod; sv=AQH_ModService_GetService(m); dbPost=AQCGI_Request_GetDbPostBody(rq); sModName=dbPost?GWEN_DB_GetCharValue(dbPost, "module", 0, NULL):NULL; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; if (currentMod) { const char *sNewModName; const char *sDescr; int rv; uint32_t perms; - const AQH_PERMDEF_LIST *permDefList; + const AQCGI_PERMDEF_LIST *permDefList; - permDefList=AQH_Module_GetPermDefList(currentMod); + permDefList=AQCGI_Module_GetPermDefList(currentMod); sNewModName=GWEN_DB_GetCharValue(dbPost, "name", 0, NULL); sDescr=GWEN_DB_GetCharValue(dbPost, "descr", 0, NULL); perms=AQH_ModService_ReadPermsFromForm(dbPost, permDefList, NULL); if (sNewModName && *sNewModName) - AQH_Module_SetName(currentMod, sNewModName); - AQH_Module_SetDescr(currentMod, sDescr); - AQH_Module_SetGuestPerms(currentMod, perms); + AQCGI_Module_SetName(currentMod, sNewModName); + AQCGI_Module_SetDescr(currentMod, sDescr); + AQCGI_Module_SetGuestPerms(currentMod, perms); - rv=AQH_Service_SaveModule(sv, currentMod); + rv=AQCGI_Service_SaveModule(sv, currentMod); if (rv<0) { GBAS(dbuf, "

Error

Error saving module

"); DBG_ERROR(NULL, "Could not save module \"%s\"", sModName); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); return; } DBG_ERROR(NULL, "Module \"%s\" saved", sModName); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html"); AQCGI_Request_SetResponseCode(rq, 303); AQCGI_Request_SetResponseText(rq, "See other"); @@ -302,21 +302,21 @@ void _handleRqEditModPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session -void _handleRqAddRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqAddRoleGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbQuery; const char *sModName; - AQH_MODULE *currentMod; - const AQH_PERMDEF_LIST *permDefList; + AQCGI_MODULE *currentMod; + const AQCGI_PERMDEF_LIST *permDefList; uint32_t guestPerms; sv=AQH_ModService_GetService(m); dbQuery=AQCGI_Request_GetDbQuery(rq); sModName=dbQuery?GWEN_DB_GetCharValue(dbQuery, "mod", 0, NULL):NULL; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; - guestPerms=currentMod?AQH_Module_GetGuestPerms(currentMod):0; - permDefList=currentMod?AQH_Module_GetPermDefList(currentMod):NULL; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; + guestPerms=currentMod?AQCGI_Module_GetGuestPerms(currentMod):0; + permDefList=currentMod?AQCGI_Module_GetPermDefList(currentMod):NULL; if (currentMod) { if (permDefList) { @@ -340,7 +340,7 @@ void _handleRqAddRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GBAS(dbuf, "

Please add permission definitions first.

\n"); GBAA(dbuf, "

back to module

\n", sModName?sModName:""); } - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); } else { GBAS(dbuf, "

Error loading module.

\n"); @@ -350,18 +350,18 @@ void _handleRqAddRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, -void _handleRqAddRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqAddRolePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sModName; - AQH_MODULE *currentMod; + AQCGI_MODULE *currentMod; int newId; const char *sName; const char *sDescr; uint32_t perms; - AQH_PERMDEF_LIST *permDefList; - AQH_ROLE_LIST *roleList; + AQCGI_PERMDEF_LIST *permDefList; + AQCGI_ROLE_LIST *roleList; int rv; /* sample data */ @@ -369,9 +369,9 @@ void _handleRqAddRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session sv=AQH_ModService_GetService(m); dbPost=AQCGI_Request_GetDbPostBody(rq); sModName=dbPost?GWEN_DB_GetCharValue(dbPost, "mod", 0, NULL):NULL; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; - permDefList=currentMod?AQH_Module_GetPermDefList(currentMod):NULL; - roleList=currentMod?AQH_Module_GetRoleList(currentMod):NULL; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; + permDefList=currentMod?AQCGI_Module_GetPermDefList(currentMod):NULL; + roleList=currentMod?AQCGI_Module_GetRoleList(currentMod):NULL; /* read role values */ newId=(roleList?_getHighestUsedRoleId(roleList):0)+1; sName=dbPost?GWEN_DB_GetCharValue(dbPost, "name", 0, NULL):NULL; @@ -387,33 +387,33 @@ void _handleRqAddRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session } if (currentMod) { - AQH_ROLE *role; + AQCGI_ROLE *role; /* set new values */ - role=AQH_Role_new(); - AQH_Role_SetId(role, newId); - AQH_Role_SetName(role, sName); - AQH_Role_SetDescr(role, sDescr); - AQH_Role_SetPerms(role, perms); + role=AQCGI_Role_new(); + AQCGI_Role_SetId(role, newId); + AQCGI_Role_SetName(role, sName); + AQCGI_Role_SetDescr(role, sDescr); + AQCGI_Role_SetPerms(role, perms); /* add role */ if (roleList==NULL) { - roleList=AQH_Role_List_new(); - AQH_Module_SetRoleList(currentMod, roleList); + roleList=AQCGI_Role_List_new(); + AQCGI_Module_SetRoleList(currentMod, roleList); } - AQH_Role_List_Add(role, roleList); + AQCGI_Role_List_Add(role, roleList); /* save module */ - rv=AQH_Service_SaveModule(sv, currentMod); + rv=AQCGI_Service_SaveModule(sv, currentMod); if (rv<0) { GBAS(dbuf, "

Error saving module.

\n"); GBAA(dbuf, "

back to module

\n", sModName?sModName:""); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); return; } _setLocationHeaderForMod(rq, "editmodule.html", sModName); AQCGI_Request_SetResponseCode(rq, 303); AQCGI_Request_SetResponseText(rq, "See Other"); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); } else { GBAS(dbuf, "

Error loading module.

\n"); @@ -423,31 +423,31 @@ void _handleRqAddRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session -void _handleRqEditRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqEditRoleGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbQuery; const char *sModName; int id; const char *sName; const char *sDescr; uint32_t perms; - AQH_MODULE *currentMod; - const AQH_PERMDEF_LIST *permDefList; - const AQH_ROLE_LIST *roleList; - const AQH_ROLE *role; + AQCGI_MODULE *currentMod; + const AQCGI_PERMDEF_LIST *permDefList; + const AQCGI_ROLE_LIST *roleList; + const AQCGI_ROLE *role; sv=AQH_ModService_GetService(m); dbQuery=AQCGI_Request_GetDbQuery(rq); sModName=dbQuery?GWEN_DB_GetCharValue(dbQuery, "mod", 0, NULL):NULL; id=dbQuery?GWEN_DB_GetIntValue(dbQuery, "id", 0, 0):0; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; - permDefList=currentMod?AQH_Module_GetPermDefList(currentMod):NULL; - roleList=currentMod?AQH_Module_GetRoleList(currentMod):NULL; - role=roleList?AQH_Role_List_GetById(roleList, id):NULL; - sName=role?AQH_Role_GetName(role):NULL; - sDescr=role?AQH_Role_GetDescr(role):NULL; - perms=role?AQH_Role_GetPerms(role):0; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; + permDefList=currentMod?AQCGI_Module_GetPermDefList(currentMod):NULL; + roleList=currentMod?AQCGI_Module_GetRoleList(currentMod):NULL; + role=roleList?AQCGI_Role_List_GetById(roleList, id):NULL; + sName=role?AQCGI_Role_GetName(role):NULL; + sDescr=role?AQCGI_Role_GetDescr(role):NULL; + perms=role?AQCGI_Role_GetPerms(role):0; if (role) { GBAA(dbuf, "

Edit Role for Module %s

\n", sModName?sModName:""); @@ -477,33 +477,33 @@ void _handleRqEditRoleGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session -void _handleRqEditRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqEditRolePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sModName; - AQH_MODULE *currentMod; + AQCGI_MODULE *currentMod; int oldId; const char *sName; const char *sDescr; uint32_t perms; - AQH_PERMDEF_LIST *permDefList; - AQH_ROLE_LIST *roleList; - AQH_ROLE *role; + AQCGI_PERMDEF_LIST *permDefList; + AQCGI_ROLE_LIST *roleList; + AQCGI_ROLE *role; int rv; /* sample data */ sv=AQH_ModService_GetService(m); dbPost=AQCGI_Request_GetDbPostBody(rq); sModName=dbPost?GWEN_DB_GetCharValue(dbPost, "mod", 0, NULL):NULL; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; - permDefList=currentMod?AQH_Module_GetPermDefList(currentMod):NULL; - roleList=currentMod?AQH_Module_GetRoleList(currentMod):NULL; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; + permDefList=currentMod?AQCGI_Module_GetPermDefList(currentMod):NULL; + roleList=currentMod?AQCGI_Module_GetRoleList(currentMod):NULL; /* read role data */ oldId=dbPost?GWEN_DB_GetIntValue(dbPost, "oldId", 0, -1):-1; sName=dbPost?GWEN_DB_GetCharValue(dbPost, "name", 0, NULL):NULL; sDescr=dbPost?GWEN_DB_GetCharValue(dbPost, "descr", 0, NULL):NULL; - role=roleList?AQH_Role_List_GetById(roleList, oldId):NULL; + role=roleList?AQCGI_Role_List_GetById(roleList, oldId):NULL; perms=(dbPost && permDefList)?AQH_ModService_ReadPermsFromForm(dbPost, permDefList, NULL):0; /* validate */ if (!(sName && *sName)) { @@ -521,23 +521,23 @@ void _handleRqEditRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio if (currentMod) { /* set new values */ - AQH_Role_SetName(role, sName); - AQH_Role_SetDescr(role, sDescr); - AQH_Role_SetPerms(role, perms); + AQCGI_Role_SetName(role, sName); + AQCGI_Role_SetDescr(role, sDescr); + AQCGI_Role_SetPerms(role, perms); /* save module */ - rv=AQH_Service_SaveModule(sv, currentMod); + rv=AQCGI_Service_SaveModule(sv, currentMod); if (rv<0) { GBAS(dbuf, "

Error saving module.

\n"); GBAA(dbuf, "

back to module

\n", sModName?sModName:""); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); return; } _setLocationHeaderForMod(rq, "editmodule.html", sModName); AQCGI_Request_SetResponseCode(rq, 303); AQCGI_Request_SetResponseText(rq, "See Other"); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); } else { GBAS(dbuf, "

Error loading module.

\n"); @@ -547,36 +547,36 @@ void _handleRqEditRolePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio -void _handleRqDeleteRole(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqDeleteRole(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbQuery; const char *sModName; int id; - AQH_MODULE *currentMod; - const AQH_ROLE_LIST *roleList; - AQH_ROLE *role; + AQCGI_MODULE *currentMod; + const AQCGI_ROLE_LIST *roleList; + AQCGI_ROLE *role; sv=AQH_ModService_GetService(m); dbQuery=AQCGI_Request_GetDbQuery(rq); sModName=dbQuery?GWEN_DB_GetCharValue(dbQuery, "mod", 0, NULL):NULL; id=dbQuery?GWEN_DB_GetIntValue(dbQuery, "id", 0, 0):0; - currentMod=(sModName && *sModName)?AQH_Service_LoadModule(sv, sModName):NULL; + currentMod=(sModName && *sModName)?AQCGI_Service_LoadModule(sv, sModName):NULL; if (currentMod) { - roleList=currentMod?AQH_Module_GetRoleList(currentMod):NULL; - role=roleList?AQH_Role_List_GetById(roleList, id):NULL; + roleList=currentMod?AQCGI_Module_GetRoleList(currentMod):NULL; + role=roleList?AQCGI_Role_List_GetById(roleList, id):NULL; if (role) { int rv; - AQH_Role_List_Del(role); - AQH_Role_free(role); + AQCGI_Role_List_Del(role); + AQCGI_Role_free(role); /* save module */ - rv=AQH_Service_SaveModule(sv, currentMod); + rv=AQCGI_Service_SaveModule(sv, currentMod); if (rv<0) { GBAS(dbuf, "

Error saving module.

\n"); GBAA(dbuf, "

back to module

\n", sModName?sModName:""); - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); return; } @@ -588,7 +588,7 @@ void _handleRqDeleteRole(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GBAS(dbuf, "

Role not found.

\n"); GBAA(dbuf, "

back to module

\n", sModName?sModName:""); } - AQH_Module_free(currentMod); + AQCGI_Module_free(currentMod); } else { GBAS(dbuf, "

Error loading module.

\n"); @@ -610,20 +610,20 @@ void _setLocationHeaderForMod(AQCGI_REQUEST *rq, const char *page, const char *s -int _getHighestUsedRoleId(const AQH_ROLE_LIST *roleList) +int _getHighestUsedRoleId(const AQCGI_ROLE_LIST *roleList) { int id=0; if (roleList) { - const AQH_ROLE *role; + const AQCGI_ROLE *role; - role=AQH_Role_List_First(roleList); + role=AQCGI_Role_List_First(roleList); while(role) { int rid; - rid=AQH_Role_GetId(role); + rid=AQCGI_Role_GetId(role); id=(rid>id)?rid:id; - role=AQH_Role_List_Next(role); + role=AQCGI_Role_List_Next(role); } } return id; @@ -631,17 +631,17 @@ int _getHighestUsedRoleId(const AQH_ROLE_LIST *roleList) -void _writeEditModForm(const AQH_MODULE *currentMod, const char *sModName, GWEN_BUFFER *dbuf) +void _writeEditModForm(const AQCGI_MODULE *currentMod, const char *sModName, GWEN_BUFFER *dbuf) { const char *sName; const char *sDescr; - const AQH_PERMDEF_LIST *permDefList; - const AQH_ROLE_LIST *roleList; + const AQCGI_PERMDEF_LIST *permDefList; + const AQCGI_ROLE_LIST *roleList; - permDefList=AQH_Module_GetPermDefList(currentMod); - roleList=AQH_Module_GetRoleList(currentMod); - sName=AQH_Module_GetName(currentMod); - sDescr=AQH_Module_GetDescr(currentMod); + permDefList=AQCGI_Module_GetPermDefList(currentMod); + roleList=AQCGI_Module_GetRoleList(currentMod); + sName=AQCGI_Module_GetName(currentMod); + sDescr=AQCGI_Module_GetDescr(currentMod); /* write module info */ GBAS(dbuf, "

Module Info

\n"); GBAA(dbuf, @@ -653,7 +653,7 @@ void _writeEditModForm(const AQH_MODULE *currentMod, const char *sModName, GWEN_ if (permDefList) { GBAA(dbuf, "\n"); - AQH_ModService_WritePermsToForm(AQH_Module_GetGuestPerms(currentMod), permDefList, NULL, dbuf); + AQH_ModService_WritePermsToForm(AQCGI_Module_GetGuestPerms(currentMod), permDefList, NULL, dbuf); GBAA(dbuf, ""); } @@ -673,36 +673,36 @@ void _writeEditModForm(const AQH_MODULE *currentMod, const char *sModName, GWEN_ -void _writeRoleListToForm(const AQH_ROLE_LIST *roleList, +void _writeRoleListToForm(const AQCGI_ROLE_LIST *roleList, const char *sModName, - const AQH_PERMDEF_LIST *permDefList, + const AQCGI_PERMDEF_LIST *permDefList, GWEN_BUFFER *dbuf) { - const AQH_ROLE *role; + const AQCGI_ROLE *role; GBAS(dbuf, "\n" "\n\n" "\n"); - role=AQH_Role_List_First(roleList); + role=AQCGI_Role_List_First(roleList); while(role) { uint8_t id; const char *s; GBAS(dbuf, ""); /* id */ - id=AQH_Role_GetId(role); + id=AQCGI_Role_GetId(role); GBAA(dbuf, "", id); /* name */ - s=AQH_Role_GetName(role); + s=AQCGI_Role_GetName(role); GBAA(dbuf, "", s?s:""); /* permissions */ GBAS(dbuf, ""); /* description */ - s=AQH_Role_GetDescr(role); + s=AQCGI_Role_GetDescr(role); GBAA(dbuf, "", s?s:""); /* actions */ GBAA(dbuf, ""); GBAS(dbuf, "\n"); - role=AQH_Role_List_Next(role); + role=AQCGI_Role_List_Next(role); } GBAS(dbuf, "\n
IdNamePermissionsDescriptionActions
%d%s"); if (permDefList) - _writeEnabledPermissions(permDefList, AQH_Role_GetPerms(role), dbuf); + _writeEnabledPermissions(permDefList, AQCGI_Role_GetPerms(role), dbuf); GBAS(dbuf, "%s"); @@ -711,7 +711,7 @@ void _writeRoleListToForm(const AQH_ROLE_LIST *roleList, GBAA(dbuf, "
\n"); @@ -722,21 +722,21 @@ void _writeRoleListToForm(const AQH_ROLE_LIST *roleList, -void _writeEnabledPermissions(const AQH_PERMDEF_LIST *permDefList, uint32_t perms, GWEN_BUFFER *dbuf) +void _writeEnabledPermissions(const AQCGI_PERMDEF_LIST *permDefList, uint32_t perms, GWEN_BUFFER *dbuf) { if (permDefList) { - const AQH_PERMDEF *permDef; + const AQCGI_PERMDEF *permDef; - permDef=AQH_PermDef_List_First(permDefList); + permDef=AQCGI_PermDef_List_First(permDefList); while(permDef) { const char *s; uint32_t mask; - s=AQH_PermDef_GetId(permDef); - mask=AQH_PermDef_GetMask(permDef); + s=AQCGI_PermDef_GetId(permDef); + mask=AQCGI_PermDef_GetMask(permDef); if (perms & mask) GBAA(dbuf, "%s ", s?s:""); - permDef=AQH_PermDef_List_Next(permDef); + permDef=AQCGI_PermDef_List_Next(permDef); } } } diff --git a/apps/aqhome-cgi/modules/common/mmodules.h b/apps/aqhome-cgi/modules/common/mmodules.h index 4933968..56b6ae1 100644 --- a/apps/aqhome-cgi/modules/common/mmodules.h +++ b/apps/aqhome-cgi/modules/common/mmodules.h @@ -24,9 +24,9 @@ -void AQH_ModAdmModules_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder); +void AQH_ModAdmModules_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder); -int AQH_ModAdmModules_Create(AQH_SERVICE *sv); +int AQH_ModAdmModules_Create(AQCGI_SERVICE *sv); diff --git a/apps/aqhome-cgi/modules/common/mservice.c b/apps/aqhome-cgi/modules/common/mservice.c index 47a3132..bbac71f 100644 --- a/apps/aqhome-cgi/modules/common/mservice.c +++ b/apps/aqhome-cgi/modules/common/mservice.c @@ -13,7 +13,7 @@ #include "./mservice_p.h" -#include "aqhome-cgi/service/module.h" +#include #include #include @@ -46,7 +46,7 @@ * ------------------------------------------------------------------------------------------------ */ -GWEN_INHERIT(AQH_MODULE, AQH_MOD_SERVICE) +GWEN_INHERIT(AQCGI_MODULE, AQH_MOD_SERVICE) @@ -56,8 +56,8 @@ GWEN_INHERIT(AQH_MODULE, AQH_MOD_SERVICE) */ static void GWENHYWFAR_CB _freeData(void *bp, void *p); -static void _calcUserModPerms(AQH_MODULE *m, const AQH_USER *user); -static uint32_t _calcRolePerms(const AQH_MODULE *m, const AQH_MODULE_PERMS *modPerms); +static void _calcUserModPerms(AQCGI_MODULE *m, const AQCGI_USER *user); +static uint32_t _calcRolePerms(const AQCGI_MODULE *m, const AQCGI_MODULE_PERMS *modPerms); @@ -66,12 +66,12 @@ static uint32_t _calcRolePerms(const AQH_MODULE *m, const AQH_MODULE_PERMS *modP * ------------------------------------------------------------------------------------------------ */ -void AQH_ModService_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) +void AQH_ModService_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder) { AQH_MOD_SERVICE *xm; GWEN_NEW_OBJECT(AQH_MOD_SERVICE, xm); - GWEN_INHERIT_SETDATA(AQH_MODULE, AQH_MOD_SERVICE, m, xm, _freeData); + GWEN_INHERIT_SETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m, xm, _freeData); xm->service=sv; xm->baseFolder=(baseFolder && *baseFolder)?strdup(baseFolder):NULL; @@ -90,12 +90,12 @@ void _freeData(GWEN_UNUSED void *bp, void *p) -AQH_SERVICE *AQH_ModService_GetService(const AQH_MODULE *m) +AQCGI_SERVICE *AQH_ModService_GetService(const AQCGI_MODULE *m) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { return xm->service; } @@ -105,12 +105,12 @@ AQH_SERVICE *AQH_ModService_GetService(const AQH_MODULE *m) -const char *AQH_ModService_GetBaseFolder(const AQH_MODULE *m) +const char *AQH_ModService_GetBaseFolder(const AQCGI_MODULE *m) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { return xm->baseFolder; } @@ -120,12 +120,12 @@ const char *AQH_ModService_GetBaseFolder(const AQH_MODULE *m) -uint32_t AQH_ModService_GetUserPerms(const AQH_MODULE *m) +uint32_t AQH_ModService_GetUserPerms(const AQCGI_MODULE *m) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { return xm->userPerms; } @@ -135,12 +135,12 @@ uint32_t AQH_ModService_GetUserPerms(const AQH_MODULE *m) -void AQH_ModService_SetHandleRequestFn(AQH_MODULE *m, AQH_MODSERVICE_HANDLEREQUEST_FN fn) +void AQH_ModService_SetHandleRequestFn(AQCGI_MODULE *m, AQH_MODSERVICE_HANDLEREQUEST_FN fn) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { xm->handleRequestFn=fn; } @@ -149,12 +149,12 @@ void AQH_ModService_SetHandleRequestFn(AQH_MODULE *m, AQH_MODSERVICE_HANDLEREQUE -void AQH_ModService_SetLoadSubModuleFn(AQH_MODULE *m, AQH_MODSERVICE_LOADSUBMODULE_FN fn) +void AQH_ModService_SetLoadSubModuleFn(AQCGI_MODULE *m, AQH_MODSERVICE_LOADSUBMODULE_FN fn) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { xm->loadSubModuleFn=fn; } @@ -163,12 +163,12 @@ void AQH_ModService_SetLoadSubModuleFn(AQH_MODULE *m, AQH_MODSERVICE_LOADSUBMODU -void AQH_ModService_SetAddHeaderFn(AQH_MODULE *m, AQH_MODSERVICE_ADDHEADER_FN fn) +void AQH_ModService_SetAddHeaderFn(AQCGI_MODULE *m, AQH_MODSERVICE_ADDHEADER_FN fn) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { xm->addHeaderFn=fn; } @@ -177,12 +177,12 @@ void AQH_ModService_SetAddHeaderFn(AQH_MODULE *m, AQH_MODSERVICE_ADDHEADER_FN fn -void AQH_ModService_SetAddFooterFn(AQH_MODULE *m, AQH_MODSERVICE_ADDFOOTER_FN fn) +void AQH_ModService_SetAddFooterFn(AQCGI_MODULE *m, AQH_MODSERVICE_ADDFOOTER_FN fn) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { xm->addFooterFn=fn; } @@ -191,19 +191,19 @@ void AQH_ModService_SetAddFooterFn(AQH_MODULE *m, AQH_MODSERVICE_ADDFOOTER_FN fn -void AQH_ModService_AddHeader(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf) +void AQH_ModService_AddHeader(AQCGI_MODULE *m, const char *lang, GWEN_BUFFER *dbuf) { if (m && dbuf) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { if (xm->addHeaderFn) xm->addHeaderFn(m, lang, dbuf); else { - AQH_MODULE *mParent; + AQCGI_MODULE *mParent; - mParent=AQH_Module_Tree2_GetParent(m); + mParent=AQCGI_Module_Tree2_GetParent(m); if (mParent) AQH_ModService_AddHeader(mParent, lang, dbuf); AQH_ModService_ReadStaticFile(m, lang, AQH_MOD_SERVICE_HEADERFILE, dbuf); @@ -214,21 +214,21 @@ void AQH_ModService_AddHeader(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf -void AQH_ModService_AddFooter(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf) +void AQH_ModService_AddFooter(AQCGI_MODULE *m, const char *lang, GWEN_BUFFER *dbuf) { if (m && dbuf) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { if (xm->addFooterFn) xm->addFooterFn(m, lang, dbuf); else { - AQH_MODULE *mParent; + AQCGI_MODULE *mParent; AQH_ModService_ReadStaticFile(m, lang, AQH_MOD_SERVICE_FOOTERFILE, dbuf); - mParent=AQH_Module_Tree2_GetParent(m); + mParent=AQCGI_Module_Tree2_GetParent(m); if (mParent) AQH_ModService_AddFooter(mParent, lang, dbuf); } @@ -238,7 +238,7 @@ void AQH_ModService_AddFooter(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf -int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_BUFFER *dbuf) +int AQH_ModService_RespondWithFile(AQCGI_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_BUFFER *dbuf) { int rv; @@ -256,7 +256,7 @@ int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char -int AQH_ModService_RespondWithVarFile(AQH_MODULE *m, AQCGI_REQUEST *rq, +int AQH_ModService_RespondWithVarFile(AQCGI_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_DB_NODE *dbVars, @@ -284,12 +284,12 @@ int AQH_ModService_RespondWithVarFile(AQH_MODULE *m, AQCGI_REQUEST *rq, -int AQH_ModService_HandleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem) +int AQH_ModService_HandleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm && xm->handleRequestFn) return xm->handleRequestFn(m, rq, session, sLastPathElem); } @@ -298,14 +298,14 @@ int AQH_ModService_HandleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION * -AQH_MODULE *AQH_ModService_LoadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName) +AQCGI_MODULE *AQH_ModService_LoadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm && xm->loadSubModuleFn) { - AQH_MODULE *mReturn; + AQCGI_MODULE *mReturn; mReturn=xm->loadSubModuleFn(m, rq, session, sModuleName); if (mReturn) @@ -318,12 +318,12 @@ AQH_MODULE *AQH_ModService_LoadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_S -int AQH_ModService_ReadStaticFile(AQH_MODULE *m, const char *lang, const char *filename, GWEN_BUFFER *dbuf) +int AQH_ModService_ReadStaticFile(AQCGI_MODULE *m, const char *lang, const char *filename, GWEN_BUFFER *dbuf) { if (m && filename && dbuf) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { GWEN_BUFFER *fbuf; int rv; @@ -351,9 +351,9 @@ int AQH_ModService_ReadStaticFile(AQH_MODULE *m, const char *lang, const char *f -AQH_SESSION *AQH_ModService_ReadSession(AQH_MODULE *m, AQCGI_REQUEST *rq) +AQCGI_SESSION *AQH_ModService_ReadSession(AQCGI_MODULE *m, AQCGI_REQUEST *rq) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *db; const char *s; @@ -361,9 +361,9 @@ AQH_SESSION *AQH_ModService_ReadSession(AQH_MODULE *m, AQCGI_REQUEST *rq) db=AQCGI_Request_GetDbRequestHeader(rq); s=GWEN_DB_GetCharValue(db, "cookies/session", 0, NULL); if (s && *s) { - AQH_SESSION *session; + AQCGI_SESSION *session; - session=AQH_Service_LoadSession(sv, s); + session=AQCGI_Service_LoadSession(sv, s); if (session==NULL) { DBG_ERROR(NULL, "Session \"%s\" not found", s); return NULL; @@ -372,24 +372,24 @@ AQH_SESSION *AQH_ModService_ReadSession(AQH_MODULE *m, AQCGI_REQUEST *rq) const char *sUserName; GWEN_BUFFER *tbuf; - sUserName=AQH_Session_GetUserAlias(session); + sUserName=AQCGI_Session_GetUserAlias(session); if (sUserName && *sUserName) { - AQH_USER *user; + AQCGI_USER *user; - user=AQH_Service_LoadUser(sv, sUserName); + user=AQCGI_Service_LoadUser(sv, sUserName); if (user==NULL) { DBG_ERROR(NULL, "User \"%s\" not found", sUserName); - AQH_Session_free(session); + AQCGI_Session_free(session); return NULL; } else { DBG_ERROR(NULL, "User is \"%s\"", sUserName); } - AQH_Session_SetUser(session, user); + AQCGI_Session_SetUser(session, user); } /* renew session cookie */ tbuf=GWEN_Buffer_new(0, 256, 0, 1); - GWEN_Buffer_AppendArgs(tbuf, "Set-Cookie: session=%s; max-age=86400", AQH_Session_GetUid(session)); + GWEN_Buffer_AppendArgs(tbuf, "Set-Cookie: session=%s; max-age=86400", AQCGI_Session_GetUid(session)); AQCGI_Request_AddResponseHeaderData(rq, GWEN_Buffer_GetStart(tbuf)); DBG_ERROR(NULL, "Renew session cookie"); GWEN_Buffer_free(tbuf); @@ -404,44 +404,44 @@ AQH_SESSION *AQH_ModService_ReadSession(AQH_MODULE *m, AQCGI_REQUEST *rq) -void AQH_ModService_CalcSessionModPerms(AQH_MODULE *m, const AQH_SESSION *session) +void AQH_ModService_CalcSessionModPerms(AQCGI_MODULE *m, const AQCGI_SESSION *session) { - const AQH_USER *user; + const AQCGI_USER *user; - user=session?AQH_Session_GetUser(session):NULL; + user=session?AQCGI_Session_GetUser(session):NULL; _calcUserModPerms(m, user); } -void _calcUserModPerms(AQH_MODULE *m, const AQH_USER *user) +void _calcUserModPerms(AQCGI_MODULE *m, const AQCGI_USER *user) { if (m) { AQH_MOD_SERVICE *xm; - xm=GWEN_INHERIT_GETDATA(AQH_MODULE, AQH_MOD_SERVICE, m); + xm=GWEN_INHERIT_GETDATA(AQCGI_MODULE, AQH_MOD_SERVICE, m); if (xm) { uint32_t perms=0; if (user) { - if (AQH_User_GetFlags(user) & AQH_USER_FLAGS_ADMIN) + if (AQCGI_User_GetFlags(user) & AQCGI_USER_FLAGS_ADMIN) perms=0xffffffff; else { const char *sModName; - const AQH_MODULE_PERMS_LIST *modPermsList; - AQH_MODULE_PERMS *modPerms; + const AQCGI_MODULE_PERMS_LIST *modPermsList; + AQCGI_MODULE_PERMS *modPerms; - sModName=AQH_Module_GetName(m); - modPermsList=AQH_User_GetModulePermList(user); - modPerms=(sModName && modPermsList)?AQH_ModulePerms_List_GetByModuleId(modPermsList, sModName):NULL; + sModName=AQCGI_Module_GetName(m); + modPermsList=AQCGI_User_GetModulePermList(user); + modPerms=(sModName && modPermsList)?AQCGI_ModulePerms_List_GetByModuleId(modPermsList, sModName):NULL; if (modPerms) perms=_calcRolePerms(m, modPerms); else - perms=AQH_Module_GetGuestPerms(m); + perms=AQCGI_Module_GetGuestPerms(m); } } /* if (user) */ else - perms=AQH_Module_GetGuestPerms(m); + perms=AQCGI_Module_GetGuestPerms(m); xm->userPerms=perms; } } /* if (m) */ @@ -449,39 +449,39 @@ void _calcUserModPerms(AQH_MODULE *m, const AQH_USER *user) -uint32_t _calcRolePerms(const AQH_MODULE *m, const AQH_MODULE_PERMS *modPerms) +uint32_t _calcRolePerms(const AQCGI_MODULE *m, const AQCGI_MODULE_PERMS *modPerms) { uint32_t perms=0; - const AQH_ROLE_LIST *roleList; + const AQCGI_ROLE_LIST *roleList; - roleList=AQH_Module_GetRoleList(m); + roleList=AQCGI_Module_GetRoleList(m); if (roleList) { int roleArraySize; int i; uint32_t explAddPerms=0; uint32_t explDelPerms=0; - roleArraySize=AQH_ModulePerms_GetRoleArrayArraySize(); + roleArraySize=AQCGI_ModulePerms_GetRoleArrayArraySize(); for (i=0; i", GWEN_Buffer_GetStart(tbuf)); else @@ -591,7 +591,7 @@ void AQH_ModService_WritePermsToForm(uint32_t perms, const AQH_PERMDEF_LIST *per GBAA(dbuf, "", GWEN_Buffer_GetStart(tbuf), s?s:""); GWEN_Buffer_Crop(tbuf, 0, pos); } - permDef=AQH_PermDef_List_Next(permDef); + permDef=AQCGI_PermDef_List_Next(permDef); } GWEN_Buffer_free(tbuf); } @@ -599,12 +599,12 @@ void AQH_ModService_WritePermsToForm(uint32_t perms, const AQH_PERMDEF_LIST *per -uint32_t AQH_ModService_ReadPermsFromForm(GWEN_DB_NODE *dbPost, const AQH_PERMDEF_LIST *permDefList, const char *sPrefix) +uint32_t AQH_ModService_ReadPermsFromForm(GWEN_DB_NODE *dbPost, const AQCGI_PERMDEF_LIST *permDefList, const char *sPrefix) { uint32_t result=0; if (permDefList) { - const AQH_PERMDEF *permDef; + const AQCGI_PERMDEF *permDef; GWEN_BUFFER *tbuf; uint32_t pos; @@ -613,23 +613,23 @@ uint32_t AQH_ModService_ReadPermsFromForm(GWEN_DB_NODE *dbPost, const AQH_PERMDE GBAA(tbuf, "%s:", sPrefix); pos=GWEN_Buffer_GetPos(tbuf); - permDef=AQH_PermDef_List_First(permDefList); + permDef=AQCGI_PermDef_List_First(permDefList); while(permDef) { const char *id; - id=AQH_PermDef_GetId(permDef); + id=AQCGI_PermDef_GetId(permDef); if (id && *id) { uint32_t mask; const char *s; GBAS(tbuf, id); - mask=AQH_PermDef_GetMask(permDef); + mask=AQCGI_PermDef_GetMask(permDef); s=GWEN_DB_GetCharValue(dbPost, GWEN_Buffer_GetStart(tbuf), 0, NULL); if (s && *s) result|=mask; GWEN_Buffer_Crop(tbuf, 0, pos); } - permDef=AQH_PermDef_List_Next(permDef); + permDef=AQCGI_PermDef_List_Next(permDef); } GWEN_Buffer_free(tbuf); } @@ -639,36 +639,36 @@ uint32_t AQH_ModService_ReadPermsFromForm(GWEN_DB_NODE *dbPost, const AQH_PERMDE -AQH_MODULE_LIST *AQH_ModService_LoadRawModules(AQH_MODULE *m) +AQCGI_MODULE_LIST *AQH_ModService_LoadRawModules(AQCGI_MODULE *m) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_STRINGLIST *slModuleNames; sv=AQH_ModService_GetService(m); - slModuleNames=AQH_Service_ListModules(sv); + slModuleNames=AQCGI_Service_ListModules(sv); if (slModuleNames) { - AQH_MODULE_LIST *modList; + AQCGI_MODULE_LIST *modList; GWEN_STRINGLISTENTRY *se; - modList=AQH_Module_List_new(); + modList=AQCGI_Module_List_new(); se=GWEN_StringList_FirstEntry(slModuleNames); while(se) { const char *sModName; sModName=GWEN_StringListEntry_Data(se); if (sModName && *sModName) { - AQH_MODULE *currentMod; + AQCGI_MODULE *currentMod; - currentMod=AQH_Service_LoadModule(sv, sModName); + currentMod=AQCGI_Service_LoadModule(sv, sModName); if (currentMod) - AQH_Module_List_Add(currentMod, modList); + AQCGI_Module_List_Add(currentMod, modList); } se=GWEN_StringListEntry_Next(se); } GWEN_StringList_free(slModuleNames); - if (AQH_Module_List_GetCount(modList)) + if (AQCGI_Module_List_GetCount(modList)) return modList; - AQH_Module_List_free(modList); + AQCGI_Module_List_free(modList); } return NULL; @@ -676,36 +676,36 @@ AQH_MODULE_LIST *AQH_ModService_LoadRawModules(AQH_MODULE *m) -AQH_USER_LIST *AQH_ModService_LoadRawUsers(AQH_MODULE *m) +AQCGI_USER_LIST *AQH_ModService_LoadRawUsers(AQCGI_MODULE *m) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_STRINGLIST *slUserNames; sv=AQH_ModService_GetService(m); - slUserNames=AQH_Service_ListUsers(sv); + slUserNames=AQCGI_Service_ListUsers(sv); if (slUserNames) { - AQH_USER_LIST *userList; + AQCGI_USER_LIST *userList; GWEN_STRINGLISTENTRY *se; - userList=AQH_User_List_new(); + userList=AQCGI_User_List_new(); se=GWEN_StringList_FirstEntry(slUserNames); while(se) { const char *sModName; sModName=GWEN_StringListEntry_Data(se); if (sModName && *sModName) { - AQH_USER *u; + AQCGI_USER *u; - u=AQH_Service_LoadUser(sv, sModName); + u=AQCGI_Service_LoadUser(sv, sModName); if (u) - AQH_User_List_Add(u, userList); + AQCGI_User_List_Add(u, userList); } se=GWEN_StringListEntry_Next(se); } GWEN_StringList_free(slUserNames); - if (AQH_User_List_GetCount(userList)) + if (AQCGI_User_List_GetCount(userList)) return userList; - AQH_User_List_free(userList); + AQCGI_User_List_free(userList); } return NULL; @@ -903,9 +903,9 @@ void AQH_ModService_RedirectWithReferer(AQCGI_REQUEST *rq, const char *destLocat -void AQH_ModService_DenyRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, const AQH_SESSION *session, GWEN_BUFFER *dbuf) +void AQH_ModService_DenyRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, const AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - if (session && AQH_Session_GetUser(session)) { + if (session && AQCGI_Session_GetUser(session)) { /* no permissions */ AQCGI_Request_SetResponseCode(rq, 403); AQCGI_Request_SetResponseText(rq, "Forbidden"); @@ -914,7 +914,7 @@ void AQH_ModService_DenyRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, const AQH_SESS } else { /* need login */ - AQH_ModService_RedirectWithReferer(rq, AQH_Service_GetLoginUrl(AQH_ModService_GetService(m))); + AQH_ModService_RedirectWithReferer(rq, AQCGI_Service_GetLoginUrl(AQH_ModService_GetService(m))); } } diff --git a/apps/aqhome-cgi/modules/common/mservice.h b/apps/aqhome-cgi/modules/common/mservice.h index af8dea6..0ae9d5e 100644 --- a/apps/aqhome-cgi/modules/common/mservice.h +++ b/apps/aqhome-cgi/modules/common/mservice.h @@ -9,9 +9,9 @@ #ifndef AQHOME_CGI_MSERVICE_H #define AQHOME_CGI_MSERVICE_H -#include -#include -#include +#include +#include +#include #include @@ -22,10 +22,10 @@ -typedef int (*AQH_MODSERVICE_HANDLEREQUEST_FN)(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); -typedef AQH_MODULE* (*AQH_MODSERVICE_LOADSUBMODULE_FN)(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -typedef void (*AQH_MODSERVICE_ADDHEADER_FN)(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); -typedef void (*AQH_MODSERVICE_ADDFOOTER_FN)(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); +typedef int (*AQH_MODSERVICE_HANDLEREQUEST_FN)(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); +typedef AQCGI_MODULE* (*AQH_MODSERVICE_LOADSUBMODULE_FN)(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +typedef void (*AQH_MODSERVICE_ADDHEADER_FN)(AQCGI_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); +typedef void (*AQH_MODSERVICE_ADDFOOTER_FN)(AQCGI_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); typedef struct AQH_MODSERVICE_HANDLER_ENTRY AQH_MODSERVICE_HANDLER_ENTRY; @@ -33,52 +33,52 @@ struct AQH_MODSERVICE_HANDLER_ENTRY { const char *page; int httpMethod; uint32_t perms; - void (*handlerFn)(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); + void (*handlerFn)(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); }; -void AQH_ModService_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder); +void AQH_ModService_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder); -AQH_SERVICE *AQH_ModService_GetService(const AQH_MODULE *m); -const char *AQH_ModService_GetBaseFolder(const AQH_MODULE *m); +AQCGI_SERVICE *AQH_ModService_GetService(const AQCGI_MODULE *m); +const char *AQH_ModService_GetBaseFolder(const AQCGI_MODULE *m); -uint32_t AQH_ModService_GetUserPerms(const AQH_MODULE *m); +uint32_t AQH_ModService_GetUserPerms(const AQCGI_MODULE *m); -void AQH_ModService_AddHeader(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); -void AQH_ModService_AddFooter(AQH_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); +void AQH_ModService_AddHeader(AQCGI_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); +void AQH_ModService_AddFooter(AQCGI_MODULE *m, const char *lang, GWEN_BUFFER *dbuf); -AQH_MODULE *AQH_ModService_LoadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -int AQH_ModService_HandleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); +AQCGI_MODULE *AQH_ModService_LoadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +int AQH_ModService_HandleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); -AQH_SESSION *AQH_ModService_ReadSession(AQH_MODULE *m, AQCGI_REQUEST *rq); -void AQH_ModService_CalcSessionModPerms(AQH_MODULE *m, const AQH_SESSION *session); +AQCGI_SESSION *AQH_ModService_ReadSession(AQCGI_MODULE *m, AQCGI_REQUEST *rq); +void AQH_ModService_CalcSessionModPerms(AQCGI_MODULE *m, const AQCGI_SESSION *session); -void AQH_ModService_HandleRequestWithTable(AQH_MODULE *m, +void AQH_ModService_HandleRequestWithTable(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, const char *page, const AQH_MODSERVICE_HANDLER_ENTRY *e); -int AQH_ModService_RespondWithFile(AQH_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_BUFFER *dbuf); -int AQH_ModService_ReadStaticFile(AQH_MODULE *m, const char *lang, const char *filename, GWEN_BUFFER *dbuf); +int AQH_ModService_RespondWithFile(AQCGI_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_BUFFER *dbuf); +int AQH_ModService_ReadStaticFile(AQCGI_MODULE *m, const char *lang, const char *filename, GWEN_BUFFER *dbuf); -void AQH_ModService_AddPermDef(AQH_PERMDEF_LIST *permDefList, const char *id, uint32_t mask, const char *descr); -void AQH_ModService_AddRole(AQH_ROLE_LIST *roleList, int id, const char *name, uint32_t perms, const char *descr); +void AQH_ModService_AddPermDef(AQCGI_PERMDEF_LIST *permDefList, const char *id, uint32_t mask, const char *descr); +void AQH_ModService_AddRole(AQCGI_ROLE_LIST *roleList, int id, const char *name, uint32_t perms, const char *descr); -void AQH_ModService_WritePermsToForm(uint32_t perms, const AQH_PERMDEF_LIST *permDefList, const char *sPrefix, GWEN_BUFFER *dbuf); -uint32_t AQH_ModService_ReadPermsFromForm(GWEN_DB_NODE *dbPost, const AQH_PERMDEF_LIST *permDefList, const char *sPrefix); +void AQH_ModService_WritePermsToForm(uint32_t perms, const AQCGI_PERMDEF_LIST *permDefList, const char *sPrefix, GWEN_BUFFER *dbuf); +uint32_t AQH_ModService_ReadPermsFromForm(GWEN_DB_NODE *dbPost, const AQCGI_PERMDEF_LIST *permDefList, const char *sPrefix); -AQH_MODULE_LIST *AQH_ModService_LoadRawModules(AQH_MODULE *m); -AQH_USER_LIST *AQH_ModService_LoadRawUsers(AQH_MODULE *m); +AQCGI_MODULE_LIST *AQH_ModService_LoadRawModules(AQCGI_MODULE *m); +AQCGI_USER_LIST *AQH_ModService_LoadRawUsers(AQCGI_MODULE *m); -void AQH_ModService_SetHandleRequestFn(AQH_MODULE *m, AQH_MODSERVICE_HANDLEREQUEST_FN fn); -void AQH_ModService_SetLoadSubModuleFn(AQH_MODULE *m, AQH_MODSERVICE_LOADSUBMODULE_FN fn); +void AQH_ModService_SetHandleRequestFn(AQCGI_MODULE *m, AQH_MODSERVICE_HANDLEREQUEST_FN fn); +void AQH_ModService_SetLoadSubModuleFn(AQCGI_MODULE *m, AQH_MODSERVICE_LOADSUBMODULE_FN fn); -void AQH_ModService_SetAddHeaderFn(AQH_MODULE *m, AQH_MODSERVICE_ADDHEADER_FN fn); -void AQH_ModService_SetAddFooterFn(AQH_MODULE *m, AQH_MODSERVICE_ADDFOOTER_FN fn); +void AQH_ModService_SetAddHeaderFn(AQCGI_MODULE *m, AQH_MODSERVICE_ADDHEADER_FN fn); +void AQH_ModService_SetAddFooterFn(AQCGI_MODULE *m, AQH_MODSERVICE_ADDFOOTER_FN fn); void AQH_ModService_EscapeToBuffer(const char *src, GWEN_BUFFER *buf); void AQH_ModService_UnescapeToBuffer(const char *src, GWEN_BUFFER *buf); @@ -86,7 +86,7 @@ void AQH_ModService_UnescapeToBuffer(const char *src, GWEN_BUFFER *buf); int AQH_ModService_FileIsCurrent(const char *sPath, int seconds); int AQH_ModService_RespondWithMimeFile(AQCGI_REQUEST *rq, const char *sFilename, const char *sMimeType, GWEN_BUFFER *dbuf); -int AQH_ModService_RespondWithVarFile(AQH_MODULE *m, AQCGI_REQUEST *rq, +int AQH_ModService_RespondWithVarFile(AQCGI_MODULE *m, AQCGI_REQUEST *rq, const char *lang, const char *sFilename, GWEN_DB_NODE *dbVars, @@ -95,7 +95,7 @@ int AQH_ModService_RespondWithVarFile(AQH_MODULE *m, AQCGI_REQUEST *rq, int AQH_ModService_AddRequestUrl(const AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); void AQH_ModService_Redirect(AQCGI_REQUEST *rq, const char *destLocation); void AQH_ModService_RedirectWithReferer(AQCGI_REQUEST *rq, const char *destLocation); -void AQH_ModService_DenyRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, const AQH_SESSION *session, GWEN_BUFFER *dbuf); +void AQH_ModService_DenyRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, const AQCGI_SESSION *session, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/common/mservice_p.h b/apps/aqhome-cgi/modules/common/mservice_p.h index a794da2..573e735 100644 --- a/apps/aqhome-cgi/modules/common/mservice_p.h +++ b/apps/aqhome-cgi/modules/common/mservice_p.h @@ -14,7 +14,7 @@ typedef struct AQH_MOD_SERVICE AQH_MOD_SERVICE; struct AQH_MOD_SERVICE { - AQH_SERVICE *service; + AQCGI_SERVICE *service; char *baseFolder; uint32_t userPerms; diff --git a/apps/aqhome-cgi/modules/common/musers.c b/apps/aqhome-cgi/modules/common/musers.c index 851269f..8d3a839 100644 --- a/apps/aqhome-cgi/modules/common/musers.c +++ b/apps/aqhome-cgi/modules/common/musers.c @@ -36,33 +36,33 @@ * ------------------------------------------------------------------------------------------------ */ -static void _createPermDefList(AQH_MODULE *m); -static void _createRoleList(AQH_MODULE *m); +static void _createPermDefList(AQCGI_MODULE *m); +static void _createRoleList(AQCGI_MODULE *m); -static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); -static void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqEditUserGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqEditUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqAddUserGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqAddUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); +static AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +static int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); +static void _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqEditUserGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqEditUserPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqAddUserGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqAddUserPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); -static int _getHighestUserId(const AQH_USER_LIST *userList); -static int _modulePermsHasRole(const AQH_MODULE_PERMS *modPerms, uint8_t rid); +static int _getHighestUserId(const AQCGI_USER_LIST *userList); +static int _modulePermsHasRole(const AQCGI_MODULE_PERMS *modPerms, uint8_t rid); -static void _writeEditUserForm(AQH_MODULE *m, - const AQH_USER *u, +static void _writeEditUserForm(AQCGI_MODULE *m, + const AQCGI_USER *u, const char *sAlias, const char *sUrl, const char *sSubmitText, GWEN_BUFFER *dbuf); -static void _writeUserModRolesToForm(const AQH_ROLE_LIST *roles, const AQH_MODULE_PERMS *perms, const char *sModName, GWEN_BUFFER *dbuf); +static void _writeUserModRolesToForm(const AQCGI_ROLE_LIST *roles, const AQCGI_MODULE_PERMS *perms, const char *sModName, GWEN_BUFFER *dbuf); -static void _readAllModRolesForUserFromForm(AQH_MODULE *m, GWEN_DB_NODE *dbPost, AQH_USER *u); +static void _readAllModRolesForUserFromForm(AQCGI_MODULE *m, GWEN_DB_NODE *dbPost, AQCGI_USER *u); static void _readModRolesFromForm(GWEN_DB_NODE *dbPost, - const AQH_ROLE_LIST *roleList, + const AQCGI_ROLE_LIST *roleList, const char *sPrefix, - AQH_MODULE_PERMS *modPerms); + AQCGI_MODULE_PERMS *modPerms); static void _addLabelAndInputToFormTableH(const char *title, const char *name, const char *value, const char *xxtra, GWEN_BUFFER *dbuf); static void _addUserStateLabelAndSelectionToFormTableH(const char *sTitle, const char *sName, int st, GWEN_BUFFER *dbuf); @@ -91,7 +91,7 @@ static AQH_MODSERVICE_HANDLER_ENTRY _requestTable[]={ * ------------------------------------------------------------------------------------------------ */ -void AQH_ModAdmUsers_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) +void AQH_ModAdmUsers_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder) { AQH_ModService_Extend(m, sv, baseFolder); AQH_ModService_SetHandleRequestFn(m, _handleRequest); @@ -100,63 +100,63 @@ void AQH_ModAdmUsers_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFold -int AQH_ModAdmUsers_Create(AQH_SERVICE *sv) +int AQH_ModAdmUsers_Create(AQCGI_SERVICE *sv) { - AQH_MODULE *m; + AQCGI_MODULE *m; int rv; - m=AQH_Module_new(); - AQH_Module_SetName(m, "users"); - AQH_Module_SetDescr(m, "user administration module"); - AQH_Module_SetGuestPerms(m, 0); + m=AQCGI_Module_new(); + AQCGI_Module_SetName(m, "users"); + AQCGI_Module_SetDescr(m, "user administration module"); + AQCGI_Module_SetGuestPerms(m, 0); _createPermDefList(m); _createRoleList(m); - rv=AQH_Service_AddModule(sv, m); + rv=AQCGI_Service_AddModule(sv, m); if (rv<0) { DBG_INFO(NULL, "here (%d)", rv); } - AQH_Module_free(m); + AQCGI_Module_free(m); return rv; } -void _createPermDefList(AQH_MODULE *m) +void _createPermDefList(AQCGI_MODULE *m) { - AQH_PERMDEF_LIST *permDefList; + AQCGI_PERMDEF_LIST *permDefList; - permDefList=AQH_PermDef_List_new(); + permDefList=AQCGI_PermDef_List_new(); AQH_ModService_AddPermDef(permDefList, "UserRead", 0x001, "Read users"); AQH_ModService_AddPermDef(permDefList, "UserWrite", 0x002, "Modify users"); AQH_ModService_AddPermDef(permDefList, "UserAdd", 0x004, "Add users"); AQH_ModService_AddPermDef(permDefList, "UserDel", 0x008, "Remove users"); - AQH_Module_SetPermDefList(m, permDefList); + AQCGI_Module_SetPermDefList(m, permDefList); } -void _createRoleList(AQH_MODULE *m) +void _createRoleList(AQCGI_MODULE *m) { - AQH_ROLE_LIST *roleList; + AQCGI_ROLE_LIST *roleList; int id=1; - roleList=AQH_Role_List_new(); + roleList=AQCGI_Role_List_new(); AQH_ModService_AddRole(roleList, id++, "admin", AQH_MODADMUSERS_PERMS_USERSREAD | AQH_MODADMUSERS_PERMS_USERSWRITE | AQH_MODADMUSERS_PERMS_USERSADD | AQH_MODADMUSERS_PERMS_USERSDEL, "Administrator Role"); - AQH_Module_SetRoleList(m, roleList); + AQCGI_Module_SetRoleList(m, roleList); } -AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName) +AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName) { /* no sub-modules */ return NULL; @@ -164,7 +164,7 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio -int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem) +int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem) { AQH_ModService_HandleRequestWithTable(m, rq, session, sLastPathElem, _requestTable); return AQCGI_SendResponse(rq); @@ -172,9 +172,9 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const -void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_USER_LIST *userList; + AQCGI_USER_LIST *userList; uint32_t perms; perms=AQH_ModService_GetUserPerms(m); @@ -188,31 +188,31 @@ void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN "\n" "\n"); if (userList) { - const AQH_USER *u; + const AQCGI_USER *u; - AQH_User_List_SortByAlias(userList, 1); - u=AQH_User_List_First(userList); + AQCGI_User_List_SortByAlias(userList, 1); + u=AQCGI_User_List_First(userList); while(u) { const char *sUserAlias; - sUserAlias=AQH_User_GetAlias(u); + sUserAlias=AQCGI_User_GetAlias(u); if (sUserAlias && *sUserAlias) { uint32_t id; const char *s; const char *sAlias; - id=AQH_User_GetId(u); - sAlias=AQH_User_GetAlias(u); + id=AQCGI_User_GetId(u); + sAlias=AQCGI_User_GetAlias(u); GBAS(dbuf, ""); GBAA(dbuf, "%lu", (unsigned long int) id); GBAA(dbuf, "%s", sAlias?sAlias:""); - s=AQH_User_GetName(u); + s=AQCGI_User_GetName(u); GBAA(dbuf, "%s", s?s:""); - s=AQH_UserState_toString(AQH_User_GetState(u)); + s=AQCGI_UserState_toString(AQCGI_User_GetState(u)); GBAA(dbuf, "%s", s?s:""); - s=AQH_User_GetEmail(u); + s=AQCGI_User_GetEmail(u); GBAA(dbuf, "%s", s?s:""); - s=AQH_User_GetNotes(u); + s=AQCGI_User_GetNotes(u); GBAA(dbuf, "%s", s?s:""); GBAS(dbuf, ""); @@ -225,12 +225,12 @@ void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN GBAA(dbuf, "\n"); GBAA(dbuf, "\n"); } - u=AQH_User_List_Next(u); + u=AQCGI_User_List_Next(u); } GBAS(dbuf, "\n" "\n"); - AQH_User_List_free(userList); + AQCGI_User_List_free(userList); } if (perms & AQH_MODADMUSERS_PERMS_USERSADD) GBAS(dbuf, "
Add User"); @@ -238,20 +238,20 @@ void _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN -void _handleRqEditUserGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqEditUserGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbQuery; const char *sAlias; - AQH_USER *user; + AQCGI_USER *user; sv=AQH_ModService_GetService(m); dbQuery=AQCGI_Request_GetDbQuery(rq); sAlias=dbQuery?GWEN_DB_GetCharValue(dbQuery, "alias", 0, NULL):NULL; - user=(sAlias && *sAlias)?AQH_Service_LoadUser(sv, sAlias):NULL; + user=(sAlias && *sAlias)?AQCGI_Service_LoadUser(sv, sAlias):NULL; if (user) { _writeEditUserForm(m, user, sAlias, "edituser.html", "Save", dbuf); - AQH_User_free(user); + AQCGI_User_free(user); } else { AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html"); @@ -262,44 +262,44 @@ void _handleRqEditUserGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session -void _handleRqEditUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqEditUserPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sAlias; - AQH_USER *u; + AQCGI_USER *u; sv=AQH_ModService_GetService(m); dbPost=AQCGI_Request_GetDbPostBody(rq); sAlias=dbPost?GWEN_DB_GetCharValue(dbPost, "alias", 0, NULL):NULL; - u=(sAlias && *sAlias)?AQH_Service_LoadUser(sv, sAlias):NULL; + u=(sAlias && *sAlias)?AQCGI_Service_LoadUser(sv, sAlias):NULL; if (u) { const char *s; int state; int rv; s=GWEN_DB_GetCharValue(dbPost, "name", 0, NULL); - AQH_User_SetName(u, s); + AQCGI_User_SetName(u, s); s=GWEN_DB_GetCharValue(dbPost, "email", 0, NULL); - AQH_User_SetEmail(u, s); + AQCGI_User_SetEmail(u, s); s=GWEN_DB_GetCharValue(dbPost, "notes", 0, NULL); - AQH_User_SetNotes(u, s); + AQCGI_User_SetNotes(u, s); s=GWEN_DB_GetCharValue(dbPost, "status", 0, NULL); - state=(s && *s)?AQH_UserState_fromString(s):AQH_UserState_Unknown; - if (state!=AQH_UserState_Unknown) - AQH_User_SetState(u, state); + state=(s && *s)?AQCGI_UserState_fromString(s):AQCGI_UserState_Unknown; + if (state!=AQCGI_UserState_Unknown) + AQCGI_User_SetState(u, state); _readAllModRolesForUserFromForm(m, dbPost, u); - rv=AQH_Service_SaveUser(sv, u); + rv=AQCGI_Service_SaveUser(sv, u); if (rv<0) { GBAS(dbuf, "

Error

Error saving user

"); DBG_ERROR(NULL, "Could not save user \"%s\"", sAlias); - AQH_User_free(u); + AQCGI_User_free(u); return; } DBG_ERROR(NULL, "User \"%s\" saved", sAlias); - AQH_User_free(u); + AQCGI_User_free(u); AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html"); AQCGI_Request_SetResponseCode(rq, 303); AQCGI_Request_SetResponseText(rq, "See other"); @@ -312,7 +312,7 @@ void _handleRqEditUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sessio -void _handleRqAddUserGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqAddUserGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { DBG_ERROR(NULL, "AddUser"); _writeEditUserForm(m, NULL, NULL, "adduser.html", "Add", dbuf); @@ -320,9 +320,9 @@ void _handleRqAddUserGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, -void _handleRqAddUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqAddUserPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sAlias; @@ -331,43 +331,41 @@ void _handleRqAddUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session sAlias=dbPost?GWEN_DB_GetCharValue(dbPost, "alias", 0, NULL):NULL; // TODO: check alias validity if (sAlias) { - AQH_USER *u; + AQCGI_USER *u; const char *s; int state; int rv; uint32_t userId; - AQH_USER_LIST *userList; + AQCGI_USER_LIST *userList; - u=AQH_User_new(); + u=AQCGI_User_new(); userList=AQH_ModService_LoadRawUsers(m); userId=_getHighestUserId(userList)+1; - AQH_User_SetId(u, userId); - AQH_User_SetAlias(u, sAlias); + AQCGI_User_SetId(u, userId); + AQCGI_User_SetAlias(u, sAlias); s=GWEN_DB_GetCharValue(dbPost, "name", 0, NULL); - AQH_User_SetName(u, s); + AQCGI_User_SetName(u, s); s=GWEN_DB_GetCharValue(dbPost, "email", 0, NULL); - AQH_User_SetEmail(u, s); + AQCGI_User_SetEmail(u, s); s=GWEN_DB_GetCharValue(dbPost, "notes", 0, NULL); - AQH_User_SetNotes(u, s); + AQCGI_User_SetNotes(u, s); s=GWEN_DB_GetCharValue(dbPost, "status", 0, NULL); - state=(s && *s)?AQH_UserState_fromString(s):AQH_UserState_Unknown; - if (state!=AQH_UserState_Unknown) - AQH_User_SetState(u, state); + state=(s && *s)?AQCGI_UserState_fromString(s):AQCGI_UserState_Unknown; + if (state!=AQCGI_UserState_Unknown) + AQCGI_User_SetState(u, state); - rv=AQH_Service_AddUser(sv, u); + rv=AQCGI_Service_AddUser(sv, u); if (rv<0) { GBAS(dbuf, "

Error

Error saving user

"); DBG_ERROR(NULL, "Could not save user \"%s\" (%d)", sAlias, rv); - AQH_User_free(u); - AQH_User_List_free(userList); + AQCGI_User_free(u); + AQCGI_User_List_free(userList); return; } DBG_ERROR(NULL, "User \"%s\" saved", sAlias); - AQH_User_free(u); - AQCGI_Request_AddResponseHeaderData(rq, "Location: index.html"); - AQCGI_Request_SetResponseCode(rq, 303); - AQCGI_Request_SetResponseText(rq, "See other"); - AQH_User_List_free(userList); + AQCGI_User_free(u); + AQH_ModService_Redirect(rq, "index.html"); + AQCGI_User_List_free(userList); } else { DBG_ERROR(NULL, "Missing alias"); @@ -377,20 +375,20 @@ void _handleRqAddUserPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session -int _getHighestUserId(const AQH_USER_LIST *userList) +int _getHighestUserId(const AQCGI_USER_LIST *userList) { int id=0; if (userList) { - const AQH_USER *user; + const AQCGI_USER *user; - user=AQH_User_List_First(userList); + user=AQCGI_User_List_First(userList); while(user) { int uid; - uid=AQH_User_GetId(user); + uid=AQCGI_User_GetId(user); id=(uid>id)?uid:id; - user=AQH_User_List_Next(user); + user=AQCGI_User_List_Next(user); } } return id; @@ -398,15 +396,15 @@ int _getHighestUserId(const AQH_USER_LIST *userList) -int _modulePermsHasRole(const AQH_MODULE_PERMS *modPerms, uint8_t rid) +int _modulePermsHasRole(const AQCGI_MODULE_PERMS *modPerms, uint8_t rid) { if (modPerms) { int arraySize; int i; - arraySize=AQH_ModulePerms_GetRoleArrayArraySize(); + arraySize=AQCGI_ModulePerms_GetRoleArrayArraySize(); for(i=0; iUser Info\n"); @@ -434,10 +432,10 @@ void _writeEditUserForm(AQH_MODULE *m, "\n", sUrl?sUrl:""); _addLabelAndInputToFormTableH("Alias", "alias", sAlias, "required", dbuf); - _addLabelAndInputToFormTableH("Name", "name", u?AQH_User_GetName(u):NULL, NULL, dbuf); - _addLabelAndInputToFormTableH("Email", "email", u?AQH_User_GetEmail(u):NULL, NULL, dbuf); - _addLabelAndInputToFormTableH("Notes", "notes", u?AQH_User_GetNotes(u):NULL, NULL, dbuf); - _addUserStateLabelAndSelectionToFormTableH("Status", "status", u?AQH_User_GetState(u):AQH_UserState_Unknown, dbuf); + _addLabelAndInputToFormTableH("Name", "name", u?AQCGI_User_GetName(u):NULL, NULL, dbuf); + _addLabelAndInputToFormTableH("Email", "email", u?AQCGI_User_GetEmail(u):NULL, NULL, dbuf); + _addLabelAndInputToFormTableH("Notes", "notes", u?AQCGI_User_GetNotes(u):NULL, NULL, dbuf); + _addUserStateLabelAndSelectionToFormTableH("Status", "status", u?AQCGI_User_GetState(u):AQCGI_UserState_Unknown, dbuf); GBAS(dbuf, "
\n"); @@ -451,26 +449,26 @@ void _writeEditUserForm(AQH_MODULE *m, "\n"); moduleList=AQH_ModService_LoadRawModules(m); if (moduleList) { - const AQH_MODULE_PERMS_LIST *modPermsList; - const AQH_MODULE *currentMod; + const AQCGI_MODULE_PERMS_LIST *modPermsList; + const AQCGI_MODULE *currentMod; - modPermsList=u?AQH_User_GetModulePermList(u):NULL; - currentMod=AQH_Module_List_First(moduleList); + modPermsList=u?AQCGI_User_GetModulePermList(u):NULL; + currentMod=AQCGI_Module_List_First(moduleList); while(currentMod) { const char *sModName; - const AQH_MODULE_PERMS *modPerms; + const AQCGI_MODULE_PERMS *modPerms; - sModName=AQH_Module_GetName(currentMod); + sModName=AQCGI_Module_GetName(currentMod); GBAA(dbuf, "%s", sModName); - modPerms=modPermsList?AQH_ModulePerms_List_GetByModuleId(modPermsList, sModName):NULL; - _writeUserModRolesToForm(AQH_Module_GetRoleList(currentMod), modPerms, sModName, dbuf); + modPerms=modPermsList?AQCGI_ModulePerms_List_GetByModuleId(modPermsList, sModName):NULL; + _writeUserModRolesToForm(AQCGI_Module_GetRoleList(currentMod), modPerms, sModName, dbuf); GBAS(dbuf, "\n"); GBAS(dbuf, ""); - currentMod=AQH_Module_List_Next(currentMod); + currentMod=AQCGI_Module_List_Next(currentMod); } /* while */ - AQH_Module_List_free(moduleList); + AQCGI_Module_List_free(moduleList); } GBAS(dbuf, "\n" @@ -484,61 +482,61 @@ void _writeEditUserForm(AQH_MODULE *m, -void _readAllModRolesForUserFromForm(AQH_MODULE *m, GWEN_DB_NODE *dbPost, AQH_USER *u) +void _readAllModRolesForUserFromForm(AQCGI_MODULE *m, GWEN_DB_NODE *dbPost, AQCGI_USER *u) { - AQH_MODULE_LIST *moduleList; + AQCGI_MODULE_LIST *moduleList; moduleList=AQH_ModService_LoadRawModules(m); if (moduleList) { - AQH_MODULE_PERMS_LIST *permsList; - const AQH_MODULE *module; + AQCGI_MODULE_PERMS_LIST *permsList; + const AQCGI_MODULE *module; - permsList=AQH_User_GetModulePermList(u); + permsList=AQCGI_User_GetModulePermList(u); if (permsList==NULL) { DBG_ERROR(NULL, "Creating module perms list for user"); - permsList=AQH_ModulePerms_List_new(); - AQH_User_SetModulePermList(u, permsList); + permsList=AQCGI_ModulePerms_List_new(); + AQCGI_User_SetModulePermList(u, permsList); } - module=AQH_Module_List_First(moduleList); + module=AQCGI_Module_List_First(moduleList); while(module) { const char *sModName; - const AQH_ROLE_LIST *roleList; + const AQCGI_ROLE_LIST *roleList; - sModName=AQH_Module_GetName(module); - roleList=AQH_Module_GetRoleList(module); + sModName=AQCGI_Module_GetName(module); + roleList=AQCGI_Module_GetRoleList(module); if (sModName && *sModName && roleList) { - AQH_MODULE_PERMS *modPerms; + AQCGI_MODULE_PERMS *modPerms; - modPerms=AQH_ModulePerms_List_GetByModuleId(permsList, sModName); + modPerms=AQCGI_ModulePerms_List_GetByModuleId(permsList, sModName); if (modPerms==NULL) { - modPerms=AQH_ModulePerms_new(); - AQH_ModulePerms_SetModuleId(modPerms, sModName); - AQH_ModulePerms_List_Add(modPerms, permsList); + modPerms=AQCGI_ModulePerms_new(); + AQCGI_ModulePerms_SetModuleId(modPerms, sModName); + AQCGI_ModulePerms_List_Add(modPerms, permsList); } _readModRolesFromForm(dbPost, roleList, sModName, modPerms); } - module=AQH_Module_List_Next(module); + module=AQCGI_Module_List_Next(module); } - AQH_Module_List_free(moduleList); + AQCGI_Module_List_free(moduleList); } } -void _writeUserModRolesToForm(const AQH_ROLE_LIST *roleList, const AQH_MODULE_PERMS *modPerms, const char *sModName, GWEN_BUFFER *dbuf) +void _writeUserModRolesToForm(const AQCGI_ROLE_LIST *roleList, const AQCGI_MODULE_PERMS *modPerms, const char *sModName, GWEN_BUFFER *dbuf) { if (roleList) { - const AQH_ROLE *role; + const AQCGI_ROLE *role; - role=AQH_Role_List_First(roleList); + role=AQCGI_Role_List_First(roleList); while(role) { const char *sRoleName; uint8_t roleId; - roleId=AQH_Role_GetId(role); - sRoleName=AQH_Role_GetName(role); + roleId=AQCGI_Role_GetId(role); + sRoleName=AQCGI_Role_GetName(role); if (sRoleName && *sRoleName) { int isChecked; @@ -552,7 +550,7 @@ void _writeUserModRolesToForm(const AQH_ROLE_LIST *roleList, const AQH_MODULE_PE GBAA(dbuf, "", sRoleName, sRoleName); } } - role=AQH_Role_List_Next(role); + role=AQCGI_Role_List_Next(role); } } } @@ -560,15 +558,15 @@ void _writeUserModRolesToForm(const AQH_ROLE_LIST *roleList, const AQH_MODULE_PE void _readModRolesFromForm(GWEN_DB_NODE *dbPost, - const AQH_ROLE_LIST *roleList, + const AQCGI_ROLE_LIST *roleList, const char *sPrefix, - AQH_MODULE_PERMS *modPerms) + AQCGI_MODULE_PERMS *modPerms) { - AQH_ModulePerms_PresetRoleArray(modPerms, 0); + AQCGI_ModulePerms_PresetRoleArray(modPerms, 0); if (roleList) { GWEN_BUFFER *tbuf; uint32_t pos; - const AQH_ROLE *role; + const AQCGI_ROLE *role; int nextRolePos=0; tbuf=GWEN_Buffer_new(0, 256, 0, 1); @@ -576,11 +574,11 @@ void _readModRolesFromForm(GWEN_DB_NODE *dbPost, GBAA(tbuf, "%s:", sPrefix); pos=GWEN_Buffer_GetPos(tbuf); - role=AQH_Role_List_First(roleList); + role=AQCGI_Role_List_First(roleList); while(role) { const char *roleName; - roleName=AQH_Role_GetName(role); + roleName=AQCGI_Role_GetName(role); if (roleName && *roleName) { const char *s; @@ -588,15 +586,15 @@ void _readModRolesFromForm(GWEN_DB_NODE *dbPost, s=GWEN_DB_GetCharValue(dbPost, GWEN_Buffer_GetStart(tbuf), 0, NULL); /*DBG_ERROR(NULL, "Role string %s = [%s]", GWEN_Buffer_GetStart(tbuf), s?s:"");*/ if (s && *s) { - if (nextRolePos", sName?sName:"", sTitle?sTitle:""); GBAA(dbuf, ""); diff --git a/apps/aqhome-cgi/modules/common/musers.h b/apps/aqhome-cgi/modules/common/musers.h index cfa7d74..1f75240 100644 --- a/apps/aqhome-cgi/modules/common/musers.h +++ b/apps/aqhome-cgi/modules/common/musers.h @@ -24,9 +24,9 @@ -void AQH_ModAdmUsers_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder); +void AQH_ModAdmUsers_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder); -int AQH_ModAdmUsers_Create(AQH_SERVICE *sv); +int AQH_ModAdmUsers_Create(AQCGI_SERVICE *sv); diff --git a/apps/aqhome-cgi/modules/devices/mdevices.c b/apps/aqhome-cgi/modules/devices/mdevices.c index 12939d6..73ae151 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices.c +++ b/apps/aqhome-cgi/modules/devices/mdevices.c @@ -51,20 +51,20 @@ * ------------------------------------------------------------------------------------------------ */ -static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); +static AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +static int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); -static void _handleRqIndexGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqValuesTableGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqValuesGraphGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqValueGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqSetDataPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqGraphGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqDeviceGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqDevicePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqPageGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqPagePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); -static void _handleRqPageGraphGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqIndexGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqValuesTableGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqValuesGraphGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqValueGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqSetDataPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqGraphGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqDeviceGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqDevicePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqPageGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqPagePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); +static void _handleRqPageGraphGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf); static AQDG_GRAPH_DATAPAIR_LIST *_createDataPairListFromDataPoints(const uint64_t *dataPoints, uint64_t numValues); @@ -100,7 +100,7 @@ static AQH_MODSERVICE_HANDLER_ENTRY _requestTable[]={ * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) +void AQH_ModDevices_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder) { AQH_ModService_Extend(m, sv, baseFolder); AQH_ModService_SetHandleRequestFn(m, _handleRequest); @@ -109,14 +109,14 @@ void AQH_ModDevices_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolde -AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName) +AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName) { return NULL; } -int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem) +int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem) { AQH_ModService_HandleRequestWithTable(m, rq, session, sLastPathElem, _requestTable); return AQCGI_SendResponse(rq); @@ -124,77 +124,77 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const -void _handleRqIndexGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqIndexGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunIndex, dbuf); } -void _handleRqValuesTableGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqValuesTableGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunValuesAsTable, dbuf); } -void _handleRqValuesGraphGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqValuesGraphGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunValuesAsGraph, dbuf); } -void _handleRqValueGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqValueGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunValue, dbuf); } -void _handleRqSetDataPost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqSetDataPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunSetData, dbuf); } -void _handleRqGraphGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqGraphGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunGraphValue, dbuf); } -void _handleRqDeviceGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqDeviceGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunDevice, dbuf); } -void _handleRqDevicePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqDevicePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunSetDevice, dbuf); } -void _handleRqPageGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqPageGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunPageGet, dbuf); } -void _handleRqPagePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqPagePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunPagePost, dbuf); } -void _handleRqPageGraphGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, GWEN_BUFFER *dbuf) +void _handleRqPageGraphGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, GWEN_BUFFER *dbuf) { AQH_ModDataClient_HandleRequest(m, rq, session, AQH_ModDevices_RunPageGraph, dbuf); } @@ -538,6 +538,25 @@ AQDG_GRAPH_DATAPAIR_LIST *AQH_ModDevices_RequestDataPairList(AQH_DATACLIENT *dc, +void AQH_ModDevices_RedirectToDevice(AQCGI_REQUEST *rq, const char *destLocation, const AQH_DEVICE *device) +{ + const char *sDeviceName; + GWEN_BUFFER *pbuf; + + sDeviceName=AQH_Device_GetName(device); + pbuf=GWEN_Buffer_new(0, 256, 0, 1); + GWEN_Buffer_AppendString(pbuf, "Location: "); + GWEN_Buffer_AppendString(pbuf, (destLocation && *destLocation)?destLocation:"index.html"); + if (sDeviceName && *sDeviceName) { + GWEN_Buffer_AppendString(pbuf, "?device="); + GWEN_Text_EscapeToBuffer(sDeviceName, pbuf); + } + AQH_ModService_Redirect(rq, GWEN_Buffer_GetStart(pbuf)); + GWEN_Buffer_free(pbuf); +} + + + AQDG_GRAPH_DATAPAIR_LIST *_createDataPairListFromDataPoints(const uint64_t *dataPoints, uint64_t numValues) { AQDG_GRAPH_DATAPAIR_LIST *dpList; diff --git a/apps/aqhome-cgi/modules/devices/mdevices.h b/apps/aqhome-cgi/modules/devices/mdevices.h index 047155d..efcbfda 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices.h +++ b/apps/aqhome-cgi/modules/devices/mdevices.h @@ -39,8 +39,8 @@ -void AQH_ModDevices_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder); -int AQH_ModDevices_Create(AQH_SERVICE *sv); +void AQH_ModDevices_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder); +int AQH_ModDevices_Create(AQCGI_SERVICE *sv); uint32_t AQH_ModDevices_ColorFromHexString(const char *s); @@ -64,6 +64,7 @@ uint32_t AQH_ModDevices_ValueGetLastDataAsUint32(AQH_DATACLIENT *dc, const AQH_V AQDG_GRAPH_DATAPAIR_LIST *AQH_ModDevices_RequestDataPairList(AQH_DATACLIENT *dc, const char *systemValueName, uint64_t tsBegin, uint64_t tsEnd, uint64_t num); +void AQH_ModDevices_RedirectToDevice(AQCGI_REQUEST *rq, const char *destLocation, const AQH_DEVICE *device); diff --git a/apps/aqhome-cgi/modules/devices/mdevices_device.c b/apps/aqhome-cgi/modules/devices/mdevices_device.c index ff70697..6aff472 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_device.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_device.c @@ -38,9 +38,9 @@ * ------------------------------------------------------------------------------------------------ */ -static void _runDeviceWithArgs(AQH_MODULE *m, +static void _runDeviceWithArgs(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, AQH_DATACLIENT *dc, const char *sDeviceName, GWEN_BUFFER *dbuf); @@ -54,7 +54,7 @@ static void _addFieldToForm(const char *sFieldTitle, const char *sFieldName, con * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunDevice(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunDevice(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sDeviceName; @@ -74,9 +74,9 @@ void AQH_ModDevices_RunDevice(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *ses -void _runDeviceWithArgs(AQH_MODULE *m, +void _runDeviceWithArgs(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, AQH_DATACLIENT *dc, const char *sDeviceName, GWEN_BUFFER *dbuf) diff --git a/apps/aqhome-cgi/modules/devices/mdevices_device.h b/apps/aqhome-cgi/modules/devices/mdevices_device.h index aae3489..1352b83 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_device.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_device.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunDevice(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunDevice(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_index.c b/apps/aqhome-cgi/modules/devices/mdevices_index.c index 6381047..56896be 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_index.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_index.c @@ -45,7 +45,7 @@ static void _addLinkForDevice(const char *page, const char *sDevice, const char * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { AQH_DEVICE_LIST *deviceList; AQH_DEVICE *device; diff --git a/apps/aqhome-cgi/modules/devices/mdevices_index.h b/apps/aqhome-cgi/modules/devices/mdevices_index.h index f5347df..cf5acac 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_index.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_index.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_init.c b/apps/aqhome-cgi/modules/devices/mdevices_init.c index 6755b5c..a211bf1 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_init.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_init.c @@ -40,8 +40,8 @@ * ------------------------------------------------------------------------------------------------ */ -static void _createPermDefList(AQH_MODULE *m); -static void _createRoleList(AQH_MODULE *m); +static void _createPermDefList(AQCGI_MODULE *m); +static void _createRoleList(AQCGI_MODULE *m); @@ -50,34 +50,34 @@ static void _createRoleList(AQH_MODULE *m); * ------------------------------------------------------------------------------------------------ */ -int AQH_ModDevices_Create(AQH_SERVICE *sv) +int AQH_ModDevices_Create(AQCGI_SERVICE *sv) { - AQH_MODULE *m; + AQCGI_MODULE *m; int rv; - m=AQH_Module_new(); - AQH_Module_SetName(m, "devices"); - AQH_Module_SetDescr(m, "device module"); - AQH_Module_SetGuestPerms(m, 0); + m=AQCGI_Module_new(); + AQCGI_Module_SetName(m, "devices"); + AQCGI_Module_SetDescr(m, "device module"); + AQCGI_Module_SetGuestPerms(m, 0); _createPermDefList(m); _createRoleList(m); - rv=AQH_Service_AddModule(sv, m); + rv=AQCGI_Service_AddModule(sv, m); if (rv<0) { DBG_INFO(NULL, "here (%d)", rv); } - AQH_Module_free(m); + AQCGI_Module_free(m); return rv; } -void _createPermDefList(AQH_MODULE *m) +void _createPermDefList(AQCGI_MODULE *m) { - AQH_PERMDEF_LIST *permDefList; + AQCGI_PERMDEF_LIST *permDefList; - permDefList=AQH_PermDef_List_new(); + permDefList=AQCGI_PermDef_List_new(); AQH_ModService_AddPermDef(permDefList, "DeviceRead", 0x001, "Read and list devices"); AQH_ModService_AddPermDef(permDefList, "DeviceWrite", 0x002, "Modify devices"); @@ -90,17 +90,17 @@ void _createPermDefList(AQH_MODULE *m) AQH_ModService_AddPermDef(permDefList, "ValueDel", 0x080, "Remove values"); AQH_ModService_AddPermDef(permDefList, "ValueSet", 0x100, "Set values"); - AQH_Module_SetPermDefList(m, permDefList); + AQCGI_Module_SetPermDefList(m, permDefList); } -void _createRoleList(AQH_MODULE *m) +void _createRoleList(AQCGI_MODULE *m) { - AQH_ROLE_LIST *roleList; + AQCGI_ROLE_LIST *roleList; int id=1; - roleList=AQH_Role_List_new(); + roleList=AQCGI_Role_List_new(); AQH_ModService_AddRole(roleList, id++, "Reader", AQH_MODDEVICES_PERMS_DEVICEREAD | AQH_MODDEVICES_PERMS_VALUEREAD, @@ -121,7 +121,7 @@ void _createRoleList(AQH_MODULE *m) AQH_MODDEVICES_PERMS_VALUEREAD | AQH_MODDEVICES_PERMS_VALUESET, "Set values"); - AQH_Module_SetRoleList(m, roleList); + AQCGI_Module_SetRoleList(m, roleList); } diff --git a/apps/aqhome-cgi/modules/devices/mdevices_init.h b/apps/aqhome-cgi/modules/devices/mdevices_init.h index 6456e24..79ef852 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_init.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_init.h @@ -21,7 +21,7 @@ -int AQH_ModDevices_Create(AQH_SERVICE *sv); +int AQH_ModDevices_Create(AQCGI_SERVICE *sv); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_page.c b/apps/aqhome-cgi/modules/devices/mdevices_page.c index 7d3b3bb..f09ccc8 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_page.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_page.c @@ -54,19 +54,19 @@ enum { * ------------------------------------------------------------------------------------------------ */ -static void _writePage(AQH_MODULE *m, AQH_DATACLIENT *dc, GWEN_XMLNODE *nPage, GWEN_BUFFER *dbuf); -static void _writeItem(AQH_MODULE *m, AQH_DATACLIENT *dc, const char *sPageId, GWEN_XMLNODE *nItem, GWEN_BUFFER *dbuf); +static void _writePage(AQCGI_MODULE *m, AQH_DATACLIENT *dc, GWEN_XMLNODE *nPage, GWEN_BUFFER *dbuf); +static void _writeItem(AQCGI_MODULE *m, AQH_DATACLIENT *dc, const char *sPageId, GWEN_XMLNODE *nItem, GWEN_BUFFER *dbuf); static void _writeActor(AQH_DATACLIENT *dc, const char *sPageId, GWEN_XMLNODE *n, int layout, GWEN_BUFFER *dbuf); static void _writeGraph(const char *sPageId, GWEN_XMLNODE *n, int layout, GWEN_BUFFER *dbuf); static void _handlePageActor(AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sActorId, GWEN_XMLNODE *nActor); -static void _handlePageGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sGraphId, GWEN_XMLNODE *nGraph, GWEN_BUFFER *dbuf); +static void _handlePageGraph(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sGraphId, GWEN_XMLNODE *nGraph, GWEN_BUFFER *dbuf); static void _genPageGraph(AQH_DATACLIENT *dc, const char *sGraphId, const char *sFilename, GWEN_XMLNODE *nGraph); static void _addCurves(AQH_DATACLIENT *dc, AQDG_GRAPH *g, GWEN_XMLNODE *nGraph, uint64_t tsBegin, uint64_t tsEnd); static AQDG_GRAPH_DATAPAIR_LIST *_readCurveData(AQH_DATACLIENT *dc, GWEN_XMLNODE *nCurve, uint64_t tsBegin, uint64_t tsEnd); static uint64_t _parseTime(const char *s); static GWEN_XMLNODE *_getSubItemNode(GWEN_XMLNODE *nPage, const char *sId, const char *sElementName); -static void _mkPathForGraph(AQH_MODULE *m, const char *sGraphId, GWEN_BUFFER *dbuf); +static void _mkPathForGraph(AQCGI_MODULE *m, const char *sGraphId, GWEN_BUFFER *dbuf); static void _addGraphLink(const char *sPageId, const char *sGraphId, int w, int h, GWEN_BUFFER *dbuf); static void _writeRgbwToForm(const char *sValueName, uint32_t color, GWEN_BUFFER *dbuf); static void _writeOnOffToForm(const char *sValueName, int intVal, GWEN_BUFFER *dbuf); @@ -76,9 +76,9 @@ static int _getColorComponent(GWEN_DB_NODE *dbPost, const char *sValueName, cons static void _setOnOffData(AQH_DATACLIENT *dc, const AQH_VALUE *value, const char *sValue); static void _setOnOffAutoData(AQH_DATACLIENT *dc, const AQH_VALUE *value, const char *sValue); -static void _sendPageList(AQH_MODULE *m, GWEN_BUFFER *dbuf); -static GWEN_STRINGLIST *_listPageFiles(AQH_MODULE *m); -static GWEN_XMLNODE *_readPage(AQH_MODULE *m, const char *sPageName); +static void _sendPageList(AQCGI_MODULE *m, GWEN_BUFFER *dbuf); +static GWEN_STRINGLIST *_listPageFiles(AQCGI_MODULE *m); +static GWEN_XMLNODE *_readPage(AQCGI_MODULE *m, const char *sPageName); static GWEN_XMLNODE *_readPageFile(const char *sFilename); static int _layoutFromString(const char *s); @@ -89,7 +89,7 @@ static int _layoutFromString(const char *s); * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunPageGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunPageGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sPageId; @@ -126,7 +126,7 @@ void AQH_ModDevices_RunPageGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *se -void AQH_ModDevices_RunPageGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunPageGraph(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sPageId; @@ -161,7 +161,7 @@ void AQH_ModDevices_RunPageGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION * -void AQH_ModDevices_RunPagePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunPagePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbPost; const char *sPageId; @@ -246,7 +246,7 @@ void _handlePageActor(AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sActorI -void _handlePageGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sGraphId, GWEN_XMLNODE *nGraph, GWEN_BUFFER *dbuf) +void _handlePageGraph(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sGraphId, GWEN_XMLNODE *nGraph, GWEN_BUFFER *dbuf) { GWEN_BUFFER *fbuf; int refreshTime; @@ -459,13 +459,13 @@ GWEN_XMLNODE *_getSubItemNode(GWEN_XMLNODE *nPage, const char *sId, const char * -void _mkPathForGraph(AQH_MODULE *m, const char *sGraphId, GWEN_BUFFER *buf) +void _mkPathForGraph(AQCGI_MODULE *m, const char *sGraphId, GWEN_BUFFER *buf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; const char *s; sv=AQH_ModService_GetService(m); - s=AQH_Service_GetCacheFolder(sv); + s=AQCGI_Service_GetCacheFolder(sv); GBAA(buf, "%s%s%s", s, GWEN_DIR_SEPARATOR_S, sGraphId); AQH_ModService_EscapeToBuffer(s, buf); GBAS(buf, ".png"); @@ -473,7 +473,7 @@ void _mkPathForGraph(AQH_MODULE *m, const char *sGraphId, GWEN_BUFFER *buf) -void _writePage(AQH_MODULE *m, AQH_DATACLIENT *dc, GWEN_XMLNODE *nPage, GWEN_BUFFER *dbuf) +void _writePage(AQCGI_MODULE *m, AQH_DATACLIENT *dc, GWEN_XMLNODE *nPage, GWEN_BUFFER *dbuf) { const char *sPageId; GWEN_XMLNODE *nItem; @@ -515,7 +515,7 @@ void _writePage(AQH_MODULE *m, AQH_DATACLIENT *dc, GWEN_XMLNODE *nPage, GWEN_BUF -void _writeItem(AQH_MODULE *m, AQH_DATACLIENT *dc, const char *sPageId, GWEN_XMLNODE *nItem, GWEN_BUFFER *dbuf) +void _writeItem(AQCGI_MODULE *m, AQH_DATACLIENT *dc, const char *sPageId, GWEN_XMLNODE *nItem, GWEN_BUFFER *dbuf) { GWEN_XMLNODE *n; uint32_t perms; @@ -819,7 +819,7 @@ void _setOnOffAutoData(AQH_DATACLIENT *dc, const AQH_VALUE *value, const char *s -void _sendPageList(AQH_MODULE *m, GWEN_BUFFER *dbuf) +void _sendPageList(AQCGI_MODULE *m, GWEN_BUFFER *dbuf) { GWEN_STRINGLIST *sl; @@ -870,16 +870,16 @@ void _sendPageList(AQH_MODULE *m, GWEN_BUFFER *dbuf) -GWEN_STRINGLIST *_listPageFiles(AQH_MODULE *m) +GWEN_STRINGLIST *_listPageFiles(AQCGI_MODULE *m) { GWEN_BUFFER *fbuf; - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_STRINGLIST *sl; int rv; sv=AQH_ModService_GetService(m); fbuf=GWEN_Buffer_new(0, 256, 0, 1); - GBAA(fbuf, "%s%spages", AQH_Service_GetRuntimeFolder(sv), GWEN_DIR_SEPARATOR_S); + GBAA(fbuf, "%s%spages", AQCGI_Service_GetRuntimeFolder(sv), GWEN_DIR_SEPARATOR_S); sl=GWEN_StringList_new(); rv=GWEN_Directory_GetMatchingFilesRecursively(GWEN_Buffer_GetStart(fbuf), sl, "*.xml"); if (rv<0) { @@ -900,15 +900,15 @@ GWEN_STRINGLIST *_listPageFiles(AQH_MODULE *m) -GWEN_XMLNODE *_readPage(AQH_MODULE *m, const char *sPageName) +GWEN_XMLNODE *_readPage(AQCGI_MODULE *m, const char *sPageName) { GWEN_BUFFER *fbuf; - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_XMLNODE *fileNode; sv=AQH_ModService_GetService(m); fbuf=GWEN_Buffer_new(0, 256, 0, 1); - GBAA(fbuf, "%s%spages%s", AQH_Service_GetRuntimeFolder(sv), GWEN_DIR_SEPARATOR_S, GWEN_DIR_SEPARATOR_S); + GBAA(fbuf, "%s%spages%s", AQCGI_Service_GetRuntimeFolder(sv), GWEN_DIR_SEPARATOR_S, GWEN_DIR_SEPARATOR_S); AQH_ModService_EscapeToBuffer(sPageName, fbuf); GBAS(fbuf, ".xml"); diff --git a/apps/aqhome-cgi/modules/devices/mdevices_page.h b/apps/aqhome-cgi/modules/devices/mdevices_page.h index 546a0b7..6282285 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_page.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_page.h @@ -21,9 +21,9 @@ -void AQH_ModDevices_RunPageGet(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); -void AQH_ModDevices_RunPagePost(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); -void AQH_ModDevices_RunPageGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunPageGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunPagePost(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunPageGraph(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_setdata.c b/apps/aqhome-cgi/modules/devices/mdevices_setdata.c index b2a665a..cda5de5 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_setdata.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_setdata.c @@ -47,9 +47,9 @@ static void _setOnOffAutoData(AQH_DATACLIENT *dc, const AQH_VALUE *value, const * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunSetData(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunSetData(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sDeviceName; const char *sValueName; diff --git a/apps/aqhome-cgi/modules/devices/mdevices_setdata.h b/apps/aqhome-cgi/modules/devices/mdevices_setdata.h index ac1263a..38768de 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_setdata.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_setdata.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunSetData(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunSetData(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_setdevice.c b/apps/aqhome-cgi/modules/devices/mdevices_setdevice.c index 9c0879a..ffaf812 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_setdevice.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_setdevice.c @@ -45,9 +45,9 @@ static void _handleDeviceForm(AQH_DATACLIENT *dc, AQH_DEVICE *device, GWEN_DB_NO * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunSetDevice(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunSetDevice(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; GWEN_DB_NODE *dbPost; const char *sDeviceName; AQH_DEVICE *device; @@ -76,17 +76,7 @@ void AQH_ModDevices_RunSetDevice(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION * DBG_ERROR(NULL, "device not found"); } - if (sDeviceName && *sDeviceName) { - GWEN_BUFFER *pbuf; - - pbuf=GWEN_Buffer_new(0, 256, 0, 1); - GBAS(pbuf, "Location: device.html?device="); - GWEN_Text_EscapeToBuffer(sDeviceName, pbuf); - AQCGI_Request_AddResponseHeaderData(rq, GWEN_Buffer_GetStart(pbuf)); - GWEN_Buffer_free(pbuf); - } - AQCGI_Request_SetResponseCode(rq, 303); - AQCGI_Request_SetResponseText(rq, "See other"); + AQH_ModDevices_RedirectToDevice(rq, "device.html", device); } diff --git a/apps/aqhome-cgi/modules/devices/mdevices_setdevice.h b/apps/aqhome-cgi/modules/devices/mdevices_setdevice.h index d370f40..4b7fcc6 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_setdevice.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_setdevice.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunSetDevice(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunSetDevice(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_value.c b/apps/aqhome-cgi/modules/devices/mdevices_value.c index 61fc436..4460bb1 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_value.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_value.c @@ -36,9 +36,9 @@ * ------------------------------------------------------------------------------------------------ */ -static void _runValueWithArgs(AQH_MODULE *m, +static void _runValueWithArgs(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, AQH_DATACLIENT *dc, const char *sDeviceName, const char *sValueName, @@ -55,7 +55,7 @@ static void _writeOnOffAutoToForm(const char *sValueName, int intVal, GWEN_BUFFE * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunValue(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunValue(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sDeviceName; @@ -100,9 +100,9 @@ void AQH_ModDevices_RunValue(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *sess -void _runValueWithArgs(AQH_MODULE *m, +void _runValueWithArgs(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, AQH_DATACLIENT *dc, const char *sDeviceName, const char *sValueName, diff --git a/apps/aqhome-cgi/modules/devices/mdevices_value.h b/apps/aqhome-cgi/modules/devices/mdevices_value.h index c1843f4..b33d58e 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_value.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_value.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunValue(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunValue(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.c b/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.c index 3163f0e..1aecb08 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.c @@ -41,6 +41,7 @@ static void _writeValueToDetailedTable(const char *sDeviceName, const AQH_VALUE static void _writeValueListToTable(const char *sDeviceName, const AQH_VALUE_LIST *valueList, GWEN_BUFFER *dbuf); static void _writeValueToTable(const char *sDeviceName, const AQH_VALUE *value, GWEN_BUFFER *dbuf); static void _addGraphLink(const char *sDeviceName, const char *sValueName, const char *sPeriod, GWEN_BUFFER *dbuf, int withLink); +static void _writeDeviceInfo(const AQH_DEVICE *device, GWEN_BUFFER *dbuf); @@ -49,7 +50,7 @@ static void _addGraphLink(const char *sDeviceName, const char *sValueName, const * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunValuesAsGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunValuesAsGraph(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sDeviceName; @@ -59,40 +60,70 @@ void AQH_ModDevices_RunValuesAsGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSI if (!(sDeviceName && *sDeviceName)) AQH_ModDevices_RunIndex(m, rq, session, dc, dbuf); else { - const char *sValueName; + AQH_DEVICE *device; - sValueName=GWEN_DB_GetCharValue(dbQuery, "value", 0, NULL); - if (sValueName && *sValueName) { - AQH_VALUE *value; + device=AQH_DataClient_GetDeviceByName(dc, sDeviceName); + if (device) { + const char *sValueName; - GBAA(dbuf,"

Value %s/%s

\n", sDeviceName, sValueName); - value=AQH_ModDevices_GetValueForDevice(dc, sDeviceName, sValueName); - if (value) { - _writeValueToDetailedTable(sDeviceName, value, dbuf); - AQH_Value_free(value); - AQCGI_Request_AddResponseHeaderData(rq, "Refresh: 120"); - } - } - else { - AQH_VALUE_LIST *valueList; + sValueName=GWEN_DB_GetCharValue(dbQuery, "value", 0, NULL); + if (sValueName && *sValueName) { + AQH_VALUE *value; - valueList=AQH_DataClient_GetValues(dc, sDeviceName, 0); - if (valueList && AQH_Value_List_GetCount(valueList)) { - - GBAA(dbuf,"

Values for Device %s

\n", sDeviceName); - _writeValueListToTable(sDeviceName, valueList, dbuf); - GBAS(dbuf, "\n"); + GBAA(dbuf,"

Value %s/%s

\n", sDeviceName, sValueName); + _writeDeviceInfo(device, dbuf); + value=AQH_ModDevices_GetValueForDevice(dc, sDeviceName, sValueName); + if (value) { + _writeValueToDetailedTable(sDeviceName, value, dbuf); + AQH_Value_free(value); + AQCGI_Request_AddResponseHeaderData(rq, "Refresh: 120"); + } } else { - GBAS(dbuf,"

No values.

\n"); + AQH_VALUE_LIST *valueList; + + valueList=AQH_DataClient_GetValues(dc, sDeviceName, 0); + if (valueList && AQH_Value_List_GetCount(valueList)) { + + GBAA(dbuf,"

Values for Device %s

\n", sDeviceName); + _writeDeviceInfo(device, dbuf); + _writeValueListToTable(sDeviceName, valueList, dbuf); + GBAS(dbuf, "\n"); + } + else { + GBAS(dbuf,"

No values.

\n"); + } + AQH_Value_List_free(valueList); + AQCGI_Request_AddResponseHeaderData(rq, "Refresh: 305"); } - AQH_Value_List_free(valueList); - AQCGI_Request_AddResponseHeaderData(rq, "Refresh: 305"); + AQH_Device_free(device); } } } +void _writeDeviceInfo(const AQH_DEVICE *device, GWEN_BUFFER *dbuf) +{ + const char *s; + int cnt=0; + + GBAS(dbuf, "

"); + s=AQH_Device_GetNameForGui(device); + if (s) + GBAA(dbuf, "%s%s", (cnt++)?", ":"", s?s:""); + s=AQH_Device_GetRoomName(device); + if (s) + GBAA(dbuf, "%s%s", (cnt++)?", ":"", s?s:""); + s=AQH_Device_GetLocation(device); + if (s) + GBAA(dbuf, "%s%s", (cnt++)?", ":"", s?s:""); + s=AQH_Device_GetDescription(device); + if (s) + GBAA(dbuf, "%s%s", (cnt++)?", ":"", s?s:""); + GBAS(dbuf, "

"); +} + + void _writeValueToDetailedTable(const char *sDeviceName, const AQH_VALUE *value, GWEN_BUFFER *dbuf) { diff --git a/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.h b/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.h index ff5c9a4..212c514 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_valuesgraph.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunValuesAsGraph(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunValuesAsGraph(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_valuestable.c b/apps/aqhome-cgi/modules/devices/mdevices_valuestable.c index ef19476..74db987 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_valuestable.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_valuestable.c @@ -47,7 +47,7 @@ static void _writeValueToTable(const char *sDeviceName, const AQH_VALUE *value, * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunValuesAsTable(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunValuesAsTable(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sDeviceName; diff --git a/apps/aqhome-cgi/modules/devices/mdevices_valuestable.h b/apps/aqhome-cgi/modules/devices/mdevices_valuestable.h index 524ae05..7736aa8 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_valuestable.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_valuestable.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunValuesAsTable(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunValuesAsTable(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/devices/mdevices_vgraph.c b/apps/aqhome-cgi/modules/devices/mdevices_vgraph.c index 3ac5ee1..a9be507 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_vgraph.c +++ b/apps/aqhome-cgi/modules/devices/mdevices_vgraph.c @@ -83,7 +83,7 @@ static MY_GRAPH_PARAMS _graphParamsBool[]={ * ------------------------------------------------------------------------------------------------ */ -static void _runGraphValueWithArgs(AQH_MODULE *m, +static void _runGraphValueWithArgs(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sDeviceName, @@ -95,7 +95,7 @@ static void _createGraph(AQH_DATACLIENT *dc, const char *graphTitle, int precision, const char *curveLabel, const char *sImgFile, int imgWidth, int imgHeight, uint64_t numDataPoints); static AQDG_GRAPH *_mkGraphObjectWithTitle(const char *graphTitle, const MY_GRAPH_PARAMS *graphParams, int precision); -static void _mkPathForValueAndPeriod(AQH_MODULE *m, const AQH_VALUE *v, const MY_GRAPH_PARAMS *graphParams, GWEN_BUFFER *dbuf); +static void _mkPathForValueAndPeriod(AQCGI_MODULE *m, const AQH_VALUE *v, const MY_GRAPH_PARAMS *graphParams, GWEN_BUFFER *dbuf); static const MY_GRAPH_PARAMS *_getParamsByName(const char *s, int modality); @@ -105,7 +105,7 @@ static const MY_GRAPH_PARAMS *_getParamsByName(const char *s, int modality); * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDevices_RunGraphValue(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) +void AQH_ModDevices_RunGraphValue(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sDeviceName; @@ -135,7 +135,7 @@ void AQH_ModDevices_RunGraphValue(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION -void _runGraphValueWithArgs(AQH_MODULE *m, +void _runGraphValueWithArgs(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQH_DATACLIENT *dc, const char *sDeviceName, @@ -251,15 +251,15 @@ AQDG_GRAPH *_mkGraphObjectWithTitle(const char *graphTitle, const MY_GRAPH_PARAM } -void _mkPathForValueAndPeriod(AQH_MODULE *m, const AQH_VALUE *v, const MY_GRAPH_PARAMS *graphParams, GWEN_BUFFER *dbuf) +void _mkPathForValueAndPeriod(AQCGI_MODULE *m, const AQH_VALUE *v, const MY_GRAPH_PARAMS *graphParams, GWEN_BUFFER *dbuf) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; const char *s; sv=AQH_ModService_GetService(m); /* cache folder */ - s=AQH_Service_GetCacheFolder(sv); + s=AQCGI_Service_GetCacheFolder(sv); GBAA(dbuf, "%s%s", s, GWEN_DIR_SEPARATOR_S); /* var name */ diff --git a/apps/aqhome-cgi/modules/devices/mdevices_vgraph.h b/apps/aqhome-cgi/modules/devices/mdevices_vgraph.h index a24dd9c..84a0f45 100644 --- a/apps/aqhome-cgi/modules/devices/mdevices_vgraph.h +++ b/apps/aqhome-cgi/modules/devices/mdevices_vgraph.h @@ -21,7 +21,7 @@ -void AQH_ModDevices_RunGraphValue(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +void AQH_ModDevices_RunGraphValue(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); #endif diff --git a/apps/aqhome-cgi/modules/mdataclient.c b/apps/aqhome-cgi/modules/mdataclient.c index fbc47eb..f501105 100644 --- a/apps/aqhome-cgi/modules/mdataclient.c +++ b/apps/aqhome-cgi/modules/mdataclient.c @@ -13,11 +13,11 @@ #include "./mdataclient.h" -#include "aqhome-cgi/service/module.h" - #include "aqhome/msg/ipc/m_ipc.h" #include "aqhome/msg/ipc/data/m_ipcd.h" +#include + #include #include @@ -43,7 +43,7 @@ * ------------------------------------------------------------------------------------------------ */ -void AQH_ModDataClient_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder) +void AQH_ModDataClient_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder) { AQH_ModService_Extend(m, sv, baseFolder); @@ -51,9 +51,9 @@ void AQH_ModDataClient_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFo -void AQH_ModDataClient_HandleRequest(AQH_MODULE *m, +void AQH_ModDataClient_HandleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, AQH_MODDATACLIENT_RUN_FN runFn, GWEN_BUFFER *dbuf) { diff --git a/apps/aqhome-cgi/modules/mdataclient.h b/apps/aqhome-cgi/modules/mdataclient.h index 7efad96..e3c1a84 100644 --- a/apps/aqhome-cgi/modules/mdataclient.h +++ b/apps/aqhome-cgi/modules/mdataclient.h @@ -20,13 +20,13 @@ -typedef void (*AQH_MODDATACLIENT_RUN_FN)(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); +typedef void (*AQH_MODDATACLIENT_RUN_FN)(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, AQH_DATACLIENT *dc, GWEN_BUFFER *dbuf); -void AQH_ModDataClient_Extend(AQH_MODULE *m, AQH_SERVICE *sv, const char *baseFolder); -void AQH_ModDataClient_HandleRequest(AQH_MODULE *m, +void AQH_ModDataClient_Extend(AQCGI_MODULE *m, AQCGI_SERVICE *sv, const char *baseFolder); +void AQH_ModDataClient_HandleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, - AQH_SESSION *session, + AQCGI_SESSION *session, AQH_MODDATACLIENT_RUN_FN runFn, GWEN_BUFFER *dbuf); diff --git a/apps/aqhome-cgi/modules/mroot.c b/apps/aqhome-cgi/modules/mroot.c index 4c72955..2d1ab11 100644 --- a/apps/aqhome-cgi/modules/mroot.c +++ b/apps/aqhome-cgi/modules/mroot.c @@ -42,13 +42,13 @@ * ------------------------------------------------------------------------------------------------ */ -static AQH_MODULE *_loadSubModule(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sModuleName); -static int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, AQH_SESSION *session, const char *sLastPathElem); -static int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); -static int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); -static int _handleRqLoginGet(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); -static int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq); -static AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq); +static AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sModuleName); +static int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, AQCGI_SESSION *session, const char *sLastPathElem); +static int _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); +static int _handleRqLogin(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); +static int _handleRqLoginGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf); +static int _handleRqLoginPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq); +static AQCGI_USER *_getAndCheckUser(AQCGI_MODULE *m, AQCGI_REQUEST *rq); /* ------------------------------------------------------------------------------------------------ @@ -56,11 +56,11 @@ static AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq); * ------------------------------------------------------------------------------------------------ */ -AQH_MODULE *AQH_ModRoot_new(AQH_SERVICE *sv, const char *baseFolder) +AQCGI_MODULE *AQH_ModRoot_new(AQCGI_SERVICE *sv, const char *baseFolder) { - AQH_MODULE *m; + AQCGI_MODULE *m; - m=AQH_Module_new(); + m=AQCGI_Module_new(); AQH_ModService_Extend(m, sv, baseFolder); AQH_ModService_SetHandleRequestFn(m, _handleRequest); AQH_ModService_SetLoadSubModuleFn(m, _loadSubModule); @@ -70,15 +70,15 @@ AQH_MODULE *AQH_ModRoot_new(AQH_SERVICE *sv, const char *baseFolder) -AQH_MODULE *_loadSubModule(AQH_MODULE *m, GWEN_UNUSED AQCGI_REQUEST *rq, GWEN_UNUSED AQH_SESSION *session, const char *sModuleName) +AQCGI_MODULE *_loadSubModule(AQCGI_MODULE *m, GWEN_UNUSED AQCGI_REQUEST *rq, GWEN_UNUSED AQCGI_SESSION *session, const char *sModuleName) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; sv=AQH_ModService_GetService(m); if (strcasecmp(sModuleName, "devices")==0) { - AQH_MODULE *mSub; + AQCGI_MODULE *mSub; - mSub=AQH_Service_LoadModule(sv, sModuleName); + mSub=AQCGI_Service_LoadModule(sv, sModuleName); if (mSub) { const char *s; GWEN_BUFFER *nbuf; @@ -88,15 +88,15 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, GWEN_UNUSED AQCGI_REQUEST *rq, GWEN_UN GWEN_Buffer_AppendArgs(nbuf, "%s/devices", s?s:"."); AQH_ModDevices_Extend(mSub, AQH_ModService_GetService(m), GWEN_Buffer_GetStart(nbuf)); - AQH_Module_Tree2_AddChild(m, mSub); + AQCGI_Module_Tree2_AddChild(m, mSub); GWEN_Buffer_free(nbuf); return mSub; } } else if (strcasecmp(sModuleName, "admin")==0) { - AQH_MODULE *mSub; + AQCGI_MODULE *mSub; - mSub=AQH_Service_LoadModule(sv, sModuleName); + mSub=AQCGI_Service_LoadModule(sv, sModuleName); if (mSub) { const char *s; GWEN_BUFFER *nbuf; @@ -106,7 +106,7 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, GWEN_UNUSED AQCGI_REQUEST *rq, GWEN_UN GWEN_Buffer_AppendArgs(nbuf, "%s/admin", s?s:"."); AQH_ModAdmin_Extend(mSub, AQH_ModService_GetService(m), GWEN_Buffer_GetStart(nbuf)); - AQH_Module_Tree2_AddChild(m, mSub); + AQCGI_Module_Tree2_AddChild(m, mSub); GWEN_Buffer_free(nbuf); return mSub; } @@ -116,7 +116,7 @@ AQH_MODULE *_loadSubModule(AQH_MODULE *m, GWEN_UNUSED AQCGI_REQUEST *rq, GWEN_UN -int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_UNUSED AQH_SESSION *session, const char *sLastPathElem) +int _handleRequest(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_UNUSED AQCGI_SESSION *session, const char *sLastPathElem) { GWEN_BUFFER *dbuf; @@ -149,7 +149,7 @@ int _handleRequest(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_UNUSED AQH_SESSION *se -int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) +int _handleRqIndex(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) { if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET) return AQH_ModService_RespondWithFile(m, rq, "en", "index.html", dbuf); @@ -163,7 +163,7 @@ int _handleRqIndex(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) -int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) +int _handleRqLogin(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) { if (AQCGI_Request_GetRequestMethod(rq)==AQCGI_REQUEST_METHOD_GET) _handleRqLoginGet(m, rq, dbuf); @@ -180,7 +180,7 @@ int _handleRqLogin(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) -int _handleRqLoginGet(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) +int _handleRqLoginGet(AQCGI_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) { GWEN_DB_NODE *dbQuery; const char *sSrc; @@ -200,11 +200,11 @@ int _handleRqLoginGet(AQH_MODULE *m, AQCGI_REQUEST *rq, GWEN_BUFFER *dbuf) -int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq) +int _handleRqLoginPost(AQCGI_MODULE *m, AQCGI_REQUEST *rq) { - AQH_SERVICE *sv; - AQH_USER *user; - AQH_SESSION *session; + AQCGI_SERVICE *sv; + AQCGI_USER *user; + AQCGI_SESSION *session; GWEN_BUFFER *tbuf; GWEN_TIMESTAMP *ts; GWEN_DB_NODE *dbPost; @@ -220,38 +220,38 @@ int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq) } ts=GWEN_Timestamp_NowInLocalTime(); - AQH_User_SetTimestampLastLogin(user, ts); - rv=AQH_Service_SaveUser(sv, user); + AQCGI_User_SetTimestampLastLogin(user, ts); + rv=AQCGI_Service_SaveUser(sv, user); if (rv<0) { - DBG_ERROR(NULL, "Error saving user \"%s\"", AQH_User_GetAlias(user)); + DBG_ERROR(NULL, "Error saving user \"%s\"", AQCGI_User_GetAlias(user)); AQCGI_Request_SetResponseCode(rq, 500); AQCGI_Request_SetResponseText(rq, "Internal Error"); - AQH_User_free(user); + AQCGI_User_free(user); return rv; } /* generate session */ tbuf=GWEN_Buffer_new(0, 64, 0, 1); AQCGI_GenerateSessionId(tbuf); - session=AQH_Session_new(); - AQH_Session_SetTimestampCreation(session, ts); - AQH_Session_SetTimestampLastAccess(session, ts); - AQH_Session_SetUid(session, GWEN_Buffer_GetStart(tbuf)); + session=AQCGI_Session_new(); + AQCGI_Session_SetTimestampCreation(session, ts); + AQCGI_Session_SetTimestampLastAccess(session, ts); + AQCGI_Session_SetUid(session, GWEN_Buffer_GetStart(tbuf)); GWEN_Buffer_free(tbuf); - AQH_Session_SetUserAlias(session, AQH_User_GetAlias(user)); - rv=AQH_Service_AddSession(sv, session); + AQCGI_Session_SetUserAlias(session, AQCGI_User_GetAlias(user)); + rv=AQCGI_Service_AddSession(sv, session); if (rv<0) { - DBG_ERROR(NULL, "Error adding session for user \"%s\" (%d)", AQH_User_GetAlias(user), rv); + DBG_ERROR(NULL, "Error adding session for user \"%s\" (%d)", AQCGI_User_GetAlias(user), rv); AQCGI_Request_SetResponseCode(rq, 500); AQCGI_Request_SetResponseText(rq, "Internal Error"); - AQH_Session_free(session); - AQH_User_free(user); + AQCGI_Session_free(session); + AQCGI_User_free(user); return GWEN_ERROR_INTERNAL; } /* add Set-Cookie header */ tbuf=GWEN_Buffer_new(0, 256, 0, 1); - GWEN_Buffer_AppendArgs(tbuf, "Set-Cookie: session=%s; max-age=%d", AQH_Session_GetUid(session), AQH_SERVICE_SESSION_MAXAGE); + GWEN_Buffer_AppendArgs(tbuf, "Set-Cookie: session=%s; max-age=%d", AQCGI_Session_GetUid(session), AQH_SERVICE_SESSION_MAXAGE); AQCGI_Request_AddResponseHeaderData(rq, GWEN_Buffer_GetStart(tbuf)); GWEN_Buffer_free(tbuf); @@ -283,24 +283,24 @@ int _handleRqLoginPost(AQH_MODULE *m, AQCGI_REQUEST *rq) AQCGI_Request_SetResponseText(rq, "See other"); } - AQH_Session_free(session); - AQH_User_free(user); + AQCGI_Session_free(session); + AQCGI_User_free(user); return 0; } -AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq) +AQCGI_USER *_getAndCheckUser(AQCGI_MODULE *m, AQCGI_REQUEST *rq) { GWEN_DB_NODE *dbPost; dbPost=AQCGI_Request_GetDbPostBody(rq); if (dbPost) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; const char *sUserName; const char *sPasswd; - AQH_USER *user; + AQCGI_USER *user; const char *hashedPaswd; GWEN_BUFFER *buf; @@ -315,7 +315,7 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq) } DBG_ERROR(NULL, "Loading user \"%s\" (%p)", sUserName, sv); - user=AQH_Service_LoadUser(sv, sUserName); + user=AQCGI_Service_LoadUser(sv, sUserName); if (user==NULL) { DBG_ERROR(NULL, "User \"%s\" not found", sUserName); AQCGI_Request_SetResponseCode(rq, 403); @@ -324,20 +324,20 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq) } DBG_ERROR(NULL, "Loaded user \"%s\"", sUserName); - if (AQH_User_GetState(user)!=AQH_UserState_Active) { + if (AQCGI_User_GetState(user)!=AQCGI_UserState_Active) { DBG_ERROR(NULL, "User \"%s\" not active", sUserName); AQCGI_Request_SetResponseCode(rq, 403); AQCGI_Request_SetResponseText(rq, "Forbidden"); - AQH_User_free(user); + AQCGI_User_free(user); return NULL; } - hashedPaswd=AQH_User_GetHashedPassword(user); + hashedPaswd=AQCGI_User_GetHashedPassword(user); if (!(hashedPaswd && *hashedPaswd)) { DBG_ERROR(NULL, "User \"%s\" has no hashed password", sUserName); AQCGI_Request_SetResponseCode(rq, 403); AQCGI_Request_SetResponseText(rq, "Forbidden"); - AQH_User_free(user); + AQCGI_User_free(user); return NULL; } buf=GWEN_Buffer_new(0, 256, 0, 1); @@ -349,7 +349,7 @@ AQH_USER *_getAndCheckUser(AQH_MODULE *m, AQCGI_REQUEST *rq) AQCGI_Request_SetResponseCode(rq, 403); AQCGI_Request_SetResponseText(rq, "Forbidden"); GWEN_Buffer_free(buf); - AQH_User_free(user); + AQCGI_User_free(user); return NULL; } GWEN_Buffer_free(buf); diff --git a/apps/aqhome-cgi/modules/mroot.h b/apps/aqhome-cgi/modules/mroot.h index c3accf9..41bb035 100644 --- a/apps/aqhome-cgi/modules/mroot.h +++ b/apps/aqhome-cgi/modules/mroot.h @@ -16,7 +16,7 @@ #include -AQH_MODULE *AQH_ModRoot_new(AQH_SERVICE *sv, const char *baseFolder); +AQCGI_MODULE *AQH_ModRoot_new(AQCGI_SERVICE *sv, const char *baseFolder); diff --git a/apps/aqhome-cgi/service/0BUILD b/apps/aqhome-cgi/service/0BUILD deleted file mode 100644 index 4962cb9..0000000 --- a/apps/aqhome-cgi/service/0BUILD +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - $(gwenhywfar_cflags) - -I$(topsrcdir) - -I$(topbuilddir) - -I$(topsrcdir)/apps - -I$(topbuilddir)/apps - -I$(builddir) - -I$(srcdir) - - - - --include=$(builddir) - --include=$(srcdir) - - - - - - $(visibility_cflags) - - - - --api=AQHOME_API - - - - module.t2d - moduleperms.t2d - role.t2d - user.t2d - session.t2d - permdef.t2d - - - - - - - - - - - - - - - $(local/built_headers_pub) - - - - - service.h - - - - - service_p.h - - - - - $(local/typefiles) - - service.c - - - - - - - - - - - - - - - - diff --git a/apps/aqhome-cgi/service/README b/apps/aqhome-cgi/service/README deleted file mode 100644 index 6e1b52b..0000000 --- a/apps/aqhome-cgi/service/README +++ /dev/null @@ -1,20 +0,0 @@ - - -- service: - - userList - - rootModule - - sessionList - -- user: - - modulePerms - -- module: - - roleList - - permDefList - -- session - - - - - diff --git a/apps/aqhome-cgi/service/module.t2d b/apps/aqhome-cgi/service/module.t2d deleted file mode 100644 index 670a037..0000000 --- a/apps/aqhome-cgi/service/module.t2d +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - AQH_MODULE - AQH_Module - module - - - with_inherit - with_xml - with_db - with_list1 - with_list2 - with_tree2 - nodup - nocopy - - - -
aqhome/api.h
-
gwenhywfar/error.h
-
aqhome-cgi/service/role.h
-
aqhome-cgi/service/permdef.h
- - - - - - - - - - - - - - - - - - - 0 - 0 - public - with_getbymember sortbymember - - - - 0 - 0 - public - with_flags - - - - 0 - 0 - public - own with_getbymember sortbymember - - - - 0 - 0 - public - own - - - - 0 - 0 - public - - - - - NULL - NULL - public - own - none - none - - - - NULL - NULL - public - own - none - none - - - - - - - - diff --git a/apps/aqhome-cgi/service/moduleperms.t2d b/apps/aqhome-cgi/service/moduleperms.t2d deleted file mode 100644 index b0f7f5b..0000000 --- a/apps/aqhome-cgi/service/moduleperms.t2d +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - AQH_MODULE_PERMS - AQH_ModulePerms - moduleperms - - - with_inherit - with_xml - with_db - with_list1 - with_list2 - - - -
aqhome/api.h
-
gwenhywfar/error.h
-
aqhome-cgi/service/role.h
- - - - - - - - - - - - 0 - 0 - public - with_getbymember sortbymember - - - - 0 - 0 - public - - - - - 0 - 0 - public - - - - - 0 - 0 - public - - - - - - - - - diff --git a/apps/aqhome-cgi/service/permdef.t2d b/apps/aqhome-cgi/service/permdef.t2d deleted file mode 100644 index 63df78b..0000000 --- a/apps/aqhome-cgi/service/permdef.t2d +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - AQH_PERMDEF - AQH_PermDef - permdef - - - with_xml - with_db - with_list1 - nodup - nocopy - - - -
aqhome/api.h
- - - - - - - - - - - - NULL - NULL - public - own with_getbymember - - - - NULL - NULL - public - own with_getbymember - - - - 0 - 0 - public - own with_getbymember - - - - NULL - NULL - public - own - - - - - - - - diff --git a/apps/aqhome-cgi/service/role.t2d b/apps/aqhome-cgi/service/role.t2d deleted file mode 100644 index a6b5b94..0000000 --- a/apps/aqhome-cgi/service/role.t2d +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - AQH_ROLE - AQH_Role - role - - - with_xml - with_db - with_list1 - with_list2 - - - -
aqhome/api.h
-
gwenhywfar/error.h
- - - - - - - - - - - - 0 - 0 - public - with_getbymember - - - - 0 - 0 - public - own - - - - 0 - 0 - public - own - - - - 0 - 0 - public - - - - - 0 - 0 - public - - - - - 0 - 0 - public - - - - - - - - - diff --git a/apps/aqhome-cgi/service/service.c b/apps/aqhome-cgi/service/service.c deleted file mode 100644 index b69c690..0000000 --- a/apps/aqhome-cgi/service/service.c +++ /dev/null @@ -1,432 +0,0 @@ -/**************************************************************************** - * This file is part of the project AqHome. - * AqHome (c) by 2025 Martin Preuss, all rights reserved. - * - * The license for this file can be found in the file COPYING which you - * should have received along with this file. - ****************************************************************************/ - -#ifdef HAVE_CONFIG_H -# include -#endif - -//#define DISABLE_DEBUGLOG - - -#include "aqhome-cgi/service/service_p.h" - -#include -#include -#include - - - -GWEN_INHERIT_FUNCTIONS(AQH_SERVICE); -GWEN_LIST_FUNCTIONS(AQH_SERVICE, AQH_Service); - - - - -AQH_SERVICE *AQH_Service_new(const char *baseFolder, const char *baseUrl) -{ - AQH_SERVICE *sv; - - GWEN_NEW_OBJECT(AQH_SERVICE, sv); - GWEN_INHERIT_INIT(AQH_SERVICE, sv); - GWEN_LIST_INIT(AQH_SERVICE, sv); - - sv->baseUrl=baseUrl?strdup(baseUrl):NULL; - sv->baseFolder=baseFolder?strdup(baseFolder):NULL; - - if (sv->baseFolder) { - GWEN_BUFFER *dbuf; - uint32_t pos; - - dbuf=GWEN_Buffer_new(0, 256, 0, 1); - GWEN_Buffer_AppendArgs(dbuf, "%s%s", sv->baseFolder, GWEN_DIR_SEPARATOR_S); - pos=GWEN_Buffer_GetPos(dbuf); - - /* data folder */ - GWEN_Buffer_AppendString(dbuf, "data"); - sv->runtimeFolder=strdup(GWEN_Buffer_GetStart(dbuf)); - DBG_ERROR(NULL, "Runtime folder: %s", GWEN_Buffer_GetStart(dbuf)); - GWEN_Buffer_Crop(dbuf, 0, pos); - - /* cache folder */ - GWEN_Buffer_AppendString(dbuf, "cache"); - sv->cacheFolder=strdup(GWEN_Buffer_GetStart(dbuf)); - DBG_ERROR(NULL, "Cache folder: %s", GWEN_Buffer_GetStart(dbuf)); - GWEN_Buffer_Crop(dbuf, 0, pos); - - GWEN_Buffer_free(dbuf); - } - - return sv; -} - - - -void AQH_Service_free(AQH_SERVICE *sv) -{ - if (sv) { - GWEN_LIST_FINI(AQH_SERVICE, sv); - GWEN_INHERIT_FINI(AQH_SERVICE, sv); - - free(sv->baseUrl); - free(sv->baseFolder); - free(sv->runtimeFolder); - free(sv->cacheFolder); - free(sv->loginUrl); - GWEN_FREE_OBJECT(sv); - } -} - - - -const char *AQH_Service_GetBaseUrl(const AQH_SERVICE *sv) -{ - return sv?sv->baseUrl:NULL; -} - - - -const char *AQH_Service_GetBaseFolder(const AQH_SERVICE *sv) -{ - return sv?sv->baseFolder:NULL; -} - - - -const char *AQH_Service_GetRuntimeFolder(const AQH_SERVICE *sv) -{ - return sv?sv->runtimeFolder:NULL; -} - - - -const char *AQH_Service_GetCacheFolder(const AQH_SERVICE *sv) -{ - return sv?sv->cacheFolder:NULL; -} - - - -const char *AQH_Service_GetLoginUrl(const AQH_SERVICE *sv) -{ - return sv?sv->loginUrl:NULL; -} - - - -void AQH_Service_SetLoginUrl(AQH_SERVICE *sv, const char *s) -{ - if (sv) { - free(sv->loginUrl); - sv->loginUrl=s?strdup(s):NULL; - } -} - - - -#if 0 -AQH_MODULE *AQH_Service_GetModuleByPath(const AQH_SERVICE *sv, const char *s) -{ - if (sv && s && *s) { - GWEN_STRINGLIST *sl; - - sl=GWEN_StringList_fromString2(s, "/", 0, - GWEN_TEXT_FLAGS_DEL_QUOTES | - GWEN_TEXT_FLAGS_DEL_LEADING_BLANKS | - GWEN_TEXT_FLAGS_DEL_MULTIPLE_BLANKS | - GWEN_TEXT_FLAGS_DEL_TRAILING_BLANKS); - if (sl) { - GWEN_STRINGLISTENTRY *se; - AQH_MODULE *m; - - m=sv->rootModule; - se=GWEN_StringList_FirstEntry(sl); - while(se && m) { - const char *sWantedName; - - sWantedName=GWEN_StringListEntry_Data(se); - if (sWantedName && *sWantedName) { - AQH_MODULE *mTemp; - - mTemp=AQH_Module_Tree2_GetFirstChild(m); - while(mTemp) { - const char *sModName; - - sModName=AQH_Module_GetName(mTemp); - if (sModName && *sModName && 0==strcasecmp(sModName, sWantedName)) - break; - mTemp=AQH_Module_Tree2_GetNext(mTemp); - } - if (mTemp==NULL) { - DBG_ERROR(NULL, "Module \%s\" not found", sWantedName); - GWEN_StringList_free(sl); - return NULL; - } - m=mTemp; - } - else { - DBG_ERROR(NULL, "Empty path element in \"%s\"", s); - GWEN_StringList_free(sl); - return NULL; - } - - se=GWEN_StringListEntry_Next(se); - } /* while(se && m) */ - GWEN_StringList_free(sl); - return m; - } - else { - DBG_ERROR(NULL, "Bad path \"%s\"", s); - } - } - return NULL; -} -#endif - - - -int AQH_Service_HandleRequest(AQH_SERVICE *sv, AQCGI_REQUEST *req) -{ - return (sv && sv->handleRequestFn)?(sv->handleRequestFn(sv, req)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -AQH_USER *AQH_Service_LoadUser(AQH_SERVICE *sv, const char *s) -{ - return (sv && sv->loadUserFn)?(sv->loadUserFn(sv, s)):NULL; -} - - - -int AQH_Service_SaveUser(AQH_SERVICE *sv, AQH_USER *user) -{ - return (sv && sv->saveUserFn)?(sv->saveUserFn(sv, user)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -int AQH_Service_AddUser(AQH_SERVICE *sv, AQH_USER *user) -{ - return (sv && sv->addUserFn)?(sv->addUserFn(sv, user)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -int AQH_Service_DelUser(AQH_SERVICE *sv, const char *s) -{ - return (sv && sv->delUserFn)?(sv->delUserFn(sv, s)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -GWEN_STRINGLIST *AQH_Service_ListUsers(AQH_SERVICE *sv) -{ - return (sv && sv->listUsersFn)?(sv->listUsersFn(sv)):NULL; -} - - - -AQH_MODULE *AQH_Service_LoadModule(AQH_SERVICE *sv, const char *s) -{ - return (sv && sv->loadModuleFn)?(sv->loadModuleFn(sv, s)):NULL; -} - - - -int AQH_Service_SaveModule(AQH_SERVICE *sv, AQH_MODULE *module) -{ - return (sv && sv->saveModuleFn)?(sv->saveModuleFn(sv, module)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -int AQH_Service_AddModule(AQH_SERVICE *sv, AQH_MODULE *module) -{ - return (sv && sv->addModuleFn)?(sv->addModuleFn(sv, module)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -int AQH_Service_DelModule(AQH_SERVICE *sv, const char *s) -{ - return (sv && sv->delModuleFn)?(sv->delModuleFn(sv, s)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -GWEN_STRINGLIST *AQH_Service_ListModules(AQH_SERVICE *sv) -{ - return (sv && sv->listModulesFn)?(sv->listModulesFn(sv)):NULL; -} - - - -AQH_SESSION* AQH_Service_LoadSession(AQH_SERVICE *sv, const char *s) -{ - return (sv && sv->loadSessionFn)?(sv->loadSessionFn(sv, s)):NULL; -} - - - -int AQH_Service_SaveSession(AQH_SERVICE *sv, AQH_SESSION *session) -{ - return (sv && sv->saveSessionFn)?(sv->saveSessionFn(sv, session)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -int AQH_Service_AddSession(AQH_SERVICE *sv, AQH_SESSION *session) -{ - return (sv && sv->addSessionFn)?(sv->addSessionFn(sv, session)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - -int AQH_Service_DelSession(AQH_SERVICE *sv, const char *s) -{ - return (sv && sv->delSessionFn)?(sv->delSessionFn(sv, s)):GWEN_ERROR_NOT_IMPLEMENTED; -} - - - - - - -void AQH_Service_SetHandleRequestFn(AQH_SERVICE *sv, AQH_SERVICE_HANDLEREQUEST_FN f) -{ - if (sv) - sv->handleRequestFn=f; -} - - - -void AQH_Service_SetLoadUserFn(AQH_SERVICE *sv, AQH_SERVICE_LOADUSER_FN f) -{ - if (sv) - sv->loadUserFn=f; -} - - - -void AQH_Service_SetSaveUserFn(AQH_SERVICE *sv, AQH_SERVICE_SAVEUSER_FN f) -{ - if (sv) - sv->saveUserFn=f; -} - - - -void AQH_Service_SetAddUserFn(AQH_SERVICE *sv, AQH_SERVICE_ADDUSER_FN f) -{ - if (sv) - sv->addUserFn=f; -} - - - -void AQH_Service_SetDelUserFn(AQH_SERVICE *sv, AQH_SERVICE_DELUSER_FN f) -{ - if (sv) - sv->delUserFn=f; -} - - - -void AQH_Service_SetListUsersFn(AQH_SERVICE *sv, AQH_SERVICE_LISTUSERS_FN f) -{ - if (sv) - sv->listUsersFn=f; -} - - - -void AQH_Service_SetLoadModuleFn(AQH_SERVICE *sv, AQH_SERVICE_LOADMODULE_FN f) -{ - if (sv) - sv->loadModuleFn=f; -} - - - -void AQH_Service_SetSaveModuleFn(AQH_SERVICE *sv, AQH_SERVICE_SAVEMODULE_FN f) -{ - if (sv) - sv->saveModuleFn=f; -} - - - -void AQH_Service_SetAddModuleFn(AQH_SERVICE *sv, AQH_SERVICE_ADDMODULE_FN f) -{ - if (sv) - sv->addModuleFn=f; -} - - - -void AQH_Service_SetDelModuleFn(AQH_SERVICE *sv, AQH_SERVICE_DELMODULE_FN f) -{ - if (sv) - sv->delModuleFn=f; -} - - - -void AQH_Service_SetListModulesFn(AQH_SERVICE *sv, AQH_SERVICE_LISTMODULES_FN f) -{ - if (sv) - sv->listModulesFn=f; -} - - - -void AQH_Service_SetLoadSessionFn(AQH_SERVICE *sv, AQH_SERVICE_LOADSESSION_FN f) -{ - if (sv) - sv->loadSessionFn=f; -} - - - -void AQH_Service_SetSaveSessionFn(AQH_SERVICE *sv, AQH_SERVICE_SAVESESSION_FN f) -{ - if (sv) - sv->saveSessionFn=f; -} - - - -void AQH_Service_SetAddSessionFn(AQH_SERVICE *sv, AQH_SERVICE_ADDSESSION_FN f) -{ - if (sv) - sv->addSessionFn=f; -} - - - -void AQH_Service_SetDelSessionFn(AQH_SERVICE *sv, AQH_SERVICE_DELSESSION_FN f) -{ - if (sv) - sv->delSessionFn=f; -} - - - -void AQH_Service_SetListSessionsFn(AQH_SERVICE *sv, AQH_SERVICE_LISTSESSIONS_FN f) -{ - if (sv) - sv->listSessionsFn=f; -} - - - - - - - - diff --git a/apps/aqhome-cgi/service/service.h b/apps/aqhome-cgi/service/service.h deleted file mode 100644 index ac0a953..0000000 --- a/apps/aqhome-cgi/service/service.h +++ /dev/null @@ -1,109 +0,0 @@ -/**************************************************************************** - * This file is part of the project AqHome. - * AqHome (c) by 2025 Martin Preuss, all rights reserved. - * - * The license for this file can be found in the file COPYING which you - * should have received along with this file. - ****************************************************************************/ - -#ifndef AQHOME_SERVICE_H -#define AQHOME_SERVICE_H - - -#include - -#include -#include -#include - - -typedef struct AQH_SERVICE AQH_SERVICE; -GWEN_INHERIT_FUNCTION_DEFS(AQH_SERVICE); -GWEN_LIST_FUNCTION_DEFS(AQH_SERVICE, AQH_Service); - - -#include "aqhome-cgi/service/user.h" -#include "aqhome-cgi/service/module.h" -#include "aqhome-cgi/service/session.h" - -#include - - -typedef int (*AQH_SERVICE_HANDLEREQUEST_FN)(AQH_SERVICE *sv, AQCGI_REQUEST *req); - -typedef AQH_USER* (*AQH_SERVICE_LOADUSER_FN)(AQH_SERVICE *sv, const char *s); -typedef int (*AQH_SERVICE_SAVEUSER_FN)(AQH_SERVICE *sv, AQH_USER *user); -typedef int (*AQH_SERVICE_ADDUSER_FN)(AQH_SERVICE *sv, AQH_USER *user); -typedef int (*AQH_SERVICE_DELUSER_FN)(AQH_SERVICE *sv, const char *s); -typedef GWEN_STRINGLIST* (*AQH_SERVICE_LISTUSERS_FN)(AQH_SERVICE *sv); - -typedef AQH_MODULE* (*AQH_SERVICE_LOADMODULE_FN)(AQH_SERVICE *sv, const char *s); -typedef int (*AQH_SERVICE_SAVEMODULE_FN)(AQH_SERVICE *sv, AQH_MODULE *module); -typedef int (*AQH_SERVICE_ADDMODULE_FN)(AQH_SERVICE *sv, AQH_MODULE *module); -typedef int (*AQH_SERVICE_DELMODULE_FN)(AQH_SERVICE *sv, const char *s); -typedef GWEN_STRINGLIST* (*AQH_SERVICE_LISTMODULES_FN)(AQH_SERVICE *sv); - - -typedef AQH_SESSION* (*AQH_SERVICE_LOADSESSION_FN)(AQH_SERVICE *sv, const char *s); -typedef int (*AQH_SERVICE_SAVESESSION_FN)(AQH_SERVICE *sv, AQH_SESSION *session); -typedef int (*AQH_SERVICE_ADDSESSION_FN)(AQH_SERVICE *sv, AQH_SESSION *session); -typedef int (*AQH_SERVICE_DELSESSION_FN)(AQH_SERVICE *sv, const char *s); -typedef GWEN_STRINGLIST* (*AQH_SERVICE_LISTSESSIONS_FN)(AQH_SERVICE *sv); - - - -AQH_SERVICE *AQH_Service_new(const char *baseFolder, const char *baseUrl); -void AQH_Service_free(AQH_SERVICE *sv); - -const char *AQH_Service_GetBaseUrl(const AQH_SERVICE *sv); -const char *AQH_Service_GetLoginUrl(const AQH_SERVICE *sv); -void AQH_Service_SetLoginUrl(AQH_SERVICE *sv, const char *s); -const char *AQH_Service_GetBaseFolder(const AQH_SERVICE *sv); -const char *AQH_Service_GetRuntimeFolder(const AQH_SERVICE *sv); -const char *AQH_Service_GetCacheFolder(const AQH_SERVICE *sv); - -int AQH_Service_HandleRequest(AQH_SERVICE *sv, AQCGI_REQUEST *req); - -AQH_USER *AQH_Service_LoadUser(AQH_SERVICE *sv, const char *s); -int AQH_Service_SaveUser(AQH_SERVICE *sv, AQH_USER *user); -int AQH_Service_AddUser(AQH_SERVICE *sv, AQH_USER *user); -int AQH_Service_DelUser(AQH_SERVICE *sv, const char *s); -GWEN_STRINGLIST *AQH_Service_ListUsers(AQH_SERVICE *sv); - -AQH_MODULE *AQH_Service_LoadModule(AQH_SERVICE *sv, const char *s); -int AQH_Service_SaveModule(AQH_SERVICE *sv, AQH_MODULE *module); -int AQH_Service_AddModule(AQH_SERVICE *sv, AQH_MODULE *module); -int AQH_Service_DelModule(AQH_SERVICE *sv, const char *s); -GWEN_STRINGLIST *AQH_Service_ListModules(AQH_SERVICE *sv); - -AQH_SESSION* AQH_Service_LoadSession(AQH_SERVICE *sv, const char *s); -int AQH_Service_SaveSession(AQH_SERVICE *sv, AQH_SESSION *session); -int AQH_Service_AddSession(AQH_SERVICE *sv, AQH_SESSION *session); -int AQH_Service_DelSession(AQH_SERVICE *sv, const char *s); -GWEN_STRINGLIST *AQH_Service_ListSessions(AQH_SERVICE *sv); - - - -void AQH_Service_SetHandleRequestFn(AQH_SERVICE *sv, AQH_SERVICE_HANDLEREQUEST_FN f); - -void AQH_Service_SetLoadUserFn(AQH_SERVICE *sv, AQH_SERVICE_LOADUSER_FN f); -void AQH_Service_SetSaveUserFn(AQH_SERVICE *sv, AQH_SERVICE_SAVEUSER_FN f); -void AQH_Service_SetAddUserFn(AQH_SERVICE *sv, AQH_SERVICE_ADDUSER_FN f); -void AQH_Service_SetDelUserFn(AQH_SERVICE *sv, AQH_SERVICE_DELUSER_FN f); -void AQH_Service_SetListUsersFn(AQH_SERVICE *sv, AQH_SERVICE_LISTUSERS_FN f); - -void AQH_Service_SetLoadModuleFn(AQH_SERVICE *sv, AQH_SERVICE_LOADMODULE_FN f); -void AQH_Service_SetSaveModuleFn(AQH_SERVICE *sv, AQH_SERVICE_SAVEMODULE_FN f); -void AQH_Service_SetAddModuleFn(AQH_SERVICE *sv, AQH_SERVICE_ADDMODULE_FN f); -void AQH_Service_SetDelModuleFn(AQH_SERVICE *sv, AQH_SERVICE_DELMODULE_FN f); -void AQH_Service_SetListModulesFn(AQH_SERVICE *sv, AQH_SERVICE_LISTMODULES_FN f); - -void AQH_Service_SetLoadSessionFn(AQH_SERVICE *sv, AQH_SERVICE_LOADSESSION_FN f); -void AQH_Service_SetSaveSessionFn(AQH_SERVICE *sv, AQH_SERVICE_SAVESESSION_FN f); -void AQH_Service_SetAddSessionFn(AQH_SERVICE *sv, AQH_SERVICE_ADDSESSION_FN f); -void AQH_Service_SetDelSessionFn(AQH_SERVICE *sv, AQH_SERVICE_DELSESSION_FN f); -void AQH_Service_SetListSessionsFn(AQH_SERVICE *sv, AQH_SERVICE_LISTSESSIONS_FN f); - - - -#endif diff --git a/apps/aqhome-cgi/service/service_p.h b/apps/aqhome-cgi/service/service_p.h deleted file mode 100644 index f7fcf96..0000000 --- a/apps/aqhome-cgi/service/service_p.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - * This file is part of the project AqHome. - * AqHome (c) by 2023 Martin Preuss, all rights reserved. - * - * The license for this file can be found in the file COPYING which you - * should have received along with this file. - ****************************************************************************/ - -#ifndef AQHOME_SERVICE_P_H -#define AQHOME_SERVICE_P_H - - -#include "aqhome-cgi/service/service.h" - - -struct AQH_SERVICE { - GWEN_INHERIT_ELEMENT(AQH_SERVICE); - GWEN_LIST_ELEMENT(AQH_SERVICE); - - char *baseUrl; - char *baseFolder; - char *runtimeFolder; - char *cacheFolder; - - char *loginUrl; - - AQH_SERVICE_HANDLEREQUEST_FN handleRequestFn; - - AQH_SERVICE_LOADUSER_FN loadUserFn; - AQH_SERVICE_SAVEUSER_FN saveUserFn; - AQH_SERVICE_ADDUSER_FN addUserFn; - AQH_SERVICE_DELUSER_FN delUserFn; - AQH_SERVICE_LISTUSERS_FN listUsersFn; - - AQH_SERVICE_LOADMODULE_FN loadModuleFn; - AQH_SERVICE_SAVEMODULE_FN saveModuleFn; - AQH_SERVICE_ADDMODULE_FN addModuleFn; - AQH_SERVICE_DELMODULE_FN delModuleFn; - AQH_SERVICE_LISTMODULES_FN listModulesFn; - - AQH_SERVICE_LOADSESSION_FN loadSessionFn; - AQH_SERVICE_SAVESESSION_FN saveSessionFn; - AQH_SERVICE_ADDSESSION_FN addSessionFn; - AQH_SERVICE_DELSESSION_FN delSessionFn; - AQH_SERVICE_LISTSESSIONS_FN listSessionsFn; - -}; - - - - -#endif diff --git a/apps/aqhome-cgi/service/session.t2d b/apps/aqhome-cgi/service/session.t2d deleted file mode 100644 index 6f0d528..0000000 --- a/apps/aqhome-cgi/service/session.t2d +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - AQH_SESSION - AQH_Session - session - - - with_xml - with_db - with_list1 - with_list2 - nodup - nocopy - - - -
aqhome/api.h
-
gwenhywfar/error.h
-
gwenhywfar/timestamp.h
-
aqhome-cgi/service/user.h
- - - - - - - - - - - - - - - - - - - - 0 - 0 - public - own with_getbymember - - - - 0 - 0 - public - with_flags - - - - NULL - NULL - public - own - - - - 0 - 0 - public - - - - - 0 - 0 - public - own - - - - NULL - NULL - public - own - - - - NULL - NULL - public - own - - - - - NULL - NULL - public - assign - none - volatile nodup nocopy - - - - - - 0 - 0 - public - with_flags volatile - - - - - - - - diff --git a/apps/aqhome-cgi/service/user.t2d b/apps/aqhome-cgi/service/user.t2d deleted file mode 100644 index b1a08b4..0000000 --- a/apps/aqhome-cgi/service/user.t2d +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - AQH_USER - AQH_User - user - - - with_xml - with_db - with_list1 - with_list2 - with_refcount - nodup - nocopy - - - -
aqhome/api.h
-
gwenhywfar/error.h
-
gwenhywfar/timestamp.h
-
aqhome-cgi/service/moduleperms.h
- - - - - - - - - - - - - - - - - - - - - - - - User suspended - - - - Waiting for email confirmation - - - - Waiting for approval by admin - - - - User active - - - - - - - - - - - 0 - 0 - public - with_getbymember sortbymember - - - - 0 - 0 - public - with_flags - - - - 0 - 0 - public - sortbymember - - - - 0 - 0 - public - own sortbymember - - - - 0 - 0 - public - own with_getbymember sortbymember - - - - 0 - 0 - public - own - - - - 0 - 0 - public - own with_getbymember sortbymember - - - - 0 - 0 - public - own - - - - NULL - NULL - public - own sortbymember - - - - NULL - NULL - public - own sortbymember - - - - NULL - NULL - public - none - none - own - - - - - 0 - 0 - public - volatile with_flags - - - - - - - - diff --git a/apps/aqhome-cgi/service_file.c b/apps/aqhome-cgi/service_file.c index f4b8aca..0921e59 100644 --- a/apps/aqhome-cgi/service_file.c +++ b/apps/aqhome-cgi/service_file.c @@ -35,7 +35,7 @@ * ------------------------------------------------------------------------------------------------ */ -GWEN_INHERIT(AQH_SERVICE, AQH_SERVICE_FILE) +GWEN_INHERIT(AQCGI_SERVICE, AQH_SERVICE_FILE) @@ -46,29 +46,29 @@ GWEN_INHERIT(AQH_SERVICE, AQH_SERVICE_FILE) static void GWENHYWFAR_CB _freeData(void *bp, void *p); -static AQH_USER *_loadUser(AQH_SERVICE *sv, const char *s); -static int _saveUser(AQH_SERVICE *sv, AQH_USER *user); -static int _addUser(AQH_SERVICE *sv, AQH_USER *user); -static int _delUser(AQH_SERVICE *sv, const char *s); -static GWEN_STRINGLIST *_listUsers(AQH_SERVICE *sv); +static AQCGI_USER *_loadUser(AQCGI_SERVICE *sv, const char *s); +static int _saveUser(AQCGI_SERVICE *sv, AQCGI_USER *user); +static int _addUser(AQCGI_SERVICE *sv, AQCGI_USER *user); +static int _delUser(AQCGI_SERVICE *sv, const char *s); +static GWEN_STRINGLIST *_listUsers(AQCGI_SERVICE *sv); -static AQH_MODULE *_loadModule(AQH_SERVICE *sv, const char *s); -static int _saveModule(AQH_SERVICE *sv, AQH_MODULE *module); -static int _addModule(AQH_SERVICE *sv, AQH_MODULE *module); -static int _delModule(AQH_SERVICE *sv, const char *s); -static GWEN_STRINGLIST *_listModules(AQH_SERVICE *sv); +static AQCGI_MODULE *_loadModule(AQCGI_SERVICE *sv, const char *s); +static int _saveModule(AQCGI_SERVICE *sv, AQCGI_MODULE *module); +static int _addModule(AQCGI_SERVICE *sv, AQCGI_MODULE *module); +static int _delModule(AQCGI_SERVICE *sv, const char *s); +static GWEN_STRINGLIST *_listModules(AQCGI_SERVICE *sv); -static AQH_SESSION* _loadSession(AQH_SERVICE *sv, const char *s); -static int _saveSession(AQH_SERVICE *sv, AQH_SESSION *session); -static int _addSession(AQH_SERVICE *sv, AQH_SESSION *session); -static int _delSession(AQH_SERVICE *sv, const char *s); -static GWEN_STRINGLIST *_listSessions(AQH_SERVICE *sv); +static AQCGI_SESSION* _loadSession(AQCGI_SERVICE *sv, const char *s); +static int _saveSession(AQCGI_SERVICE *sv, AQCGI_SESSION *session); +static int _addSession(AQCGI_SERVICE *sv, AQCGI_SESSION *session); +static int _delSession(AQCGI_SERVICE *sv, const char *s); +static GWEN_STRINGLIST *_listSessions(AQCGI_SERVICE *sv); -static GWEN_DB_NODE *_loadGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroupName); -static int _saveGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db); -static int _addGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db); -static int _deleteGroup(AQH_SERVICE *sv, const char *groupName, const char *subGroupName); -static GWEN_STRINGLIST *_listGroup(AQH_SERVICE *sv, const char *groupName); +static GWEN_DB_NODE *_loadGroupLocked(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName); +static int _saveGroupLocked(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db); +static int _addGroupLocked(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db); +static int _deleteGroup(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName); +static GWEN_STRINGLIST *_listGroup(AQCGI_SERVICE *sv, const char *groupName); //static void _logGroup(const char *groupName, const char *subGroupName, GWEN_DB_NODE *db); @@ -79,42 +79,42 @@ static GWEN_STRINGLIST *_listGroup(AQH_SERVICE *sv, const char *groupName); * ------------------------------------------------------------------------------------------------ */ -AQH_SERVICE *AQH_ServiceFiles_new(const char *baseFolder, const char *baseUrl) +AQCGI_SERVICE *AQH_ServiceFiles_new(const char *baseFolder, const char *baseUrl) { - AQH_SERVICE *sv; + AQCGI_SERVICE *sv; AQH_SERVICE_FILE *xs; GWEN_BUFFER *dbuf; - sv=AQH_Service_new(baseFolder, baseUrl); + sv=AQCGI_Service_new(baseFolder, baseUrl); GWEN_NEW_OBJECT(AQH_SERVICE_FILE, xs); - GWEN_INHERIT_SETDATA(AQH_SERVICE, AQH_SERVICE_FILE, sv, xs, _freeData); + GWEN_INHERIT_SETDATA(AQCGI_SERVICE, AQH_SERVICE_FILE, sv, xs, _freeData); - AQH_Service_SetLoadUserFn(sv, _loadUser); - AQH_Service_SetSaveUserFn(sv, _saveUser); - AQH_Service_SetAddUserFn(sv, _addUser); - AQH_Service_SetDelUserFn(sv, _delUser); - AQH_Service_SetListUsersFn(sv, _listUsers); + AQCGI_Service_SetLoadUserFn(sv, _loadUser); + AQCGI_Service_SetSaveUserFn(sv, _saveUser); + AQCGI_Service_SetAddUserFn(sv, _addUser); + AQCGI_Service_SetDelUserFn(sv, _delUser); + AQCGI_Service_SetListUsersFn(sv, _listUsers); - AQH_Service_SetLoadModuleFn(sv, _loadModule); - AQH_Service_SetSaveModuleFn(sv, _saveModule); - AQH_Service_SetAddModuleFn(sv, _addModule); - AQH_Service_SetDelModuleFn(sv, _delModule); - AQH_Service_SetListModulesFn(sv, _listModules); + AQCGI_Service_SetLoadModuleFn(sv, _loadModule); + AQCGI_Service_SetSaveModuleFn(sv, _saveModule); + AQCGI_Service_SetAddModuleFn(sv, _addModule); + AQCGI_Service_SetDelModuleFn(sv, _delModule); + AQCGI_Service_SetListModulesFn(sv, _listModules); - AQH_Service_SetLoadSessionFn(sv, _loadSession); - AQH_Service_SetSaveSessionFn(sv, _saveSession); - AQH_Service_SetAddSessionFn(sv, _addSession); - AQH_Service_SetDelSessionFn(sv, _delSession); - AQH_Service_SetListSessionsFn(sv, _listSessions); + AQCGI_Service_SetLoadSessionFn(sv, _loadSession); + AQCGI_Service_SetSaveSessionFn(sv, _saveSession); + AQCGI_Service_SetAddSessionFn(sv, _addSession); + AQCGI_Service_SetDelSessionFn(sv, _delSession); + AQCGI_Service_SetListSessionsFn(sv, _listSessions); dbuf=GWEN_Buffer_new(0, 256, 0, 1); - GWEN_Buffer_AppendArgs(dbuf, "dir://%s", AQH_Service_GetRuntimeFolder(sv)); + GWEN_Buffer_AppendArgs(dbuf, "dir://%s", AQCGI_Service_GetRuntimeFolder(sv)); DBG_ERROR(NULL, "Creating config mgr \"%s\"", GWEN_Buffer_GetStart(dbuf)); xs->configMgr=GWEN_ConfigMgr_Factory(GWEN_Buffer_GetStart(dbuf)); if (xs->configMgr==NULL) { DBG_ERROR(NULL, "Error creating config mgr \"%s\"", GWEN_Buffer_GetStart(dbuf)); GWEN_Buffer_free(dbuf); - AQH_Service_free(sv); + AQCGI_Service_free(sv); return NULL; } GWEN_Buffer_free(dbuf); @@ -135,15 +135,15 @@ void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p) -AQH_USER *_loadUser(AQH_SERVICE *sv, const char *s) +AQCGI_USER *_loadUser(AQCGI_SERVICE *sv, const char *s) { GWEN_DB_NODE *db; db=_loadGroupLocked(sv, AQH_SERVICE_FILE_GROUP_USERS, s); if (db) { - AQH_USER *user; + AQCGI_USER *user; - user=AQH_User_fromDb(db); + user=AQCGI_User_fromDb(db); GWEN_DB_Group_free(db); return user; } @@ -153,25 +153,23 @@ AQH_USER *_loadUser(AQH_SERVICE *sv, const char *s) -int _saveUser(AQH_SERVICE *sv, AQH_USER *user) +int _saveUser(AQCGI_SERVICE *sv, AQCGI_USER *user) { const char *s; - s=AQH_User_GetAlias(user); + s=AQCGI_User_GetAlias(user); if (s && *s) { GWEN_DB_NODE *db; int rv; db=GWEN_DB_Group_new(s); - rv=AQH_User_toDb(user, db); + rv=AQCGI_User_toDb(user, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); GWEN_DB_Group_free(db); return rv; } - /*_logGroup(AQH_SERVICE_FILE_GROUP_USERS, s, db);*/ - rv=_saveGroupLocked(sv, AQH_SERVICE_FILE_GROUP_USERS, s, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); @@ -186,17 +184,17 @@ int _saveUser(AQH_SERVICE *sv, AQH_USER *user) -int _addUser(AQH_SERVICE *sv, AQH_USER *user) +int _addUser(AQCGI_SERVICE *sv, AQCGI_USER *user) { const char *s; - s=AQH_User_GetAlias(user); + s=AQCGI_User_GetAlias(user); if (s && *s) { GWEN_DB_NODE *db; int rv; db=GWEN_DB_Group_new(s); - rv=AQH_User_toDb(user, db); + rv=AQCGI_User_toDb(user, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); GWEN_DB_Group_free(db); @@ -219,29 +217,29 @@ int _addUser(AQH_SERVICE *sv, AQH_USER *user) -int _delUser(AQH_SERVICE *sv, const char *s) +int _delUser(AQCGI_SERVICE *sv, const char *s) { return _deleteGroup(sv, AQH_SERVICE_FILE_GROUP_USERS, s); } -GWEN_STRINGLIST *_listUsers(AQH_SERVICE *sv) +GWEN_STRINGLIST *_listUsers(AQCGI_SERVICE *sv) { return _listGroup(sv, AQH_SERVICE_FILE_GROUP_USERS); } -AQH_MODULE *_loadModule(AQH_SERVICE *sv, const char *s) +AQCGI_MODULE *_loadModule(AQCGI_SERVICE *sv, const char *s) { GWEN_DB_NODE *db; db=_loadGroupLocked(sv, AQH_SERVICE_FILE_GROUP_MODULES, s); if (db) { - AQH_MODULE *module; + AQCGI_MODULE *module; - module=AQH_Module_fromDb(db); + module=AQCGI_Module_fromDb(db); GWEN_DB_Group_free(db); return module; } @@ -251,17 +249,17 @@ AQH_MODULE *_loadModule(AQH_SERVICE *sv, const char *s) -int _saveModule(AQH_SERVICE *sv, AQH_MODULE *module) +int _saveModule(AQCGI_SERVICE *sv, AQCGI_MODULE *module) { const char *s; - s=AQH_Module_GetName(module); + s=AQCGI_Module_GetName(module); if (s && *s) { GWEN_DB_NODE *db; int rv; db=GWEN_DB_Group_new(s); - rv=AQH_Module_toDb(module, db); + rv=AQCGI_Module_toDb(module, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); GWEN_DB_Group_free(db); @@ -281,17 +279,17 @@ int _saveModule(AQH_SERVICE *sv, AQH_MODULE *module) -int _addModule(AQH_SERVICE *sv, AQH_MODULE *module) +int _addModule(AQCGI_SERVICE *sv, AQCGI_MODULE *module) { const char *s; - s=AQH_Module_GetName(module); + s=AQCGI_Module_GetName(module); if (s && *s) { GWEN_DB_NODE *db; int rv; db=GWEN_DB_Group_new(s); - rv=AQH_Module_toDb(module, db); + rv=AQCGI_Module_toDb(module, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); GWEN_DB_Group_free(db); @@ -311,14 +309,14 @@ int _addModule(AQH_SERVICE *sv, AQH_MODULE *module) -int _delModule(AQH_SERVICE *sv, const char *s) +int _delModule(AQCGI_SERVICE *sv, const char *s) { return _deleteGroup(sv, AQH_SERVICE_FILE_GROUP_MODULES, s); } -GWEN_STRINGLIST *_listModules(AQH_SERVICE *sv) +GWEN_STRINGLIST *_listModules(AQCGI_SERVICE *sv) { return _listGroup(sv, AQH_SERVICE_FILE_GROUP_MODULES); } @@ -326,15 +324,15 @@ GWEN_STRINGLIST *_listModules(AQH_SERVICE *sv) -AQH_SESSION* _loadSession(AQH_SERVICE *sv, const char *s) +AQCGI_SESSION* _loadSession(AQCGI_SERVICE *sv, const char *s) { GWEN_DB_NODE *db; db=_loadGroupLocked(sv, AQH_SERVICE_FILE_GROUP_SESSIONS, s); if (db) { - AQH_SESSION *session; + AQCGI_SESSION *session; - session=AQH_Session_fromDb(db); + session=AQCGI_Session_fromDb(db); GWEN_DB_Group_free(db); return session; } @@ -344,17 +342,17 @@ AQH_SESSION* _loadSession(AQH_SERVICE *sv, const char *s) -int _saveSession(AQH_SERVICE *sv, AQH_SESSION *session) +int _saveSession(AQCGI_SERVICE *sv, AQCGI_SESSION *session) { const char *s; - s=AQH_Session_GetUid(session); + s=AQCGI_Session_GetUid(session); if (s && *s) { GWEN_DB_NODE *db; int rv; db=GWEN_DB_Group_new(s); - rv=AQH_Session_toDb(session, db); + rv=AQCGI_Session_toDb(session, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); GWEN_DB_Group_free(db); @@ -374,17 +372,17 @@ int _saveSession(AQH_SERVICE *sv, AQH_SESSION *session) -int _addSession(AQH_SERVICE *sv, AQH_SESSION *session) +int _addSession(AQCGI_SERVICE *sv, AQCGI_SESSION *session) { const char *s; - s=AQH_Session_GetUid(session); + s=AQCGI_Session_GetUid(session); if (s && *s) { GWEN_DB_NODE *db; int rv; db=GWEN_DB_Group_new(s); - rv=AQH_Session_toDb(session, db); + rv=AQCGI_Session_toDb(session, db); if (rv<0) { DBG_ERROR(NULL, "here (%d)", rv); GWEN_DB_Group_free(db); @@ -404,27 +402,27 @@ int _addSession(AQH_SERVICE *sv, AQH_SESSION *session) -int _delSession(AQH_SERVICE *sv, const char *s) +int _delSession(AQCGI_SERVICE *sv, const char *s) { return _deleteGroup(sv, AQH_SERVICE_FILE_GROUP_SESSIONS, s); } -GWEN_STRINGLIST *_listSessions(AQH_SERVICE *sv) +GWEN_STRINGLIST *_listSessions(AQCGI_SERVICE *sv) { return _listGroup(sv, AQH_SERVICE_FILE_GROUP_SESSIONS); } -GWEN_DB_NODE *_loadGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroupName) +GWEN_DB_NODE *_loadGroupLocked(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName) { DBG_ERROR(NULL, "Lock and load group %s/%s", groupName, subGroupName); if (sv && groupName && subGroupName) { AQH_SERVICE_FILE *xs; - xs=GWEN_INHERIT_GETDATA(AQH_SERVICE, AQH_SERVICE_FILE, sv); + xs=GWEN_INHERIT_GETDATA(AQCGI_SERVICE, AQH_SERVICE_FILE, sv); if (xs) { GWEN_DB_NODE *db=NULL; int rv; @@ -460,12 +458,12 @@ GWEN_DB_NODE *_loadGroupLocked(AQH_SERVICE *sv, const char *groupName, const cha -int _saveGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db) +int _saveGroupLocked(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db) { if (sv && groupName && subGroupName && db) { AQH_SERVICE_FILE *xs; - xs=GWEN_INHERIT_GETDATA(AQH_SERVICE, AQH_SERVICE_FILE, sv); + xs=GWEN_INHERIT_GETDATA(AQCGI_SERVICE, AQH_SERVICE_FILE, sv); if (xs) { int rv; @@ -498,12 +496,12 @@ int _saveGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGrou -int _addGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db) +int _addGroupLocked(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName, GWEN_DB_NODE *db) { if (sv && groupName && subGroupName && db) { AQH_SERVICE_FILE *xs; - xs=GWEN_INHERIT_GETDATA(AQH_SERVICE, AQH_SERVICE_FILE, sv); + xs=GWEN_INHERIT_GETDATA(AQCGI_SERVICE, AQH_SERVICE_FILE, sv); if (xs) { int rv; @@ -539,12 +537,12 @@ int _addGroupLocked(AQH_SERVICE *sv, const char *groupName, const char *subGroup -int _deleteGroup(AQH_SERVICE *sv, const char *groupName, const char *subGroupName) +int _deleteGroup(AQCGI_SERVICE *sv, const char *groupName, const char *subGroupName) { if (sv && groupName && subGroupName) { AQH_SERVICE_FILE *xs; - xs=GWEN_INHERIT_GETDATA(AQH_SERVICE, AQH_SERVICE_FILE, sv); + xs=GWEN_INHERIT_GETDATA(AQCGI_SERVICE, AQH_SERVICE_FILE, sv); if (xs) { int rv; @@ -561,12 +559,12 @@ int _deleteGroup(AQH_SERVICE *sv, const char *groupName, const char *subGroupNam -GWEN_STRINGLIST *_listGroup(AQH_SERVICE *sv, const char *groupName) +GWEN_STRINGLIST *_listGroup(AQCGI_SERVICE *sv, const char *groupName) { if (sv && groupName) { AQH_SERVICE_FILE *xs; - xs=GWEN_INHERIT_GETDATA(AQH_SERVICE, AQH_SERVICE_FILE, sv); + xs=GWEN_INHERIT_GETDATA(AQCGI_SERVICE, AQH_SERVICE_FILE, sv); if (xs) { GWEN_STRINGLIST *sl; int rv; diff --git a/apps/aqhome-cgi/service_file.h b/apps/aqhome-cgi/service_file.h index b29052e..03dbdcb 100644 --- a/apps/aqhome-cgi/service_file.h +++ b/apps/aqhome-cgi/service_file.h @@ -10,10 +10,10 @@ #define AQHOME_SERVICE_FILE_H -#include "aqhome-cgi/service/service.h" +#include "aqcgi/service/service.h" -AQH_SERVICE *AQH_ServiceFiles_new(const char *baseFolder, const char *baseUrl); +AQCGI_SERVICE *AQH_ServiceFiles_new(const char *baseFolder, const char *baseUrl);