Abstracting the LDAP stuff in an OO library.

author: Guilhem Moulin <guilhem.moulin@fripost.org> 2012-09-08 19:49:11 +0200
committer: Guilhem Moulin <guilhem.moulin@fripost.org> 2012-09-08 23:40:50 +0200
commit: 4a0d87e642c4d97ee2a026f1207e25a001518f3a (patch)
tree: b742103cfbce8c7c576766f4db9016f0faa9b629 /template
parent: 0dfeabffccf3695f5f270964aa8ef8e3460ae440 (diff)
12 files changed, 339 insertions, 165 deletions
diff --git a/template/add-alias.html b/template/add-alias.html
index 38193c6..0055012 100644
--- a/template/add-alias.html
+++ b/template/add-alias.html
@@ -2,28 +2,28 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>Edit alias <TMPL_VAR NAME=ALIAS>@<TMPL_VAR NAME=DOMAIN></title>
+    <title>Add alias under <TMPL_VAR NAME=domain></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <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="<TMPL_VAR NAME=url>/">Root</a> /
+        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
-    
-    <h1>Add alias under <tt><TMPL_VAR NAME=DOMAIN></tt></h1>
 
-    <TMPL_IF NAME=ERROR>
-      <div class="fail">Error: <TMPL_VAR NAME=ERROR></div>
+    <h1>Add alias under <tt><TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=error>
+      <div class="fail">Error: <TMPL_VAR NAME=error></div>
     <TMPL_ELSE>
       </br>
     </TMPL_IF>
@@ -33,20 +33,20 @@
     <form class="editform" name="editform" method="post">
       <div class="editform">
         <input type="hidden" name="a" value="add" />
-      <input type="hidden" name="t" value="alias" />
+        <input type="hidden" name="t" value="alias" />
 
       <p>
         <h4 class="label">Alias name</h4>
-        <input type="text" name="alias" size="15" value="<TMPL_VAR NAME=ALIAS>"/>@<TMPL_VAR NAME=DOMAIN>
+        <input type="text" name="alias" size="15" value="<TMPL_VAR NAME=alias>"/>@<TMPL_VAR NAME=domain>
       </p>
 
       <hr/>
 
       <p>
         <h4 class="label">Status</h4>
-        <select name="status">
-          <option value="active" <TMPL_IF NAME=ERROR><TMPL_IF NAME=ISACTIVE>selected</TMPL_IF><TMPL_ELSE>selected</TMPL_IF>>Active</option>
-          <option value="inactive" <TMPL_IF NAME=ERROR><TMPL_UNLESS NAME=ISACTIVE>selected</TMPL_UNLESS></TMPL_IF>>Inactive</option>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
         </select>
         <div class="help">
           <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
@@ -57,7 +57,7 @@
 
       <p>
         <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=DESCRIPTION></textarea>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
         <div class="help">
           An optional description. (HTML tags are allowed.)
         </div>
@@ -67,7 +67,7 @@
 
       <p>
         <h4 class="label">Destination(s)</h4>
-        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=MAILDROP></textarea>
+        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=maildrop></textarea>
         <div class="help">
           The list of destinations (one e-mail address per line) that
           will receive mail for this alias.
@@ -76,7 +76,6 @@
 
       <hr/>
 
-      <input type="hidden" name="destination" value="<TMPL_VAR NAME=DESTINATION>" />
       <input type="submit" name="submit" value="Submit Changes" />
       </div>
     </form>
