X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=manager%2Fcontrols.lsp;h=555e49b076ff1387b75179c44fac304ef167780e;hb=a6009c7c04d72e861737a3cdf1e327eada42dcb3;hp=60c00b5148ee19976c3d0d6286de0997b0b79496;hpb=30dfa8ed48bceb1df62c4accf5b7a680d1b20634;p=rrq%2Fhourglass.git

diff --git a/manager/controls.lsp b/manager/controls.lsp
index 60c00b5..555e49b 100644
--- a/manager/controls.lsp
+++ b/manager/controls.lsp
@@ -2,39 +2,41 @@
 
 (load "expand-string.lsp")
 
+(constant
+ 'CONTROLFILE SITE:control.dat
+ 'GAP SITE:control.activity.gap
+ 'CLIP control.activity.clip
+ )
+
 (setf UPDATE "")
 
 (when (= (env "REQUEST_METHOD") "POST")
   (load "controls-update.lsp")
   )
 
-(constant
- 'CONTROLFILE "control.dat"
- 'CONTROL (read-expr (read-file CONTROLFILE))
- 'GAP (or (lookup 'gap CONTROL) 5)
- 'CLIP (or (lookup 'clip CONTROL) 5)
- 'INCL (or (lookup 'control CONTROL) "ipset-control.lsp")
- 'TIMES (map (fn (n) (or (assoc n CONTROL) '(1 timed (7 0) (3 0) (19 0))))
-             (sequence 1 7))
- 'NET (or (lookup 'net CONTROL) "10.0.0.0/8")
- )
+(define (time-row n)
+  (or (assoc n CONTROL) (cons n (copy '(timed (7 0) (3 0) (19 0))))))
 
 (setf
  DAYS '(0 "Mon" "Tue" "Wed" "Thu" "Fri" "Sat" "Sun")
- incl-options '("ipset-control.lsp")
- gap-options '(0 1 2 5 10 15 30)
- clip-options '(0 200 500 800 1000 1200 1500 2000)
+ CONTROL (read-expr (read-file CONTROLFILE))
+ TIMES (map time-row (sequence 1 7))
  mode-options '("opened" "timed" "closed")
  start-options '()
  end-options '()
  limit-options '()
  )
-(dotimes (h 24) (dolist (m '(0 30))
-                  (push (format "%02d:%02d" h m) start-options -1)))
-(dotimes (h 24) (dolist (m '(0 30))
-                  (push (format "%02d:%02d" h m) end-options -1)))
-(for (h 1 8) (dolist (m '(0 30))
-               (push (format "%02d:%02d" h m) limit-options -1)))
 
+(dotimes (h 24)
+  (dolist (m '(0 30))
+    (push (format "%02d:%02d" h m) start-options -1)))
+(dotimes (h 24)
+  (dolist (m '(0 30))
+    (push (format "%02d:%02d" h m) end-options -1)))
+(for (h 1 8)
+  (dolist (m '(0 30))
+    (push (format "%02d:%02d" h m) limit-options -1)))
+
+(println "Status 200 OK\nContent-Type: text/html\n\n")
 (println (expand-file "tmpl/controls-form.html" ))
 (exit 0)