# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1392674302 -3600
# Node ID 065aa0214da679d4121c9382ba75ea3d693e9f92
# Parent  7426a4db30d3d764a331511577a5acf7a1f8fafd
web: fix new bug creation

diff -r 7426a4db30d3 -r 065aa0214da6 web/bugs.cgi
--- a/web/bugs.cgi	Wed Feb 05 21:57:37 2014 +0100
+++ b/web/bugs.cgi	Mon Feb 17 22:58:22 2014 +0100
@@ -238,13 +238,12 @@
 	id="$1"
 	. ${bugdir}/${id}/bug.conf
 	[ -f "${PEOPLE}/${CREATOR}/account.conf" ] && \
-		. ${PEOPLE}/${CREATOR}/account.conf
+	. ${PEOPLE}/${CREATOR}/account.conf
 	cat << EOT
 <a href="?user=$USER">$(get_gravatar "$MAIL" 24)</a> \
 ID: $id <a href="?id=$id">$BUG</a> <span class="date">$DATE</span>
 EOT
 	unset CREATOR USER MAIL
-		
 }
 
 # Usage: list_bugs STATUS
@@ -374,9 +373,9 @@
 	rm -f $bugdir/$id/msg.$count.tmp
 }
 
-# Create a new Bug
+# Create a new Bug. ID is set by counting dirs in bug/ including bug/0
 new_bug() {
-	count=$(ls -1 $bugdir | wc -l)
+	count=$(ls $bugdir | wc -l)
 	date=$(date "+%Y-%m-%d %H:%M")
 	# Sanity check, JS may be disabled.
 	[ ! "$(GET bug)" ] && echo "Missing bug title" && exit 1
@@ -397,8 +396,8 @@
 
 DESC="$(GETfiltered desc)"
 EOT
-	fold -s -w 80 $bugdir/$bug/bug.tmp > $bugdir/$bug/bug.conf
-	rm -f $bugdir/$bug/bug.tmp
+	fold -s -w 80 $bugdir/$count/bug.tmp > $bugdir/$count/bug.conf
+	rm -f $bugdir/$count/bug.tmp
 }
 
 # New bug page for the web interface
@@ -465,7 +464,7 @@
 save_bug() {
 	bug="$(GET bug)"
 	content="$(GET bugconf)"
-	sed "s|\"|'|" | fold -s | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.tmp << EOT
+	sed "s|\"|'|" | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.tmp << EOT
 $content
 EOT
 	fold -s -w 80 $bugdir/$bug/bug.tmp > $bugdir/$bug/bug.conf
diff -r 7426a4db30d3 -r 065aa0214da6 web/plugins/pkgs/pkgs.cgi
--- a/web/plugins/pkgs/pkgs.cgi	Wed Feb 05 21:57:37 2014 +0100
+++ b/web/plugins/pkgs/pkgs.cgi	Mon Feb 17 22:58:22 2014 +0100
@@ -2,9 +2,8 @@
 #
 # TinyCM/TazBug Plugin - Skeleton
 #
-. /usr/lib/slitaz/httphelper
 
-if [ "$(GET pkgs)" ] || [ "$(GET pkg)" ]; then
+if [ "$(GET packages)" ] || [ "$(GET pkg)" ]; then
 	d="Skel"
 	header
 	html_header
diff -r 7426a4db30d3 -r 065aa0214da6 web/plugins/pkgs/pkgs.conf
--- a/web/plugins/pkgs/pkgs.conf	Wed Feb 05 21:57:37 2014 +0100
+++ b/web/plugins/pkgs/pkgs.conf	Mon Feb 17 22:58:22 2014 +0100
@@ -5,7 +5,7 @@
 MAINTAINER="devel@slitaz.org"
 
 # All users
-BUGS_TOOLS="${BUGS_TOOLS} <a href='?pkgs'>Buggy packages</a>"
+BUGS_TOOLS="${BUGS_TOOLS} <a href='?packages'>Buggy packages</a>"
 
 # Authenticated users
 PLUGINS_TOOLS="${PLUGINS_TOOLS}"