diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/advertising.php | 6 | ||||
| -rw-r--r-- | www/cats/cats_import.php | 4 | ||||
| -rw-r--r-- | www/policy/CertificationPracticeStatement.php | 72 | ||||
| -rw-r--r-- | www/wot.php | 9 |
4 files changed, 47 insertions, 44 deletions
diff --git a/www/advertising.php b/www/advertising.php index e987461..43e4f93 100644 --- a/www/advertising.php +++ b/www/advertising.php @@ -47,7 +47,7 @@ if($months < 1 || $months > 12) { $id = 1; - $errmsg .= _("You can only place an advertisement for up to 12 months.<br />"); + $errmsg .= _("You can only place an advertisement for up to 12 months.")."<br />"; $process=""; $oldid=0; } @@ -55,7 +55,7 @@ if(strlen($title) <= 5) { $id = 1; - $errmsg .= _("Link title was too short.<br />"); + $errmsg .= _("Link title was too short.")."<br />"; $process=""; $oldid=0; } @@ -63,7 +63,7 @@ if(strlen($link) <= 10) { $id = 1; - $errmsg .= _("Link URI was too short.<br />"); + $errmsg .= _("Link URI was too short.")."<br />"; $process=""; $oldid=0; } diff --git a/www/cats/cats_import.php b/www/cats/cats_import.php index 56dd0cf..feb92d4 100644 --- a/www/cats/cats_import.php +++ b/www/cats/cats_import.php @@ -31,8 +31,8 @@ function sanitize_string($buffer) { } define ('UNDEFINED', 'nd'); -define ('ALLOWED_IP', '213.154.225.228'); -define ('ALLOWED_IP2', '193.238.157.112'); +define ('ALLOWED_IP', '213.154.225.243'); +define ('ALLOWED_IP2', '172.16.2.27'); define ('CONFIG_FILEPATH', '/www/'); $remote_addr = (isset($_SERVER['REMOTE_ADDR']))?$_SERVER['REMOTE_ADDR']:UNDEFINED; diff --git a/www/policy/CertificationPracticeStatement.php b/www/policy/CertificationPracticeStatement.php index e17056b..b18273c 100644 --- a/www/policy/CertificationPracticeStatement.php +++ b/www/policy/CertificationPracticeStatement.php @@ -69,7 +69,7 @@ a:hover { <a href="PolicyOnPolicy.html"><img src="cacert-draft.png" alt="CAcert Policy Status" height="31" width="88" style="border-style: none;" /></a><br /> Creation date: 20060726<br /> Status: DRAFT p20091108<br /> -<!-- $Id: CertificationPracticeStatement.php,v 1.2 2011-07-27 10:41:01 wytze Exp $ --> +<!-- $Id: CertificationPracticeStatement.php,v 1.3 2012-07-27 16:00:29 wytze Exp $ --> <font size="-1"> @@ -3203,54 +3203,50 @@ The form of the PGP signatures depends on several factors, therefore no stipulat <h4><a name="p7.1.2" id="p7.1.2">7.1.2. Certificate extensions</a></h4> <p> -Client certificates include the following extensions:. + Client certificates include the following extensions: </p> -<ul><li> - basicConstraints=CA:FALSE (critical) - </li><li> - keyUsage=digitalSignature,keyEncipherment,cRLSign - </li><li> - </li><li> - extendedKeyUsage=emailProtection,clientAuth,serverAuth,msEFS,msSGC,nsSGC - </li><li> - authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org - </li><li> - subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>). -</li></ul> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=emailProtection,clientAuth,msEFS,msSGC,nsSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> <ul class="q"> <li> what about Client Certificates Adobe Signing extensions ?</li> <li> SubjectAltName should become critical if DN is removed http://tools.ietf.org/html/rfc5280#section-4.2.1.6</li> </ul> - <p> -Server certificates include the following extensions: + Server certificates include the following extensions: </p> -<ul><li> - basicConstraints=CA:FALSE (critical) - </li><li> - keyUsage=digitalSignature,keyEncipherment - </li><li> - extendedKeyUsage=clientAuth,serverAuth,nsSGC,msSGC - </li><li> - authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org - </li><li> - subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>). -</li></ul> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=clientAuth,serverAuth,nsSGC,msSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> <p> -Code-Signing certificates include the following extensions: + Code-Signing certificates include the following extensions: </p> - -<ul><li> - basicConstraints=CA:FALSE (critical) - </li><li> - keyUsage=digitalSignature,keyEncipherment - </li><li> - extendedKeyUsage=emailProtection,clientAuth,codeSigning,msCodeInd,msCodeCom,msEFS,msSGC,nsSGC - </li><li> - authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org -</li></ul> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=emailProtection,clientAuth,codeSigning,msCodeInd,msCodeCom,msEFS,msSGC,nsSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> <ul class="q"> <li> what about subjectAltName for Code-signing</li> </ul> diff --git a/www/wot.php b/www/wot.php index 66bf7cb..bf5d301 100644 --- a/www/wot.php +++ b/www/wot.php @@ -444,7 +444,14 @@ $iecho= "c"; { sendmail($user['email'], "[CAcert.org] ".$_REQUEST['subject'], $_REQUEST['message'], $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']); - show_page("ContactAssurer",_("Your email has been sent to")." ".$user['fname'].".<br />[ <a href='javascript:history.go(-2)'>"._("Go Back")."</a> ]",""); + + showheader(_("My CAcert.org Account!"));?> + <p> + <? printf(_("Your email has been sent to %s."), $user['fname']); ?> + </p> + <p>[ <a href='javascript:history.go(-2)'><?= _("Go Back") ?></a> ]</p> + <? + showfooter(); exit; } else { show_page(0,"",_("Sorry, I was unable to locate that user.")); |