SliTaz Repositories

     1.1 --- a/tazwikiss/rootfs/var/www/wiki/index.sh	Tue Aug 09 10:27:37 2011 +0200
     1.2 +++ b/tazwikiss/rootfs/var/www/wiki/index.sh	Thu Aug 11 21:31:41 2011 +0200
     1.3 @@ -308,12 +308,14 @@
     1.4  		 	-e 's/([eE])/\€/g' -e 's/([pP])/\£/g' \
     1.5  		 	-e 's/([yY])/\¥/g'  -e 's/([tT][mM])/\™/g' \
     1.6  		 	-e 's/([cC])/\©/g' -e 's/([rR])/\®/g' \
     1.7 +		 	-e 's/([dD])/\°/g'  -e 's/(1\/2)/\½/g' \
     1.8 +		 	-e 's/(1\/4)/\¼/g'  -e 's/(3\/4)/\¾/g' \
     1.9  		 	-e 's/(<=)/\≤/g'  -e 's/(>=)/\≥/g' \
    1.10  		 	-e 's/(!=)/\&ne;/g'     -e 's/(+-)/\&plusmn;/g' <<EOT
    1.11  $CONTENT
    1.12  EOT
    1.13  )"
    1.14 -		rg_url="[0-9a-zA-Z\.\#/~\-\_%=\?\&,\+\:@;!\(\)\*\$']*" # TODO: verif & / &amp;
    1.15 +		rg_url="[0-9a-zA-Z\.\#/~\_%=\?\&,\+\:@;!\(\)\*\$'\-]*" # TODO: verif & / &amp;
    1.16  		rg_link_local="$rg_url"
    1.17  		rg_link_http="https\?://$rg_url"
    1.18  		rg_img_local="$rg_url\.jpe\?g\|$rg_url\.gif\|$rg_url\.png"
    1.19 @@ -321,6 +323,8 @@
    1.20  
    1.21  		# image, image link, link, wikipedia, email ...
    1.22  		CONTENT="$(sed \
    1.23 +			-e "s#\[\($rg_img_http\)\]#<img src=\"\1\" alt=\"\1\" style=\"float:\"/>#g" \
    1.24 +			-e "s#\[\($rg_img_local\)\]#<img src=\"\1\" alt=\"\1\" style=\"float:\"/>#g" \
    1.25  			-e "s#\[\($rg_img_http\)|*\([a-z]*\)*\]#<img src=\"\1\" alt=\"\1\" style=\"float:\2;\"/>#g" \
    1.26  			-e "s#\[\($rg_img_local\)|*\([a-z]*\)*\]#<img src=\"\1\" alt=\"\1\" style=\"float:\2;\"/>#g" \
    1.27  			-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" \
    1.28 @@ -356,7 +360,7 @@
    1.29  )"
    1.30  		while read link; do
    1.31  			[ -s $PAGES_DIR$link.txt ] && continue
    1.32 -			CONTENT="$(sed "s/\\?page=$link\"/& class=\"pending\"/" <<EOT
    1.33 +			CONTENT="$(sed "s|\\?page=$link\"|& class=\"pending\"|" <<EOT
    1.34  $CONTENT
    1.35  EOT
    1.36  )"