bug fixes

pull/1/head
root 20 years ago
parent 8d4529807b
commit 29117b165d

@ -265,7 +265,7 @@
if(is_array($addys))
foreach($addys as $addy)
mysql_query("insert into `emaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
$CSRname = $_SESSION['_config']['filepath']."/csr/email-$emailid.csr";
$CSRname = $_SESSION['_config']['filepath']."/csr/client-$emailid.csr";
$fp = fopen($CSRname, "w");
fputs($fp, $emails);
fclose($fp);
@ -327,7 +327,7 @@
if(is_array($addys))
foreach($addys as $addy)
mysql_query("insert into `emaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
$CSRname = $_SESSION['_config']['filepath']."/csr/email-$emailid.csr";
$CSRname = $_SESSION['_config']['filepath']."/csr/client-$emailid.csr";
$fp = fopen($CSRname, "w");
fputs($fp, $csr);
fclose($fp);
@ -535,7 +535,7 @@
foreach($_SESSION['_config']['altid'] as $dom)
mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='$dom'");
$CSRname = $_SESSION['_config']['filepath']."/csr/$CSRid.csr";
$CSRname = $_SESSION['_config']['filepath']."/csr/server-$CSRid.csr";
$fp = fopen($CSRname, "w");
fputs($fp, $_SESSION['_config']['CSR']);
fclose($fp);
@ -586,7 +586,7 @@
`modified`=NOW()";
mysql_query($query);
$newid = mysql_insert_id();
$newfile = $_SESSION['_config']['filepath']."/csr/$newid.csr";
$newfile = $_SESSION['_config']['filepath']."/csr/server-$newid.csr";
copy($row['csr_name'], $newfile);
mysql_query("update `domaincerts` set `csr_name`='$newfile' where `id`='$newid'");
echo _("Renewing").": ".$row['CN']."<br>\n";
@ -699,7 +699,7 @@
`created`='".$row['created']."', `modified`=NOW()";
mysql_query($query);
$newid = mysql_insert_id();
$newfile = $_SESSION['_config']['filepath']."/csr/email-$newid.csr";
$newfile = $_SESSION['_config']['filepath']."/csr/client-$newid.csr";
copy($row['csr_name'], $newfile);
mysql_query("update `emailcerts` set `csr_name`='$newfile' where `id`='$newid'");
$res = mysql_query("select * from `emaillink` where `emailcertsid`='".$row['id']."'");
@ -946,7 +946,7 @@
$org = $_SESSION['_config']['row'];
if($_POST['keytype'] == "NS")
{
if($_POST['SPKAC'] == "" || $_POST['SPKAC'] == "deadbeef")
if($_POST['SPKAC'] == "" || strlen($_POST['SPKAC']) < 512)
{
$id = 17;
showheader(_("My CAcert.org Account!"));
@ -989,7 +989,7 @@
foreach($_SESSION['_config']['domids'] as $addy)
mysql_query("insert into `domemaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
$CSRname = $_SESSION['_config']['filepath']."/csr/orgemail-$emailid.csr";
$CSRname = $_SESSION['_config']['filepath']."/csr/orgclient-$emailid.csr";
$fp = fopen($CSRname, "w");
fputs($fp, $emails);
fclose($fp);
@ -1051,7 +1051,7 @@
foreach($_SESSION['_config']['domids'] as $addy)
mysql_query("insert into `domemaillink` set `emailcertsid`='$emailid', `emailid`='$addy'");
$CSRname = $_SESSION['_config']['filepath']."/csr/orgemail-$emailid.csr";
$CSRname = $_SESSION['_config']['filepath']."/csr/orgclient-$emailid.csr";
$fp = fopen($CSRname, "w");
fputs($fp, $csr);
fclose($fp);
@ -1102,7 +1102,7 @@
`created`='".$row['created']."', `modified`=NOW(), `subject`='".$row['subject']."'";
mysql_query($query);
$newid = mysql_insert_id();
$newfile = $_SESSION['_config']['filepath']."/csr/orgemail-$newid.csr";
$newfile = $_SESSION['_config']['filepath']."/csr/orgclient-$newid.csr";
copy($row['csr_name'], $newfile);
mysql_query("update `orgemailcerts` set `csr_name`='$newfile' where `id`='$newid'");
$do = `../scripts/runclient`;
@ -1229,11 +1229,10 @@
exit;
}
$query = "select * from `orginfo`,`org`,`orgdomains` where
`org`.`memid`='".$_SESSION['profile']['id']."' and
`orgdomains`.`orgid`=`orginfo`.`id` and
`org`.`orgid`=`orginfo`.`id` and
`orgdomains`.`domain`='".$_SESSION['_config']["0.CN"]."'";
$query = "select * from `org`,`orginfo` where
`orginfo`.`id`='".$_SESSION['_config']['rowid']['0']."' and
`orginfo`.`id`=`org`.`orgid` and
`org`.`memid`='".$_SESSION['profile']['id']."'";
$org = mysql_fetch_assoc(mysql_query($query));
if($org['OU'])
@ -1261,7 +1260,7 @@
`created`=NOW(), `subject`='$csrsubject'";
mysql_query($query);
$CSRid = mysql_insert_id();
$CSRname = $_SESSION['_config']['filepath']."/csr/org$CSRid.csr";
$CSRname = $_SESSION['_config']['filepath']."/csr/orgserver-$CSRid.csr";
$fp = fopen($CSRname, "w");
fputs($fp, $_SESSION['_config']['CSR']);
fclose($fp);
@ -1317,7 +1316,7 @@
`modified`=NOW(), `subject`='".$row['subject']."'";
mysql_query($query);
$newid = mysql_insert_id();
$newfile = $_SESSION['_config']['filepath']."/csr/$newid.csr";
$newfile = $_SESSION['_config']['filepath']."/csr/orgserver-$newid.csr";
copy($row['csr_name'], $newfile);
mysql_query("update `orgdomaincerts` set `csr_name`='$newfile' where `id`='$newid'");
echo _("Renewing").": ".$row['CN']."<br>\n";

@ -349,7 +349,7 @@
else
$dom = $bits[$i];
$_SESSION['_config']['row'] = "";
$query = "select * from `orginfo`,`orgdomains`,`org` where
$query = "select *, `orginfo`.`id` as `id` from `orginfo`,`orgdomains`,`org` where
`org`.`memid`='".$_SESSION['profile']['id']."' and
`org`.`orgid`=`orginfo`.`id` and
`orgdomains`.`orgid`=`orginfo`.`id` and

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CAcert\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-28 12:03+1000\n"
"POT-Creation-Date: 2004-10-29 11:01+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: www/account/43.php:57
#: www/account/43.php:59
#, php-format
msgid "%s's Account Details"
msgstr ""
@ -30,22 +30,22 @@ msgstr ""
msgid "%s's Domains"
msgstr ""
#: includes/account.php:1441
#: includes/account.php:1440
#, php-format
msgid "'%s' has just been successfully added as an organisation to the database."
msgstr ""
#: includes/account.php:1498
#: includes/account.php:1497
#, php-format
msgid "'%s' has just been successfully added to the database."
msgstr ""
#: includes/account.php:1557
#: includes/account.php:1556
#, php-format
msgid "'%s' has just been successfully deleted from the database."
msgstr ""
#: includes/account.php:1469 includes/account.php:1545
#: includes/account.php:1468 includes/account.php:1544
#, php-format
msgid "'%s' has just been successfully updated in the database."
msgstr ""
@ -78,8 +78,8 @@ msgstr ""
msgid "About Us"
msgstr ""
#: includes/account.php:104 includes/account.php:1475
#: includes/account.php:1494 includes/account.php:1649
#: includes/account.php:104 includes/account.php:1474
#: includes/account.php:1493 includes/account.php:1648
#: includes/account_stuff.php:130 includes/account_stuff.php:138
#: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
#: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
@ -184,7 +184,7 @@ msgstr ""
msgid "Assurance Confirmation"
msgstr ""
#: www/account/43.php:128 www/wot/3.php:44
#: www/account/43.php:130 www/wot/3.php:44
msgid "Assurance Points"
msgstr ""
@ -236,7 +236,7 @@ msgstr ""
msgid "But, with all this money, and all this responsibility, they must be taking a lot of care to ensure the Certificate Authorities do their jobs well, and keep doing their jobs well, right? Well right?!"
msgstr ""
#: www/account/10.php:15 www/account/3.php:15
#: www/account/10.php:15 www/account/20.php:15 www/account/3.php:15
msgid "CAcert Certficate Acceptable Use Policy"
msgstr ""
@ -244,7 +244,7 @@ msgstr ""
msgid "CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to strict guidelines about how this money can to be used. If you'd like to make a donation, you can do so via "
msgstr ""
#: www/account/10.php:20 www/account/3.php:20
#: www/account/10.php:20 www/account/20.php:20 www/account/3.php:20
msgid "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"
msgstr ""
@ -292,7 +292,7 @@ msgstr ""
msgid "CRL"
msgstr ""
#: includes/account.php:1518 includes/account.php:1569 www/account/30.php:34
#: includes/account.php:1517 includes/account.php:1568 www/account/30.php:34
#: www/account/31.php:30 www/account/34.php:34
msgid "Cancel"
msgstr ""
@ -323,7 +323,7 @@ msgid "Certificate for '%s' has been renewed."
msgstr ""
#: includes/account.php:638 includes/account.php:754 includes/account.php:1152
#: includes/account.php:1372
#: includes/account.php:1371
#, php-format
msgid "Certificate for '%s' has been revoked."
msgstr ""
@ -345,8 +345,8 @@ msgid "Choose a filename to save the request to"
msgstr ""
#: includes/account.php:720 includes/account.php:1117
#: includes/account.php:1499 includes/account.php:1546
#: includes/account.php:1558 www/account/19.php:45 www/account/6.php:43
#: includes/account.php:1498 includes/account.php:1545
#: includes/account.php:1557 www/account/19.php:45 www/account/6.php:43
msgid "Click here"
msgstr ""
@ -435,7 +435,7 @@ msgid "Copy the contents of the email including the "
msgstr ""
#: includes/account.php:661 includes/account.php:775 includes/account.php:1174
#: includes/account.php:1396
#: includes/account.php:1395
#, php-format
msgid "Couldn't remove the request for `%s`, request had already been processed."
msgstr ""
@ -465,7 +465,7 @@ msgstr ""
msgid "Date"
msgstr ""
#: www/account/13.php:46 www/account/43.php:84 www/index/1.php:41
#: www/account/13.php:46 www/account/43.php:86 www/index/1.php:41
#: www/index/5.php:25 www/wot/6.php:34
msgid "Date of Birth"
msgstr ""
@ -478,8 +478,8 @@ msgstr ""
msgid "Default Language"
msgstr ""
#: includes/account.php:167 includes/account.php:457 includes/account.php:1551
#: includes/account.php:1671 www/account/2.php:23 www/account/2.php:50
#: includes/account.php:167 includes/account.php:457 includes/account.php:1550
#: includes/account.php:1670 www/account/2.php:23 www/account/2.php:50
#: www/account/25.php:24 www/account/25.php:41 www/account/26.php:26
#: www/account/26.php:36 www/account/30.php:35 www/account/31.php:31
#: www/account/32.php:28 www/account/32.php:43 www/account/34.php:35
@ -563,7 +563,7 @@ msgid "Edit Organisation"
msgstr ""
#: www/account/16.php:26 www/account/16.php:31 www/account/33.php:26
#: www/account/42.php:22 www/account/43.php:30 www/account/43.php:60
#: www/account/42.php:22 www/account/43.php:30 www/account/43.php:62
#: www/wot/5.php:22
msgid "Email"
msgstr ""
@ -676,7 +676,7 @@ msgstr ""
msgid "Finish up and exit IIS Certificate Wizard"
msgstr ""
#: www/account/13.php:27 www/account/43.php:64 www/account/43.php:80
#: www/account/13.php:27 www/account/43.php:66 www/account/43.php:82
#: www/index/1.php:22
msgid "First Name"
msgstr ""
@ -835,7 +835,7 @@ msgstr ""
msgid "I have read and understood the Rules For Assurers and am making this assurance subject to and in compliance with these rules."
msgstr ""
#: www/account/10.php:18 www/account/3.php:18
#: www/account/10.php:18 www/account/20.php:18 www/account/3.php:18
msgid "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."
msgstr ""
@ -843,7 +843,7 @@ msgstr ""
msgid "I want to be listed"
msgstr ""
#: www/account/43.php:48
#: www/account/43.php:50
msgid "I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!"
msgstr ""
@ -855,7 +855,7 @@ msgstr ""
msgid "If I'd like to donate to CAcert Inc., how can I do it?"
msgstr ""
#: www/account/10.php:22
#: www/account/10.php:22 www/account/20.php:22
msgid "If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence."
msgstr ""
@ -924,10 +924,6 @@ msgstr ""
msgid "Incorrect email address and/or Pass Phrase."
msgstr ""
#: www/account/20.php:15
msgid "Insert AUP for certificate use to cover our ass..."
msgstr ""
#: www/account/19.php:60 www/account/6.php:58
msgid "Install Your Certificate"
msgstr ""
@ -948,8 +944,8 @@ msgstr ""
#: includes/account.php:575 includes/account.php:627 includes/account.php:655
#: includes/account.php:688 includes/account.php:743 includes/account.php:769
#: includes/account.php:1091 includes/account.php:1141
#: includes/account.php:1168 includes/account.php:1306
#: includes/account.php:1361 includes/account.php:1390
#: includes/account.php:1168 includes/account.php:1305
#: includes/account.php:1360 includes/account.php:1389
#, php-format
msgid "Invalid ID '%s' presented, can't do anything with it."
msgstr ""
@ -968,8 +964,8 @@ msgstr ""
#: includes/account.php:581 includes/account.php:633 includes/account.php:694
#: includes/account.php:749 includes/account.php:1097
#: includes/account.php:1147 includes/account.php:1312
#: includes/account.php:1367
#: includes/account.php:1147 includes/account.php:1311
#: includes/account.php:1366
#, php-format
msgid "It would seem '%s' has already been revoked. I'll skip this for now."
msgstr ""
@ -1002,7 +998,7 @@ msgstr ""
msgid "Language"
msgstr ""
#: www/account/13.php:37 www/account/43.php:72 www/index/1.php:32
#: www/account/13.php:37 www/account/43.php:74 www/index/1.php:32
msgid "Last Name"
msgstr ""
@ -1057,10 +1053,10 @@ msgstr ""
msgid "Lost Pass Phrase Questions - Please enter five questions and your reponses to be used for security verifcation."
msgstr ""
#: includes/general_stuff.php:58 www/account/43.php:88 www/account/43.php:92
#: www/account/43.php:96 www/account/43.php:100 www/account/43.php:104
#: www/account/43.php:108 www/account/43.php:112 www/account/43.php:116
#: www/account/43.php:120 www/account/43.php:124
#: includes/general_stuff.php:58 www/account/43.php:90 www/account/43.php:94
#: www/account/43.php:98 www/account/43.php:102 www/account/43.php:106
#: www/account/43.php:110 www/account/43.php:114 www/account/43.php:118
#: www/account/43.php:122 www/account/43.php:126
msgid "Lost Password"
msgstr ""
@ -1114,7 +1110,7 @@ msgstr ""
msgid "Microsoft Support Online"
msgstr ""
#: www/account/43.php:68
#: www/account/43.php:70
msgid "Middle Name"
msgstr ""
@ -1149,13 +1145,13 @@ msgstr ""
#: includes/account.php:932 includes/account.php:952 includes/account.php:1039
#: includes/account.php:1065 includes/account.php:1077
#: includes/account.php:1128 includes/account.php:1208
#: includes/account.php:1226 includes/account.php:1279
#: includes/account.php:1291 includes/account.php:1346
#: includes/account.php:1414 includes/account.php:1440
#: includes/account.php:1468 includes/account.php:1497
#: includes/account.php:1544 includes/account.php:1556
#: includes/account.php:1619 includes/account.php:1722
#: includes/account.php:1729 includes/account.php:1737
#: includes/account.php:1226 includes/account.php:1278
#: includes/account.php:1290 includes/account.php:1345
#: includes/account.php:1413 includes/account.php:1439
#: includes/account.php:1467 includes/account.php:1496
#: includes/account.php:1543 includes/account.php:1555
#: includes/account.php:1618 includes/account.php:1721
#: includes/account.php:1728 includes/account.php:1736
#: includes/general.php:281 includes/general.php:299 includes/general.php:327
#: includes/general.php:368 includes/general.php:386 includes/general.php:418
#: www/account.php:32 www/error404.php:17 www/wot.php:106 www/wot.php:242
@ -1227,7 +1223,7 @@ msgstr ""
msgid "New Pass Phrases specified don't match or were blank."
msgstr ""
#: includes/account.php:200 includes/account.php:938 includes/account.php:1420
#: includes/account.php:200 includes/account.php:938 includes/account.php:1419
#: www/index.php:29 www/index.php:114 www/account/16.php:40
#: www/account/24.php:45 www/account/3.php:62 www/account/42.php:26
#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
@ -1251,6 +1247,11 @@ msgstr ""
msgid "No such certificate attached to your account."
msgstr ""
#: www/account/43.php:39
#, php-format
msgid "No users found matching %s"
msgstr ""
#: includes/general_stuff.php:56
msgid "Normal Login"
msgstr ""
@ -1273,17 +1274,17 @@ msgid "Now 'Create a new certificate'."
msgstr ""
#: includes/account.php:644 includes/account.php:760 includes/account.php:1158
#: includes/account.php:1378
#: includes/account.php:1377
msgid "Now deleting the following pending requests:"
msgstr ""
#: includes/account.php:564 includes/account.php:679 includes/account.php:1081
#: includes/account.php:1294
#: includes/account.php:1293
msgid "Now renewing the following certificates:"
msgstr ""
#: includes/account.php:616 includes/account.php:734 includes/account.php:1131
#: includes/account.php:1349
#: includes/account.php:1348
msgid "Now revoking the following certificates:"
msgstr ""
@ -1299,7 +1300,7 @@ msgstr ""
msgid "Old Pass Phrase"
msgstr ""
#: www/account/10.php:16 www/account/3.php:16
#: www/account/10.php:16 www/account/20.php:16 www/account/3.php:16
msgid "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."
msgstr ""
@ -1348,7 +1349,7 @@ msgstr ""
msgid "Organisation Name"
msgstr ""
#: includes/account.php:1432 includes/account.php:1459
#: includes/account.php:1431 includes/account.php:1458
msgid "Organisation Name and Contact Email are required fields."
msgstr ""
@ -1392,7 +1393,7 @@ msgstr ""
msgid "Pass Phrases were blank"
msgstr ""
#: www/account/10.php:24 www/account/20.php:17
#: www/account/10.php:26 www/account/20.php:24
msgid "Paste your CSR below..."
msgstr ""
@ -1410,6 +1411,10 @@ msgstr ""
msgid "Personal information"
msgstr ""
#: www/account/10.php:24
msgid "Please Note. All information on your certificate will be removed except the CommonName field, this is because it's an automated service and cannot automatically verify other details on your certificates are valid or not. If you are a valid organisation and would like more details to appear on certificates, contact us for more information on our organisational services."
msgstr ""
#: www/account/2.php:56 www/account/9.php:56
msgid "Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default."
msgstr ""
@ -1464,13 +1469,13 @@ msgid "References"
msgstr ""
#: includes/account.php:667 includes/account.php:781 includes/account.php:1180
#: includes/account.php:1402
#: includes/account.php:1401
#, php-format
msgid "Removed a pending request for '%s'"
msgstr ""
#: includes/account.php:558 includes/account.php:674 includes/account.php:1075
#: includes/account.php:1289 www/account/12.php:71 www/account/18.php:75
#: includes/account.php:1288 www/account/12.php:71 www/account/18.php:75
#: www/account/22.php:71 www/account/5.php:79
msgid "Renew"
msgstr ""
@ -1480,7 +1485,7 @@ msgstr ""
msgid "Renew/Revoke/Delete"
msgstr ""
#: includes/account.php:592 includes/account.php:1323
#: includes/account.php:592 includes/account.php:1322
msgid "Renewing"
msgstr ""
@ -1493,7 +1498,7 @@ msgid "Return to the 'Internet Information Services' screen in 'Administrative T
msgstr ""
#: includes/account.php:610 includes/account.php:728 includes/account.php:1125
#: includes/account.php:1344 www/account/12.php:72 www/account/18.php:76
#: includes/account.php:1343 www/account/12.php:72 www/account/18.php:76
#: www/account/22.php:72 www/account/5.php:80
msgid "Revoke/Delete"
msgstr ""
@ -1632,12 +1637,12 @@ msgid "SubjectAltName"
msgstr ""
#: includes/account.php:488 includes/account.php:508 includes/account.php:1187
#: includes/account.php:1215 www/account/10.php:27 www/account/11.php:36
#: www/account/20.php:20 www/account/21.php:38
#: includes/account.php:1215 www/account/10.php:29 www/account/11.php:36
#: www/account/20.php:27 www/account/21.php:38
msgid "Submit"
msgstr ""
#: www/account/13.php:41 www/account/43.php:76 www/index/1.php:36
#: www/account/13.php:41 www/account/43.php:78 www/index/1.php:36
msgid "Suffix"
msgstr ""
@ -1710,8 +1715,8 @@ msgstr ""
msgid "The domain '%s' has been added to the system, however before any certificates for this can be issued you need to open the link in a browser that has been sent to your email address."
msgstr ""
#: includes/account.php:365 includes/account.php:431 includes/account.php:1482
#: includes/account.php:1512
#: includes/account.php:365 includes/account.php:431 includes/account.php:1481
#: includes/account.php:1511
#, php-format
msgid "The domain '%s' is already in the system and is listed as valid. Can't continue."
msgstr ""
@ -1876,8 +1881,8 @@ msgstr ""
msgid "Unverified"
msgstr ""
#: includes/account.php:794 includes/account.php:832 includes/account.php:1447
#: includes/account.php:1504 includes/account.php:1540 www/account/13.php:98
#: includes/account.php:794 includes/account.php:832 includes/account.php:1446
#: includes/account.php:1503 includes/account.php:1539 www/account/13.php:98
#: www/account/27.php:48 www/account/29.php:35 www/account/41.php:36
#: www/wot/8.php:35
msgid "Update"
@ -1933,7 +1938,7 @@ msgstr ""
msgid "Warning! You've attempted to log into the system with a client certificate, but the login failed due to the certificate being expired, revoked or simply not valid for this site. You can login using your Email/Pass Phrase to get a new certificate, by clicking on 'Normal Login' to the right of your screen."
msgstr ""
#: includes/account.php:1663
#: includes/account.php:1662
#, php-format
msgid "Wasn't able to match '%s' against any user in the system"
msgstr ""
@ -2051,8 +2056,8 @@ msgstr ""
msgid "You currently don't have access to the email address you selected, or you haven't verified it yet."
msgstr ""
#: includes/account.php:1415 includes/account.php:1620
#: includes/account.php:1738
#: includes/account.php:1414 includes/account.php:1619
#: includes/account.php:1737
msgid "You don't have access to this area."
msgstr ""
@ -2117,7 +2122,7 @@ msgstr ""
msgid "You then need to add the domain you have control of to your account, which you can do:"
msgstr ""
#: includes/account.php:1730
#: includes/account.php:1729
msgid "You tried to use an invalid language."
msgstr ""
@ -2179,8 +2184,8 @@ msgstr ""
#: includes/account.php:343 includes/account.php:549 includes/account.php:598
#: includes/account.php:716 includes/account.php:1066
#: includes/account.php:1113 includes/account.php:1280
#: includes/account.php:1332
#: includes/account.php:1113 includes/account.php:1279
#: includes/account.php:1331
msgid "Your certificate request has failed to be processed correctly, please try submitting it again."
msgstr ""
@ -2213,7 +2218,7 @@ msgstr ""
msgid "Your information has been submitted into our system. You will now be sent an email with a web link, you need to open that link in your web browser within 24 hours or your information will be removed from our system!"
msgstr ""
#: includes/account.php:1723
#: includes/account.php:1722
msgid "Your language setting has been updated."
msgstr ""
@ -2242,8 +2247,8 @@ msgstr ""
msgid "optional"
msgstr ""
#: includes/account.php:1499 includes/account.php:1546
#: includes/account.php:1558
#: includes/account.php:1498 includes/account.php:1545
#: includes/account.php:1557
msgid "to continue."
msgstr ""

@ -21,6 +21,8 @@
<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. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. 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>
<p><b>*** <?=_("Please Note. All information on your certificate will be removed except the CommonName field, this is because it's an automated service and cannot automatically verify other details on your certificates are valid or not. If you are a valid organisation and would like more details to appear on certificates, contact us for more information on our organisational services.")?> ***</b></p>
<p><?=_("Paste your CSR below...")?></p>
<form method="post" action="account.php">
<textarea name="CSR" cols="80" rows="15"></textarea><br>

@ -12,7 +12,14 @@
the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the License for more details.
*/ ?>
<p><i><?=_("Insert AUP for certificate use to cover our ass...")?></i></p>
<h3><?=_("CAcert Certficate 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/docs/">http://www.cacert.org/docs/</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. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. 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>
<p><?=_("Paste your CSR below...")?></p>
<form method="post" action="account.php">

@ -32,9 +32,11 @@
</tr>
<? } ?>
</table>
<? } else {
<? } elseif(mysql_num_rows($res) == 1) {
$row = mysql_fetch_assoc($res);
$_GET['userid'] = $row['id'];
} else {
printf(_("No users found matching %s"), $email);
}
}

@ -23,7 +23,7 @@
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
$row['crt_name'] = "../crt/email-".$row['id'].".crt";
$row['crt_name'] = "../crt/client-".$row['id'].".crt";
$days = 365;
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
@ -75,7 +75,7 @@
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
$row['crt_name'] = "../crt/email-".$row['id'].".crt";
$row['crt_name'] = "../crt/client-".$row['id'].".crt";
$days = 365;
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]'"));
@ -151,7 +151,7 @@
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
$row[crt_name] = "../crt/orgemail-".$row['id'].".crt";
$row[crt_name] = "../crt/orgclient-".$row['id'].".crt";
$days = 365;
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
@ -189,7 +189,7 @@
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
$row[crt_name] = "../crt/orgemail-".$row['id'].".crt";
$row[crt_name] = "../crt/orgclient-".$row['id'].".crt";
$days = 365;
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
if(filesize($row[crt_name]) > 0)

@ -47,7 +47,7 @@
$days = 730;
}
$row['crt_name'] = "../crt/".$row['id'].".crt";
$row['crt_name'] = "../crt/server-".$row['id'].".crt";
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-server.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch > /dev/null 2>&1`;
$dom = mysql_fetch_assoc(mysql_query("select * from `domains` where `id`='$row[domid]'"));
$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$dom[memid]'"));
@ -116,7 +116,7 @@
$res = mysql_query($query);
while($row = mysql_fetch_assoc($res))
{
$row['crt_name'] = "../crt/org".$row['id'].".crt";
$row['crt_name'] = "../crt/orgserver-".$row['id'].".crt";
$days = 730;
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-server-org.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
if(filesize($row[crt_name]) > 0)

@ -0,0 +1,13 @@
<?
header("Content-type: image/png");
$r = 255;
$g = 255;
$b = 255;
$font = 1;
$x = 25;
$y = 4;
$im = imagecreatefrompng("/home/cacert/www/images/secured.png");
$tc = imagecolorallocate ($im, $r, $g, $b);
imagestring ($im, $font, $x, $y, "CAcert.org", $tc);
imagepng($im);
?>
Loading…
Cancel
Save