# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1486848467 -3600
# Node ID b19dbd851223bf7ac8b7f67ecce762111e067a28
# Parent  73dde38a42cf8462cf3a3bf4ffc33d46836ee331
Up plugins/users and small improvments to dashboard

diff -r 73dde38a42cf -r b19dbd851223 web/bugs.cgi
--- a/web/bugs.cgi	Sat Feb 11 15:32:56 2017 +0100
+++ b/web/bugs.cgi	Sat Feb 11 22:27:47 2017 +0100
@@ -177,7 +177,6 @@
 # Link for online signup if enabled.
 online_signup() {
 	if [ "$ONLINE_SIGNUP" == "yes" ]; then
-		echo -n "<p>" && gettext "Or:"; echo -n " "
 		echo -n "<a href='$script?signup&amp;online'>"
 		gettext "Sign Up Online"
 		echo '</a></p>'
@@ -190,8 +189,7 @@
 <h2>$(gettext 'Login')</h2>
 
 <div id="account-info">
-<p>$(gettext "No account yet? You can signup using the SliTaz Bugs reporter \
-on your SliTaz system.")</p>
+<p>$(gettext "No account yet?")</p>
 $(online_signup)
 <p>$(gettext "Tip: to attach big files or images, you can use SliTaz Paste \
 services:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a></p>
@@ -551,7 +549,7 @@
 		pass="$(GET pass)"
 		echo "Creating Server Key..."
 	fi
-	key=$(echo -n "$user:$mail:$pass" | md5sum | awk '{print $1}')
+	#key=$(echo -n "$user:$mail:$pass" | md5sum | awk '{print $1}')
 	echo "$user:$pass" >> $AUTH_FILE
 	mkdir -pm0700 $PEOPLE/$user/
 	cat > $PEOPLE/$user/account.conf << EOT
@@ -561,7 +559,6 @@
 NAME="$name"
 USER="$user"
 MAIL="$mail"
-KEY="$key"
 
 LOCATION="$(GET location)"
 RELEASES="$(GET releases)"
@@ -754,56 +751,17 @@
 		html_footer ;;
 	*\ signup\ *)
 		# Signup
-		if [ "$(GET online)" ];then
-			header
-			html_header
-			user_box
-			echo "<h2>$(gettext "Sign Up")</h2>"
-			if [ "$ONLINE_SIGNUP" == "yes" ]; then
-				signup_page
-			else
-				gettext "Online registration is disabled"
-			fi
-			html_footer && exit 0
+		header
+		html_header
+		user_box
+		echo "<h2>$(gettext "Sign Up")</h2>"
+		if [ "$ONLINE_SIGNUP" == "yes" ]; then
+			signup_page
 		else
-			header "Content-type: text/plain;"
-			user="$(GET signup)"
-			echo "Requested user login : $user"
-			if fgrep -q "$user:" $AUTH_FILE; then
-				echo "ERROR: User already exists" && exit 1
-			else
-				echo "Creating account for : $(GET name)"
-				new_user_config
-			fi
-		fi ;;
-	*\ key\ *)
-		# Let user post new bug or message with crypted key (no gettext)
-		#
-		# Testing only and is security acceptable ?
-		#
-		key="$(GET key)"
-		id="$(GET bug)"
-		header "Content-type: text/plain;"
-		echo "Checking secure key..."
-		if fgrep -qH $key $PEOPLE/*/account.conf; then
-			conf=$(fgrep -H $key $PEOPLE/*/account.conf | cut -d ":" -f 1)
-			. $conf
-			echo "Authenticated: $NAME ($USER)"
-			case " $(GET) " in
-				*\ msg\ *)
-					[ ! "$id" ] && echo "Missing bug ID" && exit 0
-					echo "Posting new message to bug: $id"
-					echo "Message: $(GET msg)"
-					new_msg ;;
-				*\ bug\ *)
-					echo "Adding new bug: $(GET bug)"
-					echo "Description: $(GET desc)"
-					new_bug ;;
-			esac
-		else
-			echo "Not a valid SliTaz user key"
-			exit 0
-		fi ;;
+			gettext "Online registration is disabled"
+		fi
+		html_footer ;;
+
 	*\ search\ *)
 		found=0
 		header
diff -r 73dde38a42cf -r b19dbd851223 web/plugins/dashboard/dashboard.cgi
--- a/web/plugins/dashboard/dashboard.cgi	Sat Feb 11 15:32:56 2017 +0100
+++ b/web/plugins/dashboard/dashboard.cgi	Sat Feb 11 22:27:47 2017 +0100
@@ -12,7 +12,6 @@
 		gettext "You must be logged in to view the dashboard"
 		exit 0
 	fi