diff --git a/template/add-list.html b/template/add-list.html
new file mode 100644
index 0000000..e50db3e
--- /dev/null
+++ b/template/add-list.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title>Add list under <TMPL_VAR NAME=domain></title>
+    <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
+  </head>
+  <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> /
+      </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"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+      </div>
+      <br/>
+    </div>
+    <hr/>
+
+    <h1>Add list under <tt><TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=error>
+      <div class="fail">Error: <TMPL_VAR NAME=error></div>
+    <TMPL_ELSE>
+      </br>
+    </TMPL_IF>
+
+    <br/>
+
+    <form class="editform" name="editform" method="post">
+      <div class="editform">
+        <input type="hidden" name="a" value="add" />
+        <input type="hidden" name="t" value="list" />
+
+      <p>
+        <h4 class="label">List name</h4>
+        <input type="text" name="list" size="15" value="<TMPL_VAR NAME=list>"/>@<TMPL_VAR NAME=domain>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Status</h4>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
+        </select>
+        <div class="help">
+          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+        </div>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Description</h4>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
+        <div class="help">
+          An optional description. (HTML tags are allowed.)
+        </div>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Transport</h4>
+        <select name="transport">
+          <option value="mailman" <TMPL_UNLESS NAME=isenc>selected</TMPL_UNLESS>>GNU Mailman</option>
+          <option value="schleuder" <TMPL_IF NAME=isenc>selected</TMPL_IF>>Schleuder</option>
+        </select>
+        <div class="help">
+          The mailing list manager (it is not possible to switch once
+          the list has been created). The two current choices are the
+          well-known <a href="http://list.org/">GNU Mailman</a>, and
+          <a href="http://schleuder2.nadir.org/">Schleuder</a>. The
+          latter offers GPG-enagbled lists (only).
+        </div>
+      </p>
+
+      <hr/>
+
+      <input type="submit" name="submit" value="Submit Changes" />
+      </div>
+    </form>
+  </body>
+</html>
diff --git a/template/add-mailbox.html b/template/add-mailbox.html
new file mode 100644
index 0000000..fd7e521
--- /dev/null
+++ b/template/add-mailbox.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title>Add mailbox under <TMPL_VAR NAME=domain></title>
+    <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
+  </head>
+  <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> /
+      </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"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
+      </div>
+      <br/>
+    </div>
+    <hr/>
+
+    <h1>Add mailbox under <tt><TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=error>
+      <div class="fail">Error: <TMPL_VAR NAME=error></div>
+    <TMPL_ELSE>
+      </br>
+    </TMPL_IF>
+
+    <br/>
+
+    <form class="editform" name="editform" method="post">
+      <div class="editform">
+      <input type="hidden" name="a" value="add" />
+      <input type="hidden" name="t" value="mailbox" />
+
+      <p>
+        <h4 class="label">User name</h4>
+        <input type="text" name="user" size="15" value="<TMPL_VAR NAME=user>"/>@<TMPL_VAR NAME=domain>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Status</h4>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
+        </select>
+        <div class="help">
+          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+        </div>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Password</h4>
+
+        <table class="loginform">
+          <tr>
+            <td class="label">Password</td>
+            <td><input type="password" name="password" size="20" /></td>
+          </tr>
+          <tr>
+            <td class="label">Repeat password</td>
+            <td><input type="password" name="password2" size="20" /></td>
+          </tr>
+        </table>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Description</h4>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
+        <div class="help">
+          An optional description. (HTML tags are allowed.)
+        </div>
+      </p>
+
+      <hr/>
+
+      <p>
+        <h4 class="label">Mail forwarding</h4>
+        <textarea type="text" name="forwards" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=forwards></textarea>
+        <div class="help">
+          An optional list of destinations (one e-mail address per line) that
+          will <i>also</i> receive mail delivered to this mailbox.
+        </div>
+      </p>
+
+      <hr/>
+
+      <input type="submit" name="submit" value="Submit Changes" />
+      </div>
+    </form>
+  </body>
+</html>
diff --git a/template/edit-alias.html b/template/edit-alias.html
index 7ff19c8..4390652 100644
--- a/template/edit-alias.html
+++ b/template/edit-alias.html
@@ -2,30 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>Edit alias <TMPL_VAR NAME=ALIAS>@<TMPL_VAR NAME=DOMAIN></title>
+    <title>Edit alias <TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <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> /
-        <TMPL_VAR NAME=ALIAS> /
+        <a href="<TMPL_VAR NAME=url>/">Root</a> /
+        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
-    
-    <h1>Edit alias <tt><TMPL_VAR NAME=ALIAS>@<TMPL_VAR NAME=DOMAIN></tt></h1>
 
-    <TMPL_IF NAME=NEWCHANGES>
-      <TMPL_IF NAME=ERROR>
-        <div class="fail">Error: <TMPL_VAR NAME=ERROR></div>
+    <h1>Edit alias <tt><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=newChanges>
+      <TMPL_IF NAME=error>
+        <div class="fail">Error: <TMPL_VAR NAME=error></div>
       <TMPL_ELSE>
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
@@ -43,9 +43,9 @@
       <p>
         <a name="status"></a>
         <h4 class="label">Status</h4>
