# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1441181651 -7200
# Node ID 46bb16b07f1ab7dcfd9de47692236ba1d405619f
# Parent  ea02fe275b3f838be628086c98bfb389dd437df9
tazwikiss: use sedesc()

diff -r ea02fe275b3f -r 46bb16b07f1a tazwikiss/rootfs/var/www/wiki/index.sh
--- a/tazwikiss/rootfs/var/www/wiki/index.sh	Thu Aug 20 21:26:04 2015 +0200
+++ b/tazwikiss/rootfs/var/www/wiki/index.sh	Wed Sep 02 10:14:11 2015 +0200
@@ -56,6 +56,12 @@
 	cache_auth "$PASSWORD"
 }
 
+sedesc()
+{
+	echo "$1" | sed 's|[/&"]|\\&|g' | \
+		sed ':a;N;$!ba;s|\n|\\n|g;s|'$(echo -en "\r")'||g'
+}
+
 plugin_call_method()
 {
 	local status
@@ -154,7 +160,7 @@
 EOT
 )"
 else
-	CONTENT="$(sed -e "s#%page%#$PAGE_TITLE#" <<EOT
+	CONTENT="$(sed -e "s/%page%/$(sedesc "$PAGE_TITLE")/" <<EOT
 $DEFAULT_CONTENT
 EOT
 )"
@@ -320,7 +326,7 @@
 		 	-e 's/(phone)/\&#9742;/' -e 's/(wphone)/\&#9743;/' \
 		 	-e 's/(skull)/\&#9760;/' -e 's/(radioactive)/\&#9762;/' \
 		 	-e 's/(sad)/\&#9785;/'  -e 's/(smile)/\&#9786;/' \
-		 	-e 's/(recycle)/\&#9742;/' -e 's/(wheelchair)/\&#9755;/' \
+		 	-e 's/(recycle)/\&#9842;/' -e 's/(wheelchair)/\&#9855;/' \
 		 	-e 's/(wflag)/\&#9872;/' -e 's/(bflag)/\&#9873;/' \
 		 	-e 's/(anchor)/\&#9875;/' -e 's/(flower)/\&#9880;/' \
 		 	-e 's/(gear)/\&#9881;/' -e 's/(volt)/\&#9889;/' \
@@ -375,8 +381,8 @@
 EOT
 )"
 		while read link; do
-			[ -s $PAGES_DIR$link.txt ] && continue
-			CONTENT="$(sed "s|\\?page=$link\"|& class=\"pending\"|" <<EOT
+			[ -s "$PAGES_DIR$link.txt" ] && continue
+			CONTENT="$(sed "s/\\?page=$(sedesc "$link")\"/& class=\"pending\"/" <<EOT
 $CONTENT
 EOT
 )"
@@ -410,7 +416,7 @@
 	<h$i><a href="#$label">$line</a></h$i>
 EOT
 )"
-				CONTENT="$(sed "s#^!!* *$line\$#<h$i><a name=\"$label\">$line</a></h$i>#" <<EOT
+				CONTENT="$(sed "s/^!!* *$(sedesc "$line")\$/<h$i><a name=\"$label\">$(sedesc "$line")<\/a><\/h$i>/" <<EOT
 $CONTENT
 EOT
 )"
@@ -462,10 +468,10 @@
 [ "$action" != "edit" ] && HELP=""
 
 [ -r "$template" ] || die "'$template' is missing!"
