Revert "yWeb: rework for basic functionality"

Your reaction to this commit were remarkable. You demanded with an
imperious kind to revert this commit. You spoke about any rules only,
and I didn't hear evidencing explanations from you.
Admittedly, my commit wasn't very pretty and not the best style because
everything was squashed in a single commit with some customizations,
but which is ultimately just a formality... that's about it, and was quite
compliant with license conditions. In additional, your name was noted on
the commit. I'm just reminding you, until a few years ago, you didn't care
about licenses. The general copyright mainly lies with yjogol and a lot of
changes of the origin yweb code has been coming in by several committers
since yweb exists. I won't judge, whether any unique selling points play a
role, but such restrictions are exactly what the license should prevent.
Especially as, many creeped in brandings in some code parts (not only yweb)
do suggest that. Besides neutralizing such things, mainly it was the
purpose to get more compatibility, even though some functionalities
were removed or switched off.

Related to yweb I have decided to take back this commit for the sake of
peace, and I hope you are happy with it. However, I still reserve to
continue using and adopting yweb.

data/y-web/scripts/Makefile.am

@@ -1,16 +1,11 @@
-installdir = $(PRIVATE_HTTPDDIR)/scripts
-
-install_SCRIPTS = \
-	_Y_Globals.sh \
-	_Y_Library.sh \
-	Y_Tools.sh
-
-# file manager
-install_SCRIPTS += \
-	Y_NAS.sh
-
-# additional
-install_SCRIPTS += \
-	\
-	Y_Plugin-control.sh \
-	Y_v3_Tools.sh
+installdir = $(PRIVATE_HTTPDDIR)/scripts
+
+install_SCRIPTS = \
+	_Y_Globals.sh \
+	_Y_Library.sh \
+	Y_Tools.sh
+
+# file manager
+install_SCRIPTS += \
+	Y_NAS.sh
+

data/y-web/scripts/Y_Plugin-control.sh

