# HG changeset patch
# User xfred222
# Date 1355447217 18000
# Node ID 24effe14f521183a70e1f85f39ac329888452b94
# Parent  db97998089d63cf23766b4c45cf6691a486d3cf8
seperate .conf file & fix last commit on bugs.cgi

diff -r db97998089d6 -r 24effe14f521 web/bugs.cgi
--- a/web/bugs.cgi	Thu Dec 13 17:08:36 2012 -0500
+++ b/web/bugs.cgi	Thu Dec 13 20:06:57 2012 -0500
@@ -7,7 +7,6 @@
 . /usr/lib/slitaz/httphelper
 [ -f "/etc/slitaz/bugs.conf" ] && . /etc/slitaz/bugs.conf
 
-
 # Internal variable
 bugdir="bug"
 plugins="plugins"
@@ -15,11 +14,6 @@
 po=""
 error_log_file="/var/log/tazbug-server.log"
 
-
-
-
-
-
 # Content negotiation for Gettext
 IFS=","
 for lang in $HTTP_ACCEPT_LANGUAGE
@@ -47,6 +41,11 @@
 TEXTDOMAIN='tazbug'
 export TEXTDOMAIN
 
+
+
+
+
+
 #
 # Functions
 #
@@ -88,6 +87,13 @@
 
 # Authentified or not
 user_box() {
+
+#bug id to remember
+IDLOC=""
+if [[ "$(GET id)" ]] ;then
+IDLOC="&id=$(GET id)"
+fi
+
 	if check_auth; then
 		. $PEOPLE/$user/account.conf
 		cat << EOT
@@ -98,10 +104,10 @@
 EOT
 	else
 	cat << EOT
-<div id="user">
-	<a href="?login"><img src="images/avatar.png" alt="[ User ]" /></a>
-	<a href="?login">$(gettext 'Log in')</a>
-</div>
+	<div id="user">
+	<a href="?login$IDLOC"><img src="images/avatar.png" alt="[ User ]" /></a>
+	<a href="?login$IDLOC">$(gettext 'Log in')</a>
+	</div>
 EOT
 	fi
 	cat << EOT
@@ -121,7 +127,12 @@
 
 # Login page
 login_page() {
-redirect_to_id="$1"
+IDLOC=""
+if [[ "$(GET id)" ]] ;then
+IDLOC="?id=$(GET id)"
+fi
+
+
 	cat << EOT
 <h2>$(gettext 'Login')</h2>
 
@@ -133,7 +144,7 @@
 </div>
 
 <div id="login">
-	<form method="post" action="$SCRIPT_NAME?id=$redirect_to_id">
+	<form method="post" action="$SCRIPT_NAME$IDLOC">
 		<input type="text" name="auth" placeholder="$(gettext 'User name')" />
 		<input type="password" name="pass" placeholder="$(gettext 'Password')" />
 		<div>
@@ -488,7 +499,7 @@
 		header
 		html_header
 		user_box
-		login_page $([ "$(GET id)" ] && GET id)
+		login_page
 		html_footer ;;
 	*\ logout\ *)
 		# Set a Cookie in the past to logout.
diff -r db97998089d6 -r 24effe14f521 web/bugs.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/bugs.conf	Thu Dec 13 20:06:57 2012 -0500
@@ -0,0 +1,14 @@
+# 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"