Permalink
Browse files

Change all existing calls to Form.unquote to use WebUtil.urldecode in…

…stead.
  • Loading branch information...
j4cbo committed Aug 8, 2010
1 parent afe2cf0 commit 19651f2401ea05341aed5b73b55305ebfe1d676d
Showing with 5 additions and 5 deletions.
  1. +1 −1 mlmusic/music.sml
  2. +1 −1 mlmusic/request.sml
  3. +1 −1 web/form.sml
  4. +1 −1 web/server/http-server-fn.sml
  5. +1 −1 web/server/http-server.sml
View
@@ -20,7 +20,7 @@ structure Music = struct
end
fun get_player_info req = let
- val desiredPlayer = Option.map Form.unquote (getCookie req "SqueezeCenter-player")
+ val desiredPlayer = Option.map U.urldecode (getCookie req "SqueezeCenter-player")
(* Go through the cached player list doing two things:
* - Find the player that the user wants; if they didn't specify one,
View
@@ -16,7 +16,7 @@ structure Request = struct
end
fun get_player_info req = let
- val desiredPlayer = Option.map Form.unquote (getCookie req "SqueezeCenter-player")
+ val desiredPlayer = Option.map U.urldecode (getCookie req "SqueezeCenter-player")
(* Go through the cached player list doing two things:
* - Find the player that the user wants; if they didn't specify one,
View
@@ -22,7 +22,7 @@ structure Form : FORM = struct
val (k, v) = Substring.splitl (fn c => c <> #"=") field
in
SOME (Substring.string k,
- unquote (Substring.string (Substring.slice (v, 1, NONE))))
+ WebUtil.urldecode (Substring.string (Substring.slice (v, 1, NONE))))
end
handle Subscript => NONE
) (Substring.fields (fn c => c = #"&") (Substring.full qstring))
@@ -87,7 +87,7 @@ struct
val (spath, squery) = Substring.splitl (fn c => c <> #"?")
(Substring.full url)
- val pathsections = case map (Form.unquote o Substring.string)
+ val pathsections = case map (WebUtil.urldecode o Substring.string)
(Substring.fields (fn c => c = #"/") spath)
of nil => [ "" ]
| ""::sections => sections
@@ -70,7 +70,7 @@ structure HTTPServer :> WEB_SERVER where type opts = INetSock.sock_addr = struct
val (spath, squery) = Substring.splitl (fn c => c <> #"?")
(Substring.full url)
- val pathsections = case map (Form.unquote o Substring.string)
+ val pathsections = case map (WebUtil.urldecode o Substring.string)
(Substring.fields (fn c => c = #"/") spath)
of nil => [ "" ]
| ""::sections => sections

0 comments on commit 19651f2

Please sign in to comment.