-        <select name="status">
-          <option value="active" <TMPL_IF NAME=ISACTIVE>selected</TMPL_IF>>Active</option>
-          <option value="inactive" <TMPL_UNLESS NAME=ISACTIVE>selected</TMPL_UNLESS>>Inactive</option>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
         </select>
         <div class="help">
           <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
@@ -57,7 +57,7 @@
       <p>
         <a name="description"></a>
         <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=DESCRIPTION></textarea>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
         <div class="help">
           An optional description. (HTML tags are allowed.)
         </div>
@@ -68,17 +68,16 @@
       <p>
         <a name="destination"></a>
         <h4 class="label">Destination(s)</h4>
-        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=MAILDROP></textarea>
+        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=maildrop></textarea>
         <div class="help">
           The list of destinations (one e-mail address per line) that
           will receive mail sent to
-          <tt><TMPL_VAR NAME=ALIAS>@<TMPL_VAR NAME=DOMAIN><tt>.
+          <tt><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain><tt>.
         </div>
       </p>
 
       <hr/>
 
-      <input type="hidden" name="destination" value="<TMPL_VAR NAME=DESTINATION>" />
       <input type="submit" name="submit" value="Submit Changes" />
       </div>
     </form>
diff --git a/template/edit-domain.html b/template/edit-domain.html
index 3b66087..7e8ba2c 100644
--- a/template/edit-domain.html
+++ b/template/edit-domain.html
@@ -2,29 +2,29 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>Edit domain <TMPL_VAR NAME=DOMAIN></title>
+    <title>Edit domain <TMPL_VAR NAME=domain></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <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="<TMPL_VAR NAME=url>/">Root</a> /
+        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
-    
-    <h1>Edit domain <tt><TMPL_VAR NAME=DOMAIN></tt></h1>
 
-    <TMPL_IF NAME=NEWCHANGES>
-      <TMPL_IF NAME=ERROR>
-        <div class="fail">Error: <TMPL_VAR NAME=ERROR></div>
+    <h1>Edit domain <tt><TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=newChanges>
+      <TMPL_IF NAME=error>
+        <div class="fail">Error: <TMPL_VAR NAME=error></div>
       <TMPL_ELSE>
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
@@ -41,9 +41,9 @@
       <p>
         <a name="status"></a>
         <h4 class="label">Status</h4>
-        <select name="status">
-          <option value="active" <TMPL_IF NAME=ISACTIVE>selected</TMPL_IF>>Active</option>
-          <option value="inactive" <TMPL_UNLESS NAME=ISACTIVE>selected</TMPL_UNLESS>>Inactive</option>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
         </select>
         <div class="help">
           <b>Warning</b>: emails are <i>not</i> delivered to mailboxes,
@@ -56,7 +56,7 @@
       <p>
         <a name="description"></a>
         <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=DESCRIPTION></textarea>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
         <div class="help">
           An optional description. (HTML tags are allowed.)
         </div>
@@ -67,20 +67,19 @@
       <p>
         <a name="catch-all"></a>
         <h4 class="label">Catch-All aliases</h4>
-        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=MAILDROP></textarea>
+        <textarea type="text" name="catchalls" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=catchalls></textarea>
         <div class="help">
           An optional list of destinations (one e-mail address per line) that
           will receive mail sent to <i>non existing</i> recipients.
           Domain aliases can be defined by leaving the local part of
           the destination empty, like in <tt>@example.org</tt>: email
-          to <tt>inexisting@<TMPL_VAR NAME=DOMAIN></tt>
+          to <tt>inexisting@<TMPL_VAR NAME=domain></tt>
           will then be sent to <tt>inexisting@example.org</tt>.
         </div>
       </p>
 
       <hr/>
 
-      <input type="hidden" name="destination" value="<TMPL_VAR NAME=DESTINATION>" />
       <input type="submit" name="submit" value="Submit Changes" />
       </div>
     </form>