@@ -1,140 +0,0 @@
-#!/bin/sh
-
-. %(PRIVATE_HTTPDDIR)/scripts/_Y_Globals.sh
-. %(PRIVATE_HTTPDDIR)/scripts/_Y_Library.sh
-
-BNAME=${0##*/}
-
-case "$1" in
-	start)
-	;;
-	stop)
-	;;
-	reset)
-	;;
-	fcm_start)
-		echo "[$BNAME] fritzcallmonitor start"
-		touch /var/etc/.fritzcallmonitor
-		service fritzcallmonitor start >/dev/console
-	;;
-	fcm_stop)
-		echo "[$BNAME] fritzcallmonitor stop"
-		service fritzcallmonitor stop >/dev/console
-		rm -f /var/etc/.fritzcallmonitor
-	;;
-	nfs_start)
-		echo "[$BNAME] nfs-server start"
-		touch /var/etc/.nfsd
-		service nfsd start >/dev/console
-	;;
-	nfs_stop)
-		echo "[$BNAME] nfs-server stop"
-		service nfsd stop >/dev/console
-		rm -f /var/etc/.nfsd
-	;;
-	samba_start)
-		echo "[$BNAME] samba-server start"
-		touch /var/etc/.samba
-		service samba start >/dev/console
-	;;
-	samba_stop)
-		echo "[$BNAME] samba-server stop"
-		service samba stop >/dev/console
-		rm -f /var/etc/.samba
-	;;
-	tuxcald_start)
-		echo "[$BNAME] tuxcal start"
-		touch /var/etc/.tuxcald
-		service tuxcald start >/dev/console
-	;;
-	tuxcald_stop)
-		echo "[$BNAME] tuxcal stop"
-		service tuxcald stop >/dev/console
-		rm -f /var/etc/.tuxcald
-	;;
-	tuxmaild_start)
-		echo "[$BNAME] tuxmail start"
-		touch /var/etc/.tuxmaild
-		service tuxmaild start >/dev/console
-	;;
-	tuxmaild_stop)
-		echo "[$BNAME] tuxmail stop"
-		service tuxmaild stop >/dev/console
-		rm -f /var/etc/.tuxmaild
-	;;
-	inadyn_start)
-		echo "[$BNAME] inadyn start"
-		touch /var/etc/.inadyn
-		service inadyn start >/dev/console
-	;;
-	inadyn_stop)
-		echo "[$BNAME] inadyn stop"
-		service inadyn stop >/dev/console
-		rm -f /var/etc/.inadyn
-	;;
-	dropbear_start)
-		echo "[$BNAME] dropbear start"
-		touch /var/etc/.dropbear
-		service dropbear start >/dev/console
-	;;
-	dropbear_stop)
-		echo "[$BNAME] dropbear stop"
-		service dropbear stop >/dev/console
-		rm -f /var/etc/.dropbear
-	;;
-	ushare_start)
-		echo "[$BNAME] ushare start"
-		touch /var/etc/.ushare
-		service ushare start >/dev/console
-	;;
-	ushare_stop)
-		echo "[$BNAME] ushare stop"
-		service ushare stop >/dev/console
-		rm -f /var/etc/.ushare
-	;;
-	djmount_start)
-		echo "[$BNAME] djmount start"
-		touch /var/etc/.djmount
-		service djmount start >/dev/console
-	;;
-	djmount_stop)
-		echo "[$BNAME] djmount stop"
-		service djmount stop >/dev/console
-		rm -f /var/etc/.djmount
-	;;
-	minidlna_start)
-		echo "[$BNAME] minidlna start"
-		touch /var/etc/.minidlnad
-		service minidlnad start >/dev/console
-	;;
-	minidlna_stop)
-		echo "[$BNAME] minidlna stop"
-		service minidlnad stop >/dev/console
-		rm -f /var/etc/.minidlnad
-	;;
-	xupnpd_start)
-		echo "[$BNAME] xupnpd start"
-		touch /var/etc/.xupnpd
-		service xupnpd start >/dev/console
-	;;
-	xupnpd_stop)
-		echo "[$BNAME] xupnpd stop"
-		service xupnpd stop >/dev/console
-		rm -f /var/etc/.xupnpd
-	;;
-	crond_start)
-		echo "[$BNAME] crond start"
-		touch /var/etc/.crond
-		service crond start >/dev/console
-	;;
-	crond_stop)
-		echo "[$BNAME] crond stop"
-		service crond stop >/dev/console
-		rm -f /var/etc/.crond
-	;;
-	*)
-		echo "[$BNAME] Parameter wrong: $*"
-	;;
-esac
-
-exit 0

data/y-web/scripts/Y_Tools.sh

