UPD: Factor out PingConfig objects and pingconfig-form.

[gigi.git] / src / org / cacert / gigi / pages / account / DomainAddForm.templ

diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.templ b/src/org/cacert/gigi/pages/account/DomainAddForm.templ
index c60405470cc9e7897afd84b1ca9b9b3d45ae9d9e..9c6de6b51888444173b61219ae34c7ecb7bff1fd 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/DomainAddForm.templ
@@ -9,71 +9,7 @@
     <td><?=_Domain?> </td>
     <td><input type="text" name="newdomain" value=""> (<?=_In the following:?> <span class='exampleDomainPlace'>example.org</span>)</td>
   </tr>
-  <tr><th></th><th><?=_Verification mechanisms?></th></tr>
-
-  <tr>
-    <td><input type="checkbox" name="emailType" value="y"></td>
-    <td><?=_Verify by sending an email to autorative email addresses?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td class='radio'>
-        Select the destination mail address:<br/>
-        <? foreach($authEmails) { ?>
-        <input type="radio" id="email_<?=$i?>" name="email" value="<?=$i?>"/>
-        <label for="email_1"><span class='name'><?=$email?>@<span class='exampleDomain'>example.org</span></span></label><div class='elements'></div>
-        <? } ?>
-       </td>
-  </tr>
-
-  <tr>
-    <td><input type="checkbox" name="DNSType" value="y"></td>
-    <td><?=_Verify by reading DNS-TXT entries?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-        Please insert the following DNS TXT entry into the Zone-file of your domain:<br/>
-        <pre>
-        <?=$tokenName?>._cacert._auth IN TXT <?=$tokenValue?>
-        </pre>
-    </td>
-  </tr>
-
-  <tr>
-    <td><input type="checkbox" name="HTTPType" value="y"></td>
-    <td><?=_Verify by reading HTTP-content?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-        <?=_Please make the following content available under ?><pre class='string'>http://<span class='exampleDomain'>example.org</span>/cacert-<?=$tokenName?>.txt</pre><br/>
-        <pre><?=$tokenValue?></pre>
-    </td>
-  </tr>
-
-  <tr>
-    <td><input type="checkbox" name="SSLType" value="y"></td>
-    <td><?=_Verify by searching for installed certificate.?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-        <?=_Please list up to four services using your certificate. You need to have two of them up and using a valid CAcert certificate in order to pass this test?>:
-        <table>
-        <? foreach($ssl-services){ ?>
-        <tr><td><select name='ssl-type-<?=$i?>'>
-          <option>direct</option>
-          <option>xmpp</option>
-          <option>server-xmpp</option>
-          <option>smtp</option>
-          <option>imap</option></select>
-        </td><td>Port: <input type='text' name='ssl-port-<?=$i?>'></td></tr>
-        <? } ?>
-        </table>
-    </td>
-  </tr>
-
+  <?=$pingconfig?>
   <tr>
     <td colspan="2"><input type="submit" name="adddomain" value="<?=_I own or am authorised to control this domain?>"></td>
   </tr>