From c2d95438aa4f99553f5b93cf1f0648561918baea Mon Sep 17 00:00:00 2001
From: otidev <otidev@oti-dev-2.(none)>
Date: Thu, 25 Apr 2013 20:15:54 -0400
Subject: [PATCH 01/20] added node status to reboot page

---
 etc/config/quickstart                         | 60 ++-----------------
 .../lua/luci/view/QS/module/applyreboot.htm   | 55 ++++++++++++++++-
 2 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index af7b6e9..46dacf2 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -8,9 +8,10 @@ config page 'welcome'
 	   option pageTitle 'Welcome'
 	   option topheader 'Welcome to the Commotion Quick Start wizard'	   
 	   list modules 'welcome'
+	   list modules 'name'
 	   list modules 'adminPassword'	   
 	   list buttons 'noBack'
-	   list buttons '2:settingsFile,|Manual Configuration &gt;,| ,| '
+	   list buttons '2:settingsFile,|Use a pre-built network file &gt;,| ,| '
 	   list buttons '3:makeItWork,|Just Make it Work &gt;,| ,| '	
 	   
 config page 'settingsFile'
@@ -36,7 +37,7 @@ config page 'accessPoint'
 	   option topheader 'Setup an Open Access Point'
 	   option subheading ''
 	   list modules 'accessPoint'
-	   list buttons '2:internetCheck,|Save &gt;,|Continue with this setting,| ,|'
+	   list buttons '2:keyfilesAndSecurity,|Save &gt;,|Continue with this setting,| ,|'
 	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
 
 config page 'secAccessPoint'
@@ -44,41 +45,7 @@ config page 'secAccessPoint'
 	   option topheader 'Setup a Private Access Point'
 	   option subheading ''
 	   list modules 'secAccessPoint'
-	   list buttons '2:internetCheck,|Save &gt;,|Continue with this setting,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-
-config page 'internetCheck'
-	   option pageTitle 'Internet Connectivity'
-	   option topheader 'Internet Connectivity'
-	   option subheading 'Are you planning to connect a cable between this Router and your home or business Internet connection?'
-	   list buttons '2:internetSharing,|Yes &gt;,|Configure your internet gateway,| ,|'
-	   list buttons '3:splashPage,|No &gt;,|Skip this step,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-	   
-config page 'internetSharing'
-	   option pageTitle 'Sharing your Internet Connection'
-	   option topheader 'Sharing your Internet Connection'
-	   option subheading 'Internet access will be available to those that connect to the mesh.<br />You may choose to advertise it to the mesh, or keep it hidden.'
-	   list buttons '2:splashPage,|Please advertise my Internet access. &gt;,|,| ,|'
-	   list buttons "3:gatewayShareOff,|Please DON'T advertise my Internet access. &gt;,|Note that access will still be available, just not advertised,| ,|"
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-	   
-config page 'splashPage'
-	   option pageTitle 'Setup a Splash Page'
-	   option topheader 'Setup a Splash Page'
-	   option subheading 'Would you like people connecting to your node to first see a splash page on their web browser?<br />This is the only way to ask people connecting to the node to agree to a Community Standards agreement or Terms of Service.'
-	   list modules 'splashPage'
-	   list buttons '2:meshApplications,|Submit Splash Text&gt;,|Use the above for your nodes splash page,| ,|'
-	   list buttons '3:noSplash,|No &gt;,|Skip this step,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-	   
-config page 'meshApplications'
-	   option pageTitle 'Setup Mesh Application Advertising'
-	   option topheader 'Setup Mesh Application Advertising'
-	   option subheading 'Would you like to advertise mesh applications to people connected to your node?<br />You will be alerted when new applications are available and need approval.'
-	   list modules 'applications'
-	   list buttons '2:netSec,|Yes &gt;,|I would like to create an application portal,| ,|'
-	   list buttons "3:noApplications,|No &gt;,|I don't want to let me node advertise applications,| ,|"
+	   list buttons '2:keyfilesAndSecurity,|Save &gt;,|Continue with this setting,| ,|'
 	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
 	   
 config page 'keyfilesAndSecurity'
@@ -97,7 +64,7 @@ config page 'naming'
 	   option pageTitle 'Please Choose your Mesh Names'
 	   option topheader 'Please Choose your Mesh Names'
 	   list modules 'nodeNaming'
-	   list buttons '3:yourNetwork,|Continue &gt;,|Set this name for your node and continue,| ,|'
+	   list buttons '3:finish,|Finish &gt;,|Set this name for your node and finish,| ,|'
 	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'	   
 
 config page 'makeItNaming'		   
@@ -105,20 +72,5 @@ config page 'makeItNaming'
 	   option topheader 'Please Choose your Mesh Names'
 	   list modules 'nodeNaming'
 	   list modules 'accessPoint'
-	   list buttons '3:yourNetwork,|Continue &gt;,|Set this name for your node and continue,| ,|'
+	   list buttons '3:finish,|Finish &gt;,|Set this name for your node and finish,| ,|'
 	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'	   
-
-config page 'yourNetwork'
-	   option pageTitle 'Your Network'
-	   option topheader 'Your Network'
-	   list modules 'yourNetwork'
-	   list buttons '3:setupComplete,|Continue &gt;,|Apply these settings to your node,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-	   
-config page 'setupComplete'
-	   option pageTitle 'Setup is complete!'
-	   option topheader 'Setup is complete!'
-	   option subheading 'You have completed the Commotion quickstart. Check below to see if your node is connected to any other nodes in the area.'
-	   list module 'complete'
-	   list buttons '3:finish,|Finish &gt;,|Go to node admin login,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| If there is a problem, Start Over,|plus'
diff --git a/usr/lib/lua/luci/view/QS/module/applyreboot.htm b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
index 78b606c..df1ee80 100644
--- a/usr/lib/lua/luci/view/QS/module/applyreboot.htm
+++ b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
@@ -1,6 +1,44 @@
 <html>
 	<head>
 		<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Redirecting...%><% end %></title>
+<%-
+   if luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
+	  for line in io.lines("/etc/commotion/profiles.d/quickstartAP") do
+		 b,c = string.find(line,"^ssid=.*")
+		 if b then
+			apName = string.sub(line,b+5,c)
+		 end
+	  end
+   elseif luci.fs.isfile("/etc/commotion/profiles.d/quickstartSec") then
+	  for line in io.lines("/etc/commotion/profiles.d/quickstartSec") do
+		 b,c = string.find(line,"^ssid=.*")
+		 if b then
+			apName = string.sub(line,b+5,c)
+		 end
+	  end
+   end
+   local uci = luci.model.uci.cursor()
+   --get hostname from system file
+   uci:foreach("system", "system",
+			   function(s)
+				  if s.hostname then
+					 hostname = s.hostname
+				  end
+			   end)
+   if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartMesh") then
+	  luci.sys.call('cp /etc/commotion/profiles.d/defaultMesh /etc/commotion/profiles.d/quickstartMesh') 
+   end
+   for line in io.lines("/etc/commotion/profiles.d/quickstartMesh") do
+	  b,c = string.find(line,"^ssid=.*")
+	  if b then
+		 netName = string.sub(line,b+5,c)
+	  end
+   end
+
+   local meshName = netName
+   local nodeName = hostname 
+end
+-%>
 		<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
 		<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
 		<script type="text/javascript">//<![CDATA[
@@ -29,10 +67,25 @@ <h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><%
 					</p>
 					<p>
 						<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+
 						<%:Waiting for changes to be applied...%>
+						<div id="zone-content-wrapper">
+						  <div id="zone-content">
+						    <h3>The name of your mesh network is:</h3>
+						    <p><strong><%=meshName%></strong></p>
+						    
+						    <h3>Your node name is:</h3>
+						    <p><strong><%=nodeName%></strong></p>
+						    
+						    <h3>When people connect to your node wirelessly, they will connect using this name:</h3>
+						    <p><strong><%=apName%></strong></p>
+						    
+						    <p>After configuring your node, you can change the node name on the node administration page.</p>
+						  </div>
+						</div>	
 					</p>
 					<form action="<%=redirect_location%>" type="get">
-						<input type="submit" value="Click here if your browser doesn't redirect you in 20 seconds" name="action" />
+					  <input type="submit" value="Click here if your browser doesn't redirect you in 20 seconds" name="action" />
 					</form>
 				</fieldset>
 			</div>

From 164c655c9e63a5f0fe3215253a9c65ef519ab715 Mon Sep 17 00:00:00 2001
From: otidev <otidev@oti-dev-2.(none)>
Date: Thu, 25 Apr 2013 20:24:46 -0400
Subject: [PATCH 02/20] added a complete from first page button. Still need to
 build the naming function.

---
 etc/config/quickstart                      | 12 +++++++++---
 usr/lib/lua/luci/controller/QS/buttons.lua | 10 ++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index 46dacf2..b485639 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -1,3 +1,6 @@
+#TODO
+#create "name" module that creates a AP and a hostname from one name value (hostname adds a number)
+
 config quickstart options
 	   option pageNo 'welcome'
 	   option lastPg 'welcome'
@@ -10,9 +13,10 @@ config page 'welcome'
 	   list modules 'welcome'
 	   list modules 'name'
 	   list modules 'adminPassword'	   
+	   list modules 'complete'
 	   list buttons 'noBack'
-	   list buttons '2:settingsFile,|Use a pre-built network file &gt;,| ,| '
-	   list buttons '3:makeItWork,|Just Make it Work &gt;,| ,| '	
+	   list buttons '2:keepGoing,|Use a pre-built network file &gt;,| ,| '
+	   list buttons '3:finish,|Just Make it Work &gt;,| ,| '	
 	   
 config page 'settingsFile'
 	   option pageTitle 'Using a Settings File'
