# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1487606612 -3600
# Node ID 69214a677729a3e019fe08f9c8a1d316c470c161
# Parent  35354740250d0a7858f9d0e79799a70a32f6bc6b
new way to handle admin user (faster)

diff -r 35354740250d -r 69214a677729 config.cgi
--- a/config.cgi	Mon Feb 20 14:36:57 2017 +0100
+++ b/config.cgi	Mon Feb 20 17:03:32 2017 +0100
@@ -8,6 +8,9 @@
 # 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 35354740250d -r 69214a677729 index.cgi
--- a/index.cgi	Mon Feb 20 14:36:57 2017 +0100
+++ b/index.cgi	Mon Feb 20 17:03:32 2017 +0100
@@ -152,7 +152,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
diff -r 35354740250d -r 69214a677729 plugins/users/users.cgi
--- a/plugins/users/users.cgi	Mon Feb 20 14:36:57 2017 +0100
+++ b/plugins/users/users.cgi	Mon Feb 20 17:03:32 2017 +0100
@@ -71,17 +71,19 @@
 <h3>Config paths</h3>
 <pre>
 People DB       : $PEOPLE
-Auth file       : $AUTH_FILE
+Authfile        : $AUTH_FILE
+Admin users     : $ADMIN_USERS
 </pre>
 EOT
 				# Get the list of administrators
 				echo "<h3>Admin users</h3>"
-				fgrep -l "ADMIN_USER=" $PEOPLE/*/account.conf | while read file;
+				echo "<pre>"
+				for u in $(cat $ADMIN_USERS)
 				do
-					. ${file}
-					echo "<a href='?user=$USER'>$USER</a>"
-					unset NAME USER
+					. ${PEOPLE}/${u}/account.conf
+					echo "<a href='?user=$u'>$u</a> | $NAME"
 				done
+				echo "</pre>"
 			fi
 			
 		else
diff -r 35354740250d -r 69214a677729 tinycm
--- a/tinycm	Mon Feb 20 14:36:57 2017 +0100
+++ b/tinycm	Mon Feb 20 17:03:32 2017 +0100
@@ -59,8 +59,11 @@
 update_config() {
 	echo "Updating config file: confi.cgi"
 	. ${path}/config.cgi
+	# Def value for new variables
 	[ ! "$WALL_MODE" ] && WALL_MODE="public"
 	[ ! "$WALL_MESSAGES_LENGTH" ] && WALL_MESSAGES_LENGTH="240"
+	# from 1.4
+	[ ! "$ADMIN_USERS" ] && ADMIN_USERS=$(dirname "$AUTH_FILE")/admin
 	cat > ${path}/config.cgi << EOT
 #
 # TinyCM configuration
@@ -72,6 +75,9 @@
 # Auth file for user
 AUTH_FILE="$AUTH_FILE"
 
+# Admin users file list
+ADMIN_USERS="/var/lib/slitaz/auth/admin"
+
 # People config files
 PEOPLE="$PEOPLE"