@@ -227,7 +227,7 @@ do_automount_getline()
 do_automount_setline()
 {
 	if ! [ -e $1 ]; then
-		cp /var/etc/auto.net $1
+		cp /etc/auto.net $1
 	fi
 	filename=$1
 	mountname=`echo "$2"|sed -e "s;---;;g"`
@@ -283,8 +283,7 @@ do_cmd()
 
 # -----------------------------------------------------------
 # yInstaller
-# un-tar uploaded file to /tmp/y-install.
-# Execute included install.sh.
+# un-tar uploaded file to /tmp. Execute included install.sh
 # -----------------------------------------------------------
 do_installer()
 {
@@ -296,16 +295,16 @@ do_installer()
 
 	if [ -s "$y_upload_file" ]
 	then
-		mkdir -p $y_path_install
-		cd $y_path_install
+		# unpack /tmp/upload.tmp
+		cd $y_path_tmp
 		tar -xf "$y_upload_file"
 		rm $y_upload_file
-		if [ -s "$y_install" ] # look for install.sh
+		if [ -s "$y_install" ] #look for install.sh
 		then
 			chmod 755 $y_install
 			o=`$y_install` # execute
 			rm -f $y_install # clean up
-			if [ -s "$y_out_html" ] # html - output?
+			if [ -s "$y_out_html" ] #html - output?
 			then
 				echo '<html><head>'
 				echo '<link rel="stylesheet" type="text/css" href="/Y_Main.css">'
@@ -337,7 +336,7 @@ do_installer()
 }
 
 # -----------------------------------------------------------
-# extension Installer $1=URL
+# extention Installer $1=URL
 # -----------------------------------------------------------
 do_ext_installer()
 {
@@ -346,11 +345,10 @@ do_ext_installer()
 	fi
 	wgetlog=`wget -O $y_upload_file $1 2>&1`
 	if [ -s "$y_upload_file" ];then
-		mkdir -p $y_path_install
-		cd $y_path_install
+		cd $y_path_tmp
 		tar -xf "$y_upload_file"
 		rm $y_upload_file
-		if [ -s "$y_install" ] # look for install.sh
+		if [ -s "$y_install" ] #look for install.sh
 		then
 			chmod 755 $y_install
 			o=`$y_install` # execute
@@ -365,7 +363,7 @@ do_ext_installer()
 
 do_ext_uninstaller()
 {
-	uinst="%(CONFIGDIR)/y-ext/uninstall.sh"
+	uinst="%(CONFIGDIR)/ext/uninstall.sh"
 	if [ -e "$uinst"  ]; then
 		chmod 755 "$uinst"
 		`$uinst $1_uninstall.inc`
@@ -387,11 +385,26 @@ proc()
 # -----------------------------------------------------------
 wol()
 {
-	msg=`ether-wake $1`
+	if [ -e $y_path_sbin/ether-wake ]; then
+		msg=`ether-wake $1`
+	fi
 	msg="<b>Wake on LAN $1</b><br><br>$msg"
 	y_format_message_html
 }
 
+# -----------------------------------------------------------
+# lcd shot
+# $1= optionen | leer
+# -----------------------------------------------------------
+do_lcshot()
+{
+	if [ -e "$y_path_varbin/lcshot" ]; then
+		$y_path_varbin/lcshot $*
+	else
+		$y_path_bin/lcshot $*
+	fi
+}
+
 # -----------------------------------------------------------
 # osd shot
 # $1= fbshot | grab
@@ -443,14 +456,14 @@ do_settings_backup_restore()
 		backup)
 			rm -rf $workdir
 			mkdir -p $workdir
-			backup.sh $workdir >/dev/null
+			$y_path_bin/backup.sh $workdir >/dev/null
 			filename=$(ls -1 -tr $workdir/settings_* | tail -1)
 			echo "$filename"
 		;;
 		restore)
 			if [ -s "$y_upload_file" ]
 			then
-				msg=$(restore.sh "$y_upload_file")
+				msg=$($y_path_bin/restore.sh "$y_upload_file")
 			else
 				msg="error: no upload file"
 			fi
@@ -490,10 +503,11 @@ case "$1" in
 	ext_installer)			shift 1; do_ext_installer $* 2>&1 ;;
 	proc)				shift 1; proc $* ;;
 	wol)				shift 1; wol $* ;;
+	lcshot)				shift 1; do_lcshot $* ;;
 	fbshot)				shift 1; do_fbshot $* ;;
 	fbshot_clear)			do_fbshot_clear ;;
 	screenshot_clear)		do_screenshot_clear ;;
-	get_update_version)		wget -O /tmp/version.txt "https://raw.githubusercontent.com/tuxbox-neutrino/gui-neutrino/master/data/y-web/Y_Version.txt" ;;
+	get_update_version)		wget -q -O /tmp/version.txt "https://raw.githubusercontent.com/tuxbox-neutrino/gui-neutrino/master/data/y-web/Y_Version.txt" ;;
 	settings_backup_restore)	shift 1; do_settings_backup_restore $* ;;
 	exec_cmd)			shift 1; $* ;;
 	automount_list)			shift 1; do_automount_list $* ;;
