Removed all other eurephia admin structs which can be replaced by XML

3 files changed, 12 insertions, 48 deletions

diff --git a/common/eurephia_admin_struct.h b/common/eurephia_admin_struct.h
index da7429c..0ecf0ee 100644
--- a/common/eurephia_admin_struct.h
+++ b/common/eurephia_admin_struct.h
@@ -29,40 +29,4 @@
 #define ACCFLAG_RSETLASTUSED 0x020
 #define ACCFLAG_RSETLOGINCNT 0x040
 
-
-typedef struct _eurephiaCERTINFO_s {
-        int info_available;
-        int  depth;
-        char *digest;
-        char *common_name;
-        char *organisation;
-        char *email;
-        char *registered;
-        int  certid;
-        struct _eurephiaCERTINFO_s *next;
-        
-} eurephiaCERTINFO;
-
-typedef struct {
-        eurephiaCERTINFO *certs;
-        int num_certs;
-        int maxlen[];
-} eurephiaCERTLIST;
-
-
-typedef struct _eurephiaLOGENTRY_s {
-        int id;
-        char *data;
-        int length;
-        struct _eurephiaLOGENTRY_s *ref;
-        struct _eurehpiaLOGENTRY_s *next;
-} eurephiaLOGENTRY;
-
-typedef struct {
-        eurephiaLOGENTRY *data;
-        eurephiaLOGENTRY *header;
-        int maxlen_data;
-        int maxlen_header;
-} eurephiaLOGLIST;
-
 #endif
diff --git a/database/eurephiadb_driver.h b/database/eurephiadb_driver.h
index 625c2bd..d5135d0 100644
--- a/database/eurephiadb_driver.h
+++ b/database/eurephiadb_driver.h
@@ -112,13 +112,13 @@ int (*eDBadminUpdateUser) (eurephiaCTX *ctx, const int uid, xmlDoc *userinfo);
 int (*eDBadminDeleteUser) (eurephiaCTX *ctx, const int uid, xmlDoc *userinfo);
 
 
-eurephiaCERTLIST *(*eDBadminGetCertificateList) (eurephiaCTX *ctx, const char *sortkeys);
-eurephiaCERTINFO *(*eDBadminGetCertificateInfo) (eurephiaCTX *ctx, eurephiaCERTINFO *searchkey);
-int (*eDBadminAddCertificate) (eurephiaCTX *ctx, eurephiaCERTINFO *certinfo);
-int (*eDBadminDeleteCertificate) (eurephiaCTX *ctx, const int certid, eurephiaCERTINFO *certinfo);
+xmlDoc *(*eDBadminGetCertificateList) (eurephiaCTX *ctx, const char *sortkeys);
+xmlDoc *(*eDBadminGetCertificateInfo) (eurephiaCTX *ctx, xmlDoc *searchkey);
+int (*eDBadminAddCertificate) (eurephiaCTX *ctx, xmlDoc *certinfo);
+int (*eDBadminDeleteCertificate) (eurephiaCTX *ctx, const int certid, xmlDoc *certinfo);
 
-eurephiaLOGLIST *(*eDBadminGetLastlog) (eurephiaCTX *ctx, xmlDoc *usersrch, eurephiaCERTINFO *certsrch, const char *sortkeys);
-eurephiaLOGLIST *(*eDBadminGetAttemptsLog) (eurephiaCTX *ctx, xmlDoc *usersrch, eurephiaCERTINFO *certsrch, const char *sortkeys);
+xmlDoc *(*eDBadminGetLastlog) (eurephiaCTX *ctx, xmlDoc *usersrch, xmlDoc *certsrch, const char *sortkeys);
+xmlDoc *(*eDBadminGetAttemptsLog) (eurephiaCTX *ctx, xmlDoc *usersrch, xmlDoc *certsrch, const char *sortkeys);
 #endif /* HAVE_LIBXML2 */
 
 #endif /* !DRIVER_MODE */
diff --git a/database/sqlite/administration.c b/database/sqlite/administration.c
index 211f8a2..825fcd0 100644
--- a/database/sqlite/administration.c
+++ b/database/sqlite/administration.c
@@ -599,29 +599,29 @@ int eDBadminDeleteUser(eurephiaCTX *ctx, const int uid, xmlDoc *usrinf) {
 }
 
 
-eurephiaCERTLIST *eDBadminGetCertificateList(eurephiaCTX *ctx, const char *sortkeys) {
+xmlDoc *eDBadminGetCertificateList(eurephiaCTX *ctx, const char *sortkeys) {
         return NULL;
 }
 
-eurephiaCERTINFO *eDBadminGetCertificateInfo(eurephiaCTX *ctx, eurephiaCERTINFO *srchkey) {
+xmlDoc *eDBadminGetCertificateInfo(eurephiaCTX *ctx, xmlDoc *srchkey) {
         return NULL;
 }
 
-int eDBadminAddCertificate(eurephiaCTX *ctx, eurephiaCERTINFO *crtinf) {
+int eDBadminAddCertificate(eurephiaCTX *ctx, xmlDoc *crtinf) {
         return 0;
 }
 
-int eDBadminDeleteCertificate(eurephiaCTX *ctx, const int uid, eurephiaCERTINFO *crtinf) {
+int eDBadminDeleteCertificate(eurephiaCTX *ctx, const int uid, xmlDoc *crtinf) {
         return 0;
 }
 
-eurephiaLOGLIST *eDBadminGetLastlog(eurephiaCTX *ctx, xmlDoc *usersrch, eurephiaCERTINFO *certsrch,
+xmlDoc *eDBadminGetLastlog(eurephiaCTX *ctx, xmlDoc *usersrch, xmlDoc *certsrch,
                                     const char *sortkeys)
 {
         return NULL;
 }
 
-eurephiaLOGLIST *eDBadminGetAttemptsLog(eurephiaCTX *ctx, xmlDoc *usersrch, eurephiaCERTINFO *certsrch,
+xmlDoc *eDBadminGetAttemptsLog(eurephiaCTX *ctx, xmlDoc *usersrch, xmlDoc *certsrch,
                                         const char *sortkeys)
 {
         return NULL;