diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-05-27 03:58:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:04 -0500 |
| commit | 1511cde44ccc94b71b8eb317deb73c103dcd8010 (patch) | |
| tree | 5add0ebb78c06c48e0973c0dda6befe1ac2a9163 /source4/web_server/esp | |
| parent | b28e017e0074c86b1d9123bcc394f07e0fb55463 (diff) | |
| download | samba-1511cde44ccc94b71b8eb317deb73c103dcd8010.tar.gz samba-1511cde44ccc94b71b8eb317deb73c103dcd8010.tar.bz2 samba-1511cde44ccc94b71b8eb317deb73c103dcd8010.zip | |
r7002: added support for getting at loadparm config parameters via lpGet() in esp scripts
lpGet takes 4 forms
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
in all cases a ejs object of the appropriate type for the variable is returned.
This commit also adds the function typeof() which returns the type of an object
(This used to be commit 5537a0d38d4805cbc2dad0d6f76db15173b1fd60)
Diffstat (limited to 'source4/web_server/esp')
| -rw-r--r-- | source4/web_server/esp/esp.c | 6 | ||||
| -rw-r--r-- | source4/web_server/esp/esp.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/web_server/esp/esp.c b/source4/web_server/esp/esp.c index 3e370cb020..c90e4afe42 100644 --- a/source4/web_server/esp/esp.c +++ b/source4/web_server/esp/esp.c @@ -218,7 +218,7 @@ void espDestroyRequest(EspRequest *ep) * rq = (requiredCast) espGetHandle(ep); */ -void espDefineCFunction(EspRequest *ep, char *functionName, EspCFunction fn, +void espDefineCFunction(EspRequest *ep, const char *functionName, EspCFunction fn, void *thisPtr) { mprAssert(functionName && *functionName); @@ -389,7 +389,7 @@ void espSetReturn(EspRequest *ep, MprVar value) /******************************************************************************/ -void espSetReturnString(EspRequest *ep, char *str) +void espSetReturnString(EspRequest *ep, const char *str) { mprAssert(ep); @@ -866,7 +866,7 @@ MprVar *espCreatePropertyValue(MprVar *obj, char *property, MprVar newValue) /******************************************************************************/ -void espDefineFunction(EspRequest *ep, char *functionName, char *args, char *body) +void espDefineFunction(EspRequest *ep, const char *functionName, char *args, char *body) { ejsDefineFunction(ep->eid, functionName, args, body); } diff --git a/source4/web_server/esp/esp.h b/source4/web_server/esp/esp.h index 9e58bdf066..a6cac1e852 100644 --- a/source4/web_server/esp/esp.h +++ b/source4/web_server/esp/esp.h @@ -159,9 +159,9 @@ extern int espProcessRequest(EspRequest *ep, const char *docPath, /* * Method invocation */ -extern void espDefineCFunction(EspRequest *ep, char *functionName, +extern void espDefineCFunction(EspRequest *ep, const char *functionName, EspCFunction fn, void *thisPtr); -extern void espDefineFunction(EspRequest *ep, char *functionName, +extern void espDefineFunction(EspRequest *ep, const char *functionName, char *args, char *body); extern void espDefineStringCFunction(EspRequest *ep, const char *functionName, EspStringCFunction fn, @@ -188,7 +188,7 @@ extern EjsId espGetScriptHandle(EspRequest *ep); extern void espRedirect(EspRequest *ep, int code, char *url); extern void espSetHeader(EspRequest *ep, char *header, bool allowMultiple); -extern void espSetReturnString(EspRequest *ep, char *str); +extern void espSetReturnString(EspRequest *ep, const char *str); extern int espWrite(EspRequest *ep, char *buf, int size); extern int espWriteString(EspRequest *ep, char *buf); extern int espWriteFmt(EspRequest *ep, char *fmt, ...); |