-html="$(sed -e "s#{\([^}]*\)RECENT_CHANGES\([^}]*\)}#\1$RECENT\2#" \
-           -e "s#{\([^}]*\)HOME\([^}]*\)}#\1$HOME\2#" \
-           -e "s#{\([^}]*\)HELP\([^}]*\)}#$HELP#" \
-           -e "s#{SEARCH}#<form method=\"get\" action=\"$urlbase?page=$(urlencode "$PAGE_TITLE" | sed 's/#/\\#/g')\"><div><input type=\"hidden\" name=\"action\" value=\"search\" /><input type=\"text\" name=\"query\" value=\"$(htmlentities $(GET query) )\" tabindex=\"1\" /> <input type=\"submit\" value=\"$SEARCH_BUTTON\" accesskey=\"q\" /></div></form>#" \
+html="$(sed -e "s/{\([^}]*\)RECENT_CHANGES\([^}]*\)}/\1$(sedesc "$RECENT")\2/" \
+           -e "s/{\([^}]*\)HOME\([^}]*\)}/\1$(sedesc "$HOME")\2/" \
+           -e "s/{\([^}]*\)HELP\([^}]*\)}/$(sedesc "$HELP")/" \
+           -e "s/{SEARCH}/<form method=\"get\" action=\"$(sedesc "$urlbase?page=$(urlencode "$PAGE_TITLE" | sed 's/#/\\#/g')")\"><div><input type=\"hidden\" name=\"action\" value=\"search\" \/><input type=\"text\" name=\"query\" value=\"$(sedesc "$(htmlentities $(GET query) )")\" tabindex=\"1\" \/> <input type=\"submit\" value=\"$(sedesc "$SEARCH_BUTTON")\" accesskey=\"q\" \/><\/div><\/form>/" \
            < $template )"
 [ "$action" != "" -a "$action" != "edit" -o ! -e "$PAGE_txt" ] && TIME="-"
 plugin_call_method template
@@ -478,37 +484,31 @@
 if $editable ; then
 	EDIT="$PROTECTED_BUTTON"
 	[ -w "$PAGE_txt" -o ! -e "$PAGE_txt" ] &&
-        EDIT="<a href=\"$urlbase?page=$(urlencode "$PAGE_TITLE")\&amp;action=edit\" accesskey=\"5\" rel=\"nofollow\">$EDIT_BUTTON</a>"
+        EDIT="<a href=\"$urlbase?page=$(urlencode "$PAGE_TITLE")&amp;action=edit\" accesskey=\"5\" rel=\"nofollow\">$EDIT_BUTTON</a>"
 fi
 [ -n "$toc" ] && toc="\1$toc\2"
 AUTH_GET=""
 AUTH_POST=""
 if authentified; then
-	AUTH_GET="auth=$AUTH\&"
+	AUTH_GET="auth=$AUTH&"
 	AUTH_POST="\n<input type=\"hidden\" name=\"auth\" value=\"$AUTH\" />"
 fi
 
 header "Content-type: text/html"
-sed	-e "s#{ERROR}#$ERROR#"		-e "s#{WIKI_TITLE}#$WIKI_TITLE#" \
-	-e "s|{\([^}]*\)HISTORY\([^}]*\)}|${HISTORY//&/\&}|" \
-	-e "s|{PAGE_TITLE}|${PAGE_TITLE_str//&/\&}|" \
-	-e "s|{\([^}]*\)EDIT\([^}]*\)}|\1${EDIT//&/\&}\2|" \
-	-e "s|{\([^}]*\)TOC\([^}]*\)}|$(awk '{ printf "%s\\n" $0 }' <<EOT | \
-		sed -e 's/&/\\\&/g' -e 's/|/\\|/g'
-$toc
-EOT
-)|" \
-	-e "s#{PAGE_TITLE_BRUT}#$(htmlentities "$PAGE_TITLE")#" \
-	-e "s#{LAST_CHANGE}#$LAST_CHANGES :#" \
-	-e "s#{CONTENT}#$(awk '{ printf "%s\\n" $0 }' <<EOT | \
-		sed -e 's/&/\\\&/g' -e 's/#/\\#/g'
-$CONTENT
-EOT
-)#" \
-	-e "s#{LANG}#$LANG#"		-e "s#href=\"?#href=\"$urlbase?#g" \
-	-e "s#$urlbase?#&$AUTH_GET#g" -e "s#action=\"$urlbase\">#&$AUTH_POST#g" \
-	-e "s#{WIKI_VERSION}#$WIKI_VERSION#" \
-	-e "s#{TIME}#$TIME#"		-e "s#{DATE}#$datew#" \
-	-e "s#{IP}#$REMOTE_ADDR#"	-e "s#{COOKIE}##" <<EOT
+sed	-e "s/{ERROR}/$(sedesc "$ERROR")/" \
+	-e "s/{WIKI_TITLE}/$(sedesc "$WIKI_TITLE")/" \
+	-e "s/{\([^}]*\)HISTORY\([^}]*\)}/$(sedesc "$HISTORY")/" \
+	-e "s/{PAGE_TITLE}/$(sedesc "$PAGE_TITLE_str")/" \
+	-e "s/{\([^}]*\)EDIT\([^}]*\)}/\1$(sedesc "$EDIT")\2/" \
+	-e "s/{\([^}]*\)TOC\([^}]*\)}/$(sedesc "$TOC")/" \
+	-e "s/{PAGE_TITLE_BRUT}/$(sedesc "$(htmlentities "$PAGE_TITLE")")/" \
+	-e "s/{LAST_CHANGE}/$(sedesc "$LAST_CHANGES") :/" \
+	-e "s/{CONTENT}/$(sedesc "$CONTENT")/" \
+	-e "s/{LANG}/$(sedesc "$LANG")/" \
+	-e "s/href=\"?/href=\"$(sedesc "$urlbase?$AUTH_GET")/g" \
+	-e "s/action=\"$(sedesc "$urlbase")\">/&$(sedesc "$AUTH_POST")/g" \
+	-e "s/{WIKI_VERSION}/$(sedesc "$WIKI_VERSION")/" \
+	-e "s/{TIME}/$(sedesc "$TIME")/" -e "s/{DATE}/$(sedesc "$datew")/" \
+	-e "s/{IP}/$REMOTE_ADDR/" -e "s/{COOKIE}//" -e "s/{RSS}//" <<EOT
 $html
 EOT
