# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1390143219 -3600
# Node ID c4a472d0a45e6cbf609adaaf20e04f31679b6e8e
# Parent  aff0e20fbd3e3fe11e8818a87ee4b0ce98d7709a
Bunch of small fixes and improvments

diff -r aff0e20fbd3e -r c4a472d0a45e index.cgi
--- a/index.cgi	Sun Jan 19 09:42:05 2014 +0000
+++ b/index.cgi	Sun Jan 19 15:53:39 2014 +0100
@@ -110,7 +110,7 @@
 <p>
 This is the default index page of your TinyCM, you can login then start to
 edit and adding some content. You can read the help about text formating
-and functions: <a href='?d=en/help'>Help page</a>
+and functions: [Help page|en/help]
 </p>
 
 EOT
@@ -547,20 +547,30 @@
 		header
 		html_header
 		user_box
-		echo "<h2>$(gettext "Document list")</h2>"
+		echo "<h2>$(gettext "Pages list")</h2>"
 		if check_auth; then
 			echo "<div id='tools'>"
 			echo "<a href='$script?dashboard'>Dashboard</a>"
 			echo "</div>"
-		fi 
+		fi
 		echo '<pre>'
 		cd ${wiki}
 		for d in $(find . -type f | sed s'/.\///')
 		do
-			echo "<a href='$script?d=${d%.txt}'>${d%.txt}</a>"
+			cat << EOT
+<a href="$script?d=${d%.txt}">${d%.txt}</a> : \
+<a href="$script?rm=$d">$(gettext "Remove")</a>
+EOT
 		done
 		echo '</pre>'
 		html_footer ;;
+	
+	*\ rm\ *)
+		[ ! check_auth ] && header "Location: Location: $script"
+		d="$(GET rm)"
+		rm ${wiki}/"${d}"
+		rm -rf ${cache}/"${d%.txt}"
+		header "Location: $script?ls" ;;
 		
 	*\ diff\ *)
 		d="$(GET diff)"
@@ -672,7 +682,7 @@
 			cat << EOT
 <div id="tools">
 	<a href='$script?log'>Activity log</a>
-	<a href='$script?ls'>List files</a>
+	<a href='$script?ls'>Pages list</a>
 	$DASHBOARD_TOOLS
 	$ADMIN_TOOLS
 </div>
diff -r aff0e20fbd3e -r c4a472d0a45e plugins/blog/blog.cgi
--- a/plugins/blog/blog.cgi	Sun Jan 19 09:42:05 2014 +0000
+++ b/plugins/blog/blog.cgi	Sun Jan 19 15:53:39 2014 +0100
@@ -23,7 +23,7 @@
 	cat << EOT
 	- <a href="$script?blogedit&amp;d=${d}">$(gettext "Edit it!")</a>
 EOT
-#<a href="$script?blogrm&amp;d=${d}">$(gettext "Remove")</a>
+#<a href="$script?blogrm=${d}">$(gettext "Remove")</a>
 }
 
 # Display blog post: show_posts nb
@@ -35,7 +35,7 @@
 	if [ -f "${PEOPLE}/${author}/account.conf" ]; then
 		. ${PEOPLE}/${author}/account.conf
 	else
-		echo ERROR: ${PEOPLE}/${author}/account.conf
+		echo "ERROR: ${PEOPLE}/${author}/account.conf"
 	fi
 	echo "<div class=\"blogpost\">"
 	cat ${blog}/${d}.txt | sed -e '/AUTHOR=/'d -e '/DATE=/'d | wiki_parser
@@ -44,8 +44,8 @@
 	<a href="$script?user=$USER">$(get_gravatar $MAIL 24)</a>
 	<span class="date">$date</span>
 EOT
-	# Post tools for auth users
-	if admin_user; then
+	# Post tools for admin users
+	if check_auth && admin_user; then
 		post_tools
 		echo "</div>"
 	else
@@ -86,7 +86,6 @@
 		header
 		html_header
 		user_box
-		# Blog tools for auth users
 		if ! check_auth && admin_user; then
 			gettext "You must be admin to create a new Blog post"
 			html_footer && exit 0
@@ -97,7 +96,7 @@
 			last=$(ls -r $blog | head -n 1)
 			nb=${last%.txt}
 			d=$(($nb + 1))
-			conf=$(echo -e "\n\nAUTHOR=\"$user\"\nDATE=\"$date\"\n\n====Title====")
+			conf=$(echo -e "\n\nAUTHOR=\"$user\"\nDATE=\"$date\"\n\n==== Title ====")
 		fi		
 		cat << EOT
 <h2>$(gettext "Blog post"): $d</h2>
@@ -105,7 +104,7 @@
 <div id="edit">
 	<form method="get" action="$script" name="editor">
 		<input type="hidden" name="blogsave" value="$d" />
-		<textarea name="content">$conf $(cat "$blog/$d.txt")</textarea>
+		<textarea name="content">${conf}$(cat "$blog/$d.txt")</textarea>
 		<input type="submit" value="$(gettext "Post content")" />
 		$(gettext "Code Helper:")
 		$(cat lib/jseditor.html)
@@ -136,8 +135,7 @@
 		header
 		html_header
 		user_box
-		#echo "<h2>$(gettext "Latest blog posts")</h2>"
-		# Blog tools for auth users
+		# Blog tools for admin users
 		if check_auth && admin_user; then
 			blog_tools
 		fi
diff -r aff0e20fbd3e -r c4a472d0a45e plugins/cloud/cloud.cgi
--- a/plugins/cloud/cloud.cgi	Sun Jan 19 09:42:05 2014 +0000
+++ b/plugins/cloud/cloud.cgi	Sun Jan 19 15:53:39 2014 +0100
@@ -48,7 +48,7 @@
 	*\ cloudlog\ *)
 		# Display Cloud activity
 		d="Cloud activity"
-		[ ! check_auth ] && header "Location: $WEB_URL"
+		[ ! check_auth ] && header "Location: $script"
 		# Clean-up logfile
 		if [ "$(GET clean)" ]; then
 			rm -f ${cloudlog} && touch ${cloudlog}
diff -r aff0e20fbd3e -r c4a472d0a45e plugins/export/export.cgi
--- a/plugins/export/export.cgi	Sun Jan 19 09:42:05 2014 +0000
+++ b/plugins/export/export.cgi	Sun Jan 19 15:53:39 2014 +0100
@@ -100,7 +100,8 @@
 			rm -rf $tmp/export/$$
 			echo '</pre>'
 			dl_link ;;
-		*\ export\ ) html_footer && exit 0 ;;
+		*\ export\ )
+			html_footer && exit 0 ;;
 		*)
 			echo '<pre>'
 			gettext "Export not yet implemented for"; echo ": $(GET export)"
diff -r aff0e20fbd3e -r c4a472d0a45e tools/serv.sh
--- a/tools/serv.sh	Sun Jan 19 09:42:05 2014 +0000
+++ b/tools/serv.sh	Sun Jan 19 15:53:39 2014 +0100
@@ -4,6 +4,7 @@
 #
 
 port=8084
+cd tools 2/dev/null || continue
 
 echo "Starting server on port: $port"
 echo "URL: http://localhost:$port/"