cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

bug fixes

Browse source
This commit is contained in:
root 2004-10-24 00:10:26 +00:00
parent b0e25fc6a0
commit f7c5b44bc7
11 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locale/da.po
View file

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CAcert\n" "Project-Id-Version: CAcert\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-08-04 13:36+1000\n" "PO-Revision-Date: 2004-08-04 13:36+1000\n"
"Last-Translator: Duane <duane@cacert.org>\n" "Last-Translator: Duane <duane@cacert.org>\n"
"Language-Team: Duane <duane@cacert.org>\n" "Language-Team: Duane <duane@cacert.org>\n"

2
locale/de.po
View file

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: messagesneu\n" "Project-Id-Version: messagesneu\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-10-09 17:46+0200\n" "PO-Revision-Date: 2004-10-09 17:46+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: <de@li.org>\n" "Language-Team: <de@li.org>\n"

2
locale/es.po
View file

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CAcert\n" "Project-Id-Version: CAcert\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-09-26 02:26+1000\n" "PO-Revision-Date: 2004-09-26 02:26+1000\n"
"Last-Translator: Duane <duane@cacert.org>\n" "Last-Translator: Duane <duane@cacert.org>\n"
"Language-Team: Duane <duane@cacert.org>\n" "Language-Team: Duane <duane@cacert.org>\n"

2
locale/fr.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-08-05 02:28+0100\n" "PO-Revision-Date: 2004-08-05 02:28+0100\n"
"Last-Translator: Alain Viret <Alain.Viret@suisse.ch>\n" "Last-Translator: Alain Viret <Alain.Viret@suisse.ch>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
locale/hu.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CACert\n" "Project-Id-Version: CACert\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-10-13 16:46+0100\n" "PO-Revision-Date: 2004-10-13 16:46+0100\n"
"Last-Translator: Levente Farkas <lfarkas@lfarkas.org>\n" "Last-Translator: Levente Farkas <lfarkas@lfarkas.org>\n"
"Language-Team: Hungarian <lfarkas@lfarkas.org>\n" "Language-Team: Hungarian <lfarkas@lfarkas.org>\n"

2
locale/it.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-10-17 20:06+0100\n" "PO-Revision-Date: 2004-10-17 20:06+0100\n"
"Last-Translator: Roberto Passuello <roberto.passuello@elettra.trieste.it>\n" "Last-Translator: Roberto Passuello <roberto.passuello@elettra.trieste.it>\n"
"Language-Team: Italian <it@li.org>\n" "Language-Team: Italian <it@li.org>\n"

2
locale/nl.po
View file

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CAcert\n" "Project-Id-Version: CAcert\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-10-11 20:49+0100\n" "PO-Revision-Date: 2004-10-11 20:49+0100\n"
"Last-Translator: Lieven Hollevoet <SYCDVWWCIUZF@spammotel.com>\n" "Last-Translator: Lieven Hollevoet <SYCDVWWCIUZF@spammotel.com>\n"
"Language-Team: <contact@CAcert.org>\n" "Language-Team: <contact@CAcert.org>\n"

2
locale/pt.po
View file

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CAcert.org Translation\n" "Project-Id-Version: CAcert.org Translation\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: 2004-09-26 02:27+1000\n" "PO-Revision-Date: 2004-09-26 02:27+1000\n"
"Last-Translator: Duane <duane@cacert.org>\n" "Last-Translator: Duane <duane@cacert.org>\n"
"Language-Team: Evaldo Gardenali <evaldo@gardenali.biz>\n" "Language-Team: Evaldo Gardenali <evaldo@gardenali.biz>\n"

10
messages.po
View file

@ -1,18 +1,18 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain. # This file is distributed under the same license as the CAcert package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: CAcert\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-10-19 00:33+1000\n" "POT-Creation-Date: 2004-10-21 16:02+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: www/account/32.php:21 #: www/account/32.php:21

23
scripts/clientcerts.php
View file

@ -23,7 +23,7 @@
$res = mysql_query($query); $res = mysql_query($query);
while($row = mysql_fetch_assoc($res)) while($row = mysql_fetch_assoc($res))
{ {
$row[crt_name] = "../crt/email-$row[id].crt"; $row['crt_name'] = "../crt/email-".$row['id'].".crt";
$days = 365; $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 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`; $do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
@ -59,13 +59,15 @@
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2); $bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
$serial = $bits[1]; $serial = $bits[1];
$query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()), $query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'"; `serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='".$row['id']."'";
mysql_query($query); mysql_query($query);
$body = _("Hi")." $user[fname],\n\n"; $body = _("Hi")." $user[fname],\n\n";
$body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]); $body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]);
$body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n"; $body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!"); $body .= _("Best regards")."\n"._("CAcert.org Support!");
mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>"); mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
} else {
$query = "delete from `emailcerts` where `id`='".$row['id']."'";
} }
} }
@ -73,7 +75,7 @@
$res = mysql_query($query); $res = mysql_query($query);
while($row = mysql_fetch_assoc($res)) while($row = mysql_fetch_assoc($res))
{ {
$row[crt_name] = "../crt/email-$row[id].crt"; $row['crt_name'] = "../crt/email-".$row['id'].".crt";
$days = 365; $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`; $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]'")); $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]'"));
@ -108,13 +110,16 @@
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2); $bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
$serial = $bits[1]; $serial = $bits[1];
$query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()), $query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'"; `serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='".$row['id']."'";
mysql_query($query); mysql_query($query);
$body = _("Hi")." $user[fname],\n\n"; $body = _("Hi")." $user[fname],\n\n";
$body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]); $body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]);
$body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n"; $body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!"); $body .= _("Best regards")."\n"._("CAcert.org Support!");
mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>"); mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
} else {
$query = "delete from `emailcerts` where `id`='".$row['id']."'";
mysql_query($query);
} }
} }
@ -146,7 +151,7 @@
$res = mysql_query($query); $res = mysql_query($query);
while($row = mysql_fetch_assoc($res)) while($row = mysql_fetch_assoc($res))
{ {
$row[crt_name] = "../crt/orgemail-$row[id].crt"; $row[crt_name] = "../crt/orgemail-".$row['id'].".crt";
$days = 365; $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 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`; $do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
@ -174,6 +179,9 @@
$query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()), $query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'"; `serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
mysql_query($query); mysql_query($query);
} else {
$query = "delete from `orgemailcerts` where `id`='".$row['id']."'";
mysql_query($query);
} }
} }
@ -181,7 +189,7 @@
$res = mysql_query($query); $res = mysql_query($query);
while($row = mysql_fetch_assoc($res)) while($row = mysql_fetch_assoc($res))
{ {
$row[crt_name] = "../crt/orgemail-$row[id].crt"; $row[crt_name] = "../crt/orgemail-".$row['id'].".crt";
$days = 365; $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`; $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) if(filesize($row[crt_name]) > 0)
@ -208,6 +216,9 @@
$query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()), $query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'"; `serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
mysql_query($query); mysql_query($query);
} else {
$query = "delete from `orgemailcerts` where `id`='".$row['id']."'";
mysql_query($query);
} }
} }

10
scripts/servercerts.php
View file

@ -47,7 +47,7 @@
$days = 730; $days = 730;
} }
$row['crt_name'] = "../crt/".$row['id'].crt; $row['crt_name'] = "../crt/".$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`; $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]'")); $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]'")); $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$dom[memid]'"));
@ -81,6 +81,9 @@
$body .= sprintf(_("Below you will find your certificate for %s.")."\n\n", $row['CN']); $body .= sprintf(_("Below you will find your certificate for %s.")."\n\n", $row['CN']);
$body .= _("Best regards")."\n"._("CAcert.org Support!")."\n\n".$cert; $body .= _("Best regards")."\n"._("CAcert.org Support!")."\n\n".$cert;
mail($user['email'], "[CAcert.org] "._("Server Certificate"), $body, "From: CAcert-Support <duane@cacert.org>"); mail($user['email'], "[CAcert.org] "._("Server Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
} else {
$query = "delete from `domaincerts` where `id`='".$row['id']."'";
mysql_query($query);
} }
} }
@ -139,7 +142,10 @@
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2); $bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
$serial = $bits[1]; $serial = $bits[1];
$query = "update `orgdomaincerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()), $query = "update `orgdomaincerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'"; `serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='".$row['id']."'";
mysql_query($query);
} else {
$query = "delete from `orgdomaincerts` where `id`='".$row['id']."'";
mysql_query($query); mysql_query($query);
} }
} }