-	users=$(ls -1 $PEOPLE | wc -l)
 	bugs=$(ls -1 $bugdir | wc -l)
 	bugsize=$(du -sh $bugdir | awk '{print $1}')
 	# Source all plugins.conf to get DASHBOARD_TOOLS and ADMIN_TOOLS
@@ -36,7 +35,6 @@
 <pre>
 Bugs count       : $bugs
 Database size    : $bugsize
-User accounts    : $users
 Server uptime    :$(uptime | cut -d "," -f 1-2)
 </pre>
 
diff -r 73dde38a42cf -r b19dbd851223 web/plugins/users/users.cgi
--- a/web/plugins/users/users.cgi	Sat Feb 11 15:32:56 2017 +0100
+++ b/web/plugins/users/users.cgi	Sat Feb 11 22:27:47 2017 +0100
@@ -39,6 +39,32 @@
 		html_header
 		user_box
 		if check_auth && ! admin_user; then
+			gettext "You must be admin to manage users" && exit 0
+		fi
+		cat << EOT
+<h2>Users admin</h2>
+<div id="tools">
+	<a href="$script?dashboard">Dashboard</a>
+	<a href='$script?loggedusers'>Logged users</a>
+	<a href='$script?userslist'>Users list</a>
+</div>
+<pre>
+User accounts   : $(ls -1 $PEOPLE | wc -l)
+Logged users    : $(ls $sessions | wc -l)
+People DB       : $PEOPLE
+Auth file       : $AUTH_FILE
+EOT
+		
+		echo "</pre>"
+		html_footer && exit 0 ;;
+		
+	*\ userslist\ *)
+		# List all users (slow if a llots a of accounts)
+		d="Users"
+		header
+		html_header
+		user_box
+		if check_auth && ! admin_user; then
 			gettext "You must be admin to manage users"
 			exit 0
 		fi
@@ -47,7 +73,8 @@
 <h2>Users: $users</h2>
 <div id="tools">
 	<a href="$script?dashboard">Dashboard</a>
-	<a href='?logged'>Logged users</a>
+	<a href="$script?users">Users admin</a>
+	<a href='$script?loggedusers'>Logged users</a>
 </div>
 <pre>
 EOT
@@ -62,14 +89,14 @@
 			cat << EOT
 $(get_gravatar $MAIL 24) <a href="?user=$USER">$USER</a> | $NAME | $MAIL
 EOT
-# deluser link
+# deluser link --> use 'tazu' on SliTaz
 #: <a href="?users&amp;deluser=$USER">$(gettext "delete")</a>
 			unset NAME USER 
 		done
 		echo "</pre>" 
 		html_footer && exit 0 ;;
 	
-	*\ logged\ *)
+	*\ loggedusers\ *)
 		# Show online users based on sessions files.
 		d="Logged users"
 		header
@@ -79,10 +106,12 @@
 			gettext "You must be logged in to view online users"
 			exit 0
 		fi
+		logged="$(ls $sessions | wc -l)"
 		cat << EOT
-<h2>Logged users</h2>
+<h2>Logged users: $logged</h2>
 <div id="tools">
 	<a href="$script?dashboard">Dashboard</a>
+	<a href="$script?users">Users admin</a>
 </div>
 <pre>
 EOT
@@ -126,7 +155,7 @@
 		html_footer && exit 0 ;;
 		
 	*\ modprofile\ *)
-		# Let user edit there profile
+		# Let user edit their profile
 		if ! check_auth; then
 			echo "ERROR" && exit 0
 		fi
diff -r 73dde38a42cf -r b19dbd851223 web/plugins/users/users.conf
--- a/web/plugins/users/users.conf	Sat Feb 11 15:32:56 2017 +0100
+++ b/web/plugins/users/users.conf	Sat Feb 11 22:27:47 2017 +0100
@@ -6,9 +6,9 @@
 
 # Authenticated users
 PLUGINS_TOOLS="${PLUGINS_TOOLS}"
-DASHBOARD_TOOLS="${DASHBOARD_TOOLS} <a href='?logged'>Logged users</a>"
+DASHBOARD_TOOLS="${DASHBOARD_TOOLS}"
 
 # Admin only in Dashboard
-ADMIN_TOOLS="${ADMIN_TOOLS} <a href='?users'>List users</a>"
+ADMIN_TOOLS="${ADMIN_TOOLS} <a href='?users'>Users</a>"
 
 # Configurable variables used in plugin.cgi