From 88c3b12c86f82ba026851f74a6f4465e0db83fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A4r-Anders=20Aronsson?= <pa.aronsson@gmail.com>
Date: Sun, 29 Jan 2012 21:11:31 +0100
Subject: [PATCH] Minor naming isssue handled.

---
 yesod-core/Yesod/Handler.hs | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index d9ae3078..98debbf9 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -59,6 +59,7 @@ module Yesod.Handler
     , sendWaiResponse
       -- * Setting headers
     , setCookie
+    , getExpires
     , deleteCookie
     , setHeader
     , setLanguage
@@ -120,7 +121,7 @@ module Yesod.Handler
 import Prelude hiding (catch)
 import Yesod.Internal.Request
 import Yesod.Internal
-import Data.Time (UTCTime)
+import Data.Time (UTCTime, getCurrentTime, addUTCTime)
 
 import Control.Exception hiding (Handler, catch, finally)
 import Control.Applicative
@@ -629,6 +630,14 @@ setCookie :: SetCookie
           -> GHandler sub master ()
 setCookie = addHeader . AddCookie
 
+-- | Helper function for setCookieExpires value
+getExpires :: Int -- ^ minutes
+          -> IO UTCTime
+getExpires m = do
+    now <- liftIO getCurrentTime
+    return $ fromIntegral (m * 60) `addUTCTime` now
+
+
 -- | Unset the cookie on the client.
 --
 -- Note: although the value used for key and path is 'Text', you should only
@@ -638,6 +647,7 @@ deleteCookie :: Text -- ^ key
              -> GHandler sub master ()
 deleteCookie a = addHeader . DeleteCookie (encodeUtf8 a) . encodeUtf8
 
+
 -- | Set the language in the user session. Will show up in 'languages' on the
 -- next request.
 setLanguage :: Text -> GHandler sub master ()
@@ -783,25 +793,7 @@ yarToResponse renderHeaders (YARPlain s hs ct c sessionFinal) =
     finalHeaders = renderHeaders hs ct sessionFinal
     finalHeaders' len = ("Content-Length", S8.pack $ show len)
                       : finalHeaders
-    {-
-    getExpires m = fromIntegral (m * 60) `addUTCTime` now
-    sessionVal =
-        case key' of
-            Nothing -> B.empty
-            Just key'' -> encodeSession key'' exp' host
-                        $ Map.toList
-                        $ Map.insert nonceKey (reqNonce rr) sessionFinal
-    hs' =
-            case key' of
-                Nothing -> hs
-                Just _ -> AddCookie
-                        (clientSessionDuration y)
-                        sessionName
-                        (bsToChars sessionVal)
-                      : hs
-    hs'' = map (headerToPair getExpires) hs'
-    hs''' = ("Content-Type", charsToBs ct) : hs''
-    -}
+
 
 httpAccept :: W.Request -> [ContentType]
 httpAccept = parseHttpAccept