# HG changeset patch # User Pascal Bellard # Date 1396000194 0 # Node ID ebf281be15d05cb8d9dc9f7264d8f5191e3e5a1b # Parent 57bd1dcb4a718e319f8a76d68da8117027d432b2 tazwikiss: fix Password & Rss plugins diff -r 57bd1dcb4a71 -r ebf281be15d0 tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh Fri Mar 28 09:02:28 2014 +0000 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh Fri Mar 28 09:49:54 2014 +0000 @@ -74,5 +74,5 @@ writedPage() { - eval sed -i $(pagepass_sedexpr $1) $1 $BACKUP_DIR$PAGE_TITLE/*.bak + eval sed -i $(pagepass_sedexpr $1) $1 $BACKUP_DIR$PAGE_TITLE/\*.bak } diff -r 57bd1dcb4a71 -r ebf281be15d0 tazwikiss/rootfs/var/www/wiki/plugins/wkp_Rss.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Rss.sh Fri Mar 28 09:02:28 2014 +0000 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Rss.sh Fri Mar 28 09:49:54 2014 +0000 @@ -6,30 +6,31 @@ { # 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 < + +$WIKI_TITLE +$ADR_ACCUEIL +$RSS_DESCRIPTION +$LANG +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$filename ($timestamp - diff)
" -CONTENT_RSS="$CONTENT_RSS + cat >> rss.xml < $filename $timestamp $ADR_ACCUEIL?page=$(urlencode '$filename') $filename $timestamp -" + +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 < - -{WIKI_TITLE} -{ADR_ACCUEIL} -{WIKI_DESCRIPTION} -{LANG} -{CONTENT_RSS} + cat >> rss.xml < EOT