@@ -517,33 +531,27 @@ case "$1" in
 		fi
 	;;
 	get_extension_list)
-		if [ -e "$y_path_config/extensions.txt" ]
+		if [ -e "$y_path_config/extentions.txt" ]
 		then
-			cat $y_path_config/extensions.txt
+			cat $y_path_config/extentions.txt
 		else
-			cat $y_path_httpd/extensions.txt
+			cat $y_path_httpd/extentions.txt
 		fi
 	;;
 	write_extension_list)
 		shift 1
-		echo  "$*" >$y_path_config/extensions.txt
+		echo  "$*" >$y_path_config/extentions.txt
 	;;
 	url_get)
 		shift 1
 		res=`wget -O /tmp/$2 "$1" >/tmp/url.log 2>&1`
 		cat /tmp/$2
 	;;
-	mtd_space)
-		df | while read filesystem blocks used available percent mounted ; do
+	mtd_space|var_space)
+		df | while read fs rest; do
 			case ${fs:0:3} in
 				mtd)
-					echo "$filesystem" "$blocks" "$used" "$available" "$percent" "$mounted"
-					break
-				;;
-			esac
-			case $mounted in
-				"/")
-					echo "$filesystem" "$blocks" "$used" "$available" "$percent" "$mounted"
+					echo "$fs" "$rest"
 					break
 				;;
 			esac

data/y-web/scripts/Y_v3_Tools.sh

