# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1440367508 -10800
# Node ID 4f619f973b8882947de23e5858306a9cc1dce4da
# Parent  5323427d34b909e2cc8e761bd113a6e526cb0643
network.cgi: use /etc/hosts as Ad/Spyware/Malicious sites blocker; faster build with stripall.sh

diff -r 5323427d34b9 -r 4f619f973b88 lib/libtazpanel
--- a/lib/libtazpanel	Thu Aug 20 17:00:19 2015 +0300
+++ b/lib/libtazpanel	Mon Aug 24 01:05:08 2015 +0300
@@ -397,6 +397,10 @@
 # Get system database. NSS compatible.
 
 getdb() {
-	getent $1 2>/dev/null || cat /etc/$1
+	if [ -n "$(which getent)" ]; then
+		getent "$1"
+	else
+		cat "/etc/$1" | sed '/^#/d'
+	fi
 }
 
diff -r 5323427d34b9 -r 4f619f973b88 network.cgi
--- a/network.cgi	Thu Aug 20 17:00:19 2015 +0300
+++ b/network.cgi	Mon Aug 24 01:05:08 2015 +0300
@@ -148,10 +148,10 @@
 			ether-wake -b $(GET iface) $pass
 		fi
 		;;
-	*\ host\ *)
-		get_hostname="$(GET host)"
-		echo $(_ 'Changed hostname: %s' $get_hostname) | log
-		echo "$get_hostname" > /etc/hostname ;;
+	*\ hostname\ *)
+		hostname="$(GET hostname)"
+		echo $(_ 'Changed hostname: %s' "$hostname") | log
+		echo "$hostname" > /etc/hostname;;
 	*\ rmarp\ *)
 		arp -d $(urldecode "$(GET entry)") ;;
 	*\ addarp\ *)
@@ -617,6 +617,100 @@
 		;;
 
 
+	*\ hosts\ *)
+		# Configure to use hosts as Ad blocker
+		xhtml_header "$(_ 'Use hosts file as Ad blocker')"
+
+		term=$(GET term)
+		found=$(mktemp)
+
+		# Find the hosts list
+		hosts=$(echo "$QUERY_STRING&" | awk '
+			BEGIN { RS="&"; FS="=" }
+			$1=="host" { printf "%s ", $2 }
+		')
+		hosts=$(httpd -d "${hosts% }")
+		# now hosts='host1 host2 ... hostn'
+
+		if [ -n "$(GET add)" ]; then
+			# Add given host
+
+			host="$(GET add)"
+
+			echo "0.0.0.0 $host #U" >> /etc/hosts
+			echo -n '<p><span data-img="info"></span>'
+			_ 'Host "%s" added to /etc/hosts.' "$host"
+			echo '</p>'
+
+		elif [ -n "$hosts" ]; then
+			# Disable given hosts
+
+			for host in $hosts; do
+				sed -i "s|^0.0.0.0[ \t][ \t]*$host\$|#\0|" /etc/hosts
+				sed -i "s|^0.0.0.0[ \t][ \t]*$host .*|#\0|" /etc/hosts
+			done
+			r=$(echo "$hosts" | tr ' ' '\n' | wc -l)
+			echo -n '<p><span data-img="info"></span>'
+			_p  '%d record disabled' \
+				'%d records disabled' "$r"   "$r"
+			echo '</p>'
+		fi
+
+		# When search term given
+		if [ -z "$term" ]; then
+			getdb hosts | fgrep 0.0.0.0 > "$found"
+			r=$(wc -l < "$found")
+			echo -n '<p><span data-img="info"></span>'
+			_p  '%d record used for Ad blocking' \
+				'%d records used for Ad blocking' "$r"   "$r"
+		else
+			getdb hosts | fgrep 0.0.0.0 | fgrep "$term" > "$found"
+			r=$(wc -l < "$found")
+			echo -n '<p><span data-img="info"></span>'
+			_p  '%d record found for "%s"' \
+				'%d records found for "%s"' "$r"   "$r" "$term"
+		fi
+
+		[ "$r" -gt 100 ] && _ ' (The list is limited to the first 100 entries.)'
+		echo '</p>'
+
+		cat <<EOT
+	<section>
+		<header>
+			<span data-icon="list">$(_ 'Hosts')</span>
+			<form id="hosts">
+				<input type="hidden" name="hosts" value=""/>
+				<input type="search" name="term" value="$(GET term)" results="5" autosave="hosts" autocomplete="on"/>
+			</form>
+		</header>
+		<pre class="scroll">
+EOT
+		sort "$found" | head -n100 | awk '{
+			printf "<label><input type=\"checkbox\" name=\"host\" value=\"%s\" form=\"hosts\"/> %s</label>\n", $2, $2;
+		}'
+		rm "$found"
+		cat <<EOT
+</pre>
+		<footer>
+			<button form="hosts" data-icon="delete" data-root>$(_ 'Disable selected')</button>
+		</footer>
+	</section>
+
+	<section>
+		<header><span data-icon="add">$(_ 'Add')</span></header>
+		<form class="wide">
+			<div>
+				<input type="hidden" name="hosts"/>
+				$(_ 'Host:')
+				<input type="text" name="add"/>
+				<button type="submit" data-icon="add" data-root>$(_ 'Add')</button>
+			</div>
+		</form>
+	</section>
+EOT
+		;;
+
+
 	*)
 		# Main Network page starting with a summary
 		xhtml_header "$(_ 'Manage network connections and services')"
