[account settings now requires old password to change password
thomashartman1@gmail.com**20080912142430] hunk ./src/Controller.hs 108
-accountSettingsPage (ChangeUserInfo pass1 pass2) =
-  [ ServerPartT $ \rq -> 
-          if pass1 == pass2 
+accountSettingsPage (ChangeUserInfo oldpass newpass1 newpass2) =
+  [ ServerPartT $ \rq -> do
+          if newpass1 == newpass2 
hunk ./src/Controller.hs 114
-                       (\user -> do update $ ModifyUser user pass1
-                                    startsess user rq )                                 
+                       (\user -> do allowed <- query $ AuthUser user oldpass
+                                    if allowed 
+                                       then do update $ ModifyUser user newpass1
+                                               ( tutlayoutReq rq [] "accountsettings-changed" ) -- startsess user rq
+                                       else errW "old password incorrect" rq) 
hunk ./src/Controller.hs 120
-                  
hunk ./src/Controller.hs 122
-  where errW msg rq = ( tutlayoutReq rq [("errormsgRegister", msg)] ) "register" 
+  where errW msg rq = ( tutlayoutReq rq [("errormsgAccountSettings", msg)] ) "accountsettings" 
hunk ./src/Model.hs 16
-data ChangeUserInfo = ChangeUserInfo String String 
+data ChangeUserInfo = ChangeUserInfo String String String 
hunk ./src/Model.hs 28
-    fromData = liftM2 ChangeUserInfo (look "password" `mplus` return "nopassword")
-                                     (look "password2" `mplus` return "nopassword2")
+    fromData = liftM3 ChangeUserInfo (look "oldpass" `mplus` return "no old password")
+                                     (look "password" `mplus` return "no password")
+                                     (look "password2" `mplus` return "no password2")
hunk ./templates/accountsettings.st 4
-    <label>Password:<input type="password" name="password"/></label>
-    <br/>
-    <label>Verify Password:<input type="password" name="password2"/></label>
-    <br/>
-    <input type="submit" name="change_password" value="Change Password">
+    <table>
+    <tr><td>Old Password:</td><td><input type="password" name="oldpass"/></td></tr>
+
+    <tr><td>Password:</td><td><input type="password" name="password"/></td></tr>
+
+    <tr><td>Verify Password:</td><td><input type="password" name="password2"/></td></tr>
+
+    <tr><td><input type="submit" name="change_password" value="Change Password"></td></tr>
+    </table>
hunk ./templates/login.st 4
-	<tr><td><label>Username:</td> <td><input type="textfield" name="username"/></label></td> </tr>
+	<tr><td>Username:</td> <td><input type="textfield" name="username"/></td> </tr>
hunk ./templates/login.st 6
-	<tr> <td><label>Password:</td> <td><input type="password" name="password"/></label> </td> </tr>
+	<tr> <td>Password:</td> <td><input type="password" name="password"/></td> </tr>
hunk ./templates/register.st 1
-    <form action="/tutorial/actions/newuser" method="post">
-    <label>Username:<input type="textfield" name="username"/></label>
-    <br/>
-    <label>Password:<input type="password" name="password"/></label>
-    <br/>
-    <label>Verify Password:<input type="password" name="password2"/></label>
-    <br/>
-    <input type="submit" name="create" value="Create Account">
-    </form>
+<h3>Register</h3>
+    <form action="/tutorial/actions/newuser" method="post"><table>
+	<tr><td>Username:</td><td><input type="textfield" name="username"/></td></tr>
+	
+	<tr><td>Password:</td><td><input type="password" name="password"/></td></tr>
+
+	<tr><td>Verify Password:</td><td><input type="password" name="password2"/></td></tr>
+
+	<tr><td><input type="submit" name="create" value="Create Account"></td></tr>
+    </table></form>