# HG changeset patch # User Pascal Bellard # Date 1446305539 -3600 # Node ID 48d2c4c7a227a319240d137b552e606a5ef5795d # Parent a10bae21f60273e7bdc310edb24d54703e1a3966 Update wiki, add module-serial diff -r a10bae21f602 -r 48d2c4c7a227 custom-console/receipt --- a/custom-console/receipt Sat Oct 31 12:53:44 2015 +0100 +++ b/custom-console/receipt Sat Oct 31 16:32:19 2015 +0100 @@ -8,6 +8,7 @@ LICENSE="BSD" WEB_SITE="http://tiny.slitaz.org/" DEPENDS="base-tiny" +SUGGESTED="module-usbserial module-serial" CONFIG_FILES="/etc/inittab" # Rules to gen a SliTaz package suitable for Tazpkg. @@ -28,7 +29,7 @@ [ -n "$TTYS" ] || TTYS=ttyS0 [ -n "$SPEED" ] || SPEED=38400 cat < Device diff -r a10bae21f602 -r 48d2c4c7a227 lpd-config/receipt --- a/lpd-config/receipt Sat Oct 31 12:53:44 2015 +0100 +++ b/lpd-config/receipt Sat Oct 31 16:32:19 2015 +0100 @@ -8,6 +8,7 @@ LICENSE="BSD" WEB_SITE="http://tiny.slitaz.org/" DEPENDS="base-tiny" +SUGGESTED="module-lp module-usblp" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r a10bae21f602 -r 48d2c4c7a227 lpd-spooling-config/receipt --- a/lpd-spooling-config/receipt Sat Oct 31 12:53:44 2015 +0100 +++ b/lpd-spooling-config/receipt Sat Oct 31 16:32:19 2015 +0100 @@ -8,6 +8,7 @@ LICENSE="BSD" WEB_SITE="http://tiny.slitaz.org/" DEPENDS="base-tiny" +SUGGESTED="module-lp module-usblp" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r a10bae21f602 -r 48d2c4c7a227 module-serial/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-serial/receipt Sat Oct 31 16:32:19 2015 +0100 @@ -0,0 +1,34 @@ +# SliTaz package receipt. + +PACKAGE="module-serial" +VERSION="2.6.14" +CATEGORY="base-system" +SHORT_DESC="Kernel module for the serial port" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL2" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path $fs/dev + $src/slitaz/list_modules.sh drivers/serial | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done + for i in 0 1 2 3; do + mknod $fs/dev/ttyS$i c 4 $((64+$i)) + done +} + +# Post install/remove commands for Tazpkg. +post_install() +{ + echo ${PACKAGE#*-} >> $1/modules +} diff -r a10bae21f602 -r 48d2c4c7a227 module-usbserial/receipt --- a/module-usbserial/receipt Sat Oct 31 12:53:44 2015 +0100 +++ b/module-usbserial/receipt Sat Oct 31 16:32:19 2015 +0100 @@ -16,12 +16,15 @@ export src=$WOK/$WANTED/source/linux-$VERSION export _pkg=$WOK/$WANTED/install path=lib/modules/$(ls $_pkg/lib/modules)/kernel - mkdir -p $fs/$path + mkdir -p $fs/$path $fs/dev $src/slitaz/list_modules.sh drivers/usb/serial/usbserial.ko | while read module; do dir=$path/$(dirname $module) [ -d $fs/$dir ] || mkdir -p $fs/$dir cp -a $_pkg/$path/$module $fs/$dir done + for i in 0 1 2 3; do + mknod $fs/dev/ttyS$i c 188 $i + done } # Post install/remove commands for Tazpkg. diff -r a10bae21f602 -r 48d2c4c7a227 p910nd/receipt --- a/p910nd/receipt Sat Oct 31 12:53:44 2015 +0100 +++ b/p910nd/receipt Sat Oct 31 16:32:19 2015 +0100 @@ -12,6 +12,7 @@ [ -n "$TARGET" ] || TARGET="i486" BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" DEPENDS="base-tiny" +SUGGESTED="module-lp module-usblp" CONFIG_FILES="/etc/inetd.conf /etc/rcS.conf" # Rules to configure and make the package. diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/config-de.sh --- a/wiki/stuff/var/www/wiki/config-de.sh Sat Oct 31 12:53:44 2015 +0100 +++ b/wiki/stuff/var/www/wiki/config-de.sh Sat Oct 31 16:32:19 2015 +0100 @@ -1,10 +1,11 @@ -PASSWORD="test" +PASSWORD="" PAGES_DIR="pages/" BACKUP_DIR="historique/" LANG="de" WIKI_TITLE="WiKiss" -START_PAGE="Startseite" +#START_PAGE="Startseite" +START_PAGE="Welcome" HOME_BUTTON="Startseite" HELP_BUTTON="Hilfe" DEFAULT_CONTENT="Die Seite %page% ist leer." diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/config-fr.sh --- a/wiki/stuff/var/www/wiki/config-fr.sh Sat Oct 31 12:53:44 2015 +0100 +++ b/wiki/stuff/var/www/wiki/config-fr.sh Sat Oct 31 16:32:19 2015 +0100 @@ -1,4 +1,4 @@ -PASSWORD="test" +PASSWORD="" PAGES_DIR="pages/" BACKUP_DIR="historique/" diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/config.sh --- a/wiki/stuff/var/www/wiki/config.sh Sat Oct 31 12:53:44 2015 +0100 +++ b/wiki/stuff/var/www/wiki/config.sh Sat Oct 31 16:32:19 2015 +0100 @@ -1,4 +1,4 @@ -PASSWORD="test" +PASSWORD="" PAGES_DIR="pages/" BACKUP_DIR="historique/" diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/index.sh --- a/wiki/stuff/var/www/wiki/index.sh Sat Oct 31 12:53:44 2015 +0100 +++ b/wiki/stuff/var/www/wiki/index.sh Sat Oct 31 16:32:19 2015 +0100 @@ -5,13 +5,14 @@ # Copyright (C) Pascal Bellard # Based on WiKiss - http://wikiss.tuxfamily.org/ -. /usr/bin/httpd_helper.sh +. /usr/bin/httphelper.sh -CONFIG=config-${HTTP_ACCEPT_LANGUAGE%%,*}.sh -[ -r "$CONFIG" ] || CONFIG=config.sh +cd $(dirname $0) +CONFIG=config-${HTTP_ACCEPT_LANGUAGE%%[,;_-]*}.sh +[ -x "$CONFIG" ] || CONFIG=config.sh . ./$CONFIG -WIKI_VERSION="TazWiKiss 0.3" +WIKI_VERSION="Based on WiKiss 0.3" # Initialisations toc='' # Table Of Content @@ -55,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 @@ -69,13 +76,16 @@ . $i eval $name "$@" [ $? == 0 ] && status=true - done + done 2> /tmp/tazwiki$$stderr + [ -s /tmp/tazwiki$$stderr ] && + logger -t "httpd/wiki/plugin" < /tmp/tazwiki$$stderr + rm -f /tmp/tazwiki$$stderr 2> /dev/null $status } curdate() { - date '+%Y/%m/%d %H:%M' + date '+%Y-%m-%d %H:%M' } filedate() @@ -108,18 +118,20 @@ # Ecrire les modifications, s'il y a lieu PAGE_txt="$PAGES_DIR$PAGE_TITLE.txt" +plugin_call_method "init" $PAGE_txt if [ -n "$content" ]; then # content => page if authentified; then - sed 's/ $PAGE_txt < $PAGE_txt <> $complete_dir_s$(curdate).bak <> "$complete_dir_s$(curdate).bak" <|' \ - -e 's|-$.*$$|\1|' \ - -e 's|+$.*$$|\1|' + -e 's|^-$.*$$|\1|' \ + -e 's|^+$.*$$|\1|' } # Actions speciales du Wiki case "$action" in edit) editable=false - HISTORY="$HISTORY_BUTTON
" + HISTORY="$HISTORY_BUTTON
" + CONTENT="$(sed 's/%/\%/g' <

$CONTENT
@@ -190,9 +207,9 @@
 history)
 	complete_dir="$BACKUP_DIR$PAGE_TITLE/"
 	if [ -n "$gtime" ]; then