@@ -64,13 +68,15 @@ config page 'naming'
 	   option pageTitle 'Please Choose your Mesh Names'
 	   option topheader 'Please Choose your Mesh Names'
 	   list modules 'nodeNaming'
+	   list modules 'complete'
 	   list buttons '3:finish,|Finish &gt;,|Set this name for your node and finish,| ,|'
 	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'	   
 
-config page 'makeItNaming'		   
+config page 'makeItNaming'
 	   option pageTitle 'Please Choose your Mesh Names'
 	   option topheader 'Please Choose your Mesh Names'
 	   list modules 'nodeNaming'
 	   list modules 'accessPoint'
+	   list modules 'complete'
 	   list buttons '3:finish,|Finish &gt;,|Set this name for your node and finish,| ,|'
 	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'	   
diff --git a/usr/lib/lua/luci/controller/QS/buttons.lua b/usr/lib/lua/luci/controller/QS/buttons.lua
index 276b3e8..a403d89 100644
--- a/usr/lib/lua/luci/controller/QS/buttons.lua
+++ b/usr/lib/lua/luci/controller/QS/buttons.lua
@@ -14,6 +14,16 @@ function gatewayShare(modules)
    return modules
 end
 
+function keepGoing(modules)
+   for i,x in ipairs(modules) do
+	  if x == 'complete' then
+		 rem = i
+	  end
+   end
+   table.remove(modules, rem)
+
+end
+
 function back()
    return {}
 end

From 7af4e2bf53e11079c333a956fd80157ec0028162 Mon Sep 17 00:00:00 2001
From: otidev <otidev@oti-dev-2.(none)>
Date: Thu, 25 Apr 2013 20:30:23 -0400
Subject: [PATCH 03/20] got quickstart to actually be a quick start... down to
 two pages.

---
 etc/config/quickstart | 59 +++----------------------------------------
 1 file changed, 4 insertions(+), 55 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index b485639..6a1991a 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -1,5 +1,7 @@
 #TODO
 #create "name" module that creates a AP and a hostname from one name value (hostname adds a number)
+# make sure "complete" module is always processed after all other modules
+
 
 config quickstart options
 	   option pageNo 'welcome'
@@ -24,59 +26,6 @@ config page 'settingsFile'
 	   option subheading 'Do you have a settings file? Your network administrator may have provided a settings file. If you have a settings file, please upload it below. Or, you can enter the settings manually.'
 	   option fileType 'config'
 	   list modules 'upload'
-	   list buttons '3:noConfigUploaded,|Continue &gt;,|Continue without uploading a file,| ,|'
-	   list buttons '4:wifiSharing,|Upload &amp; Continue &gt;&gt;,|Upload a settings file and continue,| ,|'
-	   list buttons '5:startOver,|&lt;&lt; Start Over,| ,|plus'
-
-config page 'wifiSharing'
-	   option pageTitle 'Setup Wireless Connection sharing'
-	   option topheader 'Setup Wireless Connection sharing'
-	   option subheading 'Would you like to allow anyone to use your wifi access point?'
-	   list buttons '3:accessPoint,|Yes &gt;,|Set up an open access point,| ,|'
-	   list buttons '4:secAccessPoint,|No &gt;,|Set up a secure access point,| ,|'
-	   list buttons '5:startOver,|&lt;&lt; Start Over,| ,|plus'
-
-config page 'accessPoint'
-	   option pageTitle 'Setup an Open Access Point'
-	   option topheader 'Setup an Open Access Point'
-	   option subheading ''
-	   list modules 'accessPoint'
-	   list buttons '2:keyfilesAndSecurity,|Save &gt;,|Continue with this setting,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-
-config page 'secAccessPoint'
-	   option pageTitle 'Setup a Private Access Point'
-	   option topheader 'Setup a Private Access Point'
-	   option subheading ''
-	   list modules 'secAccessPoint'
-	   list buttons '2:keyfilesAndSecurity,|Save &gt;,|Continue with this setting,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'
-	   
-config page 'keyfilesAndSecurity'
-	   option pageTitle 'Network Security Settings'
-	   option topheader 'Network Security Settings'
-	   option subheading 'This network configuration requires a key and/or password.<br />Remember, other nodes will have to use this key and/or password to connect to this mesh network.'
-	   option fileType 'key'
-	   list modules 'networkSecurity'
-	   list modules 'upload'
-	   list buttons '3:naming,|Continue &gt;,|,| ,|'
-	   list buttons '2:checkKeyFile,|Download Key File,|,| ,|'
-	   list buttons '4:continueInsecure,|No &gt;,|Continue with a insecure network,| ,|'
-	   list buttons '5:startOver,|&lt;&lt; Start Over,| ,|plus'
-	   
-config page 'naming'
-	   option pageTitle 'Please Choose your Mesh Names'
-	   option topheader 'Please Choose your Mesh Names'
-	   list modules 'nodeNaming'
-	   list modules 'complete'
-	   list buttons '3:finish,|Finish &gt;,|Set this name for your node and finish,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'	   
-
-config page 'makeItNaming'
-	   option pageTitle 'Please Choose your Mesh Names'
-	   option topheader 'Please Choose your Mesh Names'
-	   list modules 'nodeNaming'
-	   list modules 'accessPoint'
 	   list modules 'complete'
-	   list buttons '3:finish,|Finish &gt;,|Set this name for your node and finish,| ,|'
-	   list buttons '4:startOver,|&lt;&lt; Start Over,| ,|plus'	   
+	   list buttons '4:finish,|Upload and Finish,|,| ,|'
+	   list buttons '5:startOver,|&lt;&lt; Start Over,| ,|plus'
\ No newline at end of file

From c42bed3c890580e026ad64d1b8ffee502d4b2fc5 Mon Sep 17 00:00:00 2001
From: otidev <otidev@oti-dev-2.(none)>
Date: Fri, 26 Apr 2013 06:29:12 -0400
Subject: [PATCH 04/20] updating todo's

---
 etc/config/quickstart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index 6a1991a..ee1a2e9 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -2,7 +2,6 @@
 #create "name" module that creates a AP and a hostname from one name value (hostname adds a number)
 # make sure "complete" module is always processed after all other modules
 
-
 config quickstart options
 	   option pageNo 'welcome'
 	   option lastPg 'welcome'

From f313435750ad887f2bf1db8faed42fd2a356c6bd Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Tue, 30 Apr 2013 16:55:13 -0400
Subject: [PATCH 05/20] revamped the value settings to occur at the end of the
 QS instead of between each page.

---
 etc/config/quickstart                         |  21 +-
 usr/lib/lua/luci/controller/QS/QS.lua         |  12 +-
 usr/lib/lua/luci/controller/QS/buttons.lua    |  13 +-
 usr/lib/lua/luci/controller/QS/modules.lua    | 199 ++++++++++++++++--
 .../lua/luci/view/QS/module/adminPassword.htm |   5 +-
 .../lua/luci/view/QS/module/applyreboot.htm   |   1 -
 usr/lib/lua/luci/view/QS/module/complete.htm  |   1 +
 usr/lib/lua/luci/view/QS/module/name.htm      |  39 ++++
 8 files changed, 249 insertions(+), 42 deletions(-)
 create mode 100644 usr/lib/lua/luci/view/QS/module/complete.htm
 create mode 100644 usr/lib/lua/luci/view/QS/module/name.htm

diff --git a/etc/config/quickstart b/etc/config/quickstart
index ee1a2e9..f8104f8 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -1,8 +1,4 @@
-#TODO
-#create "name" module that creates a AP and a hostname from one name value (hostname adds a number)
-# make sure "complete" module is always processed after all other modules
-
-config quickstart options
+OBconfig quickstart options
 	   option pageNo 'welcome'
 	   option lastPg 'welcome'
 	   option complete 'false'
@@ -10,13 +6,11 @@ config quickstart options
 
 config page 'welcome'
 	   option pageTitle 'Welcome'
-	   option topheader 'Welcome to the Commotion Quick Start wizard'	   
-	   list modules 'welcome'
+	   option topheader 'Welcome to the Commotion Quick Start Wizard'	   
 	   list modules 'name'
-	   list modules 'adminPassword'	   
-	   list modules 'complete'
+	   list modules 'adminPassword'
 	   list buttons 'noBack'
-	   list buttons '2:keepGoing,|Use a pre-built network file &gt;,| ,| '
+	   list buttons '2:settingsFile,|Use a pre-built network file &gt;,| ,| '
 	   list buttons '3:finish,|Just Make it Work &gt;,| ,| '	
 	   
 config page 'settingsFile'
@@ -25,6 +19,9 @@ config page 'settingsFile'
 	   option subheading 'Do you have a settings file? Your network administrator may have provided a settings file. If you have a settings file, please upload it below. Or, you can enter the settings manually.'
 	   option fileType 'config'
 	   list modules 'upload'
-	   list modules 'complete'
 	   list buttons '4:finish,|Upload and Finish,|,| ,|'
-	   list buttons '5:startOver,|&lt;&lt; Start Over,| ,|plus'
\ No newline at end of file
+	   list buttons '5:startOver,|&lt;&lt; Start Over,| ,|plus'
+
+#TODO
+#create "name" module that creates a AP and a hostname from one name value (hostname adds a number)
+# make sure "complete" module is always processed after all other modules
diff --git a/usr/lib/lua/luci/controller/QS/QS.lua b/usr/lib/lua/luci/controller/QS/QS.lua
index 05f5013..b64ec19 100644
--- a/usr/lib/lua/luci/controller/QS/QS.lua
+++ b/usr/lib/lua/luci/controller/QS/QS.lua
@@ -89,12 +89,12 @@ end
 
 function pages(command, next, skip)
    --manipulates the rendered pages for a user
