Ticket #830: trac_830.diff

athena/bin/bugme/bugme

@@ -25 +25 @@
             self.firstWarn = 90
             self.warnInterval = 30
             self.annoyInterval = 10
+        # Hard time limit; user will be killed after this time
+        self.killTime = self.timeLimit * 1.5
         # (foreground, background)
         self.colors = ('black', 'white')
         try:
@@ -73 +75 @@
             self.nextWarn = now + self.warnInterval
             self.nag(((self.timeLimit - elapsed) / 60, 
                       (self.timeLimit - elapsed) % 60))
+        if options.kioskMode and elapsed >= self.killTime:
+            # The user has outstayed their welcome, nuke their session
+            print "Quitting."
+            sys.exit(0)
+
         # It's a little odd to put this here, but it doesn't work in
         # __init__; see comments in Trac #386
         self.timerWindow.set_keep_above(True)
@@ -116 +123 @@
     parser.add_option("--debug", 
                      action="store_true", dest="debugMode", default=False,
                      help="Enable debug mode (time limit of 2 minutes)")
+    parser.add_option("--fatal",
+                     action="store_true", dest="kioskMode", default=False,
+                     help="Kill the user session after 1.5 times the time limit.")
     (options, args) = parser.parse_args()
     if len(args) < 1:
         parser.error("'progname' is required")

debathena/debathena/kiosk/xinitrc

@@ -68 +68 @@
 cp "$chrome" "$profdir/chrome/userChrome.css" || exit 1
 
 # Launch firefox.
-firefox
+if [ "$(machtype -q)" = "quickstation" ] && [ -x /usr/bin/bugme ]; then
+    bugme --debug --fatal firefox
+else
+    firefox
+fi
 
+
 # Clean up.
 rm -rf .mozilla