# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1487634691 -3600
# Node ID 039c90c6049422ad4c8970f343a53b0fb98341fc
# Parent  3698cf81f88409882aced6eb2778df8d781282fa
Use new admin config and up users plugins from TinyCM

diff -r 3698cf81f884 -r 039c90c60494 web/bugs.cgi
--- a/web/bugs.cgi	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/bugs.cgi	Tue Feb 21 00:51:31 2017 +0100
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2012-2017 SliTaz GNU/Linux - BSD License
 #
-. /usr/lib/slitaz/httphelper
+. /usr/lib/slitaz/httphelper.sh
 
 # Source config file
 . ./config.cgi
@@ -112,7 +112,7 @@
 
 # Check if user is admin
 admin_user() {
-	fgrep -q 'ADMIN_USER="yes"' ${PEOPLE}/${user}/account.conf
+	fgrep -w -q "$user" ${ADMIN_USERS}
 }
 
 # Authenticated or not
@@ -543,30 +543,21 @@
 
 # Create a new user in AUTH_FILE and PEOPLE
 new_user_config() {
-	if [ ! "$online" ]; then
-		name="$(GET name)"
-		mail="$(GET mail)"
-		pass="$(GET pass)"
-		echo "Creating Server Key..."
+	if [ ! -f "$AUTH_FILE" ]; then
+		touch $AUTH_FILE && chmod 0600 $AUTH_FILE
 	fi
-	#key=$(echo -n "$user:$mail:$pass" | md5sum | awk '{print $1}')
 	echo "$user:$pass" >> $AUTH_FILE
-	mkdir -pm0700 $PEOPLE/$user/
+	mkdir -pm0700 $PEOPLE/${user}
 	cat > $PEOPLE/$user/account.conf << EOT
-# SliTaz user configuration
-#
-
+# User configuration
 NAME="$name"
 USER="$user"
 MAIL="$mail"
-
-LOCATION="$(GET location)"
-RELEASES="$(GET releases)"
-PACKAGES="$(GET packages)"
 EOT
 	chmod 0600 $PEOPLE/$user/account.conf
-	if [ ! -f $PEOPLE/$user/account.conf ]; then
-		echo "ERROR: User creation failed!"
+	# First created user is admin
+	if [ $(ls ${PEOPLE} | wc -l) == "1" ]; then
+		echo "$user" > ${ADMIN_USERS}
 	fi
 }
 
diff -r 3698cf81f884 -r 039c90c60494 web/config.cgi
--- a/web/config.cgi	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/config.cgi	Tue Feb 21 00:51:31 2017 +0100
@@ -1,12 +1,12 @@
 # SliTaz Bug Tracker Web interface configuration.
 #
 
-# TazBug URL for redirection and RSS
-WEB_URL="http://localhost/bugs/bugs.cgi"
-
 # Auth file for user
 AUTH_FILE="/var/lib/slitaz/auth/people"
 
+# Admin users file list
+ADMIN_USERS="/var/lib/slitaz/auth/admin"
+
 # People config files
 PEOPLE="/var/lib/slitaz/people"
 
diff -r 3698cf81f884 -r 039c90c60494 web/plugins/dashboard/dashboard.cgi
--- a/web/plugins/dashboard/dashboard.cgi	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/plugins/dashboard/dashboard.cgi	Tue Feb 21 00:51:31 2017 +0100
@@ -26,55 +26,42 @@
 	fi
 	if check_auth; then
 		cat << EOT
-<h2>Dashboard</h2>
-
 <div id="tools">
 	$DASHBOARD_TOOLS $ADMIN_TOOLS
 </div>
-
+<h2>Dashboard</h2>
 <pre>
 Bugs count       : $bugs
 Database size    : $bugsize
 Server uptime    :$(uptime | cut -d "," -f 1-2)
 </pre>
-
-<h3>Admin users</h3>
 EOT
