tazbug diff web/bugs.cgi @ rev 75
bugs.cgi: fold all bugs and messages to 80 char
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Feb 03 23:55:02 2014 +0100 (2014-02-03) |
parents | 88655776f9ff |
children | 239cbe0e1d4d |
line diff
1.1 --- a/web/bugs.cgi Mon Jan 20 00:22:58 2014 +0100 1.2 +++ b/web/bugs.cgi Mon Feb 03 23:55:02 2014 +0100 1.3 @@ -278,7 +278,7 @@ 1.4 sed \ 1.5 -e s"#http://\([^']*\).png#<img src='\0' alt='[ Image ]' />#"g \ 1.6 -e s"#http://\([^']*\).*# <a href='\0'>\1</a>#"g \ 1.7 - -e 's#\\\\n#\n#g;s#%22#"#g;s#%21#!#g' 1.8 + -e 's#\\\\n##g;s#%22#"#g;s#%21#!#g' 1.9 } 1.10 1.11 # Bug page 1.12 @@ -290,7 +290,6 @@ 1.13 fi 1.14 cat << EOT 1.15 <h2>$(eval_gettext 'Bug $id: $STATUS')</h2> 1.16 -<form method="get" action="$script"> 1.17 1.18 <p> 1.19 $(get_gravatar $MAIL 32) <strong>$BUG</strong> 1.20 @@ -347,7 +346,7 @@ 1.21 cat << EOT 1.22 <div> 1.23 <h3>$(gettext "New message")</h3> 1.24 - 1.25 + <form method="get" action="$script"> 1.26 <input type="hidden" name="id" value="$id" /> 1.27 <textarea name="msg" rows="8"></textarea> 1.28 <p><input type="submit" value="$(gettext 'Send message')" /></p> 1.29 @@ -366,11 +365,13 @@ 1.30 USER="$user" 1.31 fi 1.32 js_log "Will write message in $bugdir/$id/msg.$count " 1.33 - sed "s/$(echo -en '\r') /\n/g" > $bugdir/$id/msg.$count << EOT 1.34 + sed "s/$(echo -en '\r') /\n/g" > $bugdir/$id/msg.$count.tmp << EOT 1.35 USER="$USER" 1.36 DATE="$date" 1.37 MSG="$(GETfiltered msg)" 1.38 EOT 1.39 + fold -s -w 80 $bugdir/$id/msg.$count.tmp > $bugdir/$id/msg.$count 1.40 + rm -f $bugdir/$id/msg.$count.tmp 1.41 } 1.42 1.43 # Create a new Bug 1.44 @@ -384,7 +385,7 @@ 1.45 USER="$user" 1.46 fi 1.47 mkdir -p $bugdir/$count 1.48 - sed "s/$(echo -en '\r') /\n/g" > $bugdir/$count/bug.conf << EOT 1.49 + sed "s/$(echo -en '\r') /\n/g" > $bugdir/$count/bug.tmp << EOT 1.50 # SliTaz Bug configuration 1.51 1.52 BUG="$(GETfiltered bug)" 1.53 @@ -396,6 +397,8 @@ 1.54 1.55 DESC="$(GETfiltered desc)" 1.56 EOT 1.57 + fold -s -w 80 $bugdir/$bug/bug.tmp > $bugdir/$bug/bug.conf 1.58 + rm -f $bugdir/$bug/bug.tmp 1.59 } 1.60 1.61 # New bug page for the web interface 1.62 @@ -462,9 +465,11 @@ 1.63 save_bug() { 1.64 bug="$(GET bug)" 1.65 content="$(GET bugconf)" 1.66 - sed "s|\"|'|" | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT 1.67 + sed "s|\"|'|" | fold -s | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.tmp << EOT 1.68 $content 1.69 EOT 1.70 + fold -s -w 80 $bugdir/$bug/bug.tmp > $bugdir/$bug/bug.conf 1.71 + rm -f $bugdir/$bug/bug.tmp 1.72 } 1.73 1.74 # Close a fixed bug