-   log("pages command: " .. command)
+   --log("pages command: " .. command)
    local uci = luci.model.uci.cursor()
    local page = uci:get('quickstart', 'options', 'pageNo')
    local lastPg = uci:get('quickstart', 'options', 'lastPg')
-   log(page)
-   log("last="..lastPg)
+   --log(page)
+   --log("last="..lastPg)
    if next == 'back' then
 	  uci:set('quickstart', 'options', 'pageNo', lastPg)
 	  uci:set('quickstart', 'options', 'lastPg', 'welcome')
@@ -157,7 +157,9 @@ end
 
 function checkPage()
    local returns = luci.http.formvalue()
+   --log(returns)
    errors = parseSubmit(returns)
+   --log(errors)
    return errors
 end
 
@@ -203,6 +205,7 @@ function parseSubmit(returns)
    end
    if  next(errors) ~= nil then
 	  log("errors HERE")
+	  log(errors)
 	  pages('next','back')
 	  return(errors)
    end
@@ -226,7 +229,8 @@ function runParser(modules)
    --log(errors)
    return(errors)
 end
-      
+
+
 function keyCheck()
    local uci = luci.model.uci.cursor()
    --check if a key is required in a config file and compare the current key to it.
diff --git a/usr/lib/lua/luci/controller/QS/buttons.lua b/usr/lib/lua/luci/controller/QS/buttons.lua
index a403d89..0c0cba1 100644
--- a/usr/lib/lua/luci/controller/QS/buttons.lua
+++ b/usr/lib/lua/luci/controller/QS/buttons.lua
@@ -174,12 +174,13 @@ function checkKeyFile(modules)
 end
 
 function finish(modules)
-   environment = luci.http.getenv("SERVER_NAME")
-   if not environment then
-	  environment = "thisnode"
+   --luci.controller.QS.QS.log(modules)
+   mod = {}
+   for i,x in pairs(modules) do
+	  table.insert(mod, x)
    end
-   luci.template.render("QS/module/applyreboot", {redirect_location=("http://" .. environment .. "/cgi-bin/luci/admin")})
-   luci.http.close()
-   return({'complete'}) 
+   table.insert(mod, 'complete')
+   --luci.controller.QS.QS.log(mod)
+   return mod
 end
 
diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index fadbc61..474043e 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -17,22 +17,186 @@ function completeRenderer()
    return 'true'
 end
 
+function nameRenderer()
+   if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
+	  luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartAP') 
+   end
+   if luci.fs.isfile("/etc/commotion/profiles.d/quickstartSettings") then
+	  luci.sys.call("echo "" > /etc/commotion/profiles.d/quickstartSettings") 
+   end
+   return 'true'
+end
+
+function nameParser()
+   errors = nil
+   local val = luci.http.formvalue()
+   if val.nodeName and val.nodeName ~= "" and string.len(val.nodeName) < 20 then
+	  nodeID = luci.sys.exec("commotion nodeid")
+	  --luci.controller.QS.QS.log(val.nodeName)
+	  name = tostring(val.nodeName) .. nodeID
+	  file = io.open("/etc/commotion/profiles.d/quickstartSettings", a)
+	  file:write("hostname="..name.."\n")
+	  if val.secure then
+		 pass = checkPass(val.pwd1, val.pwd2)
+		 if pass == nil then
+			file:write("pwd="..pass.."\n")
+			file:write("SSIDSec="..name.."\n")
+		 else
+			return pass
+		 end
+	  else
+		 file:write("SSID="..name.."\n")		 
+	  end
+	  file:close()
+   else
+	  errors = "Please enter a name that is greater than 0 and less than 20 chars."
+   end
+   if val.
+   if errors ~= nil then
+	  return errors
+   end
+end
+
+function setValues(setting, value)
+   --[=[ This function activates the setting value setting functions for defined values.
+   --]=]
+   settings = {
+	  "ssid" = setAccessPoint,
+	  "host" = setHostName
+   }
+   settings[setting](value)
+end
+
+function setValues(setting, value)
+   --TODO how do we deal with functions that take multiple values??? pass a table?
+   local settings = {
+	  ssid=setAccessPoint,
+	  host=setHostName,
+   }
+   settings[setting](value)
+end
+
+function checkSettings(filename)
+   --[=[ Checks the quickstart settings file and returns a table with setting, value pairs.
+	  --]=]
+   for line in io.lines("/etc/commotion/profiles.d/quickstartSettings") do
+	  setting = line:split("=")
+	  setValue(setting[1], setting[2])
+   end
+end
+
+function string.split(str, pat)
+	local t = {} 
+	if pat == nil then pat=' ' end
+	local fpat = "(.-)" .. pat
+	local last_end = 1
+	local s, e, cap = str:find(fpat, 1)
+	while s do
+	   if s ~= 1 or cap ~= "" then
+	  table.insert(t,cap)
+	   end
+	   last_end = e+1
+	   s, e, cap = str:find(fpat, last_end)
+	end
+	if last_end <= #str then
+	   cap = str:sub(last_end)
+	   table.insert(t, cap)
+	end
+	return t
+end
+
+
+function setHostName(hostNamen)
+   local uci = luci.model.uci.cursor()
+   uci:foreach("system", "system",
+			   function(s)
+				  if s.hostname then
+					 uci:set("system", s['.name'], "hostname", hostNamen)
+					 uci:commit("system")
+					 uci:save("system")
+				  end
+			   end)
+   hostnameWorks = luci.sys.call("echo " .. hostNamen .. " > /proc/sys/kernel/hostname")
+end
+
+function setAccessPoint(SSID)
+   QS = luci.controller.QS.QS
+   local file = "/etc/commotion/profiles.d/quickstartAP"
+   local find =  "^ssid=.*"
+   local replacement = 'ssid='..SSID
+   replaceLine(file, find, replacement)
+end
+
+function loadingPage()
+   environment = luci.http.getenv("SERVER_NAME")
+   if not environment then
+	  environment = "thisnode"
+   end
+   luci.template.render("QS/module/applyreboot", {redirect_location=("http://" .. environment .. "/cgi-bin/luci/admin")})
+   luci.http.close()
+end
+
 function completeParser()
+   --[=[ This function controls the final settings process--]=]
+   loadingPage()
+   --This may be where we split the finction into smaller components
    local QS = luci.controller.QS.QS
    local uci = luci.model.uci.cursor()
+   settings = checkSettings()
+   for i,x in settings do
+	  setValues(i,x)
+   end
    files = {{"mesh","quickstartMesh"}, {"secAp","quickstartSec"}, {"ap","quickstartAP"}}
    QS.wirelessController(files)
-   luci.controller.QS.QS.log("Quickstart restarting network")
+   --QS.log("Quickstart restarting network")
    --set quickstart to done so that it no longer allows access to these tools without admin password
    luci.sys.call("/etc/init.d/commotiond restart")
    luci.sys.call("sleep 2; /etc/init.d/network restart")
    uci:set('quickstart', 'options', 'complete', 'true')
    uci:save('quickstart')
    uci:commit('quickstart')
-   luci.sys.call("sleep 20 && servald stop && servald start &")
+   luci.sys.call("sleep 5 && servald stop && servald start &")
 end
 
+
+
+
+function readProfile(name, obj)
+   --[=[ This function takes a profile name and the value desired and returns the result of that value.
+   --]=]
+   if type(name) == "string" then
+	  offset = string.len(tostring(obj))
+      for line in io.lines("/etc/commotion/profiles.d/"..name) do
+		 b,c = string.find(line,"^"..obj.."=.*")
+		 if b then
+			value = string.sub(line,b+offset,c)
+		 end
+	  end
+	  return value
+   else
+	  return nil
+   end
+end
+
+
+function replaceLine(fn, find, replacement)
+   --[=[ Function for replacing values in non-uci config files
+	     replaceLine(File Name, search string, replacement text)
+   --]=]
+   errorCode = 1
+   grepable = luci.sys.call('grep -q '..find..' '..fn) 
+   if grepable == 1 then
+	  errorCode = luci.sys.call("echo " .. replacement .. " >> ".. fn)
+   else
+	  errorCode = luci.sys.call('sed -i s/'..find..'/'..replacement..'/g '..fn)
+   end
+   return errorCode
+end
+
+
+
 function adminPasswordParser(val)
+   --[=[ --]=]
    errors = {}
    local p1 = val.adminPassword_pwd1
    local p2 = val.adminPassword_pwd2 
@@ -149,6 +313,23 @@ function secAccessPointParser()
    end
 end
 
+function checkPass(p1, p2)
+   --[=[ This function takes two values and compares them. It returns error text for password pages. It needs some serious refactoring, but it works --]=]
+   QS = luci.controller.QS.QS
+   if p1 and p2 then
+	  if p1 == p2 then
+		 if p1 == '' then
+			return "Please enter a password"
+		 elseif string.len(p1) < 8 then
+			return "Please enter a password that is more than 8 chars long"
+		 end
+	  else
+		 return "Given password confirmation did not match, password not changed!"
+	  end
+   end
+end
+
+
 function splashPageRenderer()
    return 'true'
 end
@@ -439,17 +620,3 @@ function uploadParser()
 	  return error
    end
 end
-
-function replaceLine(fn, find, replacement)
-   --Function for replacing values in non-uci config files
-   --replaceLine(File Name, search string, replacement text)
-   errorCode = 1
-   grepable = luci.sys.call('grep -q '..find..' '..fn) 
-   if grepable == 1 then
-	  errorCode = luci.sys.call("echo " .. replacement .. " >> ".. fn)
-   else
-	  errorCode = luci.sys.call('sed -i s/'..find..'/'..replacement..'/g '..fn)
-   end
-   return errorCode
-end
-
diff --git a/usr/lib/lua/luci/view/QS/module/adminPassword.htm b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
index 60e662a..db86a64 100644
--- a/usr/lib/lua/luci/view/QS/module/adminPassword.htm
+++ b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
@@ -6,10 +6,9 @@
 <%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
 <div id="zone-content-wrapper">
   <div id="zone-content">
