tazbug rev 17

Tiny edits
author Paul Issott <paul@slitaz.org>
date Tue Apr 03 22:50:25 2012 +0100 (2012-04-03)
parents 6f171d79db65
children a39c2f6e7317
files README tazbug tazbug-box web/bug/0/bug.conf web/bugs.cgi
line diff
     1.1 --- a/README	Tue Apr 03 19:51:05 2012 +0200
     1.2 +++ b/README	Tue Apr 03 22:50:25 2012 +0100
     1.3 @@ -2,18 +2,18 @@
     1.4  ================================================================================
     1.5  
     1.6  
     1.7 -The SliTaz Project have setup and tried several bug trackers but ther wher never
     1.8 -adopted by the main developers. This is an attemp to change that by providong
     1.9 -a radicaly simple tool well integrated wirh SliTaz packages Cooker, Cookiso,
    1.10 +The SliTaz Project have setup and tried several bug trackers but they were never
    1.11 +adopted by the main developers. This is an attempt to change that by providing
    1.12 +a radically simple tool well integrated with the SliTaz packages Cooker, Cookiso,
    1.13  Roadmap and other sites such as the wiki and forum.
    1.14  
    1.15 -Users data are securely stored outside of the web server document root. Password
    1.16 +Users data are securely stored outside of the web server document root. Passwords
    1.17  are crypted with MD5 and also stored outside of the document root. Your ID key
    1.18 -is the MD5 sum of your login, mail and password
    1.19 +is the MD5 sum of your login, mail and password.
    1.20  
    1.21 -TazBug is simple to use, 2 type of status exist: OPEN and CLOSED and 2 priority
    1.22 -level are handled. Affected packages name can be added to the bug and the all
    1.23 -bug configuration file can be edited.
    1.24 +TazBug is simple to use, 2 types of status exists: OPEN and CLOSED and 2 priority
    1.25 +levels are handled. Affected packages names can be added to the bug and the all
    1.26 +bug configuration files can be edited.
    1.27  
    1.28  
    1.29  TazBug Goals
    1.30 @@ -22,7 +22,7 @@
    1.31  	* Simple to use with a clean and modern interface
    1.32  	* Client side cmdline tool to post bugs and messages
    1.33  	* Full desktop integration with GTK boxes or local CGI script
    1.34 -	* Use http://paste.slitaz.org/ for attached files
    1.35 +	* Use http://paste.slitaz.org/ for attaching files
    1.36  	* Use shared accounts with other sites to have only one login
    1.37  
    1.38  
    1.39 @@ -38,7 +38,7 @@
    1.40  Installation
    1.41  ------------
    1.42  TazBug should work on any SliTaz system and can be used as a Bug Tracker for
    1.43 -your project. You can grab last source from SliTaz Mercurial repositories or
    1.44 +your project. You can grab last sources from SliTaz Mercurial repositories or
    1.45  a release tarball from SliTaz mirrors. You need a web server with CGI support
    1.46  and SliTaz httphelper in /usr/lib/slitaz as well as Busybox HTTPd applet.
    1.47  
     2.1 --- a/tazbug	Tue Apr 03 19:51:05 2012 +0200
     2.2 +++ b/tazbug	Tue Apr 03 22:50:25 2012 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4  #!/bin/sh
     2.5  #
     2.6 -# TazBug Command line tool. Help crypt password, key and post on the
     2.7 +# TazBug Command line tool. Help to encrypt password, key and post on the
     2.8  # the server side.
     2.9  #
    2.10  # Copyright (C) 2012 SliTaz GNU/Linux - BSD License
    2.11 @@ -122,7 +122,7 @@
    2.12  		. $conf || exit 1
    2.13  		gen_key $USER $MAIL $pass ;;
    2.14  	gen-config)
    2.15 -		# Recreate a config file if value have change sites must be updated
    2.16 +		# Recreate a config file if values have changed sites must be updated
    2.17  		check_info_args
    2.18  		gen_config
    2.19  		gen_key ;;
    2.20 @@ -131,8 +131,8 @@
    2.21  		check_info_args
    2.22  		echo ""
    2.23  		echo "Sending account request for: $name ($user)"
    2.24 -		# 'gen_key user:mail:passwd' localy but dont send it. It will be
    2.25 -		# generated on server from the user login, mail and cryted password
    2.26 +		# 'gen_key user:mail:passwd' localy but don't send it. It will be
    2.27 +		# generated on server from the user login, mail and encryted password
    2.28  		# so it is not transmited in GET urls.
    2.29  		gen_config
    2.30  		pass=$(crypt_pass $pass)
     3.1 --- a/tazbug-box	Tue Apr 03 19:51:05 2012 +0200
     3.2 +++ b/tazbug-box	Tue Apr 03 22:50:25 2012 +0100
     3.3 @@ -1,6 +1,6 @@
     3.4  #!/bin/sh
     3.5  #
     3.6 -# SliTaz Bug GUI tool. All the account part may move to slitaz-account
     3.7 +# SliTaz Bug GUI tool. All the account's parts may move to slitaz-account
     3.8  # if we use it for other sites and services so we use one centralized
     3.9  # SliTaz account.
    3.10  #
     4.1 --- a/web/bug/0/bug.conf	Tue Apr 03 19:51:05 2012 +0200
     4.2 +++ b/web/bug/0/bug.conf	Tue Apr 03 22:50:25 2012 +0100
     4.3 @@ -7,4 +7,4 @@
     4.4  DATE="2012-03-29"
     4.5  PKGS="tazbug"
     4.6  
     4.7 -DESC="The bug description with link and usefull information"
     4.8 +DESC="The bug description with links and useful information"
     5.1 --- a/web/bugs.cgi	Tue Apr 03 19:51:05 2012 +0200
     5.2 +++ b/web/bugs.cgi	Tue Apr 03 22:50:25 2012 +0100
     5.3 @@ -109,9 +109,9 @@
     5.4  <h2>$(gettext "Login")</h2>
     5.5  
     5.6  <div id="account-info">
     5.7 -$(gettext "Not yet and account ? Please signup using SliTaz Bugs formular
     5.8 -from your SliTaz system. <p>Tip: to attach big files or images, you can use
     5.9 -SliTaz Paste service:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a>
    5.10 +$(gettext "No account yet? Please signup using the SliTaz Bugs registration
    5.11 +on your SliTaz system. <p>Tip: to attach big files or images, you can use
    5.12 +SliTaz Paste services:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a>
    5.13  </p>
    5.14  </div>
    5.15  
    5.16 @@ -183,8 +183,8 @@
    5.17  	done
    5.18  }
    5.19  
    5.20 -# Stripped down Wiki parser for bug desc and messages wich are simply
    5.21 -# displyed in <pre>
    5.22 +# Stripped down Wiki parser for bug desc and messages which are simply
    5.23 +# displayed in <pre>
    5.24  wiki_parser() {
    5.25  	sed \
    5.26  		-e s"#http://\([^']*\).png#<img src='\0' alt='[ Image ]' />#"g \
    5.27 @@ -496,7 +496,7 @@
    5.28  		if check_auth; then
    5.29  			new_bug_page
    5.30  		else
    5.31 -			echo "<p>$(gettext "You must be logged to post a new bug")</p>"
    5.32 +			echo "<p>$(gettext "You must be logged in to post a new bug")</p>"
    5.33  		fi
    5.34  		html_footer ;;
    5.35  	*\ addbug\ *)
    5.36 @@ -538,7 +538,7 @@
    5.37  		user="$(GET signup)"
    5.38  		echo "Requested user login : $user"
    5.39  		if fgrep -q "$user:" $AUTH_FILE; then
    5.40 -			echo "ERROR: User already exist" && exit 1
    5.41 +			echo "ERROR: User already exists" && exit 1
    5.42  		else
    5.43  			echo "Creating account for : $(GET name)"
    5.44  			new_user_config