diff -r ea02fe275b3f -r 46bb16b07f1a tazwikiss/rootfs/var/www/wiki/pages/Aide.txt
--- a/tazwikiss/rootfs/var/www/wiki/pages/Aide.txt	Thu Aug 20 21:26:04 2015 +0200
+++ b/tazwikiss/rootfs/var/www/wiki/pages/Aide.txt	Wed Sep 02 10:14:11 2015 +0200
@@ -49,6 +49,13 @@
 Certains caractères spéciaux sont reconnus :
 * Flèches : &lt;^-- : &lt;--, ^--> : -->, &lt;^--> : &lt;-->
 * Copyrights : ^(c) ou ^(C) : (c), ^(r) ou ^(R) : (r)
+* Fractions : ^(1/2) : (1/2), ^(1/4) : (1/4), ^(3/4) : (3/4)
+* Divers : ^(+-) : (+-), ^(!=) : (!=)
+* Quelques icônes : ^(phone) : (phone), ^(wphone) : (wphone), ^(bflag) : (bflag), ^(
+wflag) : (wflag) ^(radioactive) : (radioactive), ^(sad) : (sad), ^(smile) : (sm
+ile), ^(recycle) : (recycle), ^(wheelchair) : (wheelchair), ^(anchor) : (anchor
+), ^(flower) : (flower), ^(gear) : (gear), ^(volt) : (volt), ^(warn) : (warn), 
+^(skull) : (skull), ^(star) : (star)
 ----
 Les liens externes et les adresses eMail sont reconnus automagiquement ...
 ^http://wikiss.tuxfamily.org/ --> http://wikiss.tuxfamily.org/
diff -r ea02fe275b3f -r 46bb16b07f1a tazwikiss/rootfs/var/www/wiki/pages/Help.txt
--- a/tazwikiss/rootfs/var/www/wiki/pages/Help.txt	Thu Aug 20 21:26:04 2015 +0200
+++ b/tazwikiss/rootfs/var/www/wiki/pages/Help.txt	Wed Sep 02 10:14:11 2015 +0200
@@ -9,10 +9,10 @@
 
 ----
 
-Tiles use the exclamation mark '''!'''%%
-^! Big%%
-^!! Less big%%
-^!!! Smaller%%
+Tiles use the exclamation mark '''!'''
+^! Big
+^!! Less big
+^!!! Smaller
 gives you :
 ! Big
 !! Less big
@@ -31,10 +31,10 @@
 
 ----
 
-Stroke of a work use quote and two dashes%%
+Stroke of a work use quote and two dashes
 ^'--Stroked--' --> '--Stroked--'
 
-the same applies for underline, quote followed by by two underscore%%
+the same applies for underline, quote followed by by two underscore
 ^'__Underlined__' --> '__Underlined__'
 
 ----
@@ -53,10 +53,10 @@
 
 ----
 