-		
-		# Get the list of administrators
-		fgrep -l "ADMIN_USER=" $PEOPLE/*/account.conf | while read file;
-		do
-			. ${file}
-			echo "<a href='?user=$USER'>$USER</a>"
-			unset NAME USER
-		done
-		
+	
 		# Only for admins
 		if check_auth && admin_user; then
 			# List all plugins
 			cat << EOT
-<h3>$(gettext "Plugins")</h3>
-<pre>
-	<table>
-		<thead>
-			<td>$(gettext "Name")</td>
-			<td>$(gettext "Description")</td>
-			<td>$(gettext "Action")</td>
-		</thead>
+<h3>$(gettext "Plugins:") $(ls $plugins | wc -l)</h3>
+<div id="plugins">
+<table>
+	<thead>
+		<td>$(gettext "Name")</td>
+		<td>$(gettext "Description")</td>
+		<td>$(gettext "Action")</td>
+	</thead>
 EOT
 			for p in $(ls -1 $plugins)
 			do
 				. $plugins/$p/$p.conf
 				cat << EOT
-		<tr>
-			<td><a href='?$p'>$PLUGIN</a></td>
-			<td>$SHORT_DESC</td>
-			<td>TODO</td>
-		</tr>
+	<tr>
+		<td><a href='?$p'>$PLUGIN</a></td>
+		<td>$SHORT_DESC</td>
+		<td>TODO</td>
+	</tr>
 EOT
 			done
-			echo "	</table>"
-			echo "</pre>"
+			echo "</table></div>"
 		fi
 	else
 		gettext "You must be logged in to view the dashboard"
diff -r 3698cf81f884 -r 039c90c60494 web/plugins/debug/debug.cgi
--- a/web/plugins/debug/debug.cgi	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/plugins/debug/debug.cgi	Tue Feb 21 00:51:31 2017 +0100
@@ -13,10 +13,10 @@
 		exit 0
 	fi
 	cat << EOT
-<h2>Debug interface</h2>
 <div id="tools">
 	<a href="$script?dashboard">Dashboard</a>
 </div>
+<h2>Debug interface</h2>
 EOT
 	# Handle ?debug&del request
 	if [ "$(GET del)" ]; then
diff -r 3698cf81f884 -r 039c90c60494 web/plugins/users/users.cgi
--- a/web/plugins/users/users.cgi	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/plugins/users/users.cgi	Tue Feb 21 00:51:31 2017 +0100
@@ -13,23 +13,30 @@
 	cat << EOT
 Email      : $MAIL
 </pre>
-EOT
-	# Each user can have personal profile page
-	if [ -f "$PEOPLE/$USER/profile.txt" ]; then
-		cat << EOT
+
 <div id="tools">
+	$PLUGINS_TOOLS
 	<a href="$script?modprofile">$(gettext "Modify profile")</a>
-	<a href="$script?dashboard">Dashboard</a>
 </div>
 EOT
-	else
-		cat << EOT
-<div id="tools">
-	<a href="$script?modprofile">$(gettext "Create a profile page")</a>
-	<a href="$script?dashboard">Dashboard</a>
-</div>
+}
+
+# List last active users. Usage: last_users NB
+list_last_users() {
+	count=${1}
+	echo "<h3>Last $count active users</h3>"
+	echo "<pre>"
+	find ${PEOPLE} -name "last" | xargs ls -1t | head -n ${count} | while read last;
+	do
+		dir="$(dirname $last)"
+		date="$(cat $last)"
+		u=$(basename $dir)
+		. "${PEOPLE}/${u}/account.conf"
+	cat << EOT
+$(get_gravatar $MAIL 24) $date  : <a href="?user=$u">$u</a> | $NAME
 EOT
-	fi
+	done
+	echo "</pre>"
 }
 
 case " $(GET) " in
@@ -38,28 +45,54 @@
 		header
 		html_header
 		user_box
-		if check_auth && ! admin_user; then
-			gettext "You must be admin to manage users" && exit 0
+		# Admin only
+		if admin_user; then
+			tools="<a href='$script?userslist'>Users list</a>"
 		fi
-		cat << EOT
-<h2>Users admin</h2>
+		# Logged users
+		if check_auth; then
+			cat << EOT
 <div id="tools">
 	<a href="$script?dashboard">Dashboard</a>
-	<a href='$script?loggedusers'>Logged users</a>
-	<a href='$script?userslist'>Users list</a>
+	<a href='$script?lastusers'>Last users</a>
+	$tools
 </div>
+<h2>${d}</h2>
 <pre>
 User accounts   : $(ls -1 $PEOPLE | wc -l)
 Logged users    : $(ls $sessions | wc -l)
+</pre>
+EOT
+			list_last_users 5
+			
+			# Admin only
+			if admin_user; then
+				cat << EOT
+<h3>Config paths</h3>
+<pre>
 People DB       : $PEOPLE
-Auth file       : $AUTH_FILE
+Authfile        : $AUTH_FILE
+Admin users     : $ADMIN_USERS
+</pre>
 EOT
-		
-		echo "</pre>"
+				# Get the list of administrators
+				echo "<h3>Admin users</h3>"
+				echo "<pre>"
+				for u in $(cat $ADMIN_USERS)
+				do
+					. ${PEOPLE}/${u}/account.conf
+					echo "<a href='?user=$u'>$u</a> - $NAME"
+				done
+				echo "</pre>"
+			fi
+			
+		else
+			gettext "You must be logged to check or admin users"
+		fi
 		html_footer && exit 0 ;;
 		
 	*\ userslist\ *)
-		# List all users (slow if a lot a of accounts)
+		# List all users
 		d="Users"
 		header
 		html_header
@@ -70,13 +103,18 @@
 		fi
 		users=$(ls -1 $PEOPLE | wc -l)
 		cat << EOT
-<h2>Users: $users</h2>
 <div id="tools">
 	<a href="$script?dashboard">Dashboard</a>
-	<a href="$script?users">Users admin</a>
-	<a href='$script?loggedusers'>Logged users</a>
+	<a href="$script?users">Users</a>
+	<a href='$script?lastusers'>Last users</a>
 </div>
-<pre>
+<h2>Users: $users</h2>
+<div id="users">
+<table>
+	<thead>
+		<td>$(gettext "Username")</td>
+		<td>$(gettext "Action")</td>
+	</thead>
 EOT
 		for u in $(ls $PEOPLE)
 		do
@@ -85,20 +123,22 @@
 				echo "${u} : Missing account.conf"
 				continue
 			fi
-			. "${PEOPLE}/${u}/account.conf"
 			cat << EOT
-$(get_gravatar $MAIL 24) <a href="?user=$USER">$USER</a> | $NAME | $MAIL
+	<tr>
+		<td><a href="$script?user=$u">$u</a></td>
+		<td>TODO</td>
+	</tr>
 EOT
 # deluser link --> use 'tazu' on SliTaz
 #: <a href="?users&amp;deluser=$USER">$(gettext "delete")</a>
 			unset NAME USER 
 		done
-		echo "</pre>" 
+		echo "</table></div>"
 		html_footer && exit 0 ;;
 	
-	*\ loggedusers\ *)
+	*\ lastusers\ *)
 		# Show online users based on sessions files.
-		d="Logged users"
+		d="Last users"
 		header
 		html_header
 		user_box
@@ -106,15 +146,17 @@
 			gettext "You must be logged in to view online users"
 			exit 0
 		fi
-		logged="$(ls $sessions | wc -l)"
 		cat << EOT
-<h2>Logged users: $logged</h2>
 <div id="tools">
 	<a href="$script?dashboard">Dashboard</a>
-	<a href="$script?users">Users admin</a>
+	<a href="$script?users">Users</a>
 </div>
-<pre>
 EOT
+		list_last_users 15
+		
+		# Active cookies
+		echo "<h3>Session cookies: $(ls $sessions | wc -l)</h3>"
+		echo "<pre>"
 		for u in $(ls $sessions)
 		do
 			. "${PEOPLE}/${u}/account.conf"
@@ -132,7 +174,15 @@
 		header
 		html_header
 		user_box
-		. $PEOPLE/"$(GET user)"/account.conf
+		account_config="$PEOPLE/$(GET user)/account.conf"
+		profile_config="$PEOPLE/$(GET user)/profile.conf"
+		if [ ! -f "$account_config" ]; then
+			echo "No user profile for: $(GET user)"
+			html_footer && exit 0
+		else
+			. ${account_config}
+		fi
+		[ -f "$profile_config" ] && . ${profile_config}
 cat << EOT
 <h2>$(get_gravatar $MAIL) $NAME</h2>
 
@@ -147,6 +197,18 @@
 			. $PEOPLE/"$(GET user)"/account.conf
 			public_people
 		fi
+		
+		# Messages plugin integration
+		if [ -x "$plugins/messages/messages.cgi" ]; then
+			if check_auth && [ "$(GET user)" != "$user" ]; then
+				cat << EOT
+<div id="tools">
+<a href="$script?messages&amp;to=$(GET user)">$(gettext "Send message")</a>
+</div>
+EOT
+			fi
+		fi
+		
 		# Display personal user profile
 		if [ -f "$PEOPLE/$USER/profile.txt" ]; then
 			echo "<h2>$(gettext "About me")</h2>"
diff -r 3698cf81f884 -r 039c90c60494 web/plugins/users/users.conf
--- a/web/plugins/users/users.conf	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/plugins/users/users.conf	Tue Feb 21 00:51:31 2017 +0100
@@ -6,9 +6,7 @@
 
 # Authenticated users
 PLUGINS_TOOLS="${PLUGINS_TOOLS}"
-DASHBOARD_TOOLS="${DASHBOARD_TOOLS}"
+DASHBOARD_TOOLS="${DASHBOARD_TOOLS} <a href='?users'>Users</a>"
 
 # Admin only in Dashboard
-ADMIN_TOOLS="${ADMIN_TOOLS} <a href='?users'>Users</a>"
-
-# Configurable variables used in plugin.cgi
+ADMIN_TOOLS="${ADMIN_TOOLS}"
diff -r 3698cf81f884 -r 039c90c60494 web/style.css
--- a/web/style.css	Mon Feb 13 17:45:24 2017 +0100
+++ b/web/style.css	Tue Feb 21 00:51:31 2017 +0100
@@ -220,3 +220,11 @@
 }
 
 #footer a { padding: 0 2px; }
+
+/* Users & Dashboard */
+#users table, #plugins table { border-collapse: collapse; }
+#users tr, #plugins tr {
+	padding:.3em 1em;
+	border-bottom: 1px solid #ddd; 
+}
+#users td, #plugins td { padding: 4px 0; }