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

idk

This commit is contained in:
Adam D. Ruppe 2012-11-07 13:30:34 -05:00
parent 0d8478592d
commit 86062de07b
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom.d
View File

@ -550,7 +550,7 @@ struct ElementStyle {
_attribute = ""; _attribute = "";
foreach(k, v; r) { foreach(k, v; r) {
if(v is null) if(v is null || v.length == 0) /* css can't do empty rules anyway so we'll use that to remove */
continue; continue;
if(_attribute.length) if(_attribute.length)
_attribute ~= " "; _attribute ~= " ";

36
web.d
View File

@ -457,8 +457,24 @@ class ApiProvider : WebDotDBaseType {
return ret; return ret;
} }
int redirectsSuppressed;
/// Temporarily disables the redirect() call.
void disableRedirects() {
redirectsSuppressed++;
}
/// Re-enables redirects. Call this once for every call to disableRedirects.
void enableRedirects() {
if(redirectsSuppressed)
redirectsSuppressed--;
}
/// This tentatively redirects the user - depends on the envelope fomat /// This tentatively redirects the user - depends on the envelope fomat
/// You can temporarily disable this using disableRedirects()
void redirect(string location, bool important = false) { void redirect(string location, bool important = false) {
if(redirectsSuppressed)
return;
auto f = cgi.request("envelopeFormat", "document"); auto f = cgi.request("envelopeFormat", "document");
if(f == "document" || f == "redirect") if(f == "document" || f == "redirect")
cgi.setResponseLocation(location, important); cgi.setResponseLocation(location, important);
@ -504,7 +520,7 @@ class ApiProvider : WebDotDBaseType {
auto list = container.addChild("ul"); auto list = container.addChild("ul");
auto starting = _baseUrl; auto starting = _baseUrl;
if(starting is null) if(starting is null)
starting = cgi.scriptName ~ cgi.pathInfo; // FIXME starting = cgi.logicalScriptName ~ cgi.pathInfo; // FIXME
writeFunctions(list, reflection, starting ~ "/"); writeFunctions(list, reflection, starting ~ "/");
return list.parentNode.removeChild(list); return list.parentNode.removeChild(list);
@ -1092,11 +1108,11 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint
} }
auto reflection = instantiation.reflection; auto reflection = instantiation.reflection;
instantiation._baseUrl = cgi.scriptName ~ cgi.pathInfo[0 .. pathInfoStartingPoint]; instantiation._baseUrl = cgi.logicalScriptName ~ cgi.pathInfo[0 .. pathInfoStartingPoint];
// everything assumes the url isn't empty... // everything assumes the url isn't empty...
if(cgi.pathInfo.length < pathInfoStartingPoint + 1) { if(cgi.pathInfo.length < pathInfoStartingPoint + 1) {
cgi.setResponseLocation(cgi.scriptName ~ cgi.pathInfo ~ "/" ~ (cgi.queryString.length ? "?" ~ cgi.queryString : "")); cgi.setResponseLocation(cgi.logicalScriptName ~ cgi.pathInfo ~ "/" ~ (cgi.queryString.length ? "?" ~ cgi.queryString : ""));
return; return;
} }
@ -1124,11 +1140,11 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint
catch(NonCanonicalUrlException e) { catch(NonCanonicalUrlException e) {
final switch(e.howToFix) { final switch(e.howToFix) {
case CanonicalUrlOption.cutTrailingSlash: case CanonicalUrlOption.cutTrailingSlash:
cgi.setResponseLocation(cgi.scriptName ~ cgi.pathInfo[0 .. $ - 1] ~ cgi.setResponseLocation(cgi.logicalScriptName ~ cgi.pathInfo[0 .. $ - 1] ~
(cgi.queryString.length ? ("?" ~ cgi.queryString) : "")); (cgi.queryString.length ? ("?" ~ cgi.queryString) : ""));
break; break;
case CanonicalUrlOption.addTrailingSlash: case CanonicalUrlOption.addTrailingSlash:
cgi.setResponseLocation(cgi.scriptName ~ cgi.pathInfo ~ "/" ~ cgi.setResponseLocation(cgi.logicalScriptName ~ cgi.pathInfo ~ "/" ~
(cgi.queryString.length ? ("?" ~ cgi.queryString) : "")); (cgi.queryString.length ? ("?" ~ cgi.queryString) : ""));
break; break;
} }
@ -1215,7 +1231,7 @@ void run(Provider)(Cgi cgi, Provider instantiation, size_t pathInfoStartingPoint
auto idx = cgi.referrer.indexOf("?"); auto idx = cgi.referrer.indexOf("?");
if(idx != -1 && cgi.referrer[idx + 1 .. $] != cgi.queryString) { if(idx != -1 && cgi.referrer[idx + 1 .. $] != cgi.queryString) {
// so fucking broken // so fucking broken
cgi.setResponseLocation(cgi.scriptName ~ cgi.pathInfo ~ cgi.referrer[idx .. $]); cgi.setResponseLocation(cgi.logicalScriptName ~ cgi.pathInfo ~ cgi.referrer[idx .. $]);
return; return;
} }
} }
@ -2145,8 +2161,12 @@ type fromUrlParam(type)(string ofInterest) {
ret = doc.root; ret = doc.root;
} else static if(is(type : Text)) { } else static if(is(type : Text)) {
ret = ofInterest; ret = ofInterest;
} else static if(is(type : TimeOfDay)) {
ret = TimeOfDay.fromISOExtString(ofInterest);
} else static if(is(type : Date)) {
ret = Date.fromISOExtString(ofInterest);
} else static if(is(type : DateTime)) { } else static if(is(type : DateTime)) {
ret = DateTime.fromISOString(ofInterest); ret = DateTime.fromISOExtString(ofInterest);
} }
/* /*
else static if(is(type : struct)) { else static if(is(type : struct)) {
@ -3309,7 +3329,7 @@ Table structToTable(T)(Document document, T s, string[] fieldsToSkip = null) if(
/// This adds a custom attribute to links in the document called qsa which modifies the values on the query string /// This adds a custom attribute to links in the document called qsa which modifies the values on the query string
void translateQsa(Document document, Cgi cgi, string logicalScriptName = null) { void translateQsa(Document document, Cgi cgi, string logicalScriptName = null) {
if(logicalScriptName is null) if(logicalScriptName is null)
logicalScriptName = cgi.scriptName; logicalScriptName = cgi.logicalScriptName;
foreach(a; document.querySelectorAll("a[qsa]")) { foreach(a; document.querySelectorAll("a[qsa]")) {
string href = logicalScriptName ~ cgi.pathInfo ~ "?"; string href = logicalScriptName ~ cgi.pathInfo ~ "?";