-	  <input type="hidden" name="moduleName" value="adminPassword" />	  	  
-	  <h2>Admin Password</h2>
+	  <input type="hidden" name="moduleName" value="adminPassword" />
+	  	  <label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Admin Password:</label>
 	  <h2 class="warning"><%=pwErr%></h2>
-	  <p class="flavor">Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.</p>
 	  <input type="password" name="adminPassword_pwd1">
 	  <p class="flavor">Retype your password here</p>
  	  <input type="password" name="adminPassword_pwd2">
diff --git a/usr/lib/lua/luci/view/QS/module/applyreboot.htm b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
index df1ee80..e34e37c 100644
--- a/usr/lib/lua/luci/view/QS/module/applyreboot.htm
+++ b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
@@ -37,7 +37,6 @@
 
    local meshName = netName
    local nodeName = hostname 
-end
 -%>
 		<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
 		<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
diff --git a/usr/lib/lua/luci/view/QS/module/complete.htm b/usr/lib/lua/luci/view/QS/module/complete.htm
new file mode 100644
index 0000000..6db5aa7
--- /dev/null
+++ b/usr/lib/lua/luci/view/QS/module/complete.htm
@@ -0,0 +1 @@
+	  <input type="hidden" name="moduleName" value="complete" />
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
new file mode 100644
index 0000000..5bdb6dd
--- /dev/null
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -0,0 +1,39 @@
+<%-
+   if pv.errorMsg then
+       if pv.errorMsg.name then
+          nameErr = pv.errorMsg.name
+       end
+   end
+   nodeID = luci.sys.exec("commotion nodeid")
+-%>
+
+<script type="text/javascript" language="javascript">
+   function toggleVisibility(cb)
+    {
+     var x = document.getElementById("secureAP");
+     if(cb.checked==false)
+      x.style.visibility = "hidden"; // or x.style.display = "none";
+     else
+      x.style.visibility = "visible"; //or x.style.display = "block";
+    }
+</script>
+
+<div id="zone-content-wrapper">
+  <div id="zone-content">
+	<input type="hidden" name="moduleName" value="name" />
+	<label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use numbers, letters &amp; special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.">Node Name:</label>
+	<p>What would you like to name your node?</p>
+	<p>This value is used by other users and devices to find your network wirelessly and over the mesh..</p>
+	<h2 class="warning"><%=nameErr%></h2>
+	<input type="text" value="MyNode" name="nodeName"> + <%=nodeID%>
+	
+	<input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)">
+	<div id="secureAP">
+	<h2>Password</h2>
+	<p class="flavor">This password is for your access point. Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.</p>
+	<input type="password" name="pwd1">
+	<p class="flavor">Retype your password here</p>
+	<input type="password" name="pwd2">
+	</div>
+  </div>
+</div>

From 32879ebc82bfe6c6ca41ea04b089d48046ab8b46 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Wed, 1 May 2013 16:31:55 -0400
Subject: [PATCH 06/20] completed make it work completion without error on all
 possibilities.

---
 etc/config/quickstart                         |   4 +-
 usr/lib/lua/luci/controller/QS/QS.lua         |   5 +-
 usr/lib/lua/luci/controller/QS/buttons.lua    |   6 +-
 usr/lib/lua/luci/controller/QS/modules.lua    | 125 +++++++++++-------
 .../lua/luci/view/QS/module/adminPassword.htm |   2 +-
 .../lua/luci/view/QS/module/applyreboot.htm   |  27 ++--
 usr/lib/lua/luci/view/QS/module/name.htm      |  36 ++---
 7 files changed, 115 insertions(+), 90 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index f8104f8..1f9694a 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -1,4 +1,4 @@
-OBconfig quickstart options
+config quickstart options
 	   option pageNo 'welcome'
 	   option lastPg 'welcome'
 	   option complete 'false'
@@ -6,7 +6,7 @@ OBconfig quickstart options
 
 config page 'welcome'
 	   option pageTitle 'Welcome'
-	   option topheader 'Welcome to the Commotion Quick Start Wizard'	   
+	   option topheader 'Welcome to the Commotion Quick Start'	   
 	   list modules 'name'
 	   list modules 'adminPassword'
 	   list buttons 'noBack'
diff --git a/usr/lib/lua/luci/controller/QS/QS.lua b/usr/lib/lua/luci/controller/QS/QS.lua
index b64ec19..215393f 100644
--- a/usr/lib/lua/luci/controller/QS/QS.lua
+++ b/usr/lib/lua/luci/controller/QS/QS.lua
@@ -123,7 +123,6 @@ function wirelessController(profiles)
 			   function(s)
 				  table.insert(dev, s['.name'])
 			   end)
-
    --Create interfaces
    for devNum,device in ipairs(dev) do
 	  --Make sure wireless devices are on... because it starts them disabled for some reason
@@ -204,8 +203,8 @@ function parseSubmit(returns)
 	  pages('next', button)
    end
    if  next(errors) ~= nil then
-	  log("errors HERE")
-	  log(errors)
+	  --log("errors HERE")
+	  --log(errors)
 	  pages('next','back')
 	  return(errors)
    end
diff --git a/usr/lib/lua/luci/controller/QS/buttons.lua b/usr/lib/lua/luci/controller/QS/buttons.lua
index 0c0cba1..9b3ce65 100644
--- a/usr/lib/lua/luci/controller/QS/buttons.lua
+++ b/usr/lib/lua/luci/controller/QS/buttons.lua
@@ -6,7 +6,7 @@ end
 function networkSecuritySettings(modules)
    local QS = luci.controller.QS.QS
    local error = luci.controller.QS.QS.keyCheck()
-   QS:log(error)
+   --QS:log(error)
    return(modules)
 end
 
@@ -115,7 +115,7 @@ function continueInsecure(modules)
 end
 
 function noConfigUploaded(modules)
-   luci.controller.QS.QS.log(modules)
+   --luci.controller.QS.QS.log(modules)
    for i,x in ipairs(modules) do
 	  if x == 'upload' then
 		 rem = i
@@ -127,7 +127,7 @@ function noConfigUploaded(modules)
 end
 
 function noSplash(modules)
-   luci.controller.QS.QS.log(modules)
+   --luci.controller.QS.QS.log(modules)
    for i,x in ipairs(modules) do
 	  if x == 'splashPage' then
 		 rem = i
diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index 474043e..25335b9 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -5,6 +5,7 @@ function index()
    --This function is required for LuCI
    --we don't need to define any pages in this file
 end
+
 function welcomeRenderer()
    return 'true'
 end
@@ -18,73 +19,72 @@ function completeRenderer()
 end
 
 function nameRenderer()
-   if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
-	  luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartAP') 
-   end
-   if luci.fs.isfile("/etc/commotion/profiles.d/quickstartSettings") then
-	  luci.sys.call("echo "" > /etc/commotion/profiles.d/quickstartSettings") 
-   end
+   luci.sys.call("echo '' > /etc/commotion/profiles.d/quickstartSettings") 
    return 'true'
 end
 
 function nameParser()
+   local QS = luci.controller.QS.QS
+   QS.log("nameParser running")
    errors = nil
    local val = luci.http.formvalue()
+   --QS.log(val)
    if val.nodeName and val.nodeName ~= "" and string.len(val.nodeName) < 20 then
 	  nodeID = luci.sys.exec("commotion nodeid")
 	  --luci.controller.QS.QS.log(val.nodeName)
 	  name = tostring(val.nodeName) .. nodeID
-	  file = io.open("/etc/commotion/profiles.d/quickstartSettings", a)
+	  --QS.log(name)
+	  file = io.open("/etc/commotion/profiles.d/quickstartSettings", "a")
 	  file:write("hostname="..name.."\n")
-	  if val.secure then
+	  --QS.log("wrote hostname")
+	  if val.secure == 'true' then
+		 --QS.log("passwords:"..val.pwd1.." & "..val.pwd2)
 		 pass = checkPass(val.pwd1, val.pwd2)
 		 if pass == nil then
-			file:write("pwd="..pass.."\n")
+			if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartSec") then
+			   luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartSec') 
+			end
+			file:write("pwd="..val.pwd1.."\n")
 			file:write("SSIDSec="..name.."\n")
 		 else
 			return pass
 		 end
 	  else
-		 file:write("SSID="..name.."\n")		 
+		 if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
+			luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartAP') 
+		 end
+		 file:write("SSID="..name.."\n")
 	  end
 	  file:close()
    else
 	  errors = "Please enter a name that is greater than 0 and less than 20 chars."
    end
-   if val.
    if errors ~= nil then
 	  return errors
    end
 end
 
-function setValues(setting, value)
-   --[=[ This function activates the setting value setting functions for defined values.
-   --]=]
-   settings = {
-	  "ssid" = setAccessPoint,
-	  "host" = setHostName
-   }
-   settings[setting](value)
-end
+function setAPPassword(pass)
+   local QS = luci.controller.QS.QS
+   QS.log("setAPPassword started")
 
-function setValues(setting, value)
-   --TODO how do we deal with functions that take multiple values??? pass a table?
-   local settings = {
-	  ssid=setAccessPoint,
-	  host=setHostName,
-   }
-   settings[setting](value)
+   local file = "/etc/commotion/profiles.d/quickstartSec"
+   local find =  '^wpakey=.*'
+   local replacement = "wpakey="..pass
+   replaceLine(file, find, replacement)
 end
 
