Merge branch 'contrib' into 0.2.1-FINAL

[mailer.git] / templates / de / html / mailid / mailid_timer.tpl

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index 26ea4de4f142845f7e496454f991f3294b58aae6..a98439a55db8fc8dd9acb5a561e8ec1076f573b0 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -14,8 +14,8 @@ function startCounter() {
        timer--;
        document.confirm.counter.value = timer;
        if (timer == 0) {
-               document.location.href = '{%url,js=mailid_top.php?userid=$content[userid]&$content[type]=$content[data]&mode=confirm&code=$content[rand]%}';
                clearInterval(Counter);
+               document.location.href = '{%url,js=mailid.php?userid=$content[userid]&type=$content[type]&id=$content[id]&do=confirm&code={%pipe,getRandomTan%}%}';
        }
 }
 //-->
@@ -26,16 +26,18 @@ function startCounter() {
                <table border="0" cellspacing="0" cellpadding="0" class="form_submit dashed">
                        <tr>
                                <td align="center">
-                               <form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
-                                       {%message,MEMBER_TIME_COUNTER,<input type="text" name="counter" size="$content[tim2]" readonly class="form_field" value="$content[time]" />%}
-                               </form>
+                               {%form,formNameConfirm,formMethodGet%}
+                                       {--MEMBER_TIME_COUNTER_1--}
+                                       <input type="text" class="form_field" name="counter" size="$content[tim2]" readonly="readonly" value="$content[time]" />
+                                       {--MEMBER_TIME_COUNTER_2--}
+                               {%form_close%}
                                </td>
                        </tr>
                </table>
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>