# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1333473506 -7200
# Node ID 95129e40c9dfc77f596e29609c9507239b9e47fc
# Parent  e8fc5365d589ce002636979c68952d547923ed25
Dont crypt pass twice when generating SliTaz key

diff -r e8fc5365d589 -r 95129e40c9df tazbug
--- a/tazbug	Tue Apr 03 13:41:08 2012 +0200
+++ b/tazbug	Tue Apr 03 19:18:26 2012 +0200
@@ -22,17 +22,17 @@
 do
 	case "$opt" in
 		--bug=*)
-			bug=${opt#--bug=} ;;
+			bug="${opt#--bug=}" ;;
 		--desc=*)
-			desc=${opt#--desc=} ;;
+			desc="${opt#--desc=}" ;;
 		--msg=*)
-			msg=${opt#--msg=} ;;
+			msg="${opt#--msg=}" ;;
 		--priority=*)
 			priority=${opt#--priority=} ;;
 		--pkgs=*)
-			pkgs=${opt#--pkgs=} ;;
+			pkgs="${opt#--pkgs=}" ;;
 		--name=*)
-			name=${opt#--name=} ;;
+			name="${opt#--name=}" ;;
 		--user=*)
 			user=${opt#--user=} ;;
 		--mail=*)
@@ -106,7 +106,6 @@
 # Gen the secure key: gen_key login mail passwd
 gen_key() {
 	gettext "Creating SliTaz secure key..."; echo
-	pass=$(crypt_pass $pass)
 	key=$(echo -n "$user:$mail:$pass" | md5sum | awk '{print $1}')
 	sed -i s"/KEY=.*/KEY=\"$key\"/" $conf
 	chmod 0600 $conf
@@ -132,15 +131,16 @@
 		check_info_args
 		echo ""
 		echo "Sending account request for: $name ($user)"
-		# 'gen_key login mail passwd' localy but dont send it. It will be
+		# 'gen_key user:mail:passwd' localy but dont send it. It will be
 		# generated on server from the user login, mail and cryted password
 		# so it is not transmited in GET urls.
 		gen_config
+		pass=$(crypt_pass $pass)
+		name="$(echo $name | http_urlencode)"
 		gen_key
 		. $conf
-		name="$(echo $name | http_urlencode)"
-		pass=$(crypt_pass $pass)
-		echo "Secure key: $KEY" 
+		echo "Secure key: $KEY"
+		# Wget GET url
 		busybox wget "${WEB_URL}?signup=$user&name=$name&mail=$mail&pass=$pass" \
 			-O /tmp/bug.msg
 		cat /tmp/bug.msg && rm -f /tmp/bug.msg && echo "" ;;
diff -r e8fc5365d589 -r 95129e40c9df tazbug-box
--- a/tazbug-box	Tue Apr 03 13:41:08 2012 +0200
+++ b/tazbug-box	Tue Apr 03 19:18:26 2012 +0200
@@ -162,7 +162,7 @@
 	user="$(echo $main | cut -d "|" -f 2)"
 	mail="$(echo $main | cut -d "|" -f 3)"
 	pass="$(echo $main | cut -d "|" -f 4)"
-	tazbug signup --name="$name" --user=$user --mail=$mail \
+	./tazbug signup --name="$name" --user=$user --mail=$mail \
 		--pass="$pass" | output
 }
 
@@ -180,7 +180,7 @@
 	signup) 
 		signup ;;
 	*)
-		if [ ! $HOME/.config/slitaz/account.conf ]; then
+		if [ ! -f $HOME/.config/slitaz/account.conf ]; then
 			signup
 		fi
 		new_bug ;;
diff -r e8fc5365d589 -r 95129e40c9df web/bugs.cgi
--- a/web/bugs.cgi	Tue Apr 03 13:41:08 2012 +0200
+++ b/web/bugs.cgi	Tue Apr 03 19:18:26 2012 +0200
@@ -196,7 +196,7 @@
 	if [ -f "$PEOPLE/$CREATOR/slitaz.conf" ]; then
 		. $PEOPLE/$CREATOR/slitaz.conf
 	else
-		MAIL="defaul"
+		MAIL="default"
 	fi
 	cat << EOT
 <h2>Bug $id</h2>