Further warnings cleanup

Portnov [2009-07-18 17:37:58]
Further warnings cleanup
Filename
Framework/Forms/HTML.hs
Framework/Forms/Rendering.hs
Framework/Forms/Validation.hs
Framework/Http/Sessions.hs
Framework/Modules/Auth/Handlers.hs
Framework/Modules/TextCaptcha/FormProcessors.hs
diff --git a/Framework/Forms/HTML.hs b/Framework/Forms/HTML.hs
index af866d2..c0997cc 100644
--- a/Framework/Forms/HTML.hs
+++ b/Framework/Forms/HTML.hs
@@ -107,13 +107,16 @@ createform form fid pairs action = HTMLForm vFields hFields name fid action
 -- | Inputbox widget
 data Inputbox = Inputbox { ibWidth :: Maybe Int }
 -- | Default input box
+inputbox ::  Inputbox
 inputbox = Inputbox Nothing

 data PasswordBox = PasswordBox { pbWidth :: Maybe Int }
+passwordbox ::  PasswordBox
 passwordbox = PasswordBox Nothing

 data Textarea = Textarea { tbCols :: Maybe Int, tbRows :: Maybe Int }
 -- | Default textarea
+textarea ::  Textarea
 textarea = Textarea (Just 60) (Just 15)

 instance Widget Inputbox where
diff --git a/Framework/Forms/Rendering.hs b/Framework/Forms/Rendering.hs
index 9b97a54..a13707b 100644
--- a/Framework/Forms/Rendering.hs
+++ b/Framework/Forms/Rendering.hs
@@ -11,7 +11,6 @@ import Framework.Forms.HTML
 import Framework.Forms.Validation
 import Framework.ORM
 import Framework.API.Sessions
-import Framework.Http.Vars
 import Framework.Http.Response

 import Extensions.FormProcessors (formProcessors, htmlProcessors)
@@ -60,7 +59,6 @@ renderCreateForm' form fid defvals hidden action = do
     form' <- processForm form
     filled <- sessionLookup "filled"
     sessionUnset "filled"
-    rq <- asks request
     let filledVals = decodePairs filled
     err <- sessionLookup "invalid"
     sessionUnset "invalid"
diff --git a/Framework/Forms/Validation.hs b/Framework/Forms/Validation.hs
index e911f03..156e62b 100644
--- a/Framework/Forms/Validation.hs
+++ b/Framework/Forms/Validation.hs
@@ -8,21 +8,14 @@ module Framework.Forms.Validation

 -- import Debug.Trace

-import Control.Monad.Reader.Class
 import Control.Arrow
 import qualified Data.Map as M
 import Data.Maybe
 import Data.List
-import Network.URI
-import Network.HTTP
 import qualified Database.HDBC as D

 import Framework.Types
-import Framework.Utils
-import Framework.Controller
-import Framework.API.Sessions
 import Framework.ORM
-import Framework.Http.Response (redirectG)
 import Framework.Http.Vars

 import Framework.Forms.Types
@@ -83,8 +76,6 @@ fromLeft :: Either t t1 -> t
 fromLeft (Left x) = x
 fromLeft _ = error "fromLeft applicable only to Left arguments!"

-apl f x y = f x y
-
 -- | Default form validation function
 defValidate :: Form
             -> String         -- ^ Form ID
diff --git a/Framework/Http/Sessions.hs b/Framework/Http/Sessions.hs
index 8dfa14b..a321d6b 100644
--- a/Framework/Http/Sessions.hs
+++ b/Framework/Http/Sessions.hs
@@ -87,4 +87,4 @@ session (SConnection b) rq =
 sessionCookie ::  String            -- ^ Cookie expiration date
                -> SessionID         -- ^ Session ID
                -> Header
-sessionCookie exp sid = setcookie exp "SessionID" sid
+sessionCookie expd sid = setcookie expd "SessionID" sid
diff --git a/Framework/Modules/Auth/Handlers.hs b/Framework/Modules/Auth/Handlers.hs
index a528bba..1298e86 100644
--- a/Framework/Modules/Auth/Handlers.hs
+++ b/Framework/Modules/Auth/Handlers.hs
@@ -1,8 +1,5 @@
 module Framework.Modules.Auth.Handlers where

-import Control.Monad.Reader.Class
-
-import Framework.Types
 import Framework.Controller
 import Framework.Utils
 import Framework.API.UserMessage
diff --git a/Framework/Modules/TextCaptcha/FormProcessors.hs b/Framework/Modules/TextCaptcha/FormProcessors.hs
index 8fba2bd..e3fcb98 100644
--- a/Framework/Modules/TextCaptcha/FormProcessors.hs
+++ b/Framework/Modules/TextCaptcha/FormProcessors.hs
@@ -4,12 +4,11 @@ module Framework.Modules.TextCaptcha.FormProcessors
      validateCaptcha
     ) where

-import Debug.Trace
+-- import Debug.Trace

 import System.Random
 import Data.Char

-import Framework.Types
 import Framework.Controller
 import Framework.Http.Vars
 import Framework.Forms.Types
@@ -25,6 +24,7 @@ instance Show TextCaptcha where
     show (TCSub x y) = "- "++(show x)++" "++(show y)
     show (TCMul x y) = "* "++(show x)++" "++(show y)

+readCaptcha ::  String -> TextCaptcha
 readCaptcha str | [s,xs,ys] <- words str =
     let x = read xs
         y = read ys
@@ -33,10 +33,12 @@ readCaptcha str | [s,xs,ys] <- words str =
         "-" -> TCSub x y
         "*" -> TCMul x y

+evalCaptcha ::  TextCaptcha -> Int
 evalCaptcha (TCAdd x y) = x+y
 evalCaptcha (TCSub x y) = x-y
 evalCaptcha (TCMul x y) = x*y

+renderCaptcha ::  TextCaptcha -> String
 renderCaptcha (TCAdd x y) = (show x)++" plus "++(show y)++" equals..."
 renderCaptcha (TCSub x y) = (show x)++" minus "++(show y)++" equals..."
 renderCaptcha (TCMul x y) = (show x)++" multiply "++(show y)++" equals..."
@@ -61,6 +63,7 @@ randomCaptcha = do
               1 -> TCSub x y
               2 -> TCMul x y

+isNum ::  String -> Bool
 isNum s = (not $ null s) && ((head s) `elem` "-0123456789") && (all isDigit (tail s))

 validateCaptcha :: FieldValidator
ViewGit