Further fixes for installation phase and endless loop

[mailer.git] / templates / de / html / install / install_page3.tpl

diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl
index 032c220c0451cc5081428424834f5714a699320e..1f3026b9145d2d54371b5a9a4b154e3513bf0f03 100644 (file)
--- a/templates/de/html/install/install_page3.tpl
+++ b/templates/de/html/install/install_page3.tpl
@@ -1,51 +1,51 @@
-<form action="{!__BURL_ACTION--}/install.php?page=5" method="POST" target="_self">
+<form accept-charset="utf-8" action="{?URL?}/install.php?page=5" method="post" target="_self">
 <table border="0" cellspacing="0" cellpadding="0" class="install_table">
        <tr>
                <td colspan="2" align="center">
-                       <div class="install">{--HEADER_TEXT_PAGE3--}</div>
+                       <div class="install_welcome">{--HEADER_TEXT_PAGE3--}</div>
                </td>
        </tr>
        <tr>
                <td colspan="2" height="21" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="2"><span class="install_intro">
+               <td colspan="2"><span class="install_text">
                {--TEXT_PAGE_3--} </span></td>
        </tr>
        <tr>
                <td colspan="2" height="21" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--TEXT_SMTP_HOST--}&nbsp;:&nbsp;</td>
-               <td width="50%">
-                 <input type="text" name="smtp_host" size="25" value="{!__SMTP_HOST--}" class="install_normal">
+               <td width="50%" align="right" class="install_right">{--TEXT_SMTP_HOST--}:</td>
+               <td width="50%" align="left">
+                 <input type="text" name="smtp_host" size="25" value="$content[smtp_host]" class="install_normal" />
                </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--TEXT_SMTP_USER--}&nbsp;:&nbsp;</td>
-               <td width="50%">
-                 <input type="text" name="smtp_user" size="25" value="{!__SMTP_USER--}" class="install_normal">
+               <td width="50%" align="right" class="install_right">{--TEXT_SMTP_USER--}:</td>
+               <td width="50%" align="left">
+                 <input type="text" name="smtp_user" size="25" value="$content[smtp_user]" class="install_normal" />
                </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--TEXT_SMTP_PASS1--}&nbsp;:&nbsp;</td>
-               <td width="50%">
-                 <input type="password" name="smtp_pass1" size="25" value="{!__SMTP_PASS1--}" class="install_normal">
+               <td width="50%" align="right" class="install_right">{--TEXT_SMTP_PASS1--}:</td>
+               <td width="50%" align="left">
+                 <input type="password" name="smtp_pass1" size="25" value="$content[smtp_pass1]" class="install_normal" />
                </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--TEXT_SMTP_PASS2--}&nbsp;:&nbsp;</td>
-               <td width="50%">
-                 <input type="password" name="smtp_pass2" size="25" value="{!__SMTP_PASS2--}" class="install_normal">
+               <td width="50%" align="right" class="install_right">{--TEXT_SMTP_PASS2--}:</td>
+               <td width="50%" align="left">
+                 <input type="password" name="smtp_pass2" size="25" value="$content[smtp_pass2]" class="install_normal" />
                </td>
        </tr>
        <tr>
@@ -53,18 +53,19 @@
        </tr>
        <tr>
                <td colspan="2" align="center">
-                 <input type="hidden" name="spath" value="{!__SPATH_VALUE!}" />
-                 <input type="hidden" name="burl"value="{!__BURL_VALUE!}" />
-                 <input type="hidden" name="title"     value="{!__TITLE_VALUE!}" />
-                 <input type="hidden" name="slogan" value="{!__SLOGAN_VALUE!}" />
-                 <input type="hidden" name="email" value="{!__EMAIL_VALUE!}" />
-          <input type="hidden" name="mysql[host]" value="{!__MYSQL_HOST!}" />
-          <input type="hidden" name="mysql[dbase]" value="{!__MYSQL_DBASE!}" />
-          <input type="hidden" name="mysql[prefix]" value="{!__MYSQL_PREFIX!}" />
-          <input type="hidden" name="mysql[login]" value="{!__MYSQL_LOGIN!}" />
-          <input type="hidden" name="mysql[pass1]" value="{!__MYSQL_PASS1!}" />
-          <input type="hidden" name="mysql[pass2]" value="{!__MYSQL_PASS2!}" />
-                 <input type="submit" class="admin_submit submit" value="{--NEXT_PAGE--}" class="install_submit" />
+                 <input type="hidden" name="spath" value="$content[spath]" />
+                 <input type="hidden" name="burl" value="$content[burl]" />
+                 <input type="hidden" name="title" value="$content[title]" />
+                 <input type="hidden" name="slogan" value="$content[slogan]" />
+                 <input type="hidden" name="email" value="$content[email]" />
+                 <input type="hidden" name="mysql[host]" value="$content[mysql_host]" />
+                 <input type="hidden" name="mysql[dbase]" value="$content[mysql_dbase]" />
+                 <input type="hidden" name="mysql[prefix]" value="$content[mysql_prefix]" />
+                 <input type="hidden" name="mysql[type]" value="$content[table_type]" />
+                 <input type="hidden" name="mysql[login]" value="$content[mysql_login]" />
+                 <input type="hidden" name="mysql[pass1]" value="$content[mysql_pass1]" />
+                 <input type="hidden" name="mysql[pass2]" value="$content[mysql_pass2]" />
+                 <input type="submit" class="admin_submit submit" value="{--NEXT_PAGE--}" />
                </td>
        </tr>
        <tr>