-function checkSettings(filename)
-   --[=[ Checks the quickstart settings file and returns a table with setting, value pairs.
-	  --]=]
-   for line in io.lines("/etc/commotion/profiles.d/quickstartSettings") do
-	  setting = line:split("=")
-	  setValue(setting[1], setting[2])
-   end
+function setSecAccessPoint(SSID)
+   local QS = luci.controller.QS.QS
+   QS.log("setSecAccessPoint started")
+
+   local file = "/etc/commotion/profiles.d/quickstartSec"
+   local find =  "^ssid=.*"
+   local replacement = 'ssid='..SSID
+   replaceLine(file, find, replacement)
 end
 
+
 function string.split(str, pat)
 	local t = {} 
 	if pat == nil then pat=' ' end
@@ -96,8 +96,7 @@ function string.split(str, pat)
 	  table.insert(t,cap)
 	   end
 	   last_end = e+1
-	   s, e, cap = str:find(fpat, last_end)
-	end
+	   s, e, cap = str:find(fpat, last_end)	end
 	if last_end <= #str then
 	   cap = str:sub(last_end)
 	   table.insert(t, cap)
@@ -107,6 +106,8 @@ end
 
 
 function setHostName(hostNamen)
+   local QS = luci.controller.QS.QS
+   QS.log("setHostName started")
    local uci = luci.model.uci.cursor()
    uci:foreach("system", "system",
 			   function(s)
@@ -116,11 +117,13 @@ function setHostName(hostNamen)
 					 uci:save("system")
 				  end
 			   end)
+   QS.log("almost done")
    hostnameWorks = luci.sys.call("echo " .. hostNamen .. " > /proc/sys/kernel/hostname")
 end
 
 function setAccessPoint(SSID)
-   QS = luci.controller.QS.QS
+   local QS = luci.controller.QS.QS
+   QS.log("setAccessPoint started")
    local file = "/etc/commotion/profiles.d/quickstartAP"
    local find =  "^ssid=.*"
    local replacement = 'ssid='..SSID
@@ -128,6 +131,9 @@ function setAccessPoint(SSID)
 end
 
 function loadingPage()
+   local QS = luci.controller.QS.QS
+   QS.log("loadingPage started")
+
    environment = luci.http.getenv("SERVER_NAME")
    if not environment then
 	  environment = "thisnode"
@@ -136,19 +142,46 @@ function loadingPage()
    luci.http.close()
 end
 
+function setValues(setting, value)
+   --[=[ This function activates the setting value setting functions for defined values.
+	  --]=]
+   --TODO how do we deal with functions that take multiple values? Lua allows passing of muiltiple values, may just need to make more ways to submit.
+   local QS = luci.controller.QS.QS
+   QS.log("setValue started")
+   settings = {
+	  SSID = setAccessPoint,
+	  hostname = setHostName,
+	  pwd = setAPPassword,
+	  SSIDSec = setSecAccessPoint,
+   }
+   settings[setting](value)
+   return
+end
+
+function checkSettings()
+   --[=[ Checks the quickstart settings file and returns a table with setting, value pairs.--]=]
+   local QS = luci.controller.QS.QS
+   QS.log("checkSetttings started")
+   for line in io.lines("/etc/commotion/profiles.d/quickstartSettings") do
+	  setting = line:split("=")
+	  if setting[1] ~= "" and setting[1] ~= nil then
+		 setValues(setting[1], setting[2])
+	  end
+   end
+   return true
+end
+
 function completeParser()
    --[=[ This function controls the final settings process--]=]
-   loadingPage()
-   --This may be where we split the finction into smaller components
    local QS = luci.controller.QS.QS
+   QS.log("completeParser started")
    local uci = luci.model.uci.cursor()
-   settings = checkSettings()
-   for i,x in settings do
-	  setValues(i,x)
-   end
+   loadingPage()
+   --This may be where we split the finction into smaller components
+   checkSettings()
    files = {{"mesh","quickstartMesh"}, {"secAp","quickstartSec"}, {"ap","quickstartAP"}}
    QS.wirelessController(files)
-   --QS.log("Quickstart restarting network")
+   QS.log("Quickstart restarting network")
    --set quickstart to done so that it no longer allows access to these tools without admin password
    luci.sys.call("/etc/init.d/commotiond restart")
    luci.sys.call("sleep 2; /etc/init.d/network restart")
@@ -156,11 +189,11 @@ function completeParser()
    uci:save('quickstart')
    uci:commit('quickstart')
    luci.sys.call("sleep 5 && servald stop && servald start &")
+   QS.log("it is done")
 end
 
 
 
-
 function readProfile(name, obj)
    --[=[ This function takes a profile name and the value desired and returns the result of that value.
    --]=]
@@ -538,7 +571,7 @@ function networkSecurityRenderer()
 	  if d then
 		 --I bet I could find an even more difficult set of variables to differentiate than b and d, but ill leave it at this :)
 		 servald = string.sub(line,d+8,e)
-		 luci.controller.QS.QS.log('servald = '..servald)
+		 --luci.controller.QS.QS.log('servald = '..servald)
 	  end
    end
    if servald=='true' then
diff --git a/usr/lib/lua/luci/view/QS/module/adminPassword.htm b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
index db86a64..550ee84 100644
--- a/usr/lib/lua/luci/view/QS/module/adminPassword.htm
+++ b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
@@ -1,5 +1,5 @@
 <%-
-   if pv.errorMsg then
+   if pv.errorMsg and pv.errorMsg.adminPassword then
        if pv.errorMsg.adminPassword.pw then pwErr = pv.errorMsg.adminPassword.pw end
    end
 -%>
diff --git a/usr/lib/lua/luci/view/QS/module/applyreboot.htm b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
index e34e37c..65a9d99 100644
--- a/usr/lib/lua/luci/view/QS/module/applyreboot.htm
+++ b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
@@ -2,29 +2,21 @@
 	<head>
 		<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Redirecting...%><% end %></title>
 <%-
-   if luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
-	  for line in io.lines("/etc/commotion/profiles.d/quickstartAP") do
-		 b,c = string.find(line,"^ssid=.*")
+   if luci.fs.isfile("/etc/commotion/profiles.d/quickstartSettings") then
+	  for line in io.lines("/etc/commotion/profiles.d/quickstartSettings") do
+		 b,c = string.find(line,"^SSID=.*")
+         d,e = string.find(line, "^SSIDSec=.*")
+         f,g = string.find(line, "^hostname=.*")
 		 if b then
 			apName = string.sub(line,b+5,c)
+         elseif d then
+            apName = string.sub(line,d+8,e)
 		 end
-	  end
-   elseif luci.fs.isfile("/etc/commotion/profiles.d/quickstartSec") then
-	  for line in io.lines("/etc/commotion/profiles.d/quickstartSec") do
-		 b,c = string.find(line,"^ssid=.*")
-		 if b then
-			apName = string.sub(line,b+5,c)
+         if f then
+			hostname = string.sub(line,f+9,g)
 		 end
 	  end
    end
-   local uci = luci.model.uci.cursor()
-   --get hostname from system file
-   uci:foreach("system", "system",
-			   function(s)
-				  if s.hostname then
-					 hostname = s.hostname
-				  end
-			   end)
    if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartMesh") then
 	  luci.sys.call('cp /etc/commotion/profiles.d/defaultMesh /etc/commotion/profiles.d/quickstartMesh') 
    end
@@ -34,7 +26,6 @@
 		 netName = string.sub(line,b+5,c)
 	  end
    end
-
    local meshName = netName
    local nodeName = hostname 
 -%>
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index 5bdb6dd..f5c3075 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -11,29 +11,31 @@
    function toggleVisibility(cb)
     {
      var x = document.getElementById("secureAP");
-     if(cb.checked==false)
-      x.style.visibility = "hidden"; // or x.style.display = "none";
+     if(cb.checked==true)
+         x.style.display = "block";
      else
-      x.style.visibility = "visible"; //or x.style.display = "block";
+         x.style.display = "none";
     }
-</script>
 
+</script>
+<h2 class="warning"><%=nameErr%></h2>
 <div id="zone-content-wrapper">
   <div id="zone-content">
 	<input type="hidden" name="moduleName" value="name" />
-	<label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use numbers, letters &amp; special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.">Node Name:</label>
-	<p>What would you like to name your node?</p>
-	<p>This value is used by other users and devices to find your network wirelessly and over the mesh..</p>
-	<h2 class="warning"><%=nameErr%></h2>
-	<input type="text" value="MyNode" name="nodeName"> + <%=nodeID%>
-	
-	<input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)">
-	<div id="secureAP">
-	<h2>Password</h2>
-	<p class="flavor">This password is for your access point. Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.</p>
-	<input type="password" name="pwd1">
-	<p class="flavor">Retype your password here</p>
-	<input type="password" name="pwd2">
+	<div class="cbi-value">
+      <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use numbers, letters &amp; special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.">Node Name</label>
+	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh..</p>
+	  <input type="text" value="Your Node Name + <%=nodeID%>" name="nodeName"> 
+	  <input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
+	</div>
+	<div id="secureAP" style="display:none">
+	  <div class="cbi-value">
+		<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Password</label>
+		<p class="flavor">This password is for your access point.</p>
+		<input type="password" name="pwd1">
+		<p class="flavor">Retype your password here</p>
+		<input type="password" name="pwd2">
+	  </div>
 	</div>
   </div>
 </div>

From 0c81fafce6fc9115a88cbc5403433662a2c43e18 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Thu, 2 May 2013 12:47:48 -0400
Subject: [PATCH 07/20] made node addition text sit next to input field, and
 added help text to the upload module

---
 etc/config/quickstart                      |  2 +-
 usr/lib/lua/luci/view/QS/module/name.htm   |  5 +++--
 usr/lib/lua/luci/view/QS/module/upload.htm | 10 ++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index 1f9694a..90dcf71 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -16,7 +16,7 @@ config page 'welcome'
 config page 'settingsFile'
 	   option pageTitle 'Using a Settings File'
 	   option topheader 'Using a Settings File'
