From fbd3293ca3b7d76baa1b393c939575c40831372f Mon Sep 17 00:00:00 2001
From: Christian Connert <christian@swarm-analytics.com>
Date: Wed, 10 Jul 2019 11:40:29 +0200
Subject: [PATCH] Changed to relative links to run behind a reverse proxy under
 a different location

---
 resources/templates/adduser.tmpl     |  4 +--
 resources/templates/base.tmpl        | 54 ++++++++++++++--------------
 resources/templates/modify.tmpl      |  4 +--
 resources/templates/navbar.tmpl      | 12 +++----
 resources/templates/searchadmin.tmpl |  6 ++--
 resources/templates/searchuser.tmpl  |  2 +-
 resources/templates/selfmodify.tmpl  |  4 +--
 7 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/resources/templates/adduser.tmpl b/resources/templates/adduser.tmpl
index cd8e31f..aaca2ea 100644
--- a/resources/templates/adduser.tmpl
+++ b/resources/templates/adduser.tmpl
@@ -6,7 +6,7 @@
         </div>
         <div class="col-md-12 column">
             <div class="well well-sm">
-              <form method='POST' autocomplete="off" action='/adduser' role="form" class="form-signin" id="form">
+              <form method='POST' autocomplete="off" action='./adduser' role="form" class="form-signin" id="form">
               <fieldset>
               <legend>Fill new user's attributes:</legend>
               ${form | n}
@@ -22,7 +22,7 @@
                 </div>
               </div>
               </form>
-              <script type="text/javascript" src="/static/js/ppolicy.js"></script>
+              <script type="text/javascript" src="./static/js/ppolicy.js"></script>
             </div>
         </div>
         <div class="col-md-2 column">
diff --git a/resources/templates/base.tmpl b/resources/templates/base.tmpl
index 5a66230..d848655 100644
--- a/resources/templates/base.tmpl
+++ b/resources/templates/base.tmpl
@@ -8,43 +8,43 @@
   <meta name="description" content="directory manager">
   <meta name="author" content="kakwa">
 
-    <!--link rel="stylesheet/less" href="/static/less/bootstrap.less" type="text/css" /-->
-    <!--link rel="stylesheet/less" href="/static/less/responsive.less" type="text/css" /-->
-    <!--script src="/static/js/less-1.3.3.min.js"></script-->
+    <!--link rel="stylesheet/less" href="/.static/less/bootstrap.less" type="text/css" /-->
+    <!--link rel="stylesheet/less" href="/.static/less/responsive.less" type="text/css" /-->
+    <!--script src="./static/js/less-1.3.3.min.js"></script-->
     <!--append ‘#!watch’ to the browser URL, then refresh the page. -->
 
-    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/css/custom.css" rel="stylesheet">
-    <link href="/static/css/style.css" rel="stylesheet">
-    <link href="/static/css/bootstrap-switch.css" rel="stylesheet">
-    <link href="/static/css/tablesorter-bootstrap.css" rel="stylesheet">
+    <link href="/.static/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/.static/css/custom.css" rel="stylesheet">
+    <link href="/.static/css/style.css" rel="stylesheet">
+    <link href="/.static/css/bootstrap-switch.css" rel="stylesheet">
+    <link href="/.static/css/tablesorter-bootstrap.css" rel="stylesheet">
 
   <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
   <!--[if lt IE 9]>