diff --git a/template/edit-list.html b/template/edit-list.html
index 6118dd0..d07f9da 100644
--- a/template/edit-list.html
+++ b/template/edit-list.html
@@ -2,30 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>Edit mailbox <TMPL_VAR NAME=MAILBOX>@<TMPL_VAR NAME=DOMAIN></title>
+    <title>Edit list <TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <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> /
-        <TMPL_VAR NAME=LIST> /
+        <a href="<TMPL_VAR NAME=url>/">Root</a> /
+        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
-    
-    <h1>Edit list <tt><TMPL_VAR NAME=LIST>@<TMPL_VAR NAME=DOMAIN></tt></h1>
 
-    <TMPL_IF NAME=NEWCHANGES>
-      <TMPL_IF NAME=ERROR>
-        <div class="error"><TMPL_VAR NAME=ERROR></div>
+    <h1>Edit list <tt><TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=newChanges>
+      <TMPL_IF NAME=error>
+        <div class="error"><TMPL_VAR NAME=error></div>
       <TMPL_ELSE>
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
@@ -43,9 +43,9 @@
       <p>
         <a name="status"></a>
         <h4 class="label">Status</h4>
-        <select name="status">
-          <option value="active" <TMPL_IF NAME=ISACTIVE>selected</TMPL_IF>>Active</option>
-          <option value="inactive" <TMPL_UNLESS NAME=ISACTIVE>selected</TMPL_UNLESS>>Inactive</option>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
         </select>
         <div class="help">
           <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
@@ -57,7 +57,7 @@
       <p>
         <a name="description"></a>
         <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=DESCRIPTION></textarea>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
         <div class="help">
           An optional description. (HTML tags are allowed.)
         </div>
@@ -65,7 +65,6 @@
 
       <hr/>
 
-      <input type="hidden" name="destination" value="<TMPL_VAR NAME=DESTINATION>" />
       <input type="submit" name="submit" value="Submit Changes" />
       </div>
     </form>
diff --git a/template/edit-mailbox.html b/template/edit-mailbox.html
index 69b91ab..3dce6e7 100644
--- a/template/edit-mailbox.html
+++ b/template/edit-mailbox.html
@@ -2,30 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>Edit mailbox <TMPL_VAR NAME=MAILBOX>@<TMPL_VAR NAME=DOMAIN></title>
+    <title>Edit mailbox <TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <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> /
-        <TMPL_VAR NAME=MAILBOX> /
+        <a href="<TMPL_VAR NAME=url>/">Root</a> /
+        <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
-    
-    <h1>Edit mailbox <tt><TMPL_VAR NAME=MAILBOX>@<TMPL_VAR NAME=DOMAIN></tt></h1>
 
-    <TMPL_IF NAME=NEWCHANGES>
-      <TMPL_IF NAME=ERROR>
-        <div class="fail">Error: <TMPL_VAR NAME=ERROR></div>
+    <h1>Edit mailbox <tt><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></tt></h1>
+
+    <TMPL_IF NAME=newChanges>
+      <TMPL_IF NAME=error>
+        <div class="fail">Error: <TMPL_VAR NAME=error></div>
       <TMPL_ELSE>
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
@@ -43,9 +43,9 @@
       <p>
         <a name="status"></a>
         <h4 class="label">Status</h4>
-        <select name="status">
-          <option value="active" <TMPL_IF NAME=ISACTIVE>selected</TMPL_IF>>Active</option>
-          <option value="inactive" <TMPL_UNLESS NAME=ISACTIVE>selected</TMPL_UNLESS>>Inactive</option>
+        <select name="isactive">
+          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
+          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
         </select>
         <div class="help">
           <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
@@ -57,26 +57,26 @@
       <p>
         <a name="password"></a>
         <h4 class="label">Change password</h4>
-        
+
         <table class="loginform">
           <tr>
             <td class="label">Current password</td>
-            <td><input type="password" name="oldpassword" size="20" /></td>
+            <td><input type="password" name="oldpw" size="20" /></td>
           </tr>
           <tr>
             <td class="label">New password</td>
-            <td><input type="password" name="newpassword" size="20" /></td>
+            <td><input type="password" name="newpw" size="20" /></td>
           </tr>
           <tr>
             <td class="label">Repeat new password</td>
-            <td><input type="password" name="newpassword2" size="20" /></td>
+            <td><input type="password" name="newpw2" size="20" /></td>
           </tr>
         </table>
 
         <div class="help">
           <i>Note</i>:
           You need to enter
