relative URI syntax in form actions, link references and redirects

svn path=/trunk/; revision=62

diff --git a/action.sh b/action.sh
index 0c46d73d2027cd89ba994590bc2f0559443dd92f..a0240d932d0f718a5088d44d3b942f61dce66c3c 100755 (executable)
--- a/action.sh
+++ b/action.sh
@@ -19,6 +19,6 @@
 
 ACTION="$(echo "$_GET[\"action\"]" |egrep '^[a-zA-Z0-9_-]+$')"
 ACTION="${_EXEC}/actions/${ACTION}.sh"
-[ -x "$ACTION" ] || echo -n "Location: http://$HTTP_HOST/?page=error\n\n"
+[ -x "$ACTION" ] || echo -n "Location: ?page=error\n\n"
 
 . $ACTION

diff --git a/templates/Admin.page b/templates/Admin.page
index e869e4b9a9160ada88084c3299fbd646eb50bf25..d5427fd8e88c3ee6e392f901c72728c671422a5f 100644 (file)
--- a/templates/Admin.page
+++ b/templates/Admin.page
@@ -3,7 +3,7 @@
 cat <<AdminEND
   <div id="LEFT"></div>
   <div id="MAIN">
-    <div class="section"><form method="post" accept-charset="utf-8" action="/?action=projectmeta">
+    <div class="section"><form method="post" accept-charset="utf-8" action="./?action=projectmeta">
       <h1>General</h1>
 
       <fieldset><legend>Title Display</legend>

