tazpanel rev 513

tazpanel: external reports support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 29 16:34:16 2015 +0200 (2015-07-29)
parents f476216ae0e1
children fa86b93d5e89
files index.cgi lib/libtazpanel
line diff
     1.1 --- a/index.cgi	Tue Jul 28 15:30:56 2015 +0200
     1.2 +++ b/index.cgi	Wed Jul 29 16:34:16 2015 +0200
     1.3 @@ -592,6 +592,15 @@
     1.4  <h2>$(_ 'Boot scripts')</h2>
     1.5  <pre>$(filter_taztools_msgs < /var/log/boot.log)</pre>
     1.6  EOT
     1.7 +		if [ "$(ls report.d/* 2> /dev/null)" ]; then
     1.8 +			cat <<EOT
     1.9 +	$(ok_status_t)
    1.10 +	<tr><td>$(_ 'Getting extra reports...')</td>
    1.11 +EOT
    1.12 +			for i in report.d/* ; do
    1.13 +				sh $i $i >> $output
    1.14 +			done
    1.15 +		fi
    1.16  		cat <<EOT
    1.17  	$(ok_status_t)
    1.18  	<tr><td>$(_ 'Creating report footer...')</td>
     2.1 --- a/lib/libtazpanel	Tue Jul 28 15:30:56 2015 +0200
     2.2 +++ b/lib/libtazpanel	Wed Jul 29 16:34:16 2015 +0200
     2.3 @@ -22,11 +22,10 @@
     2.4  for i in "$HTTP_COOKIE" "$QUERY_STRING" ; do
     2.5      v="$(echo "$i" | sed '/guiuser=/!d;s/.*guiuser=\([A-Za-z0-9_]*\).*/\1/')"
     2.6      [ "$v" ] || continue
     2.7 -    ps | sed '/d;/d;/127\.0\.0\.1:82/!d' | grep -q " $v " || continue
     2.8 +    busybox ps | sed '/d;/d;/127\.0\.0\.1:82/!d' | grep -q " $v " || continue
     2.9      GUI_USER="$v"
    2.10  done
    2.11 -[ "$REMOTE_USER" ] || REMOTE_USER="$GUI_USER"
    2.12 -[ "$(id -un)" == "$REMOTE_USER" ] || exec su -s /bin/sh -c "$(realpath $0) $@" $REMOTE_USER
    2.13 +[ "$(id -un)" == "${REMOTE_USER:=$GUI_USER}" ] || exec su -s /bin/sh -c "$(realpath $0) $@" $REMOTE_USER
    2.14  
    2.15  
    2.16  # Get parameters with GET, POST, COOKIE and FILE functions