-	   option subheading 'Do you have a settings file? Your network administrator may have provided a settings file. If you have a settings file, please upload it below. Or, you can enter the settings manually.'
+	   option subheading 'If you have a settings file, please upload it below.'
 	   option fileType 'config'
 	   list modules 'upload'
 	   list buttons '4:finish,|Upload and Finish,|,| ,|'
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index f5c3075..dc1e598 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -18,14 +18,15 @@
     }
 
 </script>
+
 <h2 class="warning"><%=nameErr%></h2>
 <div id="zone-content-wrapper">
   <div id="zone-content">
 	<input type="hidden" name="moduleName" value="name" />
 	<div class="cbi-value">
-      <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use numbers, letters &amp; special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.">Node Name</label>
+      <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.">Node Name</label>
 	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh..</p>
-	  <input type="text" value="Your Node Name + <%=nodeID%>" name="nodeName"> 
+	  <div style="white-space:nowrap"><input type="text" value="Your Node Name" name="nodeName"  style="display:inline-block;width:80%"><strong>+<%=nodeID%></strong> <div/>
 	  <input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
 	</div>
 	<div id="secureAP" style="display:none">
diff --git a/usr/lib/lua/luci/view/QS/module/upload.htm b/usr/lib/lua/luci/view/QS/module/upload.htm
index 6d3e5db..6c7038e 100644
--- a/usr/lib/lua/luci/view/QS/module/upload.htm
+++ b/usr/lib/lua/luci/view/QS/module/upload.htm
@@ -15,10 +15,12 @@
   <div id="zone-content">
 	<input type="hidden" name="moduleName" value="upload">
 	<div class="error"><%=upErr%></div>
-	<h2>Upload <%=uploadTitle%></h2>
-	<input type="file" name="<%=pv.modules.upload.fileType%>" id="media" />
-	<div class="upload-description">
-	  Upload <%=pv.modules.upload.fileInstructions%>
+	<div class="cbi-value">
+      <label class="cbi-value-title tippable" data-tip="Click on the field below to upload a file.">Upload <%=uploadTitle%></label>
+	  <input type="file" name="<%=pv.modules.upload.fileType%>" id="media" />
+	  <div class="upload-description">
+		Upload <%=pv.modules.upload.fileInstructions%>
+	  </div>
 	</div>
   </div>
 </div>

From a5701e2d4fc0e089eccd4fa30ea67dcc4054bd11 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Fri, 3 May 2013 11:18:29 -0400
Subject: [PATCH 08/20] modified descriptions, and organization of the
 quickstart main page. Also, made the reboot page delay 60 seconds instead of
 20.

---
 etc/config/quickstart                             | 4 ++--
 usr/lib/lua/luci/view/QS/module/adminPassword.htm | 8 ++++++--
 usr/lib/lua/luci/view/QS/module/applyreboot.htm   | 6 +++---
 usr/lib/lua/luci/view/QS/module/name.htm          | 4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index 90dcf71..3c56a7b 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -6,9 +6,9 @@ config quickstart options
 
 config page 'welcome'
 	   option pageTitle 'Welcome'
-	   option topheader 'Welcome to the Commotion Quick Start'	   
-	   list modules 'name'
+	   option topheader 'Welcome to the Commotion Quick Start'
 	   list modules 'adminPassword'
+	   list modules 'name'
 	   list buttons 'noBack'
 	   list buttons '2:settingsFile,|Use a pre-built network file &gt;,| ,| '
 	   list buttons '3:finish,|Just Make it Work &gt;,| ,| '	
diff --git a/usr/lib/lua/luci/view/QS/module/adminPassword.htm b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
index 550ee84..b2682fd 100644
--- a/usr/lib/lua/luci/view/QS/module/adminPassword.htm
+++ b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
@@ -6,12 +6,16 @@
 <%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
 <div id="zone-content-wrapper">
   <div id="zone-content">
-	  <input type="hidden" name="moduleName" value="adminPassword" />
-	  	  <label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Admin Password:</label>
+	<input type="hidden" name="moduleName" value="adminPassword" />
+	<div class="cbi-value">
+	  <label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Admin Password:</label>
+	  <p>This password is used to access the administration menu's on this device.</p>
 	  <h2 class="warning"><%=pwErr%></h2>
 	  <input type="password" name="adminPassword_pwd1">
 	  <p class="flavor">Retype your password here</p>
  	  <input type="password" name="adminPassword_pwd2">
+	</div>
   </div>
 </div>
 <%- end -%>
+	
diff --git a/usr/lib/lua/luci/view/QS/module/applyreboot.htm b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
index 65a9d99..31f9e00 100644
--- a/usr/lib/lua/luci/view/QS/module/applyreboot.htm
+++ b/usr/lib/lua/luci/view/QS/module/applyreboot.htm
@@ -38,13 +38,13 @@
 					window.clearInterval(interval);
 					window.clearInterval(interval2);
 					location.href = "<%=redirect_location%>";
-				}, 15000);
+				}, 30000);
 				img.onload = function() {
 					window.clearInterval(interval);
 					location.href = "<%=redirect_location%>";
 				};
 				img.src = 'http://<%=addr or luci.http.getenv("SERVER_NAME")%><%=resource%>/icons/loading.gif?' + Math.random();
-			}, 5000);
+			}, 30000);
 		//]]></script>
 	</head>
 	<body>
@@ -75,7 +75,7 @@ <h3>When people connect to your node wirelessly, they will connect using this na
 						</div>	
 					</p>
 					<form action="<%=redirect_location%>" type="get">
-					  <input type="submit" value="Click here if your browser doesn't redirect you in 20 seconds" name="action" />
+					  <input type="submit" value="Click here if your browser doesn't redirect you within one minute" name="action" />
 					</form>
 				</fieldset>
 			</div>
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index dc1e598..266134a 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -25,14 +25,14 @@ <h2 class="warning"><%=nameErr%></h2>
 	<input type="hidden" name="moduleName" value="name" />
 	<div class="cbi-value">
       <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.">Node Name</label>
-	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh..</p>
+	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh.</p>
 	  <div style="white-space:nowrap"><input type="text" value="Your Node Name" name="nodeName"  style="display:inline-block;width:80%"><strong>+<%=nodeID%></strong> <div/>
 	  <input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
 	</div>
 	<div id="secureAP" style="display:none">
 	  <div class="cbi-value">
 		<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Password</label>
-		<p class="flavor">This password is for your access point.</p>
+		<p class="flavor">This password is required for others to use your wifi.</p>
 		<input type="password" name="pwd1">
 		<p class="flavor">Retype your password here</p>
 		<input type="password" name="pwd2">

From e2801ef00c9fd95e9a265090b8161307679f3082 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Tue, 7 May 2013 14:56:13 -0400
Subject: [PATCH 09/20] changed just make it work button to finish button (bug
 494)

---
 etc/config/quickstart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index 3c56a7b..ce55bf1 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -11,7 +11,7 @@ config page 'welcome'
 	   list modules 'name'
 	   list buttons 'noBack'
 	   list buttons '2:settingsFile,|Use a pre-built network file &gt;,| ,| '
-	   list buttons '3:finish,|Just Make it Work &gt;,| ,| '	
+	   list buttons '3:finish,|Finish &gt;,| ,| '	
 	   
 config page 'settingsFile'
 	   option pageTitle 'Using a Settings File'

From 822dab18fcc235480e1fe077a7f8deeacfec68f5 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Thu, 9 May 2013 18:18:26 -0400
Subject: [PATCH 10/20] swapped finish button

---
 etc/config/quickstart                      | 5 +++--
 usr/lib/lua/luci/controller/QS/modules.lua | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/etc/config/quickstart b/etc/config/quickstart
index ce55bf1..dfaf952 100644
--- a/etc/config/quickstart
+++ b/etc/config/quickstart
@@ -10,8 +10,9 @@ config page 'welcome'
 	   list modules 'adminPassword'
 	   list modules 'name'
 	   list buttons 'noBack'
-	   list buttons '2:settingsFile,|Use a pre-built network file &gt;,| ,| '
-	   list buttons '3:finish,|Finish &gt;,| ,| '	
+	   list buttons '2:finish,|Finish &gt;,| ,| '			
+	   list buttons '3:settingsFile,|Use a pre-built network file &gt;,| ,| '
+
 	   
 config page 'settingsFile'
 	   option pageTitle 'Using a Settings File'
diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index 25335b9..87dd758 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -72,6 +72,10 @@ function setAPPassword(pass)
    local find =  '^wpakey=.*'
    local replacement = "wpakey="..pass
    replaceLine(file, find, replacement)
+   --local file = "/etc/commotion/profiles.d/quickstartSec"
+   --local find =  '^wpa=.*'
+   --local replacement = "wpa=true"
+   --replaceLine(file, find, replacement)
 end
 
 function setSecAccessPoint(SSID)

From 08b6563634ae81e9169f30327eb13562a7aebe1b Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Thu, 9 May 2013 18:20:30 -0400
Subject: [PATCH 11/20] changed menu's to menus

---
 usr/lib/lua/luci/view/QS/module/adminPassword.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/lib/lua/luci/view/QS/module/adminPassword.htm b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
index b2682fd..5f6fa45 100644
--- a/usr/lib/lua/luci/view/QS/module/adminPassword.htm
+++ b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
@@ -9,7 +9,7 @@
 	<input type="hidden" name="moduleName" value="adminPassword" />
 	<div class="cbi-value">
 	  <label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Admin Password:</label>
-	  <p>This password is used to access the administration menu's on this device.</p>
+	  <p>This password is used to access the administration menus on this device.</p>
 	  <h2 class="warning"><%=pwErr%></h2>
 	  <input type="password" name="adminPassword_pwd1">
 	  <p class="flavor">Retype your password here</p>