-		HISTORY="<a href=\"$urlbase?page=$PAGE_TITLE\&action=history\" rel=\"nofollow\">$HISTORY_BUTTON</a>"
+		HISTORY="<a href=\"$urlbase?page=$PAGE_TITLE&action=history\" rel=\"nofollow\">$HISTORY_BUTTON</a>"
 		if [ -r "$complete_dir$gtime" ]; then
-			HISTORY="$HISTORY <a href=\"$urlbase?page=$PAGE_TITLE\&action=edit\&time=$gtime&restore=1\" rel=\"nofollow\">$RESTORE</a>"
+			HISTORY="$HISTORY <a href=\"$urlbase?page=$PAGE_TITLE&action=edit&time=$gtime&restore=1\" rel=\"nofollow\">$RESTORE</a>"
 			CONTENT="$(cat $complete_dir$gtime | sed -e s/$(echo -ne '\r')//g -e 's|$|<br/>|g')"
 		else
 			HISTORY="$HISTORY -"
@@ -213,11 +230,11 @@
 	fi ;;
 diff)
 	if [ -n "$(GET f1)" ]; then
-		HISTORY="<a href=\"$urlbase?page=$(urlencode "$PAGE_TITLE")\&action=history\">$HISTORY_BUTTON</a>"
-		CONTENT="$(htmldiff $(GET f1) $(GET f2) )"
+		HISTORY="<a href=\"$urlbase?page=$(urlencode "$PAGE_TITLE")&action=history\">$HISTORY_BUTTON</a>"
+		CONTENT="$(htmldiff "$(GET f1)" "$(GET f2)" )"
 	else
 		# diff auto entre les 2 dernières versions
-		ls "$BACKUP_DIR$PAGE_TITLE/" | sort -r | head -n 2 | while read f1 f2; do
+		ls "$BACKUP_DIR$PAGE_TITLE/" | ( sort -r ; echo none ; echo ) | head -n 2 | while read f1 f2; do
 			redirect "$urlbase?page=$(urlencode "$PAGE_TITLE")&action=$action&f1=$f1&f2=$f2"
 		done
 	fi ;;
@@ -260,7 +277,8 @@
 		mkdir $tmpdir
 		unesc="$(echo "$CONTENT" | sed 's/\^$.$/\n^\1\n/g' | grep '\^' |\
 		  sort | uniq | grep -v "['[!]" | hexdump -e '"" 3/1 "%d " "\n"' |\
-		  awk '{ printf "-e '\''s/\\^%c/\\&#%d;/g'\'' ",$2,$2}') \
+		  awk '{ printf "-e '\''s/\\^%c/\\&#%d;/g'\'' ",$2,$2}' | \
+		  sed 's/\^$[*.]$/^\\\1/') \
 		  -e 's/\\^'\\''/\\'/g' -e 's/\^\!/\!/g' \
 		  -e 's/\^\[/\[/g'"
 		CONTENT="$(eval sed $unesc <<EOT | \
@@ -304,12 +322,22 @@
 		 	-e 's/([eE])/\€/g' -e 's/([pP])/\£/g' \
 		 	-e 's/([yY])/\¥/g'  -e 's/([tT][mM])/\™/g' \
 		 	-e 's/([cC])/\©/g' -e 's/([rR])/\®/g' \
+		 	-e 's/([dD])/\°/g'  -e 's/(1\/2)/\½/g' \
+		 	-e 's/(1\/4)/\¼/g' -e 's/(3\/4)/\¾/g' \
+		 	-e 's/(phone)/\☎/' -e 's/(wphone)/\☏/' \
+		 	-e 's/(skull)/\☠/' -e 's/(radioactive)/\☢/' \
+		 	-e 's/(sad)/\☹/'  -e 's/(smile)/\☺/' \
+		 	-e 's/(recycle)/\♲/' -e 's/(wheelchair)/\♿/' \
+		 	-e 's/(wflag)/\⚐/' -e 's/(bflag)/\⚑/' \
+		 	-e 's/(anchor)/\⚓/' -e 's/(flower)/\⚘/' \
+		 	-e 's/(gear)/\⚙/' -e 's/(volt)/\⚡/' \
+		 	-e 's/(warn)/\⚠/' -e 's/(star)/\★/' \
 		 	-e 's/(<=)/\≤/g'  -e 's/(>=)/\≥/g' \
 		 	-e 's/(!=)/\≠/g'     -e 's/(+-)/\±/g' <<EOT
 $CONTENT
 EOT
 )"
-		rg_url="[0-9a-zA-Z\.\#/~\-\_%=\?\&,\+\:@;!\*\$']*" # TODO: verif & / &
+		rg_url="[0-9a-zA-Z\.\#/~\_%=\?\&,\+\:@;!\*\$'\-]*" # TODO: verif & / &
 		rg_link_local="$rg_url"
 		rg_link_http="https\?://$rg_url"
 		rg_img_local="$rg_url\.jpe\?g\|$rg_url\.gif\|$rg_url\.png"
@@ -317,6 +345,8 @@
 
 		# image, image link, link, wikipedia, email ...
 		CONTENT="$(sed \
+			-e "s#\[$$rg_img_http$\]#<img src=\"\1\" alt=\"\1\" style=\"float:\"/>#g" \
+			-e "s#\[$$rg_img_local$\]#<img src=\"\1\" alt=\"\1\" style=\"float:\"/>#g" \
 			-e "s#\[$$rg_img_http$|*$[a-z]*$*\]#<img src=\"\1\" alt=\"\1\" style=\"float:\2;\"/>#g" \
 			-e "s#\[$$rg_img_local$|*$[a-z]*$*\]#<img src=\"\1\" alt=\"\1\" style=\"float:\2;\"/>#g" \
 			-e "s#\[$$rg_img_http$|$$rg_link_http$|*$[a-z]*$*\]#<a href=\"\2\" class=\"url\"><img src=\"\1\" alt=\"\1\" title=\"\1\"style=\"float:\3;\"/></a>#g" \
@@ -341,6 +371,7 @@
 			-e ':x;/<\/ul>$/{N;s/\n//;$P;$D;bx;}' | sed \
 			-e ':x;s/<\/ul><ul>//g;tx' -e ':x;s/<\/ol><ol>//g;tx' \
 			-e 's|----*$|<hr />|' -e 's|$|<br />|' \
+			-e 's|</ul>|&\n|g' -e 's|</ol>|&\n|g' \
 			-e 's#</li>#&\n#g' -e 's#$</h[123456]>$<br />#\1#g' \
 			-e "s#'--$[^']*$--'#<del>\1</del>#g" \
 			-e "s#'__$[^']*$__'#<u>\1</u>#g" \
@@ -351,8 +382,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
 )"
@@ -368,38 +399,44 @@
 EOT
 )"
 		done