diff --git a/templates/Home.page b/templates/Home.page
index e12b78fa2e30264a17ecb1dab34caaf77202bf59..ab36ee4ea1bacc7d7f1a3df308270ed730f726ca 100644 (file)
--- a/templates/Home.page
+++ b/templates/Home.page
@@ -12,7 +12,7 @@ EOF
 edit_intro(){
   cat <<HomeEND
       <div id="introedit" style="display: none;">
-        <form action="/?action=introedit&i=intro" method="post" accept-charset="UTF-8">
+        <form action="./?action=introedit&i=intro" method="post" accept-charset="UTF-8">
           <textarea name="text" rows="10">$([ -r "Home/intro" ] && cat Home/intro)</textarea><br>
           <input type="submit">
           $(switchbutton introedit introtext Cancel) 
@@ -26,7 +26,7 @@ add_news(){
   <div class="NEWS">
     <a id="new" class='function' href='#add' onclick='javascript:hide_screen("new");show_screen("add");'>Add News</a>
     <div id="add" style="display: none;">
-      <form action="/?action=introedit&i=news" method="post" accept-charset="UTF-8">
+      <form action="./?action=introedit&i=news" method="post" accept-charset="UTF-8">
         <textarea name="text" rows="10"></textarea><br>
         <input type="submit">
         $(switchbutton add new Cancel)
@@ -42,7 +42,7 @@ edit_news(){
 
   cat <<HomeEND
       <div id="edit_$info" style="display: none;">
-        <form action="/?action=introedit&i=$info" method="post" accept-charset="UTF-8">
+        <form action="./?action=introedit&i=$info" method="post" accept-charset="UTF-8">
           <textarea name="text" rows="10">$([ -r "$each" ] && cat $each)</textarea><br>
           <input type="submit">
           $(switchbutton edit_$info news_$info Cancel)
@@ -69,7 +69,7 @@ HomeEND
 
 cat <<HomeEND
   <div id="LEFT">
-    <form method="GET" action="/${SCRIPTNAME}" accept-charset="utf-8">
+    <form method="GET" action="./" accept-charset="utf-8">
       <input type="hidden" name="p" value="Home">
       <input type="text" name="s" placeholder="Search"><br>
       <input type="submit" value="Search News">

diff --git a/templates/Tasks.page b/templates/Tasks.page
index 82f296d3657da7f35fc86b4c7b9bfb37999542e2..50818994f8f9bd2058cc881b36bdfad8459bb2c9 100644 (file)
--- a/templates/Tasks.page
+++ b/templates/Tasks.page
@@ -5,7 +5,7 @@ show_search(){
     echo "<h1>Tasks search results for: $search</h1>"
     for each in $(grep -ile "$search" Tasks/<0000000000-9999999999>_<000-999>); do
       id=$(sed -r 's:^.*/::;s:.task$::' <<<$each)
-      echo "<div class='search'><a href='${SCRIPTNAME}?p=Tasks&amp;i=$id'><h2>$(date -d @$(cut -d_ -f1 <<<"$id"))</h2></a>"
+      echo "<div class='search'><a href='./?p=Tasks&amp;i=$id'><h2>$(date -d @$(cut -d_ -f1 <<<"$id"))</h2></a>"
       grep -C1 -ie "$search" "$each" |sed "s:$search:<b>&</b>:g;s:$:<br>:g"
       echo '</div>'
     done
@@ -78,7 +78,7 @@ list_tasks(){
     [ -z "$attendant" ] && attendant='(none)'
     cat <<TasksEND
       <div class="Task">
-        <a href="${SCRIPTNAME}?p=Tasks&amp;i=${info}"><b>$headline</b></a><br>
+        <a href="./?p=Tasks&amp;i=${info}"><b>$headline</b></a><br>
         <span><b>Status:</b> $taskstatus</span>
         <span><b>Section:</b> $section</span>
         <span><b>Attendant:</b> $attendant</span>
@@ -91,7 +91,7 @@ new_task(){
   cat <<TasksEND
       <a id='newTask_button' class='function' href='#' onclick='javascript:show_screen("newTask");hide_screen("newTask_button");'>New Task</a>
       <div id="newTask" style="display: none;">
-        <form action="/${SCRIPTNAME}" method="get" accept-charset="UTF-8">
+        <form action="./" method="get" accept-charset="UTF-8">
           <b>Headline:</b><br>
           <input type="hidden" name="p" value="Tasks">
           <textarea name="n" rows="2" style="width:99%;"></textarea><br>
@@ -104,7 +104,7 @@ TasksEND
 
 cat <<TasksEND
   <div id="LEFT">
-    <form method="GET" action="/${SCRIPTNAME}" accept-charset="utf-8">
+    <form method="GET" action="./" accept-charset="utf-8">
       <input type="hidden" name="p" value="Tasks">
       <input type="text" name="s" placeholder="Search"><br>
       <input type="submit" value="Search Tasks">

diff --git a/templates/Wiki_list.page b/templates/Wiki_list.page
index 317e45aef7079036670c6b507188817040a446a6..f12c27408c18335e625cd787399af5b48ef2202a 100755 (executable)
--- a/templates/Wiki_list.page
+++ b/templates/Wiki_list.page
@@ -17,7 +17,7 @@ change_wiki(){
 
   cat <<WikiEND
       <div id="change_$info" style="display: none;">
-        <form action="/?action=wikimeta&i=$info" method="post" accept-charset="UTF-8">
+        <form action="./?action=wikimeta&i=$info" method="post" accept-charset="UTF-8">
          <b>Title:</b> <input type="text" name="title" value="$title"><br>
          <b>Description:</b><br>
          <textarea name="desc" rows="6" style="width:100%;">$description</textarea><br>
@@ -32,7 +32,7 @@ add_page() {
   cat <<WikiEND
     <a id='addp_button' class='function' href='#' onclick='javascript:show_screen("add_page");hide_screen("addp_button");'>Add a new Page</a>
     <div id="add_page" style="display: none;">
-      <form action="/?action=wikimeta" method="post" accept-charset="UTF-8">
+      <form action="./?action=wikimeta" method="post" accept-charset="UTF-8">
         <br><b>Title:</b><br>
        <input type="text" name="title" placeholder="Fill in a title"><br>
         <b>Description:</b><br>
@@ -55,9 +55,9 @@ list_wikis(){
     cat <<WikiEND
     <div class="article">
       <div id="display_$info">
-        <a name="$info" href="/?p=Wiki&amp;i=$info"><h1>$title</h1></a>
+        <a name="$info" href="./?p=Wiki&amp;i=$info"><h1>$title</h1></a>
         $description<br><br>
-        <a class="function" href="/?p=Wiki&amp;i=$info">View</a> 
+        <a class="function" href="./?p=Wiki&amp;i=$info">View</a> 
         $($ACL_WIKIEDIT && echo "<a class='function' href='#' onclick=\"javascript:show_screen('change_$info');hide_screen('display_$info');\">Change Info</a>")
       </div>
       $($ACL_WIKIEDIT && change_wiki $info)
@@ -68,7 +68,7 @@ WikiEND
 
 cat <<WikiEND
     <div id="LEFT">
-      <form method="GET" action="/${SCRIPTNAME}" accept-charset="utf-8">
+      <form method="GET" action="./" accept-charset="utf-8">
        <input type="hidden" name="p" value="Wiki">
        <input type="text" name="s" placeholder="Search"><br>
        <input type="submit" value="Search Wiki">

diff --git a/templates/Wiki_show.page b/templates/Wiki_show.page
index cfe86e4323dc480ce6208c93f441e385202813c9..d00f0e59891e47c76c70bff3de9e4b8b9428746a 100755 (executable)
--- a/templates/Wiki_show.page
+++ b/templates/Wiki_show.page
@@ -18,7 +18,7 @@ add_comment(){
       <a id='comment_button' class='function' href='#'
          onclick='javascript:show_screen("comment");hide_screen("comment_button");'>Comment / Ask</a>
       <div id="comment" style="display: none;">
-        <form action="/?action=wikimeta&i=$info" method="post" accept-charset="UTF-8">
+        <form action="./?action=wikimeta&i=$info" method="post" accept-charset="UTF-8">
           <b>Comment:</b><br>
           <textarea name="comm" rows="6" style="width:99%;"></textarea><br>
           <input type="submit" value="Submit">
@@ -30,7 +30,7 @@ WikiEND
 
 cat <<WikiEND
     <div id="LEFT">
-      <form method="GET" action="/${SCRIPTNAME}" accept-charset="utf-8">
+      <form method="GET" action="./" accept-charset="utf-8">
        <input type="hidden" name="p" value="Wiki">
        <input type="text" name="s" placeholder="Search"><br>
        <input type="submit" value="Search Wiki">
@@ -45,10 +45,10 @@ cat <<WikiEND
         done) <a class='rev' href='?p=Wiki&amp;i=$info'>Latest</a><br>
       <hr>
       $($LOGIN && if [ -z "$lock" ]; then
-          [ -z "$rev" ] && echo "<a class='function' href='/?action=lock&amp;p=Wiki&amp;e=$info'>edit this page</a>"
-         [ -n "$rev" ] && echo "Click <a class='function' href='/?action=lock&amp;p=Wiki&amp;e=${info}&amp;r=${rev:s/.//}'>edit</a> to derive a new page revision from this one."
+          [ -z "$rev" ] && echo "<a class='function' href='./?action=lock&amp;p=Wiki&amp;e=$info'>edit this page</a>"
+         [ -n "$rev" ] && echo "Click <a class='function' href='./?action=lock&amp;p=Wiki&amp;e=${info}&amp;r=${rev:s/.//}'>edit</a> to derive a new page revision from this one."
         else
-         echo "<b>This page is currently being edited by $lock</b><a class='function' href='/?action=lock&amp;p=Wiki&amp;e=$info'>edit anyway</a>"
+         echo "<b>This page is currently being edited by $lock</b><a class='function' href='./?action=lock&amp;p=Wiki&amp;e=$info'>edit anyway</a>"
         fi
         $LOGIN && echo '<hr>')
       <h1>Table of Content</h1>

diff --git a/templates/frame.html.sh b/templates/frame.html.sh
index 969512293f3cc31f2bb6faf6f9585bf8a39a2e8a..cba50197679b3294ef1f443f99e67937ec31ad53 100755 (executable)
--- a/templates/frame.html.sh
+++ b/templates/frame.html.sh
@@ -85,7 +85,7 @@ cat <<EOF
       <span id="SLOGAN">$(egrep '^slogan=.*$' project.meta |cut -d= -f2-)</span>
     </div>
     <div id="USERMENU">
-      $( $LOGIN || echo '<form action="/?action=login" method="post" accept-charset="UTF-8">
+      $( $LOGIN || echo '<form action="./?action=login" method="post" accept-charset="UTF-8">
                            Login:<br>
                           <input type="text" name="user" value placeholder="Username"><br>
                           <input type="password" name="pass" value placeholder="Password"><br>
@@ -101,10 +101,10 @@ cat <<EOF
       $(list_accounts)
     </div>
     <div id="MENU">
-      <a href='/?p=Home'>Home</a>
-      <a href='/?p=Wiki'>Wiki</a>
-      <a href='/?p=Subversion'>Code</a>
-      <a href='/?p=Tasks'>Tasks</a>
+      <a href='./?p=Home'>Home</a>
+      <a href='./?p=Wiki'>Wiki</a>
+      <a href='./?p=Subversion'>Code</a>
+      <a href='./?p=Tasks'>Tasks</a>
     </div>
 
     $(. $PAGE body)