From ba39f847399db00a9ccf9b23e58ab71a7b03457d Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Thu, 9 May 2013 18:21:46 -0400
Subject: [PATCH 12/20] added wifi designation to wifi password

---
 usr/lib/lua/luci/view/QS/module/name.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index 266134a..484d34a 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -31,7 +31,7 @@ <h2 class="warning"><%=nameErr%></h2>
 	</div>
 	<div id="secureAP" style="display:none">
 	  <div class="cbi-value">
-		<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Password</label>
+		<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">WiFi Password</label>
 		<p class="flavor">This password is required for others to use your wifi.</p>
 		<input type="password" name="pwd1">
 		<p class="flavor">Retype your password here</p>

From a2eb59ada07f75c843e46332ad4f49dfea099a2d Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Thu, 9 May 2013 18:23:39 -0400
Subject: [PATCH 13/20] replaced name with password when talking about password
 inputs

---
 usr/lib/lua/luci/view/QS/module/adminPassword.htm | 2 +-
 usr/lib/lua/luci/view/QS/module/name.htm          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/lib/lua/luci/view/QS/module/adminPassword.htm b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
index 5f6fa45..d5bc099 100644
--- a/usr/lib/lua/luci/view/QS/module/adminPassword.htm
+++ b/usr/lib/lua/luci/view/QS/module/adminPassword.htm
@@ -8,7 +8,7 @@
   <div id="zone-content">
 	<input type="hidden" name="moduleName" value="adminPassword" />
 	<div class="cbi-value">
-	  <label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">Admin Password:</label>
+	  <label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This password can be numbers, letters, and special characters.">Admin Password:</label>
 	  <p>This password is used to access the administration menus on this device.</p>
 	  <h2 class="warning"><%=pwErr%></h2>
 	  <input type="password" name="adminPassword_pwd1">
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index 484d34a..0373ae1 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -31,7 +31,7 @@ <h2 class="warning"><%=nameErr%></h2>
 	</div>
 	<div id="secureAP" style="display:none">
 	  <div class="cbi-value">
-		<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This name can be numbers, letters, and special characters.">WiFi Password</label>
+		<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This password can be numbers, letters, and special characters.">WiFi Password</label>
 		<p class="flavor">This password is required for others to use your wifi.</p>
 		<input type="password" name="pwd1">
 		<p class="flavor">Retype your password here</p>

From 1a41ff534952dc2544d089bda2c049dd9bb1af2d Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Thu, 9 May 2013 18:59:20 -0400
Subject: [PATCH 14/20] added a check for node_name compatability with hostname
 values

---
 usr/lib/lua/luci/controller/QS/QS.lua      | 10 ++++-
 usr/lib/lua/luci/controller/QS/modules.lua | 48 ++++++++++++----------
 usr/lib/lua/luci/view/QS/module/name.htm   |  2 +-
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/usr/lib/lua/luci/controller/QS/QS.lua b/usr/lib/lua/luci/controller/QS/QS.lua
index 215393f..443ecde 100644
--- a/usr/lib/lua/luci/controller/QS/QS.lua
+++ b/usr/lib/lua/luci/controller/QS/QS.lua
@@ -215,12 +215,20 @@ function runParser(modules)
    errors = {}
    local returns = luci.http.formvalue()
    --log(returns)
+   log(modules)
    if modules then
 	  for _,value in ipairs(modules) do
 		 for i,x in pairs(luci.controller.QS.modules) do
 			if i == (value .. "Parser") then
 			   --log(value)
-			   errors[value]= luci.controller.QS.modules[value .. "Parser"](returns)
+			   errors[value] = luci.controller.QS.modules[value .. "Parser"](returns)
+			   if next(errors) then
+				  for i,x in ipairs(modules) do
+					 if x == 'complete' then
+						modules[i] = nil
+					 end
+				  end
+			   end
 			end
 		 end
 	  end
diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index 87dd758..dee0277 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -1,6 +1,6 @@
 module("luci.controller.QS.modules", package.seeall)
   --to have a html page render you must return a value or it wont.
-
+require "commotion_helpers"
 function index()
    --This function is required for LuCI
    --we don't need to define any pages in this file
@@ -30,32 +30,36 @@ function nameParser()
    local val = luci.http.formvalue()
    --QS.log(val)
    if val.nodeName and val.nodeName ~= "" and string.len(val.nodeName) < 20 then
-	  nodeID = luci.sys.exec("commotion nodeid")
-	  --luci.controller.QS.QS.log(val.nodeName)
-	  name = tostring(val.nodeName) .. nodeID
-	  --QS.log(name)
-	  file = io.open("/etc/commotion/profiles.d/quickstartSettings", "a")
-	  file:write("hostname="..name.."\n")
-	  --QS.log("wrote hostname")
-	  if val.secure == 'true' then
-		 --QS.log("passwords:"..val.pwd1.." & "..val.pwd2)
-		 pass = checkPass(val.pwd1, val.pwd2)
-		 if pass == nil then
-			if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartSec") then
-			   luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartSec') 
+	  if is_ssid(val.nodeName) then
+		 nodeID = luci.sys.exec("commotion nodeid")
+		 --luci.controller.QS.QS.log(val.nodeName)
+		 name = tostring(val.nodeName) .. nodeID
+		 --QS.log(name)
+		 file = io.open("/etc/commotion/profiles.d/quickstartSettings", "a")
+		 file:write("hostname="..name.."\n")
+		 --QS.log("wrote hostname")
+		 if val.secure == 'true' then
+			--QS.log("passwords:"..val.pwd1.." & "..val.pwd2)
+			pass = checkPass(val.pwd1, val.pwd2)
+			if pass == nil then
+			   if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartSec") then
+				  luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartSec') 
+			   end
+			   file:write("pwd="..val.pwd1.."\n")
+			   file:write("SSIDSec="..name.."\n")
+			else
+			   return pass
 			end
-			file:write("pwd="..val.pwd1.."\n")
-			file:write("SSIDSec="..name.."\n")
 		 else
-			return pass
+			if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
+			   luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartAP') 
+			end
+			file:write("SSID="..name.."\n")
 		 end
+		 file:close()
 	  else
-		 if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
-			luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartAP') 
-		 end
-		 file:write("SSID="..name.."\n")
+		 errors = "Please enter a correctly formatted name."
 	  end
-	  file:close()
    else
 	  errors = "Please enter a name that is greater than 0 and less than 20 chars."
    end
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index 0373ae1..8244437 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -25,7 +25,7 @@ <h2 class="warning"><%=nameErr%></h2>
 	<input type="hidden" name="moduleName" value="name" />
 	<div class="cbi-value">
       <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.">Node Name</label>
-	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh.</p>
+	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh. This value can be composed of letter, number and hyphens. (Hyphens can not be used at the beggining or end of the name.)</p>
 	  <div style="white-space:nowrap"><input type="text" value="Your Node Name" name="nodeName"  style="display:inline-block;width:80%"><strong>+<%=nodeID%></strong> <div/>
 	  <input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
 	</div>

From b949064e602f7eeff09a1e0d0042db42fbd0c74e Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Fri, 10 May 2013 08:27:44 -0400
Subject: [PATCH 15/20] made password validation better, fixed some css, and
 added a quickstart restart image.

---
 usr/lib/lua/luci/controller/QS/modules.lua    |  24 ++++++++++++++++--
 usr/lib/lua/luci/view/QS/module/name.htm      |   2 +-
 www/luci-static/commotion/QS_reset_button.png | Bin 0 -> 2412 bytes
 .../commotion/QS_reset_button_hover.png       | Bin 0 -> 2371 bytes
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 www/luci-static/commotion/QS_reset_button.png
 create mode 100644 www/luci-static/commotion/QS_reset_button_hover.png

diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index dee0277..02a0a59 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -1,6 +1,8 @@
 module("luci.controller.QS.modules", package.seeall)
   --to have a html page render you must return a value or it wont.
+
 require "commotion_helpers"
+
 function index()
    --This function is required for LuCI
    --we don't need to define any pages in this file
@@ -30,7 +32,7 @@ function nameParser()
    local val = luci.http.formvalue()
    --QS.log(val)
    if val.nodeName and val.nodeName ~= "" and string.len(val.nodeName) < 20 then
-	  if is_ssid(val.nodeName) then
+	  if is_hostname(val.nodeName) then
 		 nodeID = luci.sys.exec("commotion nodeid")
 		 --luci.controller.QS.QS.log(val.nodeName)
 		 name = tostring(val.nodeName) .. nodeID
@@ -43,7 +45,7 @@ function nameParser()
 			pass = checkPass(val.pwd1, val.pwd2)
 			if pass == nil then
 			   if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartSec") then
-				  luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartSec') 
+				  luci.sys.call('cp /etc/commotion/profiles.d/defaultSec /etc/commotion/profiles.d/quickstartSec') 
 			   end
 			   file:write("pwd="..val.pwd1.."\n")
 			   file:write("SSIDSec="..name.."\n")
@@ -76,6 +78,7 @@ function setAPPassword(pass)
    local find =  '^wpakey=.*'
    local replacement = "wpakey="..pass
    replaceLine(file, find, replacement)
+   
    --local file = "/etc/commotion/profiles.d/quickstartSec"
    --local find =  '^wpa=.*'
    --local replacement = "wpa=true"
@@ -363,6 +366,9 @@ function checkPass(p1, p2)
 			return "Please enter a password"
 		 elseif string.len(p1) < 8 then
 			return "Please enter a password that is more than 8 chars long"
+		 elseif not tostring(p1):match("^[%p%w]+$") then
+			return "Your password has spaces in it. You can't have spaces."
+			
 		 end
 	  else
 		 return "Given password confirmation did not match, password not changed!"
