# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1389104074 -3600
# Node ID 3acb15d87d6e41afc136e2f5a6b9df2d987b1db4
# Parent  668d92a43a47683c724f1a1d5206ab6bef5b0dee
Handle better configs files, dont use TAZBUG path but PWD and misc improvments

diff -r 668d92a43a47 -r 3acb15d87d6e bugs.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bugs.conf	Tue Jan 07 15:14:34 2014 +0100
@@ -0,0 +1,15 @@
+# SliTaz Bug Tracker Web interface configuration. This config file will
+# overwrite: /etc/slitaz/tazbug.conf
+#
+
+# TazBug URL for redirection and RSS
+WEB_URL="http://localhost/bugs/bugs.cgi"
+
+# Auth file for user
+AUTH_FILE="/var/lib/slitaz/auth/people"
+
+# People config files
+PEOPLE="/var/lib/slitaz/people"
+
+# Online registration for user
+ONLINE_SIGNUP="yes"
diff -r 668d92a43a47 -r 3acb15d87d6e po/fr.po
--- a/po/fr.po	Mon Jan 06 16:58:23 2014 +0000
+++ b/po/fr.po	Tue Jan 07 15:14:34 2014 +0100
@@ -13,7 +13,7 @@
 "Language-Team: French \n"
 "Language: fr \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
diff -r 668d92a43a47 -r 3acb15d87d6e tazbug
--- a/tazbug	Mon Jan 06 16:58:23 2014 +0000
+++ b/tazbug	Tue Jan 07 15:14:34 2014 +0100
@@ -3,7 +3,7 @@
 # TazBug Command line tool. Help to encrypt password, key and post on the
 # the server side.
 #
-# Copyright (C) 2012 SliTaz GNU/Linux - BSD License
+# Copyright (C) 2012-2014 SliTaz GNU/Linux - BSD License
 #
 . /usr/lib/slitaz/httphelper
 [ -f "/etc/slitaz/tazbug.conf" ] && . /etc/slitaz/tazbug.conf
diff -r 668d92a43a47 -r 3acb15d87d6e tazbug-box
--- a/tazbug-box	Mon Jan 06 16:58:23 2014 +0000
+++ b/tazbug-box	Tue Jan 07 15:14:34 2014 +0100
@@ -4,7 +4,7 @@
 # if we use it for other sites and services so we use one centralized
 # SliTaz account.
 #
-# Copyright (C) 2012 SliTaz GNU/Linux - BSD License
+# Copyright (C) 2012-2014 SliTaz GNU/Linux - BSD License
 #
 # Authors : Christophe Lincoln <pankso@slitaz.org>
 #
diff -r 668d92a43a47 -r 3acb15d87d6e tazbug.conf
--- a/tazbug.conf	Mon Jan 06 16:58:23 2014 +0000
+++ b/tazbug.conf	Tue Jan 07 15:14:34 2014 +0100
@@ -1,10 +1,7 @@
-# SliTaz Bug Tracker configuration
+# SliTaz Bug Tracker tools configuration
 #
 
-# Installation path
-TAZBUG="/var/www/bugs"
-
-# TazBug URL for redirection and RSS
+# TazBug URL to post bugs from cmdline
 WEB_URL="http://bugs.slitaz.org/"
 
 # Auth file for user
@@ -12,3 +9,6 @@
 
 # People config files
 PEOPLE="/var/lib/slitaz/people"
+
+# Online registration for user
+ONLINE_SIGNUP="yes"
diff -r 668d92a43a47 -r 3acb15d87d6e web/bugs.cgi
--- a/web/bugs.cgi	Mon Jan 06 16:58:23 2014 +0000
+++ b/web/bugs.cgi	Tue Jan 07 15:14:34 2014 +0100
@@ -5,15 +5,17 @@
 # Copyright (C) 2012-2014 SliTaz GNU/Linux - BSD License
 #
 . /usr/lib/slitaz/httphelper
+
+# Source config file
+[ -f "/etc/slitaz/tazbug.conf" ] && . /etc/slitaz/tazbug.conf
+# Web interface can have different setting than cmdline tools
 [ -f "/etc/slitaz/bugs.conf" ] && . /etc/slitaz/bugs.conf
-#. bugs.conf
 
 # Internal variable
-bugdir="$TAZBUG/bug"
+bugdir="$PWD/bug"
 plugins="plugins"
 sessions="/tmp/bugs/sessions"
 script="$SCRIPT_NAME"
-po=""
 
 # Content negotiation for Gettext
 IFS=","
@@ -66,37 +68,30 @@
 EOT
 }
 
-GETfiltered()
-{
-GET $1 | sed -e "s/'/\&#39;/g; s|\n|<br/>|g; s/\t/\&#09;/g;s/\%22/\"/g"
+GETfiltered() {
+	GET $1 | sed -e "s/'/\&#39;/g; s|\n|<br/>|g; s/\t/\&#09;/g;s/\%22/\"/g"
 }
 
-js_redirection_to()
-{
+js_redirection_to() {
 	js_log "Redirecting to $1"
 	echo "<script type=\"text/javascript\"> document.location = \"$1\"; </script>"
 }
 
-js_log()
-{
+js_log() {
 	echo "<script type=\"text/javascript\">console.log('$1')</script>";
 }
 
-js_set_cookie()
-{
+js_set_cookie() {
 	name=$1
 	value=$2
-
 	js_log 'Setting cookie.'
 	echo "<script type=\"text/javascript\">"
 		echo "document.cookie = \"$name=$value; expires=0; path=/\"";
 	echo "</script>"
 }
 
-js_unset_cookie()
-{
+js_unset_cookie() {
 	name=$1
-
 	js_log 'Unsetting cookie.'
 	echo "<script type=\"text/javascript\">"
 		echo "document.cookie = \"$1=\"\"; expires=-1; path=/";
diff -r 668d92a43a47 -r 3acb15d87d6e web/bugs.conf
--- a/web/bugs.conf	Mon Jan 06 16:58:23 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# SliTaz Bug Tracker configuration
-#
-
-# Installation path
-TAZBUG="/var/www/bugs"
-
-# TazBug URL for redirection and RSS
-WEB_URL="http://localhost/bugs/bugs.cgi"
-
-# Auth file for user
-AUTH_FILE="/var/lib/slitaz/auth/people"
-
-# People config files
-PEOPLE="/var/lib/slitaz/people"
-
-# Online registration for user
-ONLINE_SIGNUP="yes"