# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1336369777 -7200
# Node ID b77a89af193c761d3125d0821fd568747c0395d6
# Parent  b7f511a466794b16783e266a15cc1237470294d1
installer.cgi: fix broken user input checkings

diff -r b7f511a46679 -r b77a89af193c tazpanel/receipt
--- a/tazpanel/receipt	Sun May 06 11:56:02 2012 +0200
+++ b/tazpanel/receipt	Mon May 07 07:49:37 2012 +0200
@@ -16,8 +16,11 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-  cd $src && make && 
-  make DESTDIR=$DESTDIR install
+	cd $src # && make && 
+		# installer.cgi user validation fix
+		patch -p0 < $stuff/installer.patch || return 1
+		make &&
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r b7f511a46679 -r b77a89af193c tazpanel/stuff/installer.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpanel/stuff/installer.patch	Mon May 07 07:49:37 2012 +0200
@@ -0,0 +1,56 @@
+--- installer.cgi
++++ installer.cgi.new
+@@ -433,8 +433,8 @@
+ 	<h5 id="hostname">$(gettext 'Hostname')</h5>
+ 
+ 	$(gettext 'Set Hostname to:')
+-	<input type="text" id="hostname" name="TGT_HOSTNAME" value="$TGT_HOSTNAME" placeholder="$(gettext 'Name of your system')" onkeyup="checkLogin('hostname','msgHostname'); return false;" />
+-	<span id="msgHostname"></span>
++	<input type="text" id="hst" name="TGT_HOSTNAME" value="$TGT_HOSTNAME" placeholder="$(gettext 'Name of your system')" onkeyup="checkLogin('hst','msgHst'); return false;" />
++	<span id="msgHst"></span>
+ </div>
+ EOT
+ }
+@@ -442,7 +442,7 @@
+ select_root()
+ {
+ cat << EOT
+-<div class="box2">
++<div>
+ 	<h5 id="root">$(gettext 'Root')</h5>
+ 
+ 	$(gettext 'Root passwd:')
+@@ -459,12 +459,12 @@
+ select_user()
+ {
+ cat << EOT
+-<div class="box2">
++<div>
+ 	<h5 id="user">$(gettext 'User')</h5>
+ 
+ 	$(gettext 'User login:')
+-	<input type="text" id="user" name="TGT_USER" value="$TGT_USER" placeholder="$(gettext 'Name of the first user')" onkeyup="checkLogin('user','msgUser'); return false;" />
+-	<span id="msgUser"></span>
++	<input type="text" id="usr" name="TGT_USER" value="$TGT_USER" placeholder="$(gettext 'Name of the first user')" onkeyup="checkLogin('usr','msgUsr'); return false;" />
++	<span id="msgUsr"></span>
+ 	<br /><br />
+ 
+ 	$(gettext 'User passwd:')
+@@ -618,7 +618,7 @@
+ 	function Validate(page) {
+ 		if (page == "install") {
+ 			// hostname
+-			if (false == checkLogin('hostname','msgHostname')) {
++			if (false == checkLogin('hst','msgHst')) {
+ 				alert("$(gettext 'Hostname error')");
+ 				return false;
+ 			// root pwd
+@@ -626,7 +626,7 @@
+ 				alert("$(gettext 'Root password error')");
+ 				return false;
+ 			// user
+-			} else if (false == checkLogin('user','msgUser')) {
++			} else if (false == checkLogin('usr','msgUsr')) {
+ 				alert("$(gettext 'User login error')");
+ 				return false;
+ 			// user pwd