# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1375303426 -7200
# Node ID c6752ed0e680d74003cb2f0549109af9aa4dd5b9
# Parent  c48b0c995b140f6d1f9327e64f4856c9f4ede603
Add non-root support

diff -r c48b0c995b14 -r c6752ed0e680 data/httpd.conf
--- a/data/httpd.conf	Mon Jul 29 20:45:13 2013 +0200
+++ b/data/httpd.conf	Wed Jul 31 22:43:46 2013 +0200
@@ -3,4 +3,4 @@
 D:*
 *.cgi:/bin/sh
 I:index.cgi
-/:root:*
+/:*:*
diff -r c48b0c995b14 -r c6752ed0e680 hardware.cgi
--- a/hardware.cgi	Mon Jul 29 20:45:13 2013 +0200
+++ b/hardware.cgi	Wed Jul 31 22:43:46 2013 +0200
@@ -272,6 +272,20 @@
 
 
 		#
+		# Loop device management actions
+		#
+		device=$(GET loopdev)
+		lib crypto $device
+		case "$device" in
+		/dev/loop*)
+			set -- $(losetup | grep ^$device:)
+			[ -n "$3" ] && losetup -d $device
+			ro=""
+			[ -n "$(GET readonly)" ] && ro="-r"
+			file="$(GET backingfile)"
+			[ -n "$file" ] && losetup -o $(GET offset) $ro $device $file
+		esac
+		#
 		# Disk stats and management (mount, umount, check)
 		#
 		device=$(GET device)
@@ -291,7 +305,7 @@
 EOT
 		df_thead
 		echo '<tbody>'
-		for fs in $(blkid | sort | sed 's/:.*//')
+		for fs in $(blkid | sed 's/:.*//')
 		do
 			set -- $(df -h | grep "^$fs ")
 			size=$2
@@ -367,8 +381,10 @@
 EOT
 
 grep -v '^#' /etc/fstab | awk 'BEGIN{print "<table class=\"zebra outbox\">\
-	<thead><tr><td>spec</td><td>file</td><td>vfstype</td><td>mntops</td><td>\
-	freq</td><td>passno</td></thead><tbody>"}{print "<tr><td>"$1"</td><td>"$2\
+	<thead><tr><td>$(gettext 'Disk')</td><td>$(gettext 'Mount point')</td><td>\
+	$(gettext 'Type')</td><td>$(gettext 'Options')</td><td>\
+	$(gettext 'Freq')</td><td>$(gettext 'Pass')</td></thead><tbody>"}\
+	{print "<tr><td>"$1"</td><td>"$2\
 	"</td><td>"$3"</td><td>"$4"</td><td>"$5"</td><td>"$6"</td></tr>"}
 	END{print "</tbody></table>"}'
 
@@ -380,19 +396,8 @@
 <h3>$(gettext 'Loop devices')</h3>
 EOT
 		#
-		# Loop device management
+		# Loop device management gui
 		#
-		device=$(GET loopdev)
-		lib crypto $device
-		case "$device" in
-		/dev/loop*)
-			set -- $(losetup | grep ^$device:)
-			[ -n "$3" ] && losetup -d $device
-			ro=""
-			[ -n "$(GET readonly)" ] && ro="-r"
-			file="$(GET backingfile)"
-			[ -n "$file" ] && losetup -o $(GET offset) $ro $device $file
-		esac
 		cat << EOT
 <form method="get" action="$SCRIPT_NAME#loop">
 <table id="loop" class="zebra outbox nowrap">
diff -r c48b0c995b14 -r c6752ed0e680 lib/libtazpanel
--- a/lib/libtazpanel	Mon Jul 29 20:45:13 2013 +0200
+++ b/lib/libtazpanel	Wed Jul 31 22:43:46 2013 +0200
@@ -3,6 +3,8 @@
 # Common functions for TazPanel CGI and cmdline interface
 #
 
+[ "$(id -un)" == "$REMOTE_USER" ] || exec su -c "$(realpath $0) $@" $REMOTE_USER
+
 # Get parameters with GET, POST and FILE functions
 . /usr/lib/slitaz/httphelper