+		read hastoc <<EOT
+$CONTENT
+EOT
 		CONTENT="$(sed -e 's/^ /\ \ \ \ /' -e '1s/^TOC//' <<EOT
 $CONTENT
 EOT
 )"
 		toc='<div id="toc">'
-		i=1
-		for pat in '^![^!]' '^!![^!]' '^!!![^!]' '^!!!![^!]' '^!!!!!' ; do
-			while read line; do
-				[ -n "$line" ] || continue
-				label="$(echo $line | sed 's/[^\dA-Za-z]/_/g')"
-				toc="$(cat <<EOT
+		while read line; do
+			[ -n "$line" ] || continue
+			i=$(echo "$line" | sed 's/^!$!*$.*/\1/' | wc -c)
+			line="$(echo "$line" | sed 's/^!!*//')"
+			label="$(echo "$line" | sed 's/[^\dA-Za-z]/_/g')"
+			toc="$(cat <<EOT
 $toc
 	<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
 )"
-			done <<EOT
-$(grep "$pat" <<EOM | sed -e 's/^!!*//' -e 's/#/\#/g' -e 's/&/\\\&/g'
+		done <<EOT
+$(grep "^!" <<EOM | sed -e 's/#/\#/g' -e 's/&/\\\&/g'
 $CONTENT
 EOM
 )
 EOT
-			i=$(( $i + 1 ))
-		done
 		toc="$(cat <<EOT
 $toc
 </div>
 EOT
 )"
+		false &&
+		case "$hastoc" in
+		TOC*) ;;
+		*) toc='';;
+		esac
 		CONTENT="$(awk -v tmpdir=$tmpdir '{
 s=$0
 while (1) {
@@ -431,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
@@ -447,37 +484,40 @@
 if $editable ; then
 	EDIT="$PROTECTED_BUTTON"
 	[ -w "$PAGE_txt" -o ! -e "$PAGE_txt" ] &&
-        EDIT="<a href=\"$urlbase?page=$(urlencode "$PAGE_TITLE")\&action=edit\" accesskey=\"5\" rel=\"nofollow\">$EDIT_BUTTON</a>"
+        EDIT="<a href=\"$urlbase?page=$(urlencode "$PAGE_TITLE")&action=edit\" accesskey=\"5\" rel=\"nofollow\">$EDIT_BUTTON</a>"
 fi
-[ -n "$toc" ] && toc="\1$toc\2"
+[ $(echo "$toc" | wc -l) -gt 2 ] && toc="\1$toc\2" || toc=""
 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
-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
+html2="$(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/{LANG}/$(sedesc "$LANG")/g" \
+	-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
-)|" \
-	-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'
+)"
+header "Content-type: text/html"
+sed '/{CONTENT}/{s/{CONTENT}.*//;q}' <<EOT
+$html2
+EOT
+cat <<EOT
 $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
-$html
+sed ':a;N;/{CONTENT}/!ba;s/.*{CONTENT}//;:b;N;$!bb' <<EOT
+$html2
 EOT
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/pages/Aide.txt
--- a/wiki/stuff/var/www/wiki/pages/Aide.txt	Sat Oct 31 12:53:44 2015 +0100
+++ b/wiki/stuff/var/www/wiki/pages/Aide.txt	Sat Oct 31 16:32:19 2015 +0100
@@ -47,8 +47,11 @@
    print "Hello",sys.argv[1]}}
 ----
 Certains caractères spéciaux sont reconnus :