@@ -1,476 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------
-# Y Tools
-# -----------------------------------------------------------
-if echo "$@" | grep -q "%20"; then
-	$0 ${@//%20/ }
-	exit
-fi
-
-. %(PRIVATE_HTTPDDIR)/scripts/_Y_Globals.sh
-. %(PRIVATE_HTTPDDIR)/scripts/_Y_Library.sh
-
-BNAME=${0##*/}
-
-PLUGIN_DIRS="%(PLUGINDIR) %(PLUGINDIR_VAR) %(PLUGINDIR_MNT) $(config_get_value_direct $y_config_neutrino 'plugin_hdd_dir')"
-
-getLanguage()
-{
-	Y_LANG=$(cat %(CONFIGDIR)/nhttpd.conf | grep "^Language.selected=" | cut -d= -f2)
-}
-
-file2msg() # $1 = file to show; $2 = short description; $3 = maketable or empty
-{
-	if [ -e $1 ]; then
-		echo "ok ($1 found)"
-		msg=$(cat $1)
-		if [ ! "$msg" ]; then
-			msg="no $2 available"
-			y_format_message_html
-			exit
-		fi
-		if [ "$3" == "maketable" ]; then
-			maketable $1
-		else
-			y_format_message_html
-		fi
-	else
-		echo "failed ($1 not found)"
-	fi
-}
-
-maketable() # $1 = file to format
-{
-        # header
-	echo "<div class='work_box'><div class='work_box_head'>"
-	echo "<div class='work_box_head_h2'>Formatted results</div></div>"
-	echo "<div class='work_box_body' style='overflow: auto; font-family: monospace'>"
-	# body
-	echo "<table style='border: 0 none;'>"
-	while read _a _b _c _d _e _f _g _h _i _j _k _l _m _n _o _p
-	do
-cat << eo_tbody
-	<tr>
-		<td>$_a</td>
-		<td>$_b</td>
-		<td>$_c</td>
-		<td>$_d</td>
-		<td>$_e</td>
-		<td>$_f</td>
-		<td>$_g</td>
-		<td>$_h</td>
-		<td>$_i</td>
-		<td>$_j</td>
-		<td>$_k</td>
-		<td>$_l</td>
-		<td>$_m</td>
-		<td>$_n</td>
-		<td>$_o</td>
-		<td>$_p</td>
-	</tr>
-eo_tbody
-	done < $1
-	echo "</table>"
-	# footer
-	echo "</div>"
-}
-
-is_mount()
-{
-        M=$1
-        test -e "$M" && cd "$M" && M=$(pwd -P)
-	while read _DEV _MTPT _FSTYPE _OPTS _REST
-	do
-		case "$M" in
-			"netfs")
-				if [ "$_FSTYPE" == "nfs" ] || [ "$_FSTYPE" == "cifs" ]; then
-					RET=0; break
-				else
-					RET=1; continue
-				fi
-			;;
-			"$_DEV"|"$_MTPT")
-				if [ "$_FSTYPE" == "autofs" ]; then
-					RET=1; continue
-				else
-					RET=0; break
-				fi
-			;;
-			*)
-				RET=1; continue
-			;;
-		esac
-	done < /etc/mtab
-	return $RET
-}
-
-is_exec()
-{
-        F=$1
-	test -x $y_path_varbin/$F
-	return $?
-}
-
-is_running()
-{
-	D=$1
-	pidof $D >/dev/null 2>&1
-	return $?	
-}
-
-action=$1; shift
-
-case "$action" in
-	getline)
-		FILE=$1
-		LINE=${2:-1}
-		if [ -f $FILE ]; then
-			tmp=$(sed -ne ''"${LINE}"'p' $FILE)
-			printf "%s" "$tmp"
-		fi
-	;;
-        is_exec)
-        	FILE=$1
-        	is_exec $FILE && printf "%s" "true" || printf "%s" "false"
-        ;;
-	is_running)
-		DEAMON=$1
-		is_running $DEAMON && printf "%s" "true" || printf "%s" "false"
-	;;
-	get_update_txt)
-		version="n/a"
-		#FIXME align url to box specs
-		wget -O /tmp/release.txt "https://n4k.sourceforge.io/update.php"
-		test -e /tmp/release.txt && version=$(cat /tmp/release.txt | grep ".img" | cut -d" " -f2)
-		echo "version=${version// /}" > /tmp/update.txt
-		rm -f /tmp/release.txt
-	;;
-	rm_update_txt)
-		rm -f /tmp/update.txt
-	;;
-	get_flash_info)
-		MTPT=""
-		case "$1" in
-			"var")		MTPT="/var"	;;
-			"root"|*)	MTPT="/"	;;
-		esac
-		df ${MTPT} | while read fs total used free used_percent mtpt; do
-			case ${mtpt} in
-				${MTPT})
-					used_percent=${used_percent//\%/}
-					free_percent=$(($free*100/$total))
-					total=$(($total/1024))
-					used=$(($used/1024))
-					free=$(($free/1024))
-					case $2 in
-						used_percent)	printf "%d" "$used_percent";;
-						free_percent)	printf "%d" "$free_percent";;
-						total)		printf "%d" "$total";;
-						used)		printf "%d" "$used";;
-						free)		printf "%d" "$free";;
-					esac
-					break
-				;;
-			esac
-		done
-	;;
-	get_mem_info)
-		while read _desc _size _unit; do
-			case $_desc in
-				"MemTotal:")	total=$_size	;;
-				"MemFree:")	free=$_size	;;
-				"Buffers:")	buffers=$_size	;;
-				"Cached:")	cached=$_size	;;
-			esac
-		done < /proc/meminfo
-		free=$(($free+$buffers+$cached))
-		used=$(($total-$free))
-		#used_percent=$(($used*100/$total))
-		used_percent=$((($used*200+total)/2/$total))
-		free_percent=$(($free*100/$total))
-		total=$(($total/1024))
-		used=$(($used/1024))
-		free=$(($free/1024))
-		case $1 in
-			used_percent)	printf "%d" "$used_percent";;
-			free_percent)	printf "%d" "$free_percent";;
-			total)		printf "%d" "$total";;
-			used)		printf "%d" "$used";;
-			free)		printf "%d" "$free";;
-		esac
-	;;
-	get_mtd_info)
-		while read dev size erasesize name; do
-			case ${dev:0:3} in
-				mtd)
-					test "$1" = "dev" && printf "%s<br/>" "$dev"
-					test "$1" = "name" && printf "%s<br/>" "${name//\"/}"
-				;;
-			esac
-		done < /proc/mtd
-	;;
-	get_cpu_info)
-		for i in 1 2; do
-			while read _cpu _user _nice _system _idle _rest; do
-				case $_cpu in
-					cpu)
-						case $i in
-							1)
-								fst_all=$(($_user + $_nice + $_system + $_idle))
-								fst_idle=$_idle
-							;;
-							2)
-								snd_all=$(($_user + $_nice + $_system + $_idle))
-								snd_idle=$_idle
-							;;
-						esac
-					;;
-				esac
-			done < /proc/stat
-			test $i = 1 && sleep 1
-		done
-
-		diff_all=$(($snd_all - $fst_all))
-		diff_idle=$(($snd_idle - $fst_idle))
-		_idle_percent=$(($diff_idle * 100 / $diff_all))
-		_used_percent=$((100 - $_idle_percent))
-
-		case $1 in
-			used_percent)	printf "%s" "$_used_percent";;
-		esac
-	;;
-get_minidlnad_webif_port)
-		if [ -e /etc/minidlna.conf ]; then
-			_port=$(grep -m 1 "^[:space:]*port=" /etc/minidlna.conf | cut -d'=' -f2)
-			_port=$(echo $_port | dos2unix -u)
-		fi
-		printf "%s" $_port
-	;;
-
-	get_xupnpd_webif_port)
-		if [ -e /share/xupnpd/xupnpd.lua ]; then
-			_port=$(grep -m 1 "^[:space:]*cfg.http_port" /share/xupnpd/xupnpd.lua | cut -d'=' -f2)
-			_port=$(echo $_port | dos2unix -u)
-		fi
-		printf "%s" $_port
-	;;
-
-	countcards)
-		getLanguage
-		if [ "$Y_LANG" == "Deutsch" ]
-		then
-			Y_L_count="Karten sind online."
-			Y_L_recount="können weitergegeben werden."
-		else
-			Y_L_count="cards online."
-			Y_L_recount="can be shared."
-		fi
-		FILE=$1
-		COUNT=0
-		_DIST=""
-		_LEV=""
-		if [ -f $FILE ]; then
-			COUNT=$(cat $FILE | wc -l | sed 's/^ *//')
-			echo "<b>$COUNT</b> $Y_L_count"
-			test $COUNT = 0 && exit
-
-			RECOUNT=$(cat $FILE | grep -v Lev:0 | wc -l | sed 's/^ *//')
-			echo "<b>$RECOUNT</b> $Y_L_recount"
-
-			for i in $(seq 0 9); do
-				DIST=$(cat $FILE | grep -H dist:$i | wc -l | sed 's/^ *//')
-				test $DIST = 0 || _DIST=$(echo -e "$_DIST\n\tDist. $i: $DIST")
-			done
-			for i in $(seq 0 9); do
-				LEV=$(cat $FILE | grep -H Lev:$i | wc -l | sed 's/^ *//')
-				test $LEV = 0 || _LEV=$(echo -e "$_LEV\n\tLevel $i: $LEV")
-			done
-
-			echo "<pre>$_LEV<br/>$_DIST</pre>"
-		else
-			echo "failed ($FILE not found)"
-			exit
-		fi
-
-		test $COUNT = 0 && echo "Es sind derzeit keine Karten online!"
-	;;
-
-	# zapit-control
-	resolution)
-		pzapit --${1}		&& echo "ok" || echo "failed"
-	;;
-	43mode)
-		pzapit -vm43 ${1}	&& echo "ok" || echo "failed"
-	;;
-	reload_channellists)
-		pzapit -c		&& echo "ok" || echo "failed"
-	;;
-	reset_tuner)
-				E=0
-		pzapit -esb;	E=$(($E+$?));	sleep 1
-		pzapit -lsb;	E=$(($E+$?));	sleep 1
-		pzapit -rz;	E=$(($E+$?))
-		test $E = 0	&& echo "ok" || echo "failed"
-	;;
-	# netfs-control
-	is_mount)
-		MTPT=$1
-		is_mount $MTPT && printf "%s" "true" || printf "%s" "false"
-	;;
-	do_mount_all)
-		msg=$(/etc/init.d/fstab start_netfs)
-		y_format_message_html
-	;;
-	do_umount_all)
-		msg=$(/etc/init.d/fstab stop_netfs)
-		y_format_message_html
-	;;
-	do_mount)
-	        MTPT=$1
-	        test $MTPT || exit 1
-		test -d $MTPT || mkdir -p $MTPT;
-		FLAG="/var/etc/.srv"
-		if OUT=$(mount $MTPT 2>&1 >/dev/null); then
-			RET=$?
-			msg="mount: $MTPT - success ($RET)"
-			test -e $FLAG || touch $FLAG
-		else
-			RET=$?
-			msg="mount: $MTPT - failed ($RET)<br>$OUT"
-		fi
-		y_format_message_html
-	;;
-	do_umount)
-	        MTPT=$1
-	        test $MTPT || exit 1
-		FLAG="/var/etc/.srv"
-		rm -f $FLAG
-		if OUT=$(umount $MTPT 2>&1 >/dev/null); then
-			RET=$?
-			msg="umount: $MTPT - success ($RET)"
-		else
-			RET=$?
-			msg="umount: $MTPT - failed ($RET)<br>$OUT"
-		fi
-		is_mount netfs && touch $FLAG
-		y_format_message_html
-	;;
-	# automounter-control
-	do_autofs)
-		case $1 in
-			start|stop|restart|reload)
-				msg=$(service autofs $1)
-				y_format_message_html
-			;;
-		esac
-	;;
-	# plugin-control
-	p_fcm_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh fcm_start;;
-	p_fcm_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh fcm_stop;;
-	p_nfs_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh nfs_start;;
-	p_nfs_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh nfs_stop;;
-	p_samba_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh samba_start;;
-	p_samba_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh samba_stop;;
-	p_tuxcald_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh tuxcald_start;;
-	p_tuxcald_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh tuxcald_stop;;
-	p_tuxmaild_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh tuxmaild_start;;
-	p_tuxmaild_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh tuxmaild_stop;;
-	p_inadyn_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh inadyn_start;;
-	p_inadyn_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh inadyn_stop;;
-	p_dropbear_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh dropbear_start;;
-	p_dropbear_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh dropbear_stop;;
-	p_ushare_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh ushare_start;;
-	p_ushare_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh ushare_stop;;
-	p_djmount_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh djmount_start;;
-	p_djmount_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh djmount_stop;;
-	p_minidlna_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh minidlna_start;;
-	p_minidlna_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh minidlna_stop;;
-	p_xupnpd_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh xupnpd_start;;
-	p_xupnpd_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh xupnpd_stop;;
-	p_crond_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh crond_start;;
-	p_crond_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_v3_Plugin-control.sh crond_stop;;
-	# plugins on blue-button
-	p_show)
-		PLUGIN=$1
-		for PLUGIN_DIR in $PLUGIN_DIRS
-		do
-			cd $PLUGIN_DIR
-			test -w "$PLUGIN" || continue
-			echo "[$BNAME] modifying $PLUGIN_DIR/$PLUGIN"
-			sed -i "s/^\(hide=\).*$/\1"0"/" $PLUGIN
-		done
-	;;
-	p_hide)
-		PLUGIN=$1
-		for PLUGIN_DIR in $PLUGIN_DIRS
-		do
-			cd $PLUGIN_DIR
-			test -w "$PLUGIN" || continue
-			echo "[$BNAME] modifying $PLUGIN_DIR/$PLUGIN"
-			# fix for missing trailing linefeed in cfg-file
-			test "$(tail -c1 $PLUGIN)" != "" && echo "" >> $PLUGIN
-			if grep -q "^hide=" $PLUGIN
-			then
-				sed -i "s/^\(hide=\).*$/\1"1"/" $PLUGIN
-			else
-				echo "hide=1" >> $PLUGIN
-			fi
-		done
-	;;
-	p_list)
-		getLanguage
-		if [ "$Y_LANG" == "Deutsch" ]
-		then
-			Y_L_show="Anzeigen"
-			Y_L_hide="Verstecken"
-		else
-			Y_L_show="Show"
-			Y_L_hide="Hide"
-		fi
-		for PLUGIN_DIR in $PLUGIN_DIRS
-		do
-			test -e $PLUGIN_DIR || continue
-			cd $PLUGIN_DIR
-			PLUGINS=$(ls -1 *.cfg 2>/dev/null)
-			for PLUGIN in $PLUGINS
-			do
-				if [ "$1" == "lua" ]
-				then
-					# lua-plugins don't need the executable flag
-					test -e ${PLUGIN%%.*}.${1} || continue
-				else
-					test -x ${PLUGIN%%.*}.${1} || continue
-				fi
-				NAME=$(cat $PLUGIN | grep "^name=" | cut -d= -f2)
-				HIDE=$(cat $PLUGIN | grep "^hide=" | cut -d= -f2)
-				case $HIDE in
-					1)
-						IMG="<img src='images/x_red.png' class='status'>"
-						INP="<input type='button' value='$Y_L_show' onclick='Y_v3_Tools(\"p_show $PLUGIN\", 1000);' />"
-					;;
-					*)
-						IMG="<img src='images/check_green.png' class='status'>"
-						INP="<input type='button' value='$Y_L_hide' onclick='Y_v3_Tools(\"p_hide $PLUGIN\", 1000);' />"
-					;;
-				esac
-cat << eoPLUGIN
-			<!-- $NAME -->
-			<tr class="list">
-				<td>
-					$IMG
-					<span title="$PLUGIN_DIR/${PLUGIN%%.*}.${1}">
-						$NAME
-					</span>
-				</td>
-				<td>
-					$INP
-				</td>
-			</tr>
-eoPLUGIN
-			done
-		done
-	;;
-	*)
-		echo "[$BNAME] Parameter wrong: $action $*"
-	;;
-esac

