SliTaz Repositories

     1.1 --- a/web/bugs.cgi	Tue Feb 21 21:11:27 2017 +0100
     1.2 +++ b/web/bugs.cgi	Wed Feb 22 14:59:49 2017 +0100
     1.3 @@ -115,10 +115,10 @@
     1.4  
     1.5  # Check if user is admin
     1.6  admin_user() {
     1.7 -	fgrep -w -q "$user" ${ADMIN_USERS}
     1.8 +	grep -w -q "$user" ${ADMIN_USERS}
     1.9  }
    1.10  
    1.11 -# Authenticated or not
    1.12 +# Authenticated or not (login/logout are not translated to keep css width)
    1.13  user_box() {
    1.14  	
    1.15  	IDLOC=""
    1.16 @@ -131,14 +131,14 @@
    1.17  		cat << EOT
    1.18  <div id="user">
    1.19  <a href="?user=$user">$(get_gravatar $MAIL 20)</a>
    1.20 -<a href="?logout">$(gettext 'Logout')</a>
    1.21 +<a href="?logout">Logout</a>
    1.22  </div>
    1.23  EOT
    1.24  	else
    1.25  	cat << EOT
    1.26  	<div id="user">
    1.27  	<a href="?login$IDLOC"><img src="images/avatar.png" alt="[ User ]" /></a>
    1.28 -	<a href="?login$IDLOC">$(gettext 'Login')</a>
    1.29 +	<a href="?login$IDLOC">Login</a>
    1.30  	</div>
    1.31  EOT
    1.32  	fi
    1.33 @@ -247,7 +247,7 @@
    1.34  	. ${PEOPLE}/${CREATOR}/account.conf
    1.35  	cat << EOT
    1.36  <a href="?user=$USER">$(get_gravatar "$MAIL" 24)</a> \
    1.37 -ID $id: <a href="?id=$id">$BUG</a> <span class="date">- $DATE</span>
    1.38 +Bug $id: <a href="?id=$id">$BUG</a> <span class="date">- $DATE</span>
    1.39  EOT
    1.40  	unset CREATOR USER MAIL bugpath
    1.41  }
    1.42 @@ -267,7 +267,7 @@
    1.43  					. ${PEOPLE}/${CREATOR}/account.conf
    1.44  				cat << EOT
    1.45  <a href="?user=$USER">$(get_gravatar "$MAIL" 24)</a> \
    1.46 -ID $id: <a href="?id=$id">$BUG</a> <span class="date">- $DATE</span>
    1.47 +Bug $id: <a href="?id=$id">$BUG</a> <span class="date">- $DATE</span>
    1.48  EOT
    1.49  			fi
    1.50  			unset CREATOR USER MAIL BUG
    1.51 @@ -285,7 +285,7 @@
    1.52  		. ${PEOPLE}/${USER}/account.conf
    1.53  	cat << EOT
    1.54  <a href="?user=$USER">$(get_gravatar "$MAIL" 24)</a> \
    1.55 -ID: <a href="?id=$id">Bug $id</a> by $USER <span class="date">- $DATE</span>
    1.56 +<a href="?id=$id">Bug $id</a>: by $USER <span class="date">- $DATE</span>
    1.57  EOT
    1.58  	unset CREATOR USER MAIL
    1.59  }
    1.60 @@ -310,9 +310,7 @@
    1.61  	cat << EOT
    1.62  <h2>$(eval_gettext 'Bug $id: $STATUS')</h2>
    1.63  
    1.64 -<p>
    1.65 -	$(get_gravatar $MAIL 32) <strong>$BUG</strong>
    1.66 -</p>
    1.67 +<h3>$(get_gravatar $MAIL 32) $BUG</h3>
    1.68  <p>
    1.69  	$(gettext "Date:") $DATE -
    1.70  	$(gettext "Creator:") <a href="?user=$CREATOR">$CREATOR</a> -
    1.71 @@ -323,9 +321,16 @@
    1.72  <pre>
    1.73  $(cat $bugdir/$id/desc.txt | wiki_parser)
    1.74  </pre>
    1.75 -
    1.76 -<div id="tools">
    1.77  EOT
    1.78 +	if [ "$PKGS" ] && [ -x "$plugins/packages/packages.cgi" ]; then
    1.79 +		echo "<p>"
    1.80 +		echo "<strong>$(gettext 'Affected package(s):')</strong>"
    1.81 +		for pkg in $PKGS; do
    1.82 +			echo "<a href='?pkg=$pkg'>$pkg</a>"
    1.83 +		done
    1.84 +		echo "</p>"
    1.85 +	fi
    1.86 +	echo '<div id="tools">'
    1.87  	if check_auth; then
    1.88  		if [ "$STATUS" == "OPEN" ]; then
    1.89  			cat << EOT
    1.90 @@ -404,7 +409,7 @@
    1.91  new_bug() {
    1.92  	count=$(ls_bugs | sort -g | tail -n 1)
    1.93  	id=$(($count +1))
    1.94 -	date=$(date "+%Y-%m-%d %H:%M")
    1.95 +	date=$(date "+%Y-%m-%d")
    1.96  	# Sanity check, JS may be disabled.
    1.97  	[ ! "$(GET bug)" ] && echo "Missing bug title" && exit 1
    1.98  	[ ! "$(GET desc)" ] && echo "Missing bug description" && exit 1
    1.99 @@ -793,28 +798,36 @@
   1.100  	<input type="submit" value="$(gettext 'Search')" />
   1.101  </form>
   1.102  <div>
   1.103 +<p>
   1.104 +	$(gettext 'Search by pattern, package or user')
   1.105 +</p>
   1.106  EOT
   1.107 -		cd $bugdir
   1.108 -		for bug in *
   1.109 +		if [ ! "$(GET search)" ]; then
   1.110 +			html_footer && exit 0
   1.111 +		else
   1.112 +			echo "<h3>$(gettext 'Result for:') $(GET search)</h3>"
   1.113 +		fi
   1.114 +		for id in $(ls_bugs)
   1.115  		do
   1.116 -			result=$(fgrep -i -h "$(GET search)" $bug/*)
   1.117 +			set_bugdir "$id"
   1.118 +			result=$(fgrep -i -h "$(GET search)" $bugdir/$id/*)
   1.119  			if [ "$result" ]; then
   1.120  				found=$(($found + 1))
   1.121 -				id=${bug}
   1.122 -				echo "<p><strong>Bug $id</strong> <a href=\"?id=$id\">"$(gettext 'Show')"</a></p>"
   1.123 +				echo "<p><strong>Bug $id</strong> - <a href=\"?id=$id\">"$(gettext 'Show')"</a></p>"
   1.124  				echo '<pre>'
   1.125 -				fgrep -i -h "$(GET search)" $bugdir/$id/* | \
   1.126 +				echo "$result" | \
   1.127  					sed s"/$(GET search)/<span class='ok'>$(GET search)<\/span>/"g
   1.128  				echo '</pre>'
   1.129  			fi
   1.130 +			bugdir=$(dirname $bugdir)
   1.131  		done
   1.132  		if [ "$found" == "0" ]; then
   1.133  			echo "<p>$(gettext 'No result found for') : $(GET search)</p>"
   1.134  		else
   1.135  			echo "<p> $found $(gettext 'results found')</p>"
   1.136  		fi
   1.137 -		echo '</div>'
   1.138 -		html_footer ;;
   1.139 +		echo '</div>' && html_footer ;;
   1.140 +	
   1.141  	*)
   1.142  		# Default page.
   1.143  		bugs=$(ls_bugs | wc -l)