forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

traling slash. still not happy with it

This commit is contained in:
Adam D. Ruppe 2011-07-21 20:52:37 -04:00
parent cd9e51606e
commit 78b1c88ba5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web.d
View File

@ -698,6 +698,9 @@ void run(Provider)(Cgi cgi, Provider instantiation, int pathInfoStartingPoint =
string funName = cgi.pathInfo[pathInfoStartingPoint + 1..$]; string funName = cgi.pathInfo[pathInfoStartingPoint + 1..$];
if(funName[$-1] == '/')
funName = funName[0 .. $-1];
// kinda a hack, but this kind of thing should be available anyway // kinda a hack, but this kind of thing should be available anyway
if(funName == "functions.js") { if(funName == "functions.js") {
cgi.setResponseContentType("text/javascript"); cgi.setResponseContentType("text/javascript");
@ -813,6 +816,9 @@ void run(Provider)(Cgi cgi, Provider instantiation, int pathInfoStartingPoint =
} else { } else {
if(parts[0].length == 0) { if(parts[0].length == 0) {
auto inst = cast(ApiProvider) currentReflection.instantiation; auto inst = cast(ApiProvider) currentReflection.instantiation;
// FIXME: this ought to always be available
inst._baseUrl = cgi.scriptName ~ cgi.pathInfo[0 .. pathInfoStartingPoint] ~ "/" ~ currentReflection.name;
auto document = inst._defaultPage(); auto document = inst._defaultPage();
if(document !is null) { if(document !is null) {
instantiation._postProcess(document); instantiation._postProcess(document);
@ -1517,7 +1523,7 @@ WrapperFunction generateWrapper(alias getInstantiation, alias f, alias group, st
foreach(i, type; ParameterTypeTuple!(__traits(getMember, group, funName ~ "_PermissionCheck"))) { foreach(i, type; ParameterTypeTuple!(__traits(getMember, group, funName ~ "_PermissionCheck"))) {
string name = parameterNamesOf!(__traits(getMember, group, funName ~ "_PermissionCheck"))[i]; string name = parameterNamesOf!(__traits(getMember, group, funName ~ "_PermissionCheck"))[i];
static if(is(type == bool)) { static if(is(type == bool)) {
if(name in sargs) if(name in sargs && sargs[name] != "false" && sargs[name] != "0")
args[i] = true; args[i] = true;
else else
args[i] = false; args[i] = false;
@ -1549,8 +1555,15 @@ WrapperFunction generateWrapper(alias getInstantiation, alias f, alias group, st
static if(is(type == bool)) { static if(is(type == bool)) {
// bool is special cased because HTML checkboxes don't send anything if it isn't checked // bool is special cased because HTML checkboxes don't send anything if it isn't checked
if(using in sargs) if(name in sargs) {
if(
sargs[name][$-1] != "false" &&
sargs[name][$-1] != "False" &&
sargs[name][$-1] != "FALSE" &&
sargs[name][$-1] != "0"
)
args[i] = true; // FIXME: should try looking at the value args[i] = true; // FIXME: should try looking at the value
}
else else
args[i] = false; args[i] = false;
} else static if(is(Unqual!(type) == Cgi.UploadedFile)) { } else static if(is(Unqual!(type) == Cgi.UploadedFile)) {