r7008: - split out the loadparm type definitions so loadparm internals can be accessed externally

- moved esp_lpGet() to web_server/calls.c

- attempt to fixup ejs build with includes.h again
(This used to be commit 592a81c347981420154ddf3b8d4252d3bb08bc86)

3 files changed, 110 insertions, 8 deletions

diff --git a/source4/web_server/calls.c b/source4/web_server/calls.c
index 8cd0c21b1c..6f1649d131 100644
--- a/source4/web_server/calls.c
+++ b/source4/web_server/calls.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "web_server/esp/esp.h"
+#include "param/loadparm.h"
 
 
 /*
@@ -63,6 +64,111 @@ static int esp_typeof(struct EspRequest *ep, int argc, struct MprVar **argv)
 
 
 /*
+  allow access to loadparm variables from inside esp scripts in swat
+  
+  can be called in 4 ways:
+
+    v = lpGet("type:parm");             gets a parametric variable
+    v = lpGet("share", "type:parm");    gets a parametric variable on a share
+    v = lpGet("parm");                  gets a global variable
+    v = lpGet("share", "parm");         gets a share variable
+
+  the returned variable is a ejs object. It is an array object for lists.  
+*/
+static int esp_lpGet(struct EspRequest *ep, int argc, char **argv)
+{
+	struct parm_struct *parm = NULL;
+	void *parm_ptr = NULL;
+	int i;
+
+	if (argc < 1) return -1;
+
+	if (argc == 2) {
+		/* its a share parameter */
+		int snum = lp_servicenumber(argv[0]);
+		if (snum == -1) {
+			return -1;
+		}
+		if (strchr(argv[1], ':')) {
+			/* its a parametric option on a share */
+			const char *type = talloc_strndup(ep, argv[1], strcspn(argv[1], ":"));
+			const char *option = strchr(argv[1], ':') + 1;
+			const char *value;
+			if (type == NULL || option == NULL) return -1;
+			value = lp_get_parametric(snum, type, option);
+			if (value == NULL) return -1;
+			espSetReturnString(ep, value);
+			return 0;
+		}
+
+		parm = lp_parm_struct(argv[1]);
+		if (parm == NULL || parm->class == P_GLOBAL) {
+			return -1;
+		}
+		parm_ptr = lp_parm_ptr(snum, parm);
+	} else if (strchr(argv[0], ':')) {
+		/* its a global parametric option */
+		const char *type = talloc_strndup(ep, argv[0], strcspn(argv[0], ":"));
+		const char *option = strchr(argv[0], ':') + 1;
+		const char *value;
+		if (type == NULL || option == NULL) return -1;
+		value = lp_get_parametric(-1, type, option);
+		if (value == NULL) return -1;
+		espSetReturnString(ep, value);
+		return 0;
+	} else {
+		/* its a global parameter */
+		parm = lp_parm_struct(argv[0]);
+		if (parm == NULL) return -1;
+		parm_ptr = parm->ptr;
+	}
+
+	if (parm == NULL || parm_ptr == NULL) {
+		return -1;
+	}
+
+	/* construct and return the right type of ejs object */
+	switch (parm->type) {
+	case P_STRING:
+	case P_USTRING:
+		espSetReturnString(ep, *(char **)parm_ptr);
+		break;
+	case P_BOOL:
+		espSetReturn(ep, mprCreateBoolVar(*(BOOL *)parm_ptr));
+		break;
+	case P_INTEGER:
+		espSetReturn(ep, mprCreateIntegerVar(*(int *)parm_ptr));
+		break;
+	case P_ENUM:
+		for (i=0; parm->enum_list[i].name; i++) {
+			if (*(int *)parm_ptr == parm->enum_list[i].value) {
+				espSetReturnString(ep, parm->enum_list[i].name);
+				return 0;
+			}
+		}
+		return -1;
+	
+	case P_LIST: {
+		const char **list = *(const char ***)parm_ptr;
+		struct MprVar var;
+		var = mprCreateObjVar(parm->label, 10);
+		for (i=0;list[i];i++) {
+			char idx[16];
+			struct MprVar val;
+			mprItoa(i, idx, sizeof(idx));
+			val = mprCreateStringVar(list[i], 1);
+			mprCreateProperty(&var, idx, &val);
+		}
+		espSetReturn(ep, var);
+		break;
+	case P_SEP:
+		return -1;
+	}
+	}
+	return 0;
+}
+
+/*
   setup the C functions that be called from ejs
 */
 void http_setup_ejs_functions(void)
diff --git a/source4/web_server/ejs/miniMpr.c b/source4/web_server/ejs/miniMpr.c
index 8e1689ac9d..311f2defeb 100644
--- a/source4/web_server/ejs/miniMpr.c
+++ b/source4/web_server/ejs/miniMpr.c
@@ -35,7 +35,7 @@
 #if !BLD_APPWEB
 #if !BLD_GOAHEAD_WEBSERVER
 
-static TALLOC_CTX *mpr_ctx;
+static void *mpr_ctx;
 
 void mprSetCtx(TALLOC_CTX *ctx)
 {
diff --git a/source4/web_server/ejs/miniMpr.h b/source4/web_server/ejs/miniMpr.h
index b30ef1437f..447a0f4c34 100644
--- a/source4/web_server/ejs/miniMpr.h
+++ b/source4/web_server/ejs/miniMpr.h
@@ -35,10 +35,7 @@
 /*
  *	Find out about our configuration
  */
-/*
-	this is not needed in samba builds, and breaks the build with my gcc-4.0 --metze
-	#include	"includes.h"
-*/
+    #include	"includes.h"
 
 /* allow this library to use strcpy() */
 #undef strcpy
@@ -195,7 +192,7 @@ typedef int 			bool;
 	typedef __int64 			int64;
 	typedef unsigned __int64 	uint64;
 #else
-	#define O_BINARY 0
+#define O_BINARY 0
 #ifndef uint
 	#define uint unsigned
 #endif
@@ -270,8 +267,7 @@ extern int		mprReallocStrcat(char **dest, int max, int existingLen,
 extern int		mprStrcpy(char *dest, int destMax, const char *src);
 extern int 		mprMemcpy(char *dest, int destMax, const char *src, int nbytes);
 
-extern void mprFreeAll(void);
-extern void mprSetCtx(TALLOC_CTX *ctx);
+extern void mprSetCtx(void *ctx);
 
 #ifdef __cplusplus
 }