tazbug rev 26 1.0

Small bug fix (it stable for 4.0)
author Christophe Lincoln <pankso@slitaz.org>
date Tue Apr 10 12:34:20 2012 +0200 (2012-04-10)
parents 21dba452c589
children 8263e4cea830
files tazbug-box web/bugs.cgi
line diff
     1.1 --- a/tazbug-box	Thu Apr 05 00:22:13 2012 +0200
     1.2 +++ b/tazbug-box	Tue Apr 10 12:34:20 2012 +0200
     1.3 @@ -98,7 +98,7 @@
     1.4  	pkgs="$(echo $main | cut -d "|" -f 3)"
     1.5  	if [ "$bug" ] && [ "$desc" ]; then
     1.6  		tazbug new-bug --bug="$bug" --desc="$desc" --priority=$priority \
     1.7 -			--pkgs="$pkgs"
     1.8 +			--pkgs="$pkgs" | output
     1.9  	fi
    1.10  }
    1.11  
     2.1 --- a/web/bugs.cgi	Thu Apr 05 00:22:13 2012 +0200
     2.2 +++ b/web/bugs.cgi	Tue Apr 10 12:34:20 2012 +0200
     2.3 @@ -77,7 +77,7 @@
     2.4  # Authentified or not
     2.5  user_box() {
     2.6  	if check_auth; then
     2.7 -		. $PEOPLE/$user/slitaz.conf
     2.8 +		. $PEOPLE/$user/account.conf
     2.9  		cat << EOT
    2.10  <div id="user">
    2.11  <a href="?user=$user">$(get_gravatar $MAIL 20)</a>
    2.12 @@ -87,7 +87,7 @@
    2.13  	else
    2.14  	cat << EOT
    2.15  <div id="user">
    2.16 -	<img src="images/avatar.png" alt="[ User ]" />
    2.17 +	<a href="?login"><img src="images/avatar.png" alt="[ User ]" /></a>
    2.18  	<a href="?login">Login</a>
    2.19  </div>
    2.20  EOT
    2.21 @@ -189,8 +189,8 @@
    2.22  
    2.23  # Bug page
    2.24  bug_page() {
    2.25 -	if [ -f "$PEOPLE/$CREATOR/slitaz.conf" ]; then
    2.26 -		. $PEOPLE/$CREATOR/slitaz.conf
    2.27 +	if [ -f "$PEOPLE/$CREATOR/account.conf" ]; then
    2.28 +		. $PEOPLE/$CREATOR/account.conf
    2.29  	else
    2.30  		MAIL="default"
    2.31  	fi
    2.32 @@ -395,7 +395,7 @@
    2.33  	key=$(echo -n "$user:$mail:$pass" | md5sum | awk '{print $1}')
    2.34  	echo "$user:$pass" >> $AUTH_FILE
    2.35  	mkdir -p $PEOPLE/$user/
    2.36 -	cat > $PEOPLE/$user/slitaz.conf << EOT
    2.37 +	cat > $PEOPLE/$user/account.conf << EOT
    2.38  # SliTaz user configuration
    2.39  #
    2.40  
    2.41 @@ -409,7 +409,7 @@
    2.42  RELEASES="$(GET releases)"
    2.43  PACKAGES="$(GET packages)"
    2.44  EOT
    2.45 -	chmod 0600 $PEOPLE/$user/slitaz.conf
    2.46 +	chmod 0600 $PEOPLE/$user/account.conf
    2.47  }
    2.48  
    2.49  #
    2.50 @@ -477,7 +477,7 @@
    2.51  		header
    2.52  		html_header
    2.53  		user_box
    2.54 -		. $PEOPLE/"$(GET user)"/slitaz.conf
    2.55 +		. $PEOPLE/"$(GET user)"/account.conf
    2.56  		echo "<h2>$(get_gravatar $MAIL) $(GET user)</h2>"
    2.57  		if check_auth && [ "$(GET user)" == "$user" ]; then
    2.58  			auth_people
    2.59 @@ -549,8 +549,8 @@
    2.60  		id="$(GET bug)"
    2.61  		header "Content-type: text/plain;"
    2.62  		echo "Checking secure key..." 
    2.63 -		if fgrep -qH $key $PEOPLE/*/slitaz.conf; then
    2.64 -			conf=$(fgrep -H $key $PEOPLE/*/slitaz.conf | cut -d ":" -f 1)
    2.65 +		if fgrep -qH $key $PEOPLE/*/account.conf; then
    2.66 +			conf=$(fgrep -H $key $PEOPLE/*/account.conf | cut -d ":" -f 1)
    2.67  			. $conf
    2.68  			echo "Authentified: $NAME ($USER)"
    2.69  			case " $(GET) " in