-* Flèches : <^-- : <--, ^--> : -->, <^--> : <-->
+* Flèches : <^-- : <--, ^--> : -->, <^--> : <-->, <^== : <==, ^==> : ==>, <^==> : <==>
 * 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) : (smile), ^(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 a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/pages/Help.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/pages/Help.txt	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,130 @@
+TOC
+!Help
+
+Here is a summary of all the formatting rules in ''WiKiss''.
+Click "Edit" on top or bottom of this page to see how it works.
+(if you see "Page Locked", do a chmod 775 on this file via a ftp client)
+
+See also [AideTables] to create tables.
+
+----
+
+Tiles use the exclamation mark '''!'''
+^! Big
+^!! Less big
+^!!! Smaller
+gives you :
+! Big
+!! Less big
+!!! Smaller
+
+To automatically add a table of contents in a page, add the '''TOC''' mark in it :
+* at the last line to be clearer, there is no influence on position ;
+* at the first line if you need to write TOC in your page. Only the first occurrence will be replaced.
+
+----
+
+Styles use the single quote '
+* ^''^'Bold^''^' --> '''Bold'''
+* ^''italic^'' --> ''italic''
+* ^''^''^'Bold and italic^''^''^' --> '''''Bold and italic'''''
+
+----
+
+Stroke of a work use quote and two dashes
+^'--Stroked--' --> '--Stroked--'
+
+the same applies for underline, quote followed by by two underscore
+^'__Underlined__' --> '__Underlined__'
+
+----
+
+The ordered lists use sharp '''#'''
+# First
+# Second
+# Third
+
+----
+
+Non ordered lists use the star '''*'''
+* Apple
+* Pear
+* Peach
+
+----
+
+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:
+   print "Hello",sys.argv[1]}}
+
+----
+
+The separation between paragraphs of text is done through an empty line.
+To force a line break in the middle of a paragraph, use: ^
+
+----
+
+Some special characters are recognized:
+* Arrows: <^-- : <--, ^--> : -->, <^--> : <-->, <^== : <==, ^==> : ==>, <^==> : <==>
+* 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)
+
+----
+
+Links to wiki-pages use square brackets :
+'''^['''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 ...
+[SandBox]
+
+To link a wiki-page with a different text use :
+'''^['''Beginning'''|?page='''Accueil''']''' --> [Beginning|?page=Accueil]
+
+The external links and addresses eMail are automagically recognized ...
+* ^http://wikiss.tuxfamily.org/ --> http://wikiss.tuxfamily.org/
+* wikiss^@example.org --> wikiss@example.org
+
+or through a text between square brackets :
+* '''^['''Visit WiKiss web site'''|'''^http://wikiss.tuxfamily.org/''']''' --> [Visit WiKiss web site|http://wikiss.tuxfamily.org/]
+
+with a ? you get a Wikipedia link in the current language :
+* '''^[?'''Wiki''']''' --> [?Wiki]
+
+----
+
+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 : 
+'''^['''^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]
+
+
+<-- '''^['''^http://wikiss.tuxfamily.org/img/logo_100.png'''|left]'''
+'''^['''^http://wikiss.tuxfamily.org/img/logo_100.png'''|'''^http://wikiss.tuxfamily.org'''|right]''' -->
+
+
+----
+
+... to insert lines, simply use four dashes :  '''---- '''
+
+----
+
+Finally, in order to neutralize the syntax WiKiss, use the caret ^ 
+Thus, enter '''^^^['''WiKiss''']''' can display ^[WiKiss] rather than [WiKiss]
+
+----
+
+Try it, you'll see, it's very simple.
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/pages/HelpTables.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/pages/HelpTables.txt	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,70 @@
+! Help on the table syntax
+
+!! Table creation
+Tables are defined with the pipe character |
+
+Basically you just need to draw the table :
+
+{{|cell 1|cell 2|
+|cell 3|cell 4|
+}}
+
+will be displayed as :
+|cell 1|cell 2|
+|cell 3|cell 4|
+
+You can also format your cell. For that, add some characters at the beginning :
+
+* a '''h''' if the cell is a header
+* more letters followed by a space to defined alignment :
+** t : vertically aligned on top
+** b : vertically aligned on bottom
+** l : horizontally aligned on left
+** r : horizontally aligned on right
+* two numbers can be added to connect cells
+** first one to give how many columns has to be connected
+** second one, after a comma connects lines
+
+{{
+|hl Title on left|hr Title on right|
+|r right         |l    left    |
+|2 Two columns                 |
+|t ,2 Two lines  | A |
+                 | B |
+|,2 two lines    | C |
+                 | D |}}
+
+|hl Title on left|hr title on right|
+|r right       |l    left    |
+|2 Two columns                |
+|t ,2 Two lines  | A |
+                 | B |
+|,2 two lines    | C |
+                 | D |
+
+!! Other syntax included in a table
+
+|h 3 Supported wiki syntax |
+|ht ,7 Formatting | ^''italic^'' | ''italic'' |
+                     |  '^''bold'^''  |  '''bold'''  |
+                     |'^'^'^''bold italic'^'^'^''|'''''bold italic'''''|
+                     |^'--stroked--'|'--stroked--'|
+                     |^'__underlined__'|'__underlined__'|
+                     | Special chars | (c) (r) --> <-- |
+                     |^{{code}}|{{code}}|
+|ht ,3 Links         |^[WikiLink] | [WikiLink] |
+                     |^[Link 2^|?page=Link]| [Link 2|?page=Link] |
+                     |^[?Wikipedia]| [?Wikipedia] |
+|ht ,4 Images        |^[^http://wikiss.tuxfamily.org/img/logo_100.png]|[http://wikiss.tuxfamily.org/img/logo_100.png]|
+    |^[/logo_100.png^|^http://wikiss.tuxfamily.org/]|[http://wikiss.tuxfamily.org/img/logo_100.png|http://wikiss.tuxfamily.org/]|
+    |^[^http://wikiss.tuxfamily.org/img/logo_100.png^|right] | [http://wikiss.tuxfamily.org/img/logo_100.png|right]|
+    |^[/logo_100.png^|^http://wikiss.tuxfamily.org/^|left] | [http://wikiss.tuxfamily.org/img/logo_100.png|http://wikiss.tuxfamily.org/|left]|
+
+and
+
+|h 2 Not supported syntax|
+|Titles   | !! Titles|
+|,2 Lists | * non ordered |
+          | # ordered |
+|Lines    |----|
+
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Admin.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Admin.sh	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,152 @@
+plugin="<a href=\"?action=admin\" title=\"Wiki administration\">Administration</a>"
+description_fr="Administration du Wiki"
+description="Wiki administration"
+      
+admin_enable()
+{
+	[ -n "$(POST $1)" ] || return
+	chmod 444 $4/$2*
+	for i in $(POST); do
+		case "$i" in $3*) chmod 755 $4/${i/$3/$2}.* ;; esac
+	done
+}
+
+admin_download()
+{
+	cat - $1 <<EOT
+Content-Type: application/octet-stream
+Content-Length: $(stat -c %s $1)
+Content-Disposition: attachment; filename=${2:-$1}
+
+EOT
+}
+
+action()
+{
+	case "$1" in
+	list|config|admin);;
+	backup)	file=$(FILE file tmpname)
+		if [ -z "$file" ]; then
+			file=$(mktemp -p /tmp)
+			find */ | cpio -o -H newc | gzip -9 > $file
+			admin_download $file wiki-$(date '+%Y%m%d%H%M').cpio.gz
+			rm -f $file
+			exit 0
+		else
+			zcat $file | cpio -idmu $(echo */ | sed 's|/||g')
+			rm -rf $(dirname $file)
+			return 1
+		fi ;;
+	*)	return 1 ;;
+	esac
+	PAGE_TITLE_link=false
+	editable=false
+	lang="${HTTP_ACCEPT_LANGUAGE%%[,;_-]*}"
+	PAGE_TITLE="Administration"
+	curpass="$(POST curpass)"
+	secret="admin.secret"
+	if [ -n "$(POST setpass)" ]; then
+		if [ -z "$curpass" ]; then	# unauthorized
+			if [ ! -s $secret -o "$(cat $secret 2> /dev/null)" == \
+				  "$(echo $(POST password) | md5sum)" ]; then
+				curpass="$(POST password)"
+			fi
+		fi
+		[ -n "$curpass" ] && echo $curpass | md5sum > $secret &&
+		chmod 400 $secret
+	fi
+	if [ -n "$(POST save)" ]; then
+		admin_download $(POST file)
+		exit 0
+	fi
+	[ -n "$(POST restore)" ] && mv -f $(FILE data tmpname) $(POST file)
+	admin_enable Locales config- config_ .
+	admin_enable Plugins wkp_ wkp_ plugins
+	admin_enable Pages '' page pages
+	disabled="disabled=disabled"
+	[ -n "$curpass" ] && disabled="" && 
+	curpass="<input type=\"hidden\" name=\"curpass\" value=\"$curpass\" />
+"
+	hr="$curpass<tr><td colspan=2><hr /></td><tr />"
+	CONTENT="
+<table width=\"100%\">
+<form method=\"post\" action=\"?action=admin\">
+<tr><td><h2>$MDP</h2></td>
+<td><input type=\"text\" name=\"password\" />$curpass
+<input type=\"submit\" value=\"$DONE_BUTTON\" name=\"setpass\" /></td></tr>
+</form>
+"
+	mform="form method=\"post\" enctype=\"multipart/form-data\" action=\"?action"
+	while read section files test; do
+		CONTENT="$CONTENT
+<$mform=admin\">
+$hr
+<tr><td><h2>$section</h2></td>
+<td><input type=\"submit\" $disabled value=\"$DONE_BUTTON\" name=\"$section\" /></td></tr>
+"
+		for i in $files ; do
+			case "$section" in
+			Plugins)
+				plugin=
+				eval $(grep ^plugin= $i)
+				[ -n "$plugin" ] || continue
+				eval $(grep ^description= $i)
+				alt="$(grep ^description_$lang= $i)"
+				[ -n "$alt" ] && eval $(echo "$alt" | sed 's/_..=/=/')
+				help=
+				eval $(grep ^help= $i)
+				alt="$(grep ^help_$lang= $i)"
+				[ -n "$alt" ] && eval $(echo "$alt" | sed 's/_..=/=/')
+				name="$(basename $i .sh)"
+				[ -n "$help" ] && description=" <a href='?page=$help' title='$plugin help page'>$description</a>"
+				;;
+			Locales)
+				j=${i#config-}
+				j=${j%.sh}
+				[ -n "$j" ] || continue
+				name="config_$j"
+				plugin="$j"
+				description="$(. ./$i ; echo $WIKI_TITLE)"
+				;;
+			Pages)
+				j="$(basename $i .txt)"
+				plugin="<a href=\"?page=$j\">$j</a>"
+				name="page$j"
+				description="$([ -w $i ] || echo -n $PROTECTED_BUTTON)"
+				;;
+			esac
+			CONTENT="$CONTENT
+<tr><td><b>
+<input type=checkbox $disabled $([ $test $i ] && echo 'checked=checked ') name=\"$name\" />
+$plugin</b></td><td><i>$description</i></td></tr>"
+		done
+		CONTENT="$CONTENT</form>"
+	done <<EOT
+Plugins	$plugins_dir/*.sh	-x
+Locales	config-*.sh		-x
+Pages	pages/*.txt		-w
+EOT
+	CONTENT="$CONTENT
+<$mform=admin\">
+$hr
+<tr><td><h2>Configuration</h2></td>
+<td><select name="file" $disabled>
+$(for i in template.html style.css config*.sh; do
+  [ -x $i ] && echo "<option>$i</option>"; done)
+</select>
+<input type=\"submit\" $disabled value=\"$DONE_BUTTON\" name=\"save\" />
+<input type=\"file\" $disabled name=\"data\" />
+<input type=\"submit\" $disabled value=\"$RESTORE\" name=\"restore\" /></td></tr>
+</form>
+<$mform=backup\">
+$hr
+<tr><td><h2>Data</h2></td>
+<td><input type=\"submit\" $disabled name=\"save\" value=\"$DONE_BUTTON\" />
+<input type=\"file\" $disabled name=\"file\" value=\"file\" />
+<input type=\"submit\" $disabled name=\"restore\" value=\"$RESTORE\" />
+</td></tr>
+$(du -hs */ | sed 's|$.*$\t$.*$|<tr><td><b>\1</b></td><td><i>\2</i></td></tr>|')
+</form>
+</table>
+"
+}
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Calc.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Calc.css	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,33 @@
+.bordercalc {
+    background-color: #ccc;
+    font-weight: bold;
+    text-align: center;
+    border: 1px solid #999;
+    padding: 0;
+}
+
+.inputcalc {
+    border: none;
+    min-width: 80px;
+    width: 80px;
+    font-size: inherit;
+    padding: 2px;
+}
+
+.inputcalc:hover {
+    background-color: #eee;
+}
+
+.inputcalc:focus {
+    background-color: #ccf;
+}
+
+.tablecalc {
+    border-collapse: collapse;  
+}
+
+.cellcalc {
+    border: 1px solid #999;
+    padding: 0;
+    font-size: 14px;
+}
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Calc.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Calc.sh	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,200 @@
+plugin="Calc"
+description_fr="Feuille de calcul au format CSV"
+description="CSV format spreadsheet"
+help_fr="AideCalc"
+help="HelpCalc"
+
+case "$1" in
+showhead) cat <<EOT
+
+<script type="text/javascript">
+0){var x=c;c+=p;p=x};return c;};
+    DATA[id].sum  = DATA[id].SUM  =
+	function(a,b){return zone(id,a,b,0,function(a,b){return a+b});};
+    DATA[id].min  = DATA[id].MIN  =
+	function(a,b){return zone(id,a,b,Number.MAX_VALUE,Math.min);};
+    DATA[id].max  = DATA[id].MAX  =
+	function(a,b){return zone(id,a,b,Number.MIN_VALUE,Math.max);};
+    DATA[id].cnt  = DATA[id].CNT  = cnt
+    for (var i=0; i<=rows; i++) {
+        var row = document.getElementById(id).insertRow(-1);
+        for (var j=0; j<=cols && j<=26; j++) {
+            var letter = String.fromCharCode("A".charCodeAt(0)+j-1);
+	    var cell = row.insertCell(-1);
+	    if (i&&j) {
+		cell.className = "cellcalc";
+		cell.innerHTML = "<input id='"+ id+letter+i +"' class='inputcalc'/>";
+	    }
+	    else {
+		cell.className = "bordercalc";
+		cell.title = "Show CSV";
+		cell.onclick = function(){csv(id,rows,cols);};
+		cell.innerHTML = (i||j) ? i||letter : "√";
+	    }
+        }
+    }
+}
+
+function getWidth(s)
+{
+	var e = document.getElementById("widthcalc");
+	e.innerHTML = s;
+	return (e.offsetWidth < e.minWidth || s.charAt(0) == "=") ?
+		 e.minWidth : e.offsetWidth;
+}
+
+function setCell(e, v)
+{
+    e.style.width = getWidth(v)+"px";
+    e.style.textAlign = 
+	(isNaN(parseFloat(v)) && v.charAt(0) != "=") ? "left" : "right";
+    e.title = v;
+}
+//-->
+</script>
+<span id="widthcalc" class="cellcalc" style="visibility:hidden;"></span>
+EOT
+	exit 0 ;;
+showtail) cat <<EOT
+<script type="text/javascript">
+
+</script>
+EOT
+	exit 0 ;;
+esac
+
+formatEnd()
+{
+CONTENT=$(awk -v prg=$plugins_dir/wkp_$plugin.sh '
+function showcalc()
+{
+	if (lines > 1 && rows > 1) {
+		id="C" (100+cnt++)
+		print "<noscript><a href=\"http://www.enable-javascript.com/\" target=\"_blank\">Enable javascript to see the spreadsheet " id "</a></noscript>"
+		print "<table id=\"" id "\" class=\"tablecalc\"></table>"
+		print "<script type=\"text/javascript\">"
+		print ""
+		print "</script>"
+	}
+	else for (i = 1; i <= lines; i++) print line[i]
+	rows = lines = gotcalc = 0
+}
+{
+	if (/;<br \/>$/) {
+		gotcalc = 1
+		if (!headdone) {
+			headdone = 1
+			showtail = 1
+			system("/bin/sh " prg " showhead")
+		}
+		line[++lines] = $0
+		gsub("<","<",$0)
+		i = split($0,tmp,";")-1
+		if (lines == 1) rows = i
+		if (i != rows) rows = -1
+	}
+	else {
+		if (gotcalc) showcalc()
+		print
+	}
+}
+END {
+	if (gotcalc) showcalc()
+	if (showtail) system("/bin/sh " prg " showtail")
+}
+' <<EOT
+$CONTENT
+EOT
+)
+}
+
+template()
+{
+	html=$(sed 's|</head>|\t<style type="text/css"> @import "plugins/wkp_Calc.css"; </style>\n&|' <<EOT
+$html
+EOT
+)
+}
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_ListPlugins.sh
--- a/wiki/stuff/var/www/wiki/plugins/wkp_ListPlugins.sh	Sat Oct 31 12:53:44 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-plugin="ListPlugins"
-description_fr="Affiche la liste des plugins chargés"
-description="List plugins"
-      
-action()
-{
-	[ "$1" == "list" -o "$1" == "config" ] || return 1
-	CONTENT='
-<table width="100%">
-<tr><td span=2><h2>Plugins</h2></td></tr>
-'
-	PAGE_TITLE_link=false
-	editable=false
-	lang="${HTTP_ACCEPT_LANGUAGE%%,*}"
-	PAGE_TITLE="Configuration"
-	for i in $plugins_dir/*.sh ; do
-		eval $(grep ^plugin= $i)
-		eval $(grep ^description= $i)
-		alt="$(grep ^description_$lang= $i)"
-		[ -n "$alt" ] && eval $(echo "$alt" | sed 's/_..=/=/')
-		CONTENT="$CONTENT
-<tr><td><b>
-<input type=checkbox disabled=disabled $([ -x $i ] && echo 'checked=checked ')/>
-$plugin</b></td><td><i>$description</i></td></tr>"
-	done
-	CONTENT="$CONTENT
-<tr><td span=2><br /><h2>Locales</h2></td></tr>
-"
-	for i in config-*.sh ; do
-		i=${i#config-}
-		i=${i%.sh}
-		[ -n "$i" ] || continue
-	CONTENT="$CONTENT
-<tr><td><b>
-<input type=checkbox disabled=disabled $([ "$i" == "$lang" ] && echo 'checked=checked ')/>
-$i</b></td></tr>
-"
-	done
-	CONTENT="$CONTENT
-<tr><td span=2><br /><h2>Data</h2></td></tr>
-$(du -hs */ | awk '{ printf "<tr><td><b>%s</b></td><td><i>%s</i></td></tr>\n",$1,$2 }')
-</table>
-"
-}
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Password.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Password.sh	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,78 @@
+plugin="Password"
+description_fr="Ajoute un mot de passe à une page avec {PASSWORD=code}"
+description="Add a password to a page with {PASSWORD=something}"
+   
+pagepass_hash()
+{
+	echo $1 | md5sum | cut -c1-8
+}
+
+init()
+{
+	if grep -qs '{HASHPASSWORD=' $1; then
+		case "$(GET action)" in
+			pagepass|'') return ;;
+		esac
+		hash="$(sed '/{HASHPASSWORD=.*}/!d;s/.*{HASHPASSWORD=$[^}]*$}.*/\1/;q' <$1)"
+		cookie="pagepass$(pagepass_hash $PWD$PAGE_txt)"
+		[ "$(COOKIE $cookie)" == "$hash" ] && return
+		header
+		echo "<script> history.go(-1); </script>"
+		exit 0
+	fi
+}
+
+action()
+{
+	[ "$1" == "pagepass" ] || return 1
+	uri="$SCRIPT_NAME?page=$(POST page)&auth=$(POST auth)"
+	if [ "$(pagepass_hash $(POST pass))" == "$(POST hash)" ]; then
+		header  "HTTP/1.0 302 Found" \
+			"location: $uri" \
+			"Set-Cookie: $(POST cookie)=$(POST hash)"
+##			"Set-Cookie: $(POST cookie)=$(POST hash); Max-Age=3600; Path=$(dirname $SCRIPT_NAME); HttpOnly"
+	else
+		header  "HTTP/1.0 302 Found" \
+			"location: $uri&error=1"
+	fi
+	exit 0
+}
+
+formatBegin()
+{
+	hash="$(sed '/{HASHPASSWORD=.*}/!d;s/.*{HASHPASSWORD=$[^}]*$}.*/\1/;q' <<EOT
+$CONTENT
+EOT
+)"
+	cookie="pagepass$(pagepass_hash $PWD$PAGE_txt)"
+	if [ "$(COOKIE $cookie)" != "$hash" ]; then
+		editable=false
+		CONTENT="<form method=\"post\" action=\"?action=pagepass\">
+<input type=\"hidden\" name=\"page\" value=\"$(GET page)\" /> \
+<input type=\"hidden\" name=\"auth\" value=\"$(GET auth)\" /> \
+<input type=\"hidden\" name=\"hash\" value=\"$hash\" /> \
+<input type=\"hidden\" name=\"cookie\" value=\"$cookie\" /> \
+$MDP <input type=\"text\" name=\"pass\" /> \
+<input type=\"submit\" value=\"$DONE_BUTTON\" />
+</form>"
+	else
+		CONTENT="$(sed 's/{HASHPASSWORD=[^}]*}//' <<EOT
+$CONTENT
+EOT
+)"
+	fi
+}
+
+pagepass_sedexpr()
+{
+	sed '/{PASSWORD=.*}/!d;s/.*{PASSWORD=$[^}]*$}.*/\1/' $1 | \
+	while read pass; do
+		echo -n "-e 's|{PASSWORD=$pass|{HASHPASSWORD=$(pagepass_hash $pass)|' "
+	done
+	echo -n "-e 's|{PASSWORD=}||' "
+}
+
+writedPage()
+{
+	eval sed -i $(pagepass_sedexpr $1) $1 $BACKUP_DIR$PAGE_TITLE/\*.bak
+}
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Rss.sh
--- a/wiki/stuff/var/www/wiki/plugins/wkp_Rss.sh	Sat Oct 31 12:53:44 2015 +0100
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Rss.sh	Sat Oct 31 16:32:19 2015 +0100
@@ -6,30 +6,30 @@
 {
 	# Attention, bug si https ou port différent de 80 ?
 	ADR_ACCUEIL="http://$SERVER_NAME$SCRIPT_NAME"
+	RSS_DESCRIPTION="Flux RSS de $WIKI_TITLE"
 	CONTENT_RSS=""      
+	cat > rss.xml <<EOT
+<rss version="0.91">
+<channel>
+<title>$WIKI_TITLE</title>
+<link>$ADR_ACCUEIL</link>
+<description>$RSS_DESCRIPTION</description>
+<language>$LANG</language>
+EOT
 	for file in $(ls -l $PWD/$PAGES_DIR/*.txt 2> /dev/null | awk '{ print $9 }' | tail -n 10) ; do
 		filename=$(basename $file ".txt")
 		timestamp=$(filedate $file)
 		CONTENT="$CONTENT<a href=\"?page=$filename\">$filename</a> ($timestamp - <a href=\"./?page=$filename&action=diff\">diff</a>)<br />"
-CONTENT_RSS="$CONTENT_RSS<item>
+		cat >> rss.xml <<EOT
+<item>
 <title>$filename</title>
 <pubDate>$timestamp</pubDate>
 <link>$ADR_ACCUEIL?page=$(urlencode '$filename')</link>
 <description>$filename $timestamp</description>
-</item>"
+</item>
+EOT
 	done
-	sed -e "s#{WIKI_TITLE}#$WIKI_TITLE#" \
-	    -e "s#{ADR_ACCUEIL}#$ADR_ACCUEIL#" \
-	    -e "s#{LANG}#$LANG#" \
-	    -e "s#{WIKI_DESCRIPTION}#Flux RSS de $WIKI_TITLE#" \
-	    -e "s#{CONTENT_RSS}#$CONTENT_RSS#" > rss.xml <<EOT
-<rss version="0.91">
-<channel>
-<title>{WIKI_TITLE}</title>
-<link>{ADR_ACCUEIL}</link>
-<description>{WIKI_DESCRIPTION}</description>
-<language>{LANG}</language>
-{CONTENT_RSS}
+	cat >> rss.xml <<EOT
 </channel>
 </rss>
 EOT
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Tables.sh
--- a/wiki/stuff/var/www/wiki/plugins/wkp_Tables.sh	Sat Oct 31 12:53:44 2015 +0100
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Tables.sh	Sat Oct 31 16:32:19 2015 +0100
@@ -9,10 +9,10 @@
     -e 's,^$ *|$|,\1,' -e 's/|$ *$$/\1/' <<EOT | awk '
 {
   if (/^ *\|.*\|$/) {
-    if (in_array == 0) print "<table class=\"wikitable\">"
+    if (in_array == 0) printf "<table class=\"wikitable\">"
     in_array = 1
     s = $0
-    print "<tr>"
+    printf "<tr>"
     while (match(s,/\|[^\|]*\|/)) {
       q = substr(s,RSTART+1,RLENGTH-2)
       s = substr(s,RSTART+RLENGTH)
@@ -40,9 +40,9 @@
         c = c " rowspan=\"" substr(q,2,RLENGTH-1) "\""
         q = substr(q,n+1)
       }
-      print "  <td" c ">" q "</td>"
+      printf "  <td" c ">" q "</td>"
     }
-    print "</tr>"
+    printf "</tr>"
   }
   else {
     if (in_array != 0) print "</table>"
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/plugins/wkp_Upload.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/stuff/var/www/wiki/plugins/wkp_Upload.sh	Sat Oct 31 16:32:19 2015 +0100
@@ -0,0 +1,113 @@
+plugin="<a href=\"?action=upload\" title=\"Upload a file\">Upload</a>"
+description_fr="Télécharge des fichiers complémentaires (ex: images)"
+description="Upload page extra files (ex: images)"
+      
+case "$LANG" in
+fr) UPLOAD="Chargement" ;;
+*)  UPLOAD="Upload" ;;
+esac
+
+template()
+{
+	case "$(GET action)" in
+	edit)	UPLOAD="<a href=\"$urlbase?action=upload\">$UPLOAD</a>"
+		html="$(sed "s|HISTORY|$(sedesc "$UPLOAD") / HISTORY|" <<EOT
+$html
+EOT
+)" ;;
+	upload*) html="$(sed 's| / <a href.*recent.*</a>||;s|.*name="query".*||' <<EOT
+$html
+EOT
+)" ;;
+	*)	return 1 ;;
+	esac
+	return 0
+}
+
+action()
+{
+	case "$1" in
+	upload) CONTENT="$(cat <<EOT
+<form method="post" enctype="multipart/form-data" action="?action=uploadfile">
+<input type="file" name="file" value="file"/>
+<input type="submit"/>
+<table>
+EOT
+		for i in pages/data/* ; do
+			[ -e $i ] || continue
+			echo -n "<tr><td><input type=checkbox "
+			grep -qs "$i" pages/*.txt &&  echo "checked=checked "
+			echo "disabled=disabled /><a href="$i">$(basename $i)</a></td></tr>"
+		done
+		cat <<EOT
+</table>
+</form>
+EOT
+)"
+		PAGE_TITLE_link=false
+		editable=false
+		lang="${HTTP_ACCEPT_LANGUAGE%%[,;_-]*}"
+		PAGE_TITLE="$UPLOAD" ;;
+	uploadfile)
+		mkdir -p pages/data 2> /dev/null
+		name=$(FILE file name)
+		if [ -z "$name" ]; then
+			CONTENT="<script> history.go(-2); </script>"
+			return 1
+		fi
+		n=''
+		while [ -e pages/data/$n$name ]; do
+			n=$(($n+1))
+		done
+		filesize=$(stat -c "%s" $(FILE file tmpname))
+		ls pages/data | while read file; do
+			stat -c "%s %n" pages/data/$file
+		done | while read size file; do
+			[ $filesize == $size ] && 
+			cmp $(FILE file tmpname) $file > /dev/null &&
+			ln -s $(basename $file) pages/data/$n$name && break
+		done
+		if [ -L pages/data/$n$name ]; then
+			n=pages/data/$n$name
+			name="$(readlink $n)"
+			rm -f $n
+			n=""
+		else
+			mv $(FILE file tmpname) pages/data/$n$name
+		fi
+		rm -rf $(dirname $(FILE file tmpname) )
+		URL=pages/data/$n$name
+		PAGE_TITLE_link=false
+		editable=false
+		PAGE_TITLE="$UPLOAD"
+		CONTENT="$(cat <<EOT
+<h1><a href="javascript:history.go(-2)">$EDIT_BUTTON</a></h1>
+<p>
+The file $(FILE file name) ($(FILE file size) bytes, $(FILE file type)) is
+stored at <a href="$URL">$URL</a>.
+</p>
+EOT
+)"
+		case "$(FILE file type)" in
+		image*) CONTENT="$(cat <<EOT
+$CONTENT
+<p>
+You can insert this image with <b>[$URL]</b> see
+<a href="?page=$HELP_BUTTON">$HELP_BUTTON</a> for details
+</p>
+<img src="$URL" alt="$URL" />
+EOT
+)"
+		esac ;;
+	*)	return 1 ;;
+	esac
+	return 0
+}
+
+formatEnd()
+{
+	CONTENT="$(sed 's|href="[^"]*page=pages/data/|href="pages/data/|g' <<EOT
+$CONTENT
+EOT
+)"
+}
diff -r a10bae21f602 -r 48d2c4c7a227 wiki/stuff/var/www/wiki/style.css
--- a/wiki/stuff/var/www/wiki/style.css	Sat Oct 31 12:53:44 2015 +0100
+++ b/wiki/stuff/var/www/wiki/style.css	Sat Oct 31 16:32:19 2015 +0100
@@ -1,172 +1,136 @@
+/* CSS style for TazWikiss */
+
+body { font: 13px sans-serif, vernada, arial; margin: 0; }
+code { font-size: 12px; }
+img { border: 0px; }
+a { color: #333C4D; }
+a.pending { color: #7F4736; }
+a.url { color: #808080; }
+a:hover { color: #57A2D4; }
+pre { 
+	border: 1px dotted #ddd;
+	padding: 4px;
+	width: 640px;
+	overflow: auto;
+}
+
 /* Plugin wkp_Tables */
 table.wikitable {
-  border-collapse: collapse;
-  border: 1px solid #ccc;
+	border-collapse: collapse;
+	border: 1px solid #ddd;
 }
 
 table.wikitable td {
-  border: 1px solid #ccc;
-  text-align: center;
-  vertical-align: middle;
-  padding: 2px;
+	border: 1px solid #ddd;
+	text-align: center;
+	vertical-align: middle;
+	padding: 2px;
 }
 
 table.wikitable td.em {
-  background: #ccc;
-  font-weight: bold;
+	background: #ccc;
+	font-weight: bold;
 } 
 
 /* Table Of Content */
 #toc {
-     border: 1px dashed #11141A;
-     float:right;
-     padding-right: 2em;
+	border: 1px dashed #11141A;
+	float:right;
+	padding-right: 2em;
 }
 #toc h1 {
-     font-size: 10px;
-     padding-left: .5em;
+	font-size: 10px;
+	padding-left: .5em;
 }
 #toc h2 {
-     font-size: 9px;
-     padding-left: 1.5em;
+	font-size: 9px;
+	padding-left: 1.5em;
 }
 #toc h3 {
-     font-size: 8px;
-     padding-left: 2em;
+	font-size: 8px;
+	padding-left: 2em;
 }
 #toc h4 {
-     font-size: 7px;
-     padding-left: 2.5em;
+	font-size: 7px;
+	padding-left: 2.5em;
 }
 #toc h5 {
-     font-size: 6px;
-     padding-left: 3em;
-}
-
-img {
-border: 0px
-}
-
-body {
-background-color: #828A99;
-font-family: Trebuchet, "Trebuchet MS", sans-serif;
-font-size: 14px;
-line-height: 16px;
-}
-
-pre
-{ 
-border: 1px dotted #ccc;
-padding: 4px;
-width: 640px;
-overflow: auto;
-}
-
-code
-{
-font-family: "Courier New", monospace;
-font-size: 12px;
-}
-
-a {
-color: #333C4D;
-}
-
-a.pending {
-color: #7F4736;
-}
-
-a.url {
-color: #808080;
-}
-
-a:hover {
-color: #57A2D4;
-background: inherit;
+	font-size: 6px;
+	padding-left: 3em;
 }
 
 .category {
-  color: #999;
-  background: inherit;
+	color: #999;
+	background: inherit;
 }
 