-          <tt><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></tt>'s
+          <tt><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></tt>'s
           current password first.
         </div>
       </p>
@@ -86,7 +86,7 @@
       <p>
         <a name="description"></a>
         <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=DESCRIPTION></textarea>
+        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
         <div class="help">
           An optional description. (HTML tags are allowed.)
         </div>
@@ -97,17 +97,16 @@
       <p>
         <a name="forward"></a>
         <h4 class="label">Mail forwarding</h4>
-        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=MAILDROP></textarea>
+        <textarea type="text" name="forwards" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=forwards></textarea>
         <div class="help">
           An optional list of destinations (one e-mail address per line) that
-          will <i>also</i> receive mail sent to
-          <tt><TMPL_VAR NAME=MAILBOX>@<TMPL_VAR NAME=DOMAIN><tt>.
+          will <i>also</i> receive mail delivered to
+          <tt><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain><tt>.
         </div>
       </p>
 
       <hr/>
 
-      <input type="hidden" name="destination" value="<TMPL_VAR NAME=DESTINATION>" />
       <input type="submit" name="submit" value="Submit Changes" />
       </div>
     </form>
diff --git a/template/error.html b/template/error.html
index b7f8930..5c1d0f1 100644
--- a/template/error.html
+++ b/template/error.html
@@ -6,16 +6,16 @@
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <body>
-    <TMPL_IF NAME=MESSAGE><p class="error"><b><TMPL_VAR NAME=MESSAGE></b></p></TMPL_IF>
+    <TMPL_IF NAME=message><p class="error"><b><TMPL_VAR NAME=message></b></p></TMPL_IF>
 
     <p>
-      <TMPL_IF NAME=EMAIL>
+      <TMPL_IF NAME=email>
         If you think it is a bug, please report it to
-        <a href="mailto:<TMPL_VAR NAME=EMAIL>"><TMPL_VAR NAME=EMAIL></a>.
+        <a href="mailto:<TMPL_VAR NAME=email>"><TMPL_VAR NAME=email></a>.
       </TMPL_IF>
     </p>
-  
+
     <hr/>
-    <TMPL_IF NAME=URL><p><a href="<TMPL_VAR NAME=URL>">Back</a></p></TMPL_IF>
+    <TMPL_IF NAME=url><p><a href="<TMPL_VAR NAME=url>">Back</a></p></TMPL_IF>
   </body>
 </html>
diff --git a/template/error_http.html b/template/error_http.html
index 34d444b..7cf4f50 100644
--- a/template/error_http.html
+++ b/template/error_http.html
@@ -2,10 +2,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title><TMPL_IF NAME=MESSAGE><TMPL_VAR NAME=MESSAGE><TMPL_ELSE>Error</TMPL_IF></title>
+    <title><TMPL_IF NAME=message><TMPL_VAR NAME=message><TMPL_ELSE>Error</TMPL_IF></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <body>
-    <h1><TMPL_VAR NAME=CODE> <TMPL_VAR NAME=MESSAGE></h1>
+    <h1><TMPL_VAR NAME=code> <TMPL_VAR NAME=message></h1>
   </body>
 </html>
diff --git a/template/list-domains.html b/template/list-domains.html
index bb29de5..561f788 100644
--- a/template/list-domains.html
+++ b/template/list-domains.html
@@ -11,33 +11,31 @@
         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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
 
-    <h1>Manage domains<span class="add">[<a href="<TMPL_VAR NAME=URL>/?a=add">add</a>]<span></h1>
+    <h1>Manage domains<span class="add">[<a href="<TMPL_VAR NAME=url>/?a=add">add</a>]<span></h1>
 
     <a name="domains"></a>
     <table class="list">
       <thead>
         <tr class="odd">
           <th>Domain</th>
-          <th>Permissions</th>
           <th>Description</th>
           <th>Active</th>
         </tr>
       </thead>
       <tbody>
-      <TMPL_LOOP NAME=DOMAINS>
+      <TMPL_LOOP NAME=domains>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/"><TMPL_VAR NAME=DOMAIN></a></tt></td>
-          <td><TMPL_IF NAME=PERMS><TMPL_VAR NAME=PERMS><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></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><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a></tt></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>
       </TMPL_LOOP>
       </tbody>
