tazpanel diff settings.cgi @ rev 508
Add Name[fr] in .desktop
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jul 12 17:53:53 2015 +0200 (2015-07-12) |
parents | a8ff72f76e0d |
children | aaf630cf6a8b |
line diff
1.1 --- a/settings.cgi Sun Jul 12 13:03:50 2015 +0200 1.2 +++ b/settings.cgi Sun Jul 12 17:53:53 2015 +0200 1.3 @@ -16,13 +16,6 @@ 1.4 TITLE=$(_ 'System settings') 1.5 1.6 1.7 -# Get system database. LDAP compatible. 1.8 - 1.9 -getdb() { 1.10 - getent $1 2>/dev/null || cat /etc/$1 1.11 -} 1.12 - 1.13 - 1.14 listdb() { 1.15 for item in $(getdb $1 | cut -d: -f1); do 1.16 echo "<option>$item</option>\n" 1.17 @@ -124,8 +117,8 @@ 1.18 1.19 1.20 *\ tweak\ *) 1.21 - HOME="$(awk -F: -vu=$REMOTE_USER '$1==u{print $6}' /etc/passwd)" 1.22 - [ -z "$HOME" ] && exit 0 1.23 + HOME="$(getdb passwd | awk -F: -vu=$REMOTE_USER '$1==u{print $6}')" 1.24 + [ -d "$HOME" ] && exit 0 1.25 1.26 dd="$HOME/.local/share/desktop-directories"; sd="$dd/SliTazMenu.directory" 1.27 1.28 @@ -311,7 +304,7 @@ 1.29 for login in $(getdb passwd | cut -d: -f1); do 1.30 if [ -d "/home/$login" ]; then 1.31 blocked=''; usericon='user' 1.32 - if grep -qs "^$login:!" /etc/shadow; then 1.33 + if getdb shadow | grep -qs "^$login:!"; then 1.34 blocked='class="color31"' 1.35 usericon="lock" 1.36 fi 1.37 @@ -474,7 +467,7 @@ 1.38 user="$REMOTE_USER"; host="$(hostname)" 1.39 xhtml_header "$(_ 'Small quick tweaks for user %s' "$user")" 1.40 1.41 - HOME="$(awk -F: -vu=$user '$1==u{print $6}' /etc/passwd)" 1.42 + HOME="$(getdb passwd | awk -F: -vu=$user '$1==u{print $6}')" 1.43 font="${TERM_FONT:-monospace}"; palette=$(echo $TERM_PALETTE | tr A-Z a-z) 1.44 case $user in 1.45 root) color=31; ind="#";;