@@ -668,7 +762,17 @@
 
 <section>
 	<header id="hosts">$(_ 'Hosts'; edit_button /etc/hosts)</header>
-	<pre class="scroll">$(getdb hosts)</pre>
+	<span data-icon="info">$(r=$(getdb hosts | wc -l); 
+		_p '%s record in the hosts DB' \
+			'%s records in the hosts DB' "$r" \
+			"$r")</span>
+	<pre class="scroll">$(getdb hosts | fgrep -v 0.0.0.0)</pre>
+	<footer>
+		<form>
+			<button name="hosts" data-icon="admin" data-root>$(_ 'Configure')</button>
+			$(_ 'Use hosts file as Ad blocker')
+		</form>
+	</footer>
 </section>
 
 
@@ -677,10 +781,9 @@
 	<footer>
 EOT
 		if [ -w '/etc/hostname' ]; then
-			# was: name="hostname"; please don't use 'name' in name: unwanted webkit styling
 			cat <<EOT
 		<form>
-			<input type="text" name="host" value="$(cat /etc/hostname)"/><!--
+			<input type="text" name="hostname" value="$(hostname)"/><!--
 			--><button type="submit" data-icon="ok">$(_ 'Change')</button>
 		</form>
 EOT
diff -r 5323427d34b9 -r 4f619f973b88 stripall.sh
--- a/stripall.sh	Thu Aug 20 17:00:19 2015 +0300
+++ b/stripall.sh	Mon Aug 24 01:05:08 2015 +0300
@@ -7,6 +7,18 @@
 substitute_icons() {
 	grep -q 'data-icon="\|data-img"' $1 || return
 
+	# Customize sed script
+	cp "$sed_script" "$sed_script.do"
+	sed -i "s|@@@|$1|" "$sed_script.do"
+	# Run sed script
+	sh "$sed_script.do"
+	rm "$sed_script.do"
+}
+
+
+# Make script for substitution
+	sed_script="$(mktemp)"
+	echo -n "sed -i '" > "$sed_script"
 	echo -e "\
 	add				\n	admin			\n	back			\n	battery	
 	brightness		\n	cancel			\n	cd				\n	check	
@@ -32,18 +44,17 @@
 	msg				\n	msgerr			\n	msgwarn			\n	msgup	
 	msgtip			\n	vpn			" | \
 	while read icon symbol; do
-		echo -n "."
-		sed -i "s|data-icon=\"$icon\"|data-icon=\"$symbol\"|g" $1
-		sed -i "s|data-img=\"$icon\"|data-img=\"$symbol\"|g" $1
+		echo -n "s|data-icon=\"$icon\"|data-icon=\"$symbol\"|g; " >> "$sed_script"
+		echo -n "s|data-img=\"$icon\"|data-img=\"$symbol\"|g; " >> "$sed_script"
 	done
-}
+	echo "' @@@" >> "$sed_script"
 
 
 cd build
 
 echo -e "\nStrip shell scripts"
 for CGI in *.cgi tazpanel libtazpanel bootloader *.html; do
-	echo -en "\nProcessing $CGI"
+	echo "Processing $CGI"
 
 	mv $CGI $CGI.old
 	# Copy initial comment (down to empty line)
@@ -65,7 +76,7 @@
 
 echo -e "\n\nStrip CSS stylesheets"
 for CSS in *.css; do
-	echo -en "\nProcessing $CSS"
+	echo "Processing $CSS"
 
 	mv $CSS $CSS.old
 	tr '\n' ' ' < $CSS.old > $CSS
@@ -97,4 +108,5 @@
 cat *.js > gz/tazpanel.js
 gzip -9 gz/tazpanel.js
 
+rm "$sed_script"
 echo
diff -r 5323427d34b9 -r 4f619f973b88 styles/default/base.css
--- a/styles/default/base.css	Thu Aug 20 17:00:19 2015 +0300
+++ b/styles/default/base.css	Mon Aug 24 01:05:08 2015 +0300
@@ -159,7 +159,7 @@
 section header form, section footer form {
 	display: table-cell; vertical-align: baseline; line-height: 0; width: 1px; white-space: nowrap;
 }
-section header button, section footer button { margin: 0; }
+section header button, section header input, section footer button, section footer input { margin: 0; }
 
 section header a { float: right; }
 
diff -r 5323427d34b9 -r 4f619f973b88 styles/default/header.html
--- a/styles/default/header.html	Thu Aug 20 17:00:19 2015 +0300
+++ b/styles/default/header.html	Mon Aug 24 01:05:08 2015 +0300
@@ -120,7 +120,7 @@
 	root) icon='data-img="slitaz"'; warn=''
 	      toggle_url="http://$HTTP_HOST/";;
 	*)    icon='data-img="user"';   warn="$(_ 'Some features are disabled.')"$'\n'
-	      toggle_url="http://$HTTP_HOST/user/";;
+	      toggle_url="http://$RANDOM:*@$HTTP_HOST/user/";;
 esac
 
 cat <<EOT