diff --git a/template/list-locals.html b/template/list-locals.html
index b0aa2e4..76c2951 100644
--- a/template/list-locals.html
+++ b/template/list-locals.html
@@ -2,34 +2,34 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>Manage domain <TMPL_VAR NAME=DOMAIN></title>
+    <title>Manage domain <TMPL_VAR NAME=domain></title>
     <link href="/css/style.css" media="all" rel="stylesheet" type="text/css" />
   </head>
   <body>
     <div id="header">
       <div class="left column">
-        <a href="<TMPL_VAR NAME=URL>/">Root</a> / <TMPL_VAR NAME=DOMAIN> /
+        <a href="<TMPL_VAR NAME=url>/">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"
-                  ><TMPL_VAR NAME=USER_LOCALPART>@<TMPL_VAR NAME=USER_DOMAINPART></a>
-        | <a href="<TMPL_VAR NAME=URL>/?a=logout">Log out</a>
+        Logged as <a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=user_domainpart>/<TMPL_VAR NAME=user_localpart>/?a=edit"
+                  ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
+        | <a href="<TMPL_VAR NAME=url>/?a=logout">Log out</a>
       </div>
       <br/>
     </div>
     <hr/>
 
-    <h1>Manage domain <tt><TMPL_VAR NAME=DOMAIN></tt
-        ><TMPL_IF NAME=CANEDIT><span class="edit">[<a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/?a=edit">edit domain</a>]<span></TMPL_IF></h1>
+    <h1>Manage domain <tt><TMPL_VAR NAME=domain></tt
+        ><TMPL_IF NAME=canEditDomain><span class="edit">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=edit">edit domain</a>]<span></TMPL_IF></h1>
 
-    <TMPL_IF NAME=DESCRIPTION><p class="description"><TMPL_VAR NAME=DESCRIPTION></p></TMPL_IF>
+    <TMPL_IF NAME=description><p class="description"><TMPL_VAR NAME=description></p></TMPL_IF>
 
-    <p>Domain status: <b><TMPL_IF NAME=ISACTIVE><span class="active">Active</span><TMPL_ELSE><span class="inactive">Inactive</span></TMPL_IF></b><p>
+    <p>Domain status: <b><TMPL_IF NAME=isactive><span class="active">Active</span><TMPL_ELSE><span class="inactive">Inactive</span></TMPL_IF></b><p>
 
 
-    <TMPL_IF NAME=LISTMAILBOXES>
-    <h3>Mailboxes<TMPL_IF NAME=CANADDMAILBOX
-       ><span class="add">[<a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/?a=add&t=mailbox">add</a>]</span
+    <TMPL_IF NAME=listMailboxes>
+    <h3>Mailboxes<TMPL_IF NAME=canAddMailbox
+       ><span class="add">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&t=mailbox">add</a>]</span
        ></TMPL_IF></h3>
 
     <a name="mailboxes"></a>
@@ -44,15 +44,15 @@
         </tr>
       </thead>
       <tbody>
-      <TMPL_LOOP NAME=MAILBOXES>
+      <TMPL_LOOP NAME=mailboxes>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/<TMPL_VAR NAME=USER>/"><TMPL_VAR NAME=USER></a></tt></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>
-              <TMPL_LOOP NAME=FORWARDS><tt><TMPL_VAR NAME=FORWARD></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=user>/"><TMPL_VAR NAME=user></a></tt></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>
+              <TMPL_LOOP NAME=forwards><tt><TMPL_VAR NAME=forward></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
 
-          <td><TMPL_IF NAME=QUOTA><TMPL_VAR NAME=QUOTA><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
+          <td><TMPL_IF NAME=quota><TMPL_VAR NAME=quota><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
         </tr>
       </TMPL_LOOP>
       </tbody>
@@ -62,9 +62,9 @@
 
     <br/>
 
-    <TMPL_IF NAME=LISTALIASES>
-    <h3>Alias<TMPL_IF NAME=CANADDALIAS
-       ><span class="add">[<a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/?a=add&t=alias">add</a>]</span
+    <TMPL_IF NAME=listAliases>
+    <h3>Alias<TMPL_IF NAME=canAddAlias
+       ><span class="add">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&t=alias">add</a>]</span
        ></TMPL_IF></h3>
 
     <a name="aliases"></a>
@@ -74,30 +74,25 @@
           <th>Alias</th>
           <th>Description</th>
           <th>Active</th>
-          <th>Owner(s)</th>
           <th>Destination(s)</th>
         </tr>
       </thead>
       <tbody>
-      <TMPL_LOOP NAME=ALIASES>
+      <TMPL_LOOP NAME=aliases>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/<TMPL_VAR NAME=ALIAS>/"><TMPL_VAR NAME=ALIAS></a></tt></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=OWNERS><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=OWNERS><tt><TMPL_VAR NAME=OWNER></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
-          <td><TMPL_UNLESS NAME=DESTINATIONS><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=DESTINATIONS><tt><TMPL_VAR NAME=DESTINATION></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=alias>/"><TMPL_VAR NAME=alias></a></tt></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>
+              <TMPL_LOOP NAME=destinations><tt><TMPL_VAR NAME=destination></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
         </tr>
       </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>Catch-all alias(es) for domain <tt><TMPL_VAR NAME=DOMAIN></tt>.</td>
+      <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>Catch-all alias(es) for domain <tt><TMPL_VAR NAME=domain></tt>.</td>
          <td><span class="dunno">&#x2014;</span></td>
-         <td><TMPL_UNLESS NAME=OWNERS><span class="none">(none)</span></TMPL_UNLESS>
-             <TMPL_LOOP NAME=OWNERS><tt><TMPL_VAR NAME=OWNER></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
-         <td><TMPL_LOOP NAME=CATCHALLS><tt><TMPL_VAR NAME=CATCHALL></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+         <td><TMPL_LOOP NAME=catchalls><tt><TMPL_VAR NAME=catchall></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
         <tr>
       </TMPL_IF>
       </tbody>
@@ -107,9 +102,9 @@
 
     <br/>
 
-    <TMPL_IF NAME=LISTLISTS>
-    <h3>Lists<TMPL_IF NAME=CANADDLIST
-       ><span class="add">[<a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/?a=add&t=list">add</a>]</span
+    <TMPL_IF NAME=listLists>
+    <h3>Lists<TMPL_IF NAME=canAddList
+       ><span class="add">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&t=list">add</a>]</span
        ></TMPL_IF></h3>
 
     <a name="lists"></a>
@@ -119,19 +114,16 @@
           <th>List</th>
           <th>Description</th>
           <th>Active</th>
-          <th>Owner(s)</th>
           <th>Tranport</th>
         </tr>
       </thead>
       <tbody>
-      <TMPL_LOOP NAME=LISTS>
+      <TMPL_LOOP NAME=lists>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=URL>/<TMPL_VAR NAME=DOMAIN>/<TMPL_VAR NAME=LIST>/"><TMPL_VAR NAME=LIST></a></tt></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=OWNERS><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=OWNERS><tt><TMPL_VAR NAME=OWNER></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
-          <td><TMPL_VAR NAME=TRANSPORT></td>
+          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=list>/"><TMPL_VAR NAME=list></a></tt></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_VAR NAME=transport></td>
         </tr>
       </TMPL_LOOP>
       </tbody>
diff --git a/template/login.html b/template/login.html
index 293f20f..766dd7d 100644
--- a/template/login.html
+++ b/template/login.html
@@ -30,11 +30,11 @@
           </tr>
         </table>
         <div>
-          <input type="hidden" name="destination" value="<TMPL_VAR NAME=DESTINATION>" />
+          <input type="hidden" name="destination" value="<TMPL_VAR NAME=destination>" />
           <input type="submit" name="login" value="Log in" />
         </div>
       </form>
-      <TMPL_IF NAME=ERROR><p class="error">Invalid username or password.</p></TMPL_IF>
+      <TMPL_IF NAME=error><p class="error">Invalid username or password.</p></TMPL_IF>
     </div>
   </body>
 </html>
author	Guilhem Moulin <guilhem.moulin@fripost.org>	2012-09-08 19:49:11 +0200
committer	Guilhem Moulin <guilhem.moulin@fripost.org>	2012-09-08 23:40:50 +0200
commit	4a0d87e642c4d97ee2a026f1207e25a001518f3a (patch)
tree	b742103cfbce8c7c576766f4db9016f0faa9b629 /template
parent	0dfeabffccf3695f5f270964aa8ef8e3460ae440 (diff)