tazpanel rev 315

installer.cgi: fix user validation checks
author Dominique Corbex <domcox@slitaz.org>
date Fri May 18 21:37:27 2012 +0200 (2012-05-18)
parents 03de38e7cdf3
children f50f3c09d208
files installer.cgi
line diff
     1.1 --- a/installer.cgi	Thu May 17 15:29:27 2012 +0300
     1.2 +++ b/installer.cgi	Fri May 18 21:37:27 2012 +0200
     1.3 @@ -435,8 +435,8 @@
     1.4  	<h5 id="hostname">$(gettext 'Hostname')</h5>
     1.5  
     1.6  	$(gettext 'Set Hostname to:')
     1.7 -	<input type="text" id="hostname" name="TGT_HOSTNAME" value="$TGT_HOSTNAME" placeholder="$(gettext 'Name of your system')" onkeyup="checkLogin('hostname','msgHostname'); return false;" />
     1.8 -	<span id="msgHostname"></span>
     1.9 +	<input type="text" id="hst" name="TGT_HOSTNAME" value="$TGT_HOSTNAME" placeholder="$(gettext 'Name of your system')" onkeyup="checkLogin('hst','msgHst'); return false;" />
    1.10 +	<span id="msgHst"></span>
    1.11  </div>
    1.12  EOT
    1.13  }
    1.14 @@ -444,7 +444,7 @@
    1.15  select_root()
    1.16  {
    1.17  cat << EOT
    1.18 -<div class="box2">
    1.19 +<div>
    1.20  	<h5 id="root">$(gettext 'Root')</h5>
    1.21  
    1.22  	$(gettext 'Root passwd:')
    1.23 @@ -461,12 +461,12 @@
    1.24  select_user()
    1.25  {
    1.26  cat << EOT
    1.27 -<div class="box2">
    1.28 +<div>
    1.29  	<h5 id="user">$(gettext 'User')</h5>
    1.30  
    1.31  	$(gettext 'User login:')
    1.32 -	<input type="text" id="user" name="TGT_USER" value="$TGT_USER" placeholder="$(gettext 'Name of the first user')" onkeyup="checkLogin('user','msgUser'); return false;" />
    1.33 -	<span id="msgUser"></span>
    1.34 +	<input type="text" id="usr" name="TGT_USER" value="$TGT_USER" placeholder="$(gettext 'Name of the first user')" onkeyup="checkLogin('usr','msgUsr'); return false;" />
    1.35 +	<span id="msgUsr"></span>
    1.36  	<br /><br />
    1.37  
    1.38  	$(gettext 'User passwd:')
    1.39 @@ -620,7 +620,7 @@
    1.40  	function Validate(page) {
    1.41  		if (page == "install") {
    1.42  			// hostname
    1.43 -			if (false == checkLogin('hostname','msgHostname')) {
    1.44 +			if (false == checkLogin('hst','msgHst')) {
    1.45  				alert("$(gettext 'Hostname error')");
    1.46  				return false;
    1.47  			// root pwd
    1.48 @@ -628,7 +628,7 @@
    1.49  				alert("$(gettext 'Root password error')");
    1.50  				return false;
    1.51  			// user
    1.52 -			} else if (false == checkLogin('user','msgUser')) {
    1.53 +			} else if (false == checkLogin('usr','msgUsr')) {
    1.54  				alert("$(gettext 'User login error')");
    1.55  				return false;
    1.56  			// user pwd