@@ -617,6 +623,20 @@ function networkSecurityParser()
    end
 end
 
+function replaceLine(fn, find, replacement)
+   --[=[ Function for replacing values in non-uci config files
+	     replaceLine(File Name, search string, replacement text)
+   --]=]
+   errorCode = 1
+   grepable = luci.sys.call('grep -q '..find..' '..fn) 
+   if grepable == 1 then
+	  errorCode = luci.sys.call("echo " .. replacement .. " >> ".. fn)
+   else
+	  errorCode = luci.sys.call('sed -i s/'..find..'/'..replacement..'/g '..fn)
+   end
+   return errorCode
+end
+
 
 function uploadRenderer()
    --creates an uploader based upon the fileType of the page config
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index 8244437..cfdce8d 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -26,7 +26,7 @@ <h2 class="warning"><%=nameErr%></h2>
 	<div class="cbi-value">
       <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.">Node Name</label>
 	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh. This value can be composed of letter, number and hyphens. (Hyphens can not be used at the beggining or end of the name.)</p>
-	  <div style="white-space:nowrap"><input type="text" value="Your Node Name" name="nodeName"  style="display:inline-block;width:80%"><strong>+<%=nodeID%></strong> <div/>
+	  <div style="white-space:nowrap"><input type="text" value="Your Node Name" name="nodeName"  style="display:inline-block;width:80%"><strong>+<%=nodeID%></strong> </div>
 	  <input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
 	</div>
 	<div id="secureAP" style="display:none">
diff --git a/www/luci-static/commotion/QS_reset_button.png b/www/luci-static/commotion/QS_reset_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..04ad47366257ab2d4a82870b58ef910ca17321c2
GIT binary patch
literal 2412
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

literal 0
HcmV?d00001

diff --git a/www/luci-static/commotion/QS_reset_button_hover.png b/www/luci-static/commotion/QS_reset_button_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..b394b039e14d1af03627fb607a1d74aa4ba3f021
GIT binary patch
literal 2371
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

literal 0
HcmV?d00001


From 1c350a2cc5c0cecd2fed509354f1f2e58397d2e1 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Mon, 13 May 2013 08:16:31 -0400
Subject: [PATCH 16/20] Added a nodogsplash restart to the end of the
 quickstart finish process per Issue #503

---
 usr/lib/lua/luci/controller/QS/modules.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index 02a0a59..dae9c8e 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -200,6 +200,7 @@ function completeParser()
    uci:save('quickstart')
    uci:commit('quickstart')
    luci.sys.call("sleep 5 && servald stop && servald start &")
+   luci.sys.cal("/etc/init.d/nodogsplash start")
    QS.log("it is done")
 end
 

From 86963bdf681d91c26c444175e3fe9030e2a1d013 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Mon, 13 May 2013 08:28:56 -0400
Subject: [PATCH 17/20] added increased logging to final countdown sequence in
 order to track down where Issue #502 is occuring.

---
 usr/lib/lua/luci/controller/QS/QS.lua      |  2 +-
 usr/lib/lua/luci/controller/QS/modules.lua | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/usr/lib/lua/luci/controller/QS/QS.lua b/usr/lib/lua/luci/controller/QS/QS.lua
index 443ecde..3f10878 100644
--- a/usr/lib/lua/luci/controller/QS/QS.lua
+++ b/usr/lib/lua/luci/controller/QS/QS.lua
@@ -215,7 +215,7 @@ function runParser(modules)
    errors = {}
    local returns = luci.http.formvalue()
    --log(returns)
-   log(modules)
+   --log(modules)
    if modules then
 	  for _,value in ipairs(modules) do
 		 for i,x in pairs(luci.controller.QS.modules) do
diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index dae9c8e..0e2db2a 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -128,8 +128,8 @@ function setHostName(hostNamen)
 					 uci:save("system")
 				  end
 			   end)
-   QS.log("almost done")
    hostnameWorks = luci.sys.call("echo " .. hostNamen .. " > /proc/sys/kernel/hostname")
+   QS.log("hostname set")
 end
 
 function setAccessPoint(SSID)
@@ -139,6 +139,7 @@ function setAccessPoint(SSID)
    local find =  "^ssid=.*"
    local replacement = 'ssid='..SSID
    replaceLine(file, find, replacement)
+   QS.log("Access Point Set")
 end
 
 function loadingPage()
@@ -179,6 +180,7 @@ function checkSettings()
 		 setValues(setting[1], setting[2])
 	  end
    end
+   QS.log("quickstartSettings Completed")
    return true
 end
 
@@ -191,17 +193,23 @@ function completeParser()
    --This may be where we split the finction into smaller components
    checkSettings()
    files = {{"mesh","quickstartMesh"}, {"secAp","quickstartSec"}, {"ap","quickstartAP"}}
+   QS.log("Wireless UCI Controller about to start")
    QS.wirelessController(files)
-   QS.log("Quickstart restarting network")
+   QS.log("Quickstart Final Countdown started")
    --set quickstart to done so that it no longer allows access to these tools without admin password
+   QS.log("1 of 5: restarting commotiond")
    luci.sys.call("/etc/init.d/commotiond restart")
+   QS.log("2 of 5: restarting network")
    luci.sys.call("sleep 2; /etc/init.d/network restart")
+   QS.log("3 of 5: Turning off Quickstart.")
    uci:set('quickstart', 'options', 'complete', 'true')
    uci:save('quickstart')
    uci:commit('quickstart')
+   QS.log("4 of 5: restarting servald")
    luci.sys.call("sleep 5 && servald stop && servald start &")
+   QS.log("5 of 5: restarting nodogsplash")
    luci.sys.cal("/etc/init.d/nodogsplash start")
-   QS.log("it is done")
+   QS.log("Final Countdown Completed")
 end
 
 

From 4be6bfcbc8018d412b795bb52e7a88fa284f6597 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Mon, 13 May 2013 08:38:25 -0400
Subject: [PATCH 18/20] added hostname success logging

---
 usr/lib/lua/luci/controller/QS/modules.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index 0e2db2a..2836f30 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -129,6 +129,7 @@ function setHostName(hostNamen)
 				  end
 			   end)
    hostnameWorks = luci.sys.call("echo " .. hostNamen .. " > /proc/sys/kernel/hostname")
+   QS.log("HostName was set correcty:"..tostring(hostnameWorks))
    QS.log("hostname set")
 end
 

From ff3db9c4d6c8a825fa29df9f5dca11cd9d1f7456 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Tue, 14 May 2013 15:15:20 -0400
Subject: [PATCH 19/20] made it so the access point does not receive the node
 ID in its name

---
 usr/lib/lua/luci/controller/QS/modules.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/lib/lua/luci/controller/QS/modules.lua b/usr/lib/lua/luci/controller/QS/modules.lua
index 2836f30..bea2646 100644
--- a/usr/lib/lua/luci/controller/QS/modules.lua
+++ b/usr/lib/lua/luci/controller/QS/modules.lua
@@ -35,10 +35,10 @@ function nameParser()
 	  if is_hostname(val.nodeName) then
 		 nodeID = luci.sys.exec("commotion nodeid")
 		 --luci.controller.QS.QS.log(val.nodeName)
-		 name = tostring(val.nodeName) .. nodeID
+		 hostName = tostring(val.nodeName) .. nodeID
 		 --QS.log(name)
 		 file = io.open("/etc/commotion/profiles.d/quickstartSettings", "a")
-		 file:write("hostname="..name.."\n")
+		 file:write("hostname="..hostName.."\n")
 		 --QS.log("wrote hostname")
 		 if val.secure == 'true' then
 			--QS.log("passwords:"..val.pwd1.." & "..val.pwd2)
@@ -48,7 +48,7 @@ function nameParser()
 				  luci.sys.call('cp /etc/commotion/profiles.d/defaultSec /etc/commotion/profiles.d/quickstartSec') 
 			   end
 			   file:write("pwd="..val.pwd1.."\n")
-			   file:write("SSIDSec="..name.."\n")
+			   file:write("SSIDSec="..val.nodeName.."\n")
 			else
 			   return pass
 			end
@@ -56,7 +56,7 @@ function nameParser()
 			if not luci.fs.isfile("/etc/commotion/profiles.d/quickstartAP") then
 			   luci.sys.call('cp /etc/commotion/profiles.d/defaultAP /etc/commotion/profiles.d/quickstartAP') 
 			end
-			file:write("SSID="..name.."\n")
+			file:write("SSID="..val.nodeName.."\n")
 		 end
 		 file:close()
 	  else

From 4c22fe235832e95051b0f910a5e982a31243b016 Mon Sep 17 00:00:00 2001
From: s2e <s2e@device.(none)>
Date: Tue, 14 May 2013 15:17:39 -0400
Subject: [PATCH 20/20] removed node ID from the end of the name input, since
 it will only be added to the hostname.

---
 usr/lib/lua/luci/view/QS/module/name.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm
index cfdce8d..f77169a 100644
--- a/usr/lib/lua/luci/view/QS/module/name.htm
+++ b/usr/lib/lua/luci/view/QS/module/name.htm
@@ -26,7 +26,7 @@ <h2 class="warning"><%=nameErr%></h2>
 	<div class="cbi-value">
       <label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.">Node Name</label>
 	  <p>This value is used by other users and devices to find your network wirelessly and over the mesh. This value can be composed of letter, number and hyphens. (Hyphens can not be used at the beggining or end of the name.)</p>
-	  <div style="white-space:nowrap"><input type="text" value="Your Node Name" name="nodeName"  style="display:inline-block;width:80%"><strong>+<%=nodeID%></strong> </div>
+	  <input type="text" value="Your Node Name" name="nodeName">
 	  <input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
 	</div>
 	<div id="secureAP" style="display:none">