-th
-{
-padding-left: 1em;
-background: #333C4D;
-color: white;
-text-align: left;
-border-bottom: 1px dashed #11141A;
+th {
+	text-align: left;
+	background: #351a0a;
+	height: 40px;
+	border-bottom: 4px solid #d66018;
 }
 
 th h1 {
-font-family: "Futura Condensed", Futura, sans-serif !important;
-font-weight: bolder;
-padding-top: 10px;
-padding-bottom: 4px;
-margin-top: 0;
-margin-bottom: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
-font-family: "Futura Condensed", Futura, sans-serif !important;
+	margin: 0; padding: 8px; color: #fff; font-size: 20px;
 }
 
 th a {
-text-decoration: none;
-color: white !important;
+	text-decoration: none;
+	color: white !important;
 }
 
 th p {
-font-size: 80%;
-margin-top: 0;
-margin-bottom: 0;
-padding-left: 2em;
+	position: absolute;
+	top: 2px;
+	right: 2px;
+	font-size: 80%;
+	margin: 0;
+	color: white !important;
 }
 
 #mainTable {
-border: 1px solid #11141A;
+	border-bottom: 1px solid #ddd;
 }
 
 .pageLinks {
-padding-left: 1em;
-padding-right: 1em;
-font-size: 80%;
-margin-top: 0;
-margin-bottom: 0;
-background-color: #eee;
-color: #666;
+	padding-left: 1em;
+	padding-right: 1em;
+	font-size: 80%;
+	margin-top: 0;
+	margin-bottom: 0;
+	background-color: #eee;
+	color: #666;
 }
 .pageLinks a {
-font-weight: bold;
-text-decoration: none;
+	font-weight: bold;
+	text-decoration: none;
 }
 
 #headerLinks td {
-border-bottom: 1px dashed #ccc !important;
+	border-bottom: 1px dashed #ccc !important;
 }
 
 #footerLinks td {
-border-top: 1px dashed #ccc !important;
+	border-top: 1px dashed #ccc !important;
 }
 
 #mainContent {
-font-size: 90%;
-padding: 1em;
-background-color: white;
+	font-size: 90%;
+	padding: 1em;
+	background-color: white;
 }
 
 #mainContent h2:first-child {
-margin-top: 0px;
+	margin-top: 0px;
 }
 
-
 .error {
-color: #F25A5A;
-font-size: 80%;
-font-weight: bold;
+	color: #F25A5A;
+	font-size: 80%;
+	font-weight: bold;
 }
 
 form {
-display: inline
+	display: inline
 }