-    <script src="/static/js/html5shiv.js"></script>
+    <script src="./static/js/html5shiv.js"></script>
   <![endif]-->
 
   <!-- Fav and touch icons -->
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/static/img/apple-touch-icon-144-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/static/img/apple-touch-icon-114-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/static/img/apple-touch-icon-72-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" href="/static/img/apple-touch-icon-57-precomposed.png">
-  <link rel="icon" type="image/png" href="/static/img/favicon.png">
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/.static/img/apple-touch-icon-144-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/.static/img/apple-touch-icon-114-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/.static/img/apple-touch-icon-72-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="/.static/img/apple-touch-icon-57-precomposed.png">
+  <link rel="icon" type="image/png" href="/.static/img/favicon.png">
 
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
-    <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="/static/js/scripts.js"></script>
-    <script type="text/javascript" src="/static/js/validator.js"></script>
-    <script type="text/javascript" src="/static/js/bootstrap-notify.js"></script>
-    <script type="text/javascript" src="/static/js/jquery.tablesorter.min.js"></script>
-    <script type="text/javascript" src="/static/js/bootstrap-switch.js"></script>
-    <script type="text/javascript" src="/static/js/jquery.popconfirm.js"></script>
-    <script type="text/javascript" src="/static/js/removediacritic.js"></script>
-    <script type="text/javascript" src="/static/js/lc-filler.js"></script>
-    <script type="text/javascript" src="/static/js/sha1.js"></script>
+    <script type="text/javascript" src="./static/js/jquery.min.js"></script>
+    <script type="text/javascript" src="./static/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="./static/js/scripts.js"></script>
+    <script type="text/javascript" src="./static/js/validator.js"></script>
+    <script type="text/javascript" src="./static/js/bootstrap-notify.js"></script>
+    <script type="text/javascript" src="./static/js/jquery.tablesorter.min.js"></script>
+    <script type="text/javascript" src="./static/js/bootstrap-switch.js"></script>
+    <script type="text/javascript" src="./static/js/jquery.popconfirm.js"></script>
+    <script type="text/javascript" src="./static/js/removediacritic.js"></script>
+    <script type="text/javascript" src="./static/js/lc-filler.js"></script>
+    <script type="text/javascript" src="./static/js/sha1.js"></script>
     % if custom_js:
     % for js in custom_js:
-    <script type="text/javascript" src="/custom/${js}"></script>
+    <script type="text/javascript" src="./custom/${js}"></script>
     % endfor
     %endif
 
@@ -70,6 +70,6 @@
         <p class="muted credit"><a href="http://ldapcherry.readthedocs.org" target="_blank">LdapCherry</a> • © 2016 • Pierre-François Carpentier • Released under the MIT License</p>
       </div>
     </div>
-<script type="text/javascript" src="/static/js/alignforms.js"></script>
+<script type="text/javascript" src="./static/js/alignforms.js"></script>
 </body>
 </html>
diff --git a/resources/templates/modify.tmpl b/resources/templates/modify.tmpl
index b494fcc..94a98d1 100644
--- a/resources/templates/modify.tmpl
+++ b/resources/templates/modify.tmpl
@@ -6,7 +6,7 @@
         </div>
         <div class="col-md-12 column">
             <div class="well well-sm">
-              <form method='POST' action='/modify' role="form" class="form-signin" id="form">
+              <form method='POST' action='./modify' role="form" class="form-signin" id="form">
               <fieldset>
               <legend>Modify user's attributes:</legend>
               ${form | n}
@@ -62,7 +62,7 @@
                 </div>
               </div>
               </form>
-              <script type="text/javascript" src="/static/js/ppolicy.js"></script>
+              <script type="text/javascript" src="./static/js/ppolicy.js"></script>
             </div>
         </div>
         <div class="col-md-2 column">
diff --git a/resources/templates/navbar.tmpl b/resources/templates/navbar.tmpl
index 99d3a88..ba57352 100644
--- a/resources/templates/navbar.tmpl
+++ b/resources/templates/navbar.tmpl
@@ -6,19 +6,19 @@
 			<nav class="navbar navbar-inverse" role="navigation">
                 <div class="navbar-header">
                      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>
-                <a class="navbar-brand" href="/"><img src="/static/img/icon.png" alt="LdapCherry" height="22" width="22"></a>
-                <a class="navbar-brand" href="/selfmodify">Self Modify</a>
+                <a class="navbar-brand" href="/."><img src="./static/img/icon.png" alt="LdapCherry" height="22" width="22"></a>
+                <a class="navbar-brand" href="/.selfmodify">Self Modify</a>
                 % if is_admin:
-                <a class="navbar-brand" href="/adduser">Add User</a>
-                <a class="navbar-brand" href="/searchadmin">Delete/Modify User</a>
+                <a class="navbar-brand" href="/.adduser">Add User</a>
+                <a class="navbar-brand" href="/.searchadmin">Delete/Modify User</a>
                 % endif
                 </div>
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <a class="navbar-brand navbar-right" href='/logout'><span class="glyphicon glyphicon-off"></span> Logout</a>
                             % if is_admin:
-		            <form method='GET' action='/searchadmin' class="navbar-form navbar-right" role="search" data-toggle="validator">
+		            <form method='GET' action='./searchadmin' class="navbar-form navbar-right" role="search" data-toggle="validator">
                             % else:
-		            <form method='GET' action='/searchuser' class="navbar-form navbar-right" role="search" data-toggle="validator">
+		            <form method='GET' action='./searchuser' class="navbar-form navbar-right" role="search" data-toggle="validator">
                             % endif
                         <div class="form-group">
                             % if is_admin:
diff --git a/resources/templates/searchadmin.tmpl b/resources/templates/searchadmin.tmpl
index e682166..baeaf81 100644
--- a/resources/templates/searchadmin.tmpl
+++ b/resources/templates/searchadmin.tmpl
@@ -3,7 +3,7 @@
 <%block name="core">
     <div class="row clearfix">
         <div class="col-md-12 column">
-            <form method='get' action='/searchadmin' role="form" class="form-inline" data-toggle="validator">
+            <form method='get' action='./searchadmin' role="form" class="form-inline" data-toggle="validator">
                 <div class="form-group">
                      <label for="searchstring">Search user to modify/delete</label>
                      <input type="text" class="form-control" id="searchstring" name="searchstring" placeholder="Search User">
@@ -52,10 +52,10 @@
                                 </td>
                             % endfor
                                 <td>
-                                    <a href="/modify?user=${user | n,u}" class="btn btn-xs blue pad" ><span class="glyphicon glyphicon-cog"></span> Modify</a>
+                                    <a href="/.modify?user=${user | n,u}" class="btn btn-xs blue pad" ><span class="glyphicon glyphicon-cog"></span> Modify</a>
                                 </td>
                                 <td>
-                                    <a href="/delete?user=${user | n,u}" data-toggle='confirmation-delete' class="btn btn-xs red pad"><span class="glyphicon glyphicon-remove-sign"></span> Delete</a>
+                                    <a href="/.delete?user=${user | n,u}" data-toggle='confirmation-delete' class="btn btn-xs red pad"><span class="glyphicon glyphicon-remove-sign"></span> Delete</a>
                                 </td>
                             </tr>
                             % endfor
diff --git a/resources/templates/searchuser.tmpl b/resources/templates/searchuser.tmpl
index 29d52e2..b884f83 100644
--- a/resources/templates/searchuser.tmpl
+++ b/resources/templates/searchuser.tmpl
@@ -3,7 +3,7 @@
 <%block name="core">
     <div class="row clearfix">
         <div class="col-md-12 column">
-            <form method='get' action='/searchuser' role="form" class="form-inline" data-toggle="validator">
+            <form method='get' action='./searchuser' role="form" class="form-inline" data-toggle="validator">
                 <div class="form-group">
                      <label for="searchstring">Search user</label>
                      <input type="text" id="searchstring" data-minlength="3" data-error="Too short" class="form-control" name="searchstring" placeholder="Search User" required>
diff --git a/resources/templates/selfmodify.tmpl b/resources/templates/selfmodify.tmpl
index 95bd806..5d42a8b 100644
--- a/resources/templates/selfmodify.tmpl
+++ b/resources/templates/selfmodify.tmpl
@@ -6,7 +6,7 @@
         </div>
         <div class="col-md-12 column">
             <div class="well well-sm">
-              <form method='POST' action='/selfmodify' autocomplete="off" role="form" class="form-signin" id="form">
+              <form method='POST' action='./selfmodify' autocomplete="off" role="form" class="form-signin" id="form">
               <legend>Modify your attributes:</legend>
               ${form | n}
               </fieldset>
@@ -17,7 +17,7 @@
                 </div>
               </div>
               </form>
-              <script type="text/javascript" src="/static/js/ppolicy.js"></script>
+              <script type="text/javascript" src="./static/js/ppolicy.js"></script>
             </div>
         </div>
         <div class="col-md-2 column">