# HG changeset patch
# User John "Elwin" Edwards
# Date 1396369211 25200
# Node ID b5a1430d0f71c7c12201d8794a12a5f23990dfd2
# Parent  bc69717ff38687591328858c54a1050713034dc1# Parent  c4a32007d2dc00649dacd6258c817389dfc90898
Merge with poll-removal.

diff -r c4a32007d2dc -r b5a1430d0f71 README.txt
--- a/README.txt	Mon Jan 27 16:02:27 2014 -0800
+++ b/README.txt	Tue Apr 01 09:20:11 2014 -0700
@@ -11,7 +11,7 @@
 
 Installation
 ---
-RLGWebD expects to be run in a dgamelaunch installation, and it makes 
+RLGWebD expects to be run in a chroot used by dgamelaunch, and it makes 
 some assumptions about the configuration.  It expects the dgamelaunch 
 playground to be at /dgldir inside the chroot.  It expects the 
 in-progress files to be in /dgldir/inprogress/<gamename>.  RLGWebD 
@@ -25,6 +25,18 @@
 It creates a socket in the filesystem which is used to control the 
 server.
 
+The following files need to be copied into CHROOT/var/www:
+  about.html
+  bell.svg
+  options.html
+  options.js
+  rlgterm.js
+  style-rlg.css
+  termemu.js
+  termemu-keys.js
+  tty.css
+Copy index-rlg.html to CHROOT/var/www/index.html.
+
 sqlickrypt
 ---
 RLGWebD uses a separate program written in C to operate on the 
@@ -45,3 +57,9 @@
 
 Stop by passing 'stop' as an argument.  (This requires socat to be 
 installed.)
+
+webtty
+---
+webtty.js is a Node app which uses the terminal emulator to run a shell.  It
+includes NO SECURITY WHATSOEVER and should only be used for testing the 
+terminal emulator.  Copy index-sh.html to index.html before running it.
diff -r c4a32007d2dc -r b5a1430d0f71 index-rlg.html
--- a/index-rlg.html	Mon Jan 27 16:02:27 2014 -0800
+++ b/index-rlg.html	Tue Apr 01 09:20:11 2014 -0700
@@ -118,7 +118,7 @@
 </div>
 <div class="modal" id="register">
 <div class="formtable">
-<div><div>Name:</div><div><input type="text" name="name" id="regin_name" maxlength="10"></div></div>
+<div><div>Name:</div><div><input type="text" name="name" id="regin_name" maxlength="20"></div></div>
 <div><div>Password:</div><div><input type="password" name="pw" id="regin_pw"></div></div>
 <div><div>E-mail (optional):</div><div><input type="text" name="email" id="regin_email"></div></div>
 <div>
diff -r c4a32007d2dc -r b5a1430d0f71 sqlickrypt.c
--- a/sqlickrypt.c	Mon Jan 27 16:02:27 2014 -0800
+++ b/sqlickrypt.c	Tue Apr 01 09:20:11 2014 -0700
@@ -118,6 +118,10 @@
   sqlite3_stmt *qstmt;
   char salt[20];
 
+  if (strlen(uname) > 20) {
+    return 4;
+  }
+
   opendb(&db, &qstmt, checkquery);
   /* Check for existing account in the same transaction with creating it. */
   status = sqlite3_exec(db, "BEGIN;", NULL, NULL, NULL);