tinycm diff index.cgi @ rev 106

Fix admin_user
author Christophe Lincoln <pankso@slitaz.org>
date Wed Feb 22 12:22:11 2017 +0100 (2017-02-22)
parents 348289f0b48d
children 05ccbdd25ab5
line diff
     1.1 --- a/index.cgi	Mon Feb 20 18:50:00 2017 +0100
     1.2 +++ b/index.cgi	Wed Feb 22 12:22:11 2017 +0100
     1.3 @@ -152,7 +152,7 @@
     1.4  
     1.5  # Check if user is admin
     1.6  admin_user() {
     1.7 -	fgrep -w -q "$user" ${ADMIN_USERS}
     1.8 +	grep -w -q "$user" ${ADMIN_USERS}
     1.9  }
    1.10  
    1.11  # Authenticated or not
    1.12 @@ -243,25 +243,18 @@
    1.13  
    1.14  # Create a new user in AUTH_FILE and PEOPLE
    1.15  new_user_config() {
    1.16 -	if [ ! -f "$AUTH_FILE" ];then
    1.17 -		touch $AUTH_FILE
    1.18 -		chmod 0600 $AUTH_FILE
    1.19 +	if [ ! -f "$AUTH_FILE" ]; then
    1.20 +		touch $AUTH_FILE && chmod 0600 $AUTH_FILE
    1.21  	fi
    1.22  	echo "$user:$pass" >> $AUTH_FILE
    1.23 -	mkdir -p $PEOPLE/$user/
    1.24 +	mkdir -pm0700 $PEOPLE/${user}
    1.25  	cat > $PEOPLE/$user/account.conf << EOT
    1.26  # User configuration
    1.27  NAME="$name"
    1.28  USER="$user"
    1.29  MAIL="$mail"
    1.30  EOT
    1.31 -	cat > $PEOPLE/$user/profile.conf << EOT
    1.32 -# User profile
    1.33 -WEBSITE="$website"
    1.34 -FACEBOOK="$facebook"
    1.35 -TWITTER="$twitter"
    1.36 -EOT
    1.37 -	chmod 0600 $PEOPLE/$user/*.conf
    1.38 +	chmod 0600 $PEOPLE/$user/account.conf
    1.39  	# First created user is admin
    1.40  	if [ $(ls ${PEOPLE} | wc -l) == "1" ]; then
    1.41  		echo "$user" > ${ADMIN_USERS}