data/y-web/scripts/_Y_Globals.sh

@@ -15,13 +15,10 @@
 y_path_httpd=".."
 y_path_scripts="$y_path_httpd/scripts"
 y_path_bin="/bin"
-y_path_usrbin="/usr/bin"
 y_path_varbin="/var/bin"
 y_path_sbin="/sbin"
-y_path_usrsbin="/usr/sbin"
 y_path_config="%(CONFIGDIR)"
 y_path_tmp="/tmp"
-y_path_install="$y_path_tmp/y-install"
 y_path_zapit="%(ZAPITDIR)"
 
 y_url_control="http://localhost/control"
@@ -38,4 +35,4 @@ y_tmp_m3u="$y_path_tmp/y.m3u"
 y_tmp_pls="$y_path_tmp/y.pls"
 
 y_out_html="$y_path_tmp/y_out.yhtm"
-y_install="$y_path_install/install.sh"
+y_install="$y_path_tmp/install.sh"

data/y-web/scripts/_Y_Library.sh

@@ -22,7 +22,7 @@ buildLocalIP()
 }
 
 # -----------------------------------------------------------
-# Streaming URL fuer sed
+# Streaming URL f<EFBFBD>r sed
 # -----------------------------------------------------------
 buildStreamingURL()
 {
@@ -43,7 +43,7 @@ buildStreamingRawURL()
 }
 
 # -----------------------------------------------------------
-# Audio: Streaming URL fuer sed
+# Audio: Streaming URL f<EFBFBD>r sed
 # -----------------------------------------------------------
 buildStreamingAudioURL()
 {