# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1487335184 -3600
# Node ID 5b8fd5ab20b7f5e33a8f58a266d8e694e6e819c2
# Parent  97dca04ea0facb6986251a44f431f602d89f2516
Clean-up keygen plugin

diff -r 97dca04ea0fa -r 5b8fd5ab20b7 plugins/cloud/cloud.cgi
--- a/plugins/cloud/cloud.cgi	Fri Feb 17 13:06:47 2017 +0100
+++ b/plugins/cloud/cloud.cgi	Fri Feb 17 13:39:44 2017 +0100
@@ -65,7 +65,7 @@
 EOT
 		if admin_user; then
 			cat << EOT
-<a href="$script?cloudlog&amp;clean">$(gettext "Clean logfile")</a>"
+<a href="$script?cloudlog&amp;clean">$(gettext "Clean logfile")</a>
 EOT
 		fi
 		echo "</div>"
diff -r 97dca04ea0fa -r 5b8fd5ab20b7 plugins/community/community.cgi
--- a/plugins/community/community.cgi	Fri Feb 17 13:06:47 2017 +0100
+++ b/plugins/community/community.cgi	Fri Feb 17 13:39:44 2017 +0100
@@ -87,28 +87,6 @@
 		fi
 		html_footer && exit 0 ;;
 	
-	*\ communityconfig\ *)
-		d="Community plugin config"
-		header
-		html_header
-		user_box
-		if ! admin_user; then
-			header "Location: $script"
-		fi
-		cat << EOT
-<div id="tools">
-	<a href="$script?dashboard">Dashboard</a>
-	<a href="$script?community">Community Tools</a>
-</div>
-
-<h2>$d</h2>
-<pre>
-Wall mode        : $WALL_MODE
-Messages length  : $WALL_MESSAGES_LENGTH
-</pre>
-EOT
-		html_footer && exit 0 ;;
-	
 	*\ community\ *)
 		d="Community Tools"
 		header
@@ -118,15 +96,20 @@
 		if check_auth; then
 			echo "<a href='$script?dashboard'>Dashboard</a>"
 		fi
-		if admin_user; then
-			echo "<a href='$script?communityconfig'>Plugin Config</a>"
-		fi
 		cat << EOT
 <a href="$script?wall">Community Wall</a>
 </div>
 <h2>$d</h2>
 <p>$SHORT_DESC</p>
 EOT
-		
+		if admin_user; then
+			cat << EOT
+<h3>Plugin config</h3>
+<pre>
+Wall mode        : $WALL_MODE
+Messages length  : $WALL_MESSAGES_LENGTH
+</pre>
+EOT
+		fi
 		html_footer && exit 0 ;;
 esac
diff -r 97dca04ea0fa -r 5b8fd5ab20b7 plugins/keygen/keygen.cgi
--- a/plugins/keygen/keygen.cgi	Fri Feb 17 13:06:47 2017 +0100
+++ b/plugins/keygen/keygen.cgi	Fri Feb 17 13:39:44 2017 +0100
@@ -12,13 +12,14 @@
 		html_header
 		user_box
 		cat << EOT
-<h2>$(gettext "Key generator")</h2>
+<h2>$(gettext "Password &amp; key generator")</h2>
 
 <div style="text-align: center; padding: 20px 0;">
 	<form method="get" action="$script">
 		<input type="text" name="keygen" 
 			placeholder="$(gettext "Random or personal string")" />
 		<div>
+			<input type="submit" name="encryption" value="password" />
 			<input type="submit" name="encryption" value="base64" />
 			<input type="submit" name="encryption" value="md5sum" />
 			<input type="submit" name="encryption" value="sha256sum" />
@@ -38,31 +39,10 @@
 			*\ md5sum\ *) echo "$keygen" | md5sum | awk '{print $1}' ;;
 			*\ sha256sum\ *) echo "$keygen" | sha256sum | awk '{print $1}' ;;
 			*\ sha512sum\ *) echo "$keygen" | sha512sum | awk '{print $1}' ;;
+			*\ password\ *) 
+				< /dev/urandom tr -dc '/()?!@#$%+-_A-Z-a-z-0-9' | head -c 10; echo "" ;;
 			*) echo "--" ;;
 		esac
-		# Random password
-		cat << EOT
-</pre>
-
-<h3>$(gettext "Random password")</h3>
-
-<div>
-	<form method="get" action="$script">
-		<div>
-			<input type="hidden" name="keygen" value="passwd" />
-			<input type="submit" name="random" value="$(gettext "generate")" />
-		</div>
-	</form>
-</div>
-<pre>
-EOT
-		
-		if [ "$(GET keygen)" == "passwd" ]; then
-			< /dev/urandom tr -dc '/()?!@#$%+-_A-Z-a-z-0-9' | head -c 10; echo ""
-			#date +%s | sha256sum | base64 | head -c 10 ; echo ""
-		else
-			echo "--"
-		fi
 		echo "</pre>"
 		html_footer && exit 0 ;;
 esac