Reviewed-on: #18
Reviewed-by: Kim Nilsson <knilsson@cacert.org>
Reviewed-by: Brian Mc Cullough <bmccullough@cacert.org>
Reviewed-by: Dirk Astrath <dirk@cacert.org>
@ -156,7 +156,7 @@ function buildSubjectFromSession() {
$emailid = mysql_insert_id();
$emailid = mysql_insert_id();
$body = _("Below is the link you need to open to verify your email address. Once your address is verified you will be able to start issuing certificates to your heart's content!")."\n\n";
$body = _("Below is the link you need to open to verify your email address. Once your address is verified you will be able to start issuing certificates to your heart's content!")."\n\n";
@ -520,7 +520,7 @@ function buildSubjectFromSession() {
{
{
$id = 4;
$id = 4;
showheader(_("My CAcert.org Account!"));
showheader(_("My CAcert.org Account!"));
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
showfooter();
showfooter();
exit;
exit;
} else {
} else {
@ -671,7 +671,7 @@ function buildSubjectFromSession() {
$domainid = mysql_insert_id();
$domainid = mysql_insert_id();
$body = sprintf(_("Below is the link you need to open to verify your domain '%s'. Once your address is verified you will be able to start issuing certificates to your heart's content!"),$_SESSION['_config']['domain'])."\n\n";
$body = sprintf(_("Below is the link you need to open to verify your domain '%s'. Once your address is verified you will be able to start issuing certificates to your heart's content!"),$_SESSION['_config']['domain'])."\n\n";
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
showfooter();
showfooter();
exit;
exit;
}
}
@ -858,7 +858,7 @@ function buildSubjectFromSession() {
{
{
$id = 11;
$id = 11;
showheader(_("My CAcert.org Account!"));
showheader(_("My CAcert.org Account!"));
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
showfooter();
showfooter();
exit;
exit;
} else {
} else {
@ -944,7 +944,7 @@ function buildSubjectFromSession() {
$res = mysql_query($query);
$res = mysql_query($query);
if(mysql_num_rows($res) <= 0)
if(mysql_num_rows($res) <= 0)
{
{
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
} else {
} else {
$drow = mysql_fetch_assoc($res);
$drow = mysql_fetch_assoc($res);
$crt_name = escapeshellarg($drow['crt_name']);
$crt_name = escapeshellarg($drow['crt_name']);
@ -1108,7 +1108,7 @@ function buildSubjectFromSession() {
$res = mysql_query($query);
$res = mysql_query($query);
if(mysql_num_rows($res) <= 0)
if(mysql_num_rows($res) <= 0)
{
{
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
} else {
} else {
printf(_("Certificate for '%s' has been renewed."), $row['CN']);
printf(_("Certificate for '%s' has been renewed."), $row['CN']);
@ -1662,7 +1662,7 @@ function buildSubjectFromSession() {
if(mysql_num_rows($res) <= 0)
if(mysql_num_rows($res) <= 0)
{
{
showheader(_("My CAcert.org Account!"));
showheader(_("My CAcert.org Account!"));
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
showfooter();
showfooter();
exit;
exit;
} else {
} else {
@ -1918,7 +1918,7 @@ function buildSubjectFromSession() {
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
showfooter();
showfooter();
exit;
exit;
}
}
@ -2016,7 +2016,7 @@ function buildSubjectFromSession() {
if(mysql_num_rows($res) <= 0)
if(mysql_num_rows($res) <= 0)
{
{
showheader(_("My CAcert.org Account!"));
showheader(_("My CAcert.org Account!"));
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions.")." CSRid: $CSRid", "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions.")." CSRid: $CSRid", "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
showfooter();
showfooter();
exit;
exit;
} else {
} else {
@ -2088,7 +2088,7 @@ function buildSubjectFromSession() {
$res = mysql_query($query);
$res = mysql_query($query);
if(mysql_num_rows($res) <= 0)
if(mysql_num_rows($res) <= 0)
{
{
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions.")." newid: $newid", "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions.")." newid: $newid", "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
} else {
} else {
$drow = mysql_fetch_assoc($res);
$drow = mysql_fetch_assoc($res);
$crtname = escapeshellarg($drow['crt_name']);
$crtname = escapeshellarg($drow['crt_name']);
@ -2898,7 +2898,7 @@ function buildSubjectFromSession() {
if(mysql_num_rows($res) <= 0)
if(mysql_num_rows($res) <= 0)
{
{
showheader(_("My CAcert.org Account!"));
showheader(_("My CAcert.org Account!"));
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='http://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
printf(_("Your certificate request has failed to be processed correctly, see %sthe WIKI page%s for reasons and solutions."), "<ahref='https://wiki.cacert.org/wiki/FAQ/CertificateRenewal'>", "</a>");
$body = _("Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!")."\n\n";
$body = _("Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!")."\n\n";