-The code, and all of those things where formatting is important, use the braces %%
-^{{import sys%%
-if len(sys.argv) == 2:%%
-   print "Hello",sys.argv^[1]}}%%
+The code, and all of those things where formatting is important, use the braces
+^{{import sys
+if len(sys.argv) == 2:
+   print "Hello",sys.argv^[1]}}
 give :
 {{import sys
 if len(sys.argv) == 2:
@@ -65,13 +65,16 @@
 ----
 
 The separation between paragraphs of text is done through an empty line.
-To force a line break in the middle of a paragraph, use: ^%%
+To force a line break in the middle of a paragraph, use: ^
 
 ----
 
 Some special characters are recognized:
-* Arrows : &lt;^-- : &lt;--, ^--> : -->, &lt;^--> : &lt;-->
-* Copyrights : ^(c) or ^(C) : (c), ^(r) or ^(R) : (r)
+* Arrows: &lt;^-- : &lt;--, ^--> : -->, &lt;^--> : &lt;-->
+* Copyrights: ^(c) or ^(C) : (c), ^(r) or ^(R) : (r)
+* Fractions: ^(1/2) : (1/2), ^(1/4) : (1/4), ^(3/4) : (3/4)
+* Miscellaneous: ^(+-) : (+-), ^(!=) : (!=)
+* Some icons: ^(phone) : (phone), ^(wphone) : (wphone), ^(bflag) : (bflag), ^(wflag) : (wflag) ^(radioactive) : (radioactive), ^(sad) : (sad), ^(smile) : (smile), ^(recycle) : (recycle), ^(wheelchair) : (wheelchair), ^(anchor) : (anchor), ^(flower) : (flower), ^(gear) : (gear), ^(volt) : (volt), ^(warn) : (warn), ^(skull) : (skull), ^(star) : (star)
 
 ----
 
@@ -79,7 +82,7 @@
 '''^['''Accueil''']''' --> [Accueil]
 
 If a page does not exists, it will be created on first click.
-Click on "SandBox" below and you will be able to create it ...%%
+Click on "SandBox" below and you will be able to create it ...
 [SandBox]
 
 To link a wiki-page with a different text use :
@@ -97,21 +100,21 @@
 
 ----
 
-Images are automagically inserted with the picture URL between square brackets%%
+Images are automagically inserted with the picture URL between square brackets
 '''^['''^http://wikiss.tuxfamily.org/img/logo_100.png''']''' -->
 [http://wikiss.tuxfamily.org/img/logo_100.png]
 
-You can also use an image as a link : %%
+You can also use an image as a link : 
 '''^['''^http://wikiss.tuxfamily.org/img/logo_100.png'''|'''^http://wikiss.tuxfamily.org/''']''' --> 
 [http://wikiss.tuxfamily.org/img/logo_100.png|http://wikiss.tuxfamily.org/]
 
 But also position the image on a floating left or right: 
 [http://wikiss.tuxfamily.org/img/logo_100.png|left] [http://wikiss.tuxfamily.org/img/logo_100.png|http://wikiss.tuxfamily.org|right]
-%%
 
-&lt;-- '''^['''^http://wikiss.tuxfamily.org/img/logo_100.png'''|left]'''%%
+
+&lt;-- '''^['''^http://wikiss.tuxfamily.org/img/logo_100.png'''|left]'''
 '''^['''^http://wikiss.tuxfamily.org/img/logo_100.png'''|'''^http://wikiss.tuxfamily.org'''|right]''' -->
-%%
+
 
 ----
 
@@ -119,7 +122,7 @@
 
 ----
 
-Finally, in order to neutralize the syntax WiKiss, use the caret ^ %%
+Finally, in order to neutralize the syntax WiKiss, use the caret ^ 
 Thus, enter '''^^^['''WiKiss''']''' can display ^[WiKiss] rather than [WiKiss]
 
 ----
diff -r ea02fe275b3f -r 46bb16b07f1a tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh
--- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh	Thu Aug 20 21:26:04 2015 +0200
+++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh	Wed Sep 02 10:14:11 2015 +0200
@@ -11,7 +11,7 @@
 {
 	case "$(GET action)" in
 	edit)	UPLOAD="<a href=\"$urlbase?action=upload\">$UPLOAD</a>"
-		html="$(sed "s|HISTORY|$UPLOAD / HISTORY|" <<EOT
+		html="$(sed "s|HISTORY|$(sedesc "$UPLOAD") / HISTORY|" <<EOT
 $html
 EOT
 )" ;;