# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1438180456 -7200
# Node ID a6066b70a2af057d40dec25930d4adfb2fbe6fb7
# Parent  f476216ae0e11dd3f814945a9c2054100a916936
tazpanel: external reports support

diff -r f476216ae0e1 -r a6066b70a2af index.cgi
--- a/index.cgi	Tue Jul 28 15:30:56 2015 +0200
+++ b/index.cgi	Wed Jul 29 16:34:16 2015 +0200
@@ -592,6 +592,15 @@
 <h2>$(_ 'Boot scripts')</h2>
 <pre>$(filter_taztools_msgs < /var/log/boot.log)</pre>
 EOT
+		if [ "$(ls report.d/* 2> /dev/null)" ]; then
+			cat <<EOT
+	$(ok_status_t)
+	<tr><td>$(_ 'Getting extra reports...')</td>
+EOT
+			for i in report.d/* ; do
+				sh $i $i >> $output
+			done
+		fi
 		cat <<EOT
 	$(ok_status_t)
 	<tr><td>$(_ 'Creating report footer...')</td>
diff -r f476216ae0e1 -r a6066b70a2af lib/libtazpanel
--- a/lib/libtazpanel	Tue Jul 28 15:30:56 2015 +0200
+++ b/lib/libtazpanel	Wed Jul 29 16:34:16 2015 +0200
@@ -22,11 +22,10 @@
 for i in "$HTTP_COOKIE" "$QUERY_STRING" ; do
     v="$(echo "$i" | sed '/guiuser=/!d;s/.*guiuser=\([A-Za-z0-9_]*\).*/\1/')"
     [ "$v" ] || continue
-    ps | sed '/d;/d;/127\.0\.0\.1:82/!d' | grep -q " $v " || continue
+    busybox ps | sed '/d;/d;/127\.0\.0\.1:82/!d' | grep -q " $v " || continue
     GUI_USER="$v"
 done
-[ "$REMOTE_USER" ] || REMOTE_USER="$GUI_USER"
-[ "$(id -un)" == "$REMOTE_USER" ] || exec su -s /bin/sh -c "$(realpath $0) $@" $REMOTE_USER
+[ "$(id -un)" == "${REMOTE_USER:=$GUI_USER}" ] || exec su -s /bin/sh -c "$(realpath $0) $@" $REMOTE_USER
 
 
 # Get parameters with GET, POST, COOKIE and FILE functions