--- cacert/pages/account/16.php	2010-03-21 11:38:14.483665875 +0100
+++ cacert-old/pages/account/16.php	2008-09-03 20:44:17.000000000 +0200
@@ -14,54 +14,13 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Description:
-    This page represents the view of organisation admins when they want to send 
-    and / or create new signing requests.
 */
 	include_once("../includes/shutdown.php");
 ?>
-
-<? 
-/* 
-   Text originating from 3.php - the (personal) Client Certificate requesting page 
-   -> TODO fix translations to lookup for fixed "CAcert Certif*i*cate"  string in translations
-*/
-?>
-<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
-<p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
-
-<p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
-
-<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/policy/">http://www.cacert.org/policy/</a></p>
-
-<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. (TO BE DISCUSSED ->) The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
-
-<?/* Additional (new) text as reminder and very short help for org sysadmins */?>
-<h4><?=_("Reminder for Organisation Administrators")?></h4>
-<p><?=_("Organisation Assurance is still in early stages - as organisation administrator you are the bridge between your Organisation and CAcert. You are also in between CAcert's policies and local data protection acts. The community is trying to solve the issues to make life easier for you - until policies are more precise: Stay informed on your local law and know your rights both at CAcert policy and local data protection act (DPA) level.")?></p>
-
-<p><?=_("Inform yourself on how local DPA may be affecting the way, if you as Org-Admin, or the requesting person have to generate private keys or not - if the later one, you only need a CSR from your requestor. Some may also have a paper reglementing who has to do backups of keypairs. - Ask for that.")?></p>
-
-<h4><?=_("At last")?></h4>
-<p><?=_("Please don't send in a signing request for your organisation if you have doubt's about it's credibility. In case e.g. you are being forced by your organisation to request an abusive certificate or if you have serious doubts - unresolvable with your Organisation: File an arbitration! Your organisation has also signed the Organisation Assurance Policy and has to follow CAcert arbitration as well.")?></p>
-
-<h4><?=_("Method A: Paste a CSR")?></h4>
-<form method="post" action="account.php">
-<input type="radio" name="rootcert" value="1" checked="checked"> <?=_("Sign by class 1 root certificate")?><br>
-<input type="radio" name="rootcert" value="2"> <?=_("Sign by class 3 root certificate")?><br>
-<p><?=_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people")?></p>
-<p><?=_("Paste your CSR below...")?></p>
-<textarea name="CSR" cols="80" rows="15"></textarea><br>
-<input type="submit" name="process" value="<?=_("Submit")?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
-</form>
-
-<h4><?=_("Method B: Let your browser generate the key")?></h4>
 <form method="post" action="account.php">
-<table align="left" valign="left" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("New Organisation Client Certificate")?></td>
+    <td colspan="2" class="title"><?=_("New Client Certificate")?></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Add")?></td>
@@ -87,7 +46,7 @@
   </tr>
   <tr>
     <td class="DataTD" colspan="2" align="left">
-        <input type="radio" name="rootcert" value="1" checked="checked"> <?=_("Sign by class 1 root certificate")?><br>
+        <input type="radio" name="rootcert" value="1" checked> <?=_("Sign by class 1 root certificate")?><br>
         <input type="radio" name="rootcert" value="2"> <?=_("Sign by class 3 root certificate")?><br>
         <?=str_replace("\n", "<br>\n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 60))?>
     </td>