Proper escaping of URIs.

author: Guilhem Moulin <guilhem.moulin@fripost.org> 2012-09-29 02:03:21 +0200
committer: Guilhem Moulin <guilhem.moulin@fripost.org> 2012-09-29 02:03:21 +0200
commit: 2bece6abde54881bb074dd44e7f87885eab4a777 (patch)
tree: bde87a2c98476847ab5082facade40062cb52e70 /template
parent: aa3340e58fc5b993bfc88070edf543a2ed82ef94 (diff)
9 files changed, 55 insertions, 50 deletions
diff --git a/template/add-alias.html b/template/add-alias.html
index 7ceb4cf..8ad887f 100644
--- a/template/add-alias.html
+++ b/template/add-alias.html
@@ -8,13 +8,13 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../">Root</a> /
+        <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/add-list.html b/template/add-list.html
index ef99497..e69690b 100644
--- a/template/add-list.html
+++ b/template/add-list.html
@@ -8,13 +8,13 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../">Root</a> /
+        <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
@@ -103,7 +103,7 @@
         <i>Note</i>: No confirmation email will be sent. It may take a while for the list to be created (especially
         for the Schleuder list manager, as it requires a GPG key creation); Once the list has succefully been created,
         it will be visible under the
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/">management page for <span class="domain"><TMPL_VAR NAME=domain></span></a>.
+        <a href="./">management page for <span class="domain"><TMPL_VAR NAME=domain></span></a>.
       </div>
       </div>
     </form>
diff --git a/template/add-mailbox.html b/template/add-mailbox.html
index d82af0e..6bcc748 100644
--- a/template/add-mailbox.html
+++ b/template/add-mailbox.html
@@ -8,13 +8,13 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../">Root</a> /
+        <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/edit-alias.html b/template/edit-alias.html
index 85e2d5f..aa18faf 100644
--- a/template/edit-alias.html
+++ b/template/edit-alias.html
@@ -8,14 +8,14 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../../">Root</a> /
+        <a href="../"><TMPL_VAR NAME=domain></a> /
         <TMPL_VAR NAME=alias> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
@@ -23,7 +23,7 @@
 
     <div id="content">
     <h1>Edit alias <span class="email"><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></span><TMPL_IF NAME=canDelete
-      ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=alias>/?a=delete">delete</a>]</span
+      ><span class="action">[<a href="./?a=delete">delete</a>]</span
       ></TMPL_IF></h1>
 
     <TMPL_IF NAME=newChanges>
diff --git a/template/edit-domain.html b/template/edit-domain.html
index e6373e8..a6d6b34 100644
--- a/template/edit-domain.html
+++ b/template/edit-domain.html
@@ -8,13 +8,13 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../">Root</a> /
+        <a href="./"><TMPL_VAR NAME=domain></a> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/edit-list.html b/template/edit-list.html
index f44e38c..1cc8148 100644
--- a/template/edit-list.html
+++ b/template/edit-list.html
@@ -8,21 +8,21 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../../">Root</a> /
+        <a href="../"><TMPL_VAR NAME=domain></a> /
         <TMPL_VAR NAME=list> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
 
     <div id="content">
-    <h1>Edit list <a class="external" target="_blank" href="<TMPL_VAR NAME=listurl>"
+    <h1>Edit list <a class="external" target="_blank" href="<TMPL_VAR NAME=listURL>"
                   ><span class="email"><TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></span
                   ></a></h1>
 
diff --git a/template/edit-mailbox.html b/template/edit-mailbox.html
index 5f5dc08..892c643 100644
--- a/template/edit-mailbox.html
+++ b/template/edit-mailbox.html
@@ -8,14 +8,14 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> /
-        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a> /
+        <a href="../../">Root</a> /
+        <a href="../"><TMPL_VAR NAME=domain></a> /
         <TMPL_VAR NAME=user> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
@@ -71,9 +71,11 @@
 
       <div class="help">
         <i>Note</i>:
-        You need to enter
-        <span class="mailbox"><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></span>'s
+        You need to enter your
+        (<span class="mailbox"><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></span>'s)
         current password first.
+        Leave these fields empty if you do not want to change the
+        password.
       </div>
 
       <hr/>
diff --git a/template/list-domains.html b/template/list-domains.html
index 980b8de..5ebdd05 100644
--- a/template/list-domains.html
+++ b/template/list-domains.html
@@ -11,16 +11,16 @@
         Root /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
 
     <div id="content">
-    <h1>Manage domains<span class="action">[<a href="<TMPL_VAR NAME=url>/?a=add">add</a>]</span></h1>
+    <h1>Manage domains<span class="action">[<a href="./?a=add">add</a>]</span></h1>
 
     <table class="list" id="domains">
       <thead>
@@ -33,7 +33,7 @@
       <tbody>
       <TMPL_LOOP NAME=domains>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><span class="domain"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a></span></td>
+          <td><span class="domain"><a href="<TMPL_VAR NAME=domainURI>/"><TMPL_VAR NAME=domain></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
         </tr>
diff --git a/template/list-locals.html b/template/list-locals.html
index cb6f057..40ebeec 100644
--- a/template/list-locals.html
+++ b/template/list-locals.html
@@ -8,12 +8,12 @@
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=url>/">Root</a> / <TMPL_VAR NAME=domain> /
+        <a href="../">Root</a> / <TMPL_VAR NAME=domain> /
       </div>
       <div class="right column">
-        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+        Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+        | <a href="./?a=logout">Log out</a>
       </div>
       <br/>
     </div>
@@ -21,7 +21,7 @@
 
     <div id="content">
     <h1>Manage domain <span class="domain"><TMPL_VAR NAME=domain></span
-        ><TMPL_IF NAME=canEditDomain><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=edit">edit domain</a>]</span></TMPL_IF></h1>
+        ><TMPL_IF NAME=canEditDomain><span class="action">[<a href="./?a=edit">edit domain</a>]</span></TMPL_IF></h1>
 
     <TMPL_IF NAME=description><p class="description"><TMPL_VAR NAME=description></p></TMPL_IF>
 
@@ -36,7 +36,7 @@
 
     <TMPL_IF NAME=listMailboxes>
     <h3>Mailboxes<TMPL_IF NAME=canAddMailbox
-       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&amp;t=mailbox">add</a>]</span
+       ><span class="action">[<a href="./?a=add&amp;t=mailbox">add</a>]</span
        ></TMPL_IF></h3>
 
     <table class="list" id="mailboxes">
@@ -52,7 +52,7 @@
       <tbody>
       <TMPL_LOOP NAME=mailboxes>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><span class="mailbox"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=user>/"><TMPL_VAR NAME=user></a></span></td>
+          <td><span class="mailbox"><a href="<TMPL_VAR NAME=userURI>/"><TMPL_VAR NAME=user></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
           <td><TMPL_UNLESS NAME=forwards><span class="none">(none)</span></TMPL_UNLESS>
@@ -69,7 +69,7 @@
 
     <TMPL_IF NAME=listAliases>
     <h3>Alias<TMPL_IF NAME=canAddAlias
-       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&amp;t=alias">add</a>]</span
+       ><span class="action">[<a href="./?a=add&amp;t=alias">add</a>]</span
        ></TMPL_IF></h3>
 
     <table class="list" id="aliases">
@@ -84,7 +84,7 @@
       <tbody>
       <TMPL_LOOP NAME=aliases>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><span class="alias"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=aliasurl>/"><TMPL_VAR NAME=alias></a></span></td>
+          <td><span class="alias"><a href="<TMPL_VAR NAME=aliasURI>/"><TMPL_VAR NAME=alias></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
           <td><TMPL_UNLESS NAME=destinations><span class="none">(none)</span></TMPL_UNLESS>
@@ -93,7 +93,7 @@
       </TMPL_LOOP>
       <TMPL_IF NAME=catchalls>
         <TMPL_IF NAME=CAodd><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-         <td><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=edit#catch-all">*</a></td>
+         <td><a href="./?a=edit#catch-all">*</a></td>
          <td>Catch-all alias(es) for domain <span class="domain"><TMPL_VAR NAME=domain></span>.</td>
          <td><span class="dunno">&#x2014;</span></td>
          <td><TMPL_LOOP NAME=catchalls><span class="email"><TMPL_VAR NAME=catchall></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
@@ -107,7 +107,7 @@
 
     <TMPL_IF NAME=listLists>
     <h3>Lists<TMPL_IF NAME=canAddList
-       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&amp;t=list">add</a>]</span
+       ><span class="action">[<a href="./?a=add&amp;t=list">add</a>]</span
        ></TMPL_IF></h3>
 
     <table class="list" id="lists">
@@ -122,10 +122,13 @@
       <tbody>
       <TMPL_LOOP NAME=lists>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><span class="list"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=list>/"><TMPL_VAR NAME=list></a></span
-             > <a class="external" target="_blank" href="<TMPL_VAR NAME=listurl>">➠</a></td>
+          <td><span class="list"><TMPL_UNLESS NAME=ispending><a href="./<TMPL_VAR NAME=listURI>/"></TMPL_UNLESS
+             ><TMPL_VAR NAME=list
+             ><TMPL_UNLESS NAME=ispending></a> <a class="external" target="_blank" href="<TMPL_VAR NAME=listURL>">&#x27A0;</a></TMPL_UNLESS></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
-          <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
+          <td><TMPL_IF NAME=ispending><span class="pending">&#x2691;</span>
+              <TMPL_ELSE><TMPL_IF NAME=isactive><span class="active">&#x2714;</span>
+              <TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></TMPL_IF></td>
           <td><TMPL_VAR NAME=transport></td>
         </tr>
       </TMPL_LOOP>
author	Guilhem Moulin <guilhem.moulin@fripost.org>	2012-09-29 02:03:21 +0200
committer	Guilhem Moulin <guilhem.moulin@fripost.org>	2012-09-29 02:03:21 +0200
commit	2bece6abde54881bb074dd44e7f87885eab4a777 (patch)
tree	bde87a2c98476847ab5082facade40062cb52e70 /template
parent	aa3340e58fc5b993bfc88070edf543a2ed82ef94 (diff)