slitaz-dev-tools rev 223
tazwikiss: fix Password & Rss plugins
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Mar 28 09:49:54 2014 +0000 (2014-03-28) |
parents | 57bd1dcb4a71 |
children | 4ef87cdc7d28 |
files | tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh tazwikiss/rootfs/var/www/wiki/plugins/wkp_Rss.sh |
line diff
1.1 --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh Fri Mar 28 09:02:28 2014 +0000 1.2 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh Fri Mar 28 09:49:54 2014 +0000 1.3 @@ -74,5 +74,5 @@ 1.4 1.5 writedPage() 1.6 { 1.7 - eval sed -i $(pagepass_sedexpr $1) $1 $BACKUP_DIR$PAGE_TITLE/*.bak 1.8 + eval sed -i $(pagepass_sedexpr $1) $1 $BACKUP_DIR$PAGE_TITLE/\*.bak 1.9 }
2.1 --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Rss.sh Fri Mar 28 09:02:28 2014 +0000 2.2 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Rss.sh Fri Mar 28 09:49:54 2014 +0000 2.3 @@ -6,30 +6,31 @@ 2.4 { 2.5 # Attention, bug si https ou port différent de 80 ? 2.6 ADR_ACCUEIL="http://$SERVER_NAME$SCRIPT_NAME" 2.7 + RSS_DESCRIPTION="Flux RSS de $WIKI_TITLE" 2.8 CONTENT_RSS="" 2.9 + cat > rss.xml <<EOT 2.10 +<rss version="0.91"> 2.11 +<channel> 2.12 +<title>$WIKI_TITLE</title> 2.13 +<link>$ADR_ACCUEIL</link> 2.14 +<description>$RSS_DESCRIPTION</description> 2.15 +<language>$LANG</language> 2.16 +EOT 2.17 for file in $(ls -l $PWD/$PAGES_DIR/*.txt 2> /dev/null | awk '{ print $9 }' | tail -n 10) ; do 2.18 filename=$(basename $file ".txt") 2.19 timestamp=$(filedate $file) 2.20 CONTENT="$CONTENT<a href=\"?page=$filename\">$filename</a> ($timestamp - <a href=\"./?page=$filename&action=diff\">diff</a>)<br />" 2.21 -CONTENT_RSS="$CONTENT_RSS<item> 2.22 + cat >> rss.xml <<EOT 2.23 +EOT 2.24 +<item> 2.25 <title>$filename</title> 2.26 <pubDate>$timestamp</pubDate> 2.27 <link>$ADR_ACCUEIL?page=$(urlencode '$filename')</link> 2.28 <description>$filename $timestamp</description> 2.29 -</item>" 2.30 +</item> 2.31 +EOT 2.32 done 2.33 - sed -e "s#{WIKI_TITLE}#$WIKI_TITLE#" \ 2.34 - -e "s#{ADR_ACCUEIL}#$ADR_ACCUEIL#" \ 2.35 - -e "s#{LANG}#$LANG#" \ 2.36 - -e "s#{WIKI_DESCRIPTION}#Flux RSS de $WIKI_TITLE#" \ 2.37 - -e "s#{CONTENT_RSS}#$CONTENT_RSS#" > rss.xml <<EOT 2.38 -<rss version="0.91"> 2.39 -<channel> 2.40 -<title>{WIKI_TITLE}</title> 2.41 -<link>{ADR_ACCUEIL}</link> 2.42 -<description>{WIKI_DESCRIPTION}</description> 2.43 -<language>{LANG}</language> 2.44 -{CONTENT_RSS} 2.45 + cat >> rss.xml <<EOT 2.46 </channel> 2.47 </rss> 2.48 EOT