Merge branch 'master' of git://github.com/spwhitton/sariulclocksv1.0.1

4 files changed, 21 insertions, 7 deletions

diff --git a/assets/js/main.js b/assets/js/main.js
index 1586c5c..f4d5af2 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -46,7 +46,8 @@ function createCookie(name,value,days) {
         var expires = "; expires="+date.toGMTString();
     }
     else var expires = "";
-    document.cookie = name+"="+value+expires+"; path=/";
+    // TODO: make this not absolute
+    document.cookie = name+"="+value+expires+"; path=/sariul/cgi-bin";
 }
 
 function readCookie(name) {
@@ -89,6 +90,9 @@ function startLesson()
 
     // set the cookie and reload to start the session
     createCookie("class_cookie", cookieString, 1);
+    // reset clock because it's currently dangerous to do so when
+    // ending a lesson
+    timeWastingClock.reset();
     // reload, preventing Firefox from resubmitting POST data
     window.location.assign(document.URL.split("#")[0]);
 }
@@ -124,7 +128,9 @@ function endLesson()
 
     // submit
     timeWastingClock.stop();
-    timeWastingClock.reset();
+    // dangerous to reset clock here in case user inputs wrong
+    // password: instead reset when *starting* a class
+    // timeWastingClock.reset();
     $form.submit();
 }
 
diff --git a/deploy.sh b/deploy.sh
index 6b7962d..c967121 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -6,8 +6,8 @@
 
 # 1. choose where to deploy
 
-live="$HOME/html/sariul"
-devel="$HOME/html/sariul-devel"
+live="$HOME/html/sariul/cgi-bin"
+devel="$HOME/html/sariul-devel/cgi-bin"
 
 if [ "$1" = "live" ]; then
     dest="$live"
@@ -45,6 +45,10 @@ cp -RL ../schoolclock/sounds $dest
 cd $HOME
 # mkhomepg -p
 mkdir -p $dest/data
+if ! [ -e "$dest/password" ]; then
+    echo "dummy_password" > $dest/password
+    echo "Please update password in $dest/password!"
+fi
 chmod 777 $dest/data
 chmod 755 $dest/sariulclocks.cgi
 
diff --git a/src/Types/Session.hs b/src/Types/Session.hs
index 5d037a4..210cd28 100644
--- a/src/Types/Session.hs
+++ b/src/Types/Session.hs
@@ -26,7 +26,7 @@ makeClassCookie now session =
                    Nothing -> "Nothing"
            , cookieExpires  = Just $ endOfSchoolDay now
            , cookieDomain   = Nothing
-           , cookiePath     = Nothing
+           , cookiePath     = Just "/sariul/cgi-bin"
            , cookieSecure   = False}
 
 makeClockCookie             :: ClockTime -> Session -> Cookie
@@ -38,7 +38,7 @@ makeClockCookie now session =
                    CountUpClock   -> "1"
            , cookieExpires  = Just $ endOfSchoolDay now
            , cookieDomain   = Nothing
-           , cookiePath     = Nothing
+           , cookiePath     = Just "/sariul/cgi-bin"
            , cookieSecure   = False}
 
 makeSsCookie               :: ClockTime -> Session -> Cookie
@@ -50,7 +50,8 @@ makeSsCookie now session =
                    Just c -> show $ numberOfSs c
            , cookieExpires = Just $ endOfSchoolDay now
            , cookieDomain  = Nothing
-           , cookiePath    = Nothing
+-- make the cookie path not absolute
+           , cookiePath    = Just "/sariul/cgi-bin"
            , cookieSecure  = False}
 
 endOfSchoolDay       :: ClockTime -> CalendarTime
diff --git a/src/sariulclocks.hs b/src/sariulclocks.hs
index 74ae00c..137e1bd 100644
--- a/src/sariulclocks.hs
+++ b/src/sariulclocks.hs
@@ -164,6 +164,9 @@ cgiMain = do
 
     -- TODO: use POST,REDIRECT,GET https://stackoverflow.com/questions/570015/how-do-i-reload-a-page-without-a-postdata-warning-in-javascript/570069#570069
 
+
+    -- TODO: restore time wasting clock if password was wrong
+
     let scores' =
             if   points' /= 0 && userPassword == (unpack . strip . pack) password
             then updateScore scores (fromJust cookieClass) points' timeWasted'