upgraded to fit new shcgi revision, slightly better input validation, switched to...

[busy] / templates / Subversion.page

diff --git a/templates/Subversion.page b/templates/Subversion.page
index 72f8189bb00995ebd7fc8a28b9c33148f160fe3f..866b965d88c735e27b74b8f7dd6c2d75f66ee3db 100755 (executable)
--- a/templates/Subversion.page
+++ b/templates/Subversion.page
@@ -3,35 +3,20 @@
 cat <<SVNEND
   <div id="LEFT">
     <h1>Path:</h1>
-    <a href='?p=Subversion&amp;i=/&amp;r=$rev'>[root]</a> 
-    $(tmp="$url"
-    until [ -z "$tmp" -o "$tmp" = '//' -o "$tmp" = './' ]; do
-      echo "<a href='?p=Subversion&amp;i=$tmp&amp;r=$rev'>/$(basename "$tmp")</a> "
-      tmp="$(dirname "$tmp")/"
-    done |tac)
+    <a href='?p=Subversion&amp;i=/&amp;r=$rev'>[root]/</a> 
+    $(svn_path)
     <hr>
     <h1>Revisions:</h1>
-    $(for i in {1.."$lastrev"}; do
-      echo "<a href='?p=Subversion&amp;i=$url&amp;r=$i'>$i</a>"
-    done)
+    $(svn_revisions)
   </div>
 
   <div id="RIGHT">
     <h1>Changelog:</h1><hr>
-    $(svn log $(egrep -q '^(.*/|)$' <<<"$url" && echo '') "${baseuri}/${url}" |\
-      sed -rn '2,${s:^-+$:</div>:g;
-      s:^r([0-9]+) \| ([a-zA-Z0-9]+) \| ([0-9: -]+) .+$:<div class="changelog"><h2>Revision \1 by \2<br>at \3</h2>:g;p}')
+    $(svn_changelog)
   </div>
 
-  <div id="MAIN">
-  <div class='wikitext'><h1>$(basename "$url"), Revision "$rev":</h1>
-  $(if (egrep -q '^(.*/|)$' <<<"$url"); then #are we showing a directory
-    svn ls -r "$rev" "${baseuri}/${url}" |sed -r "s:^.*$:<a href='?p=Subversion\&amp;i=$url/&\&amp;r=$rev'>&</a><br>:g"
-    echo '</div>'
-  else #or are we showing a file
-    lang=$(source-highlight --lang-list |cut -d\  -f1 |grep -x "$(sed 's:.*\.::g' <<<"$url")" || echo sh)
-    grep -q '\.' <<<"$url" || lang=txt
-    svn cat -r "$rev" "${baseuri}/${url}" |source-highlight -s "$lang"
-  fi)
+  <div id="MAIN"><div class='wikitext'>
+    <h1>$(basename "$url"), Revision "$rev":</h1>
+    $(svn_showurl)
   </div></div>
 SVNEND