From df92c83b625715f223070d5d9c9e3f5b814560ec Mon Sep 17 00:00:00 2001 From: Markus Warg Date: Thu, 11 Mar 2010 15:19:46 +0100 Subject: source code taken from cacert-20100204.tar.bz2 --- cacert/pages/account/0.php | 4 +++- cacert/pages/account/13.php | 36 ++++++++++++++++++++++-------------- cacert/pages/account/40.php | 2 +- cacert/pages/index/1.php | 2 +- cacert/pages/index/11.php | 2 +- cacert/pages/index/19.php | 5 +++++ cacert/pages/index/8.php | 11 +++++------ cacert/pages/wot/1.php | 11 +++++++++-- cacert/pages/wot/2.php | 7 +++++-- cacert/pages/wot/4.php | 5 +++++ cacert/pages/wot/6.php | 12 ++++++++---- 11 files changed, 65 insertions(+), 32 deletions(-) (limited to 'cacert/pages') diff --git a/cacert/pages/account/0.php b/cacert/pages/account/0.php index b595b84..84b581e 100644 --- a/cacert/pages/account/0.php +++ b/cacert/pages/account/0.php @@ -28,4 +28,6 @@

-

+

+

+ ?> diff --git a/cacert/pages/account/13.php b/cacert/pages/account/13.php index 829b543..e8dad73 100644 --- a/cacert/pages/account/13.php +++ b/cacert/pages/account/13.php @@ -24,11 +24,19 @@ $month = intval(substr($user['dob'], 5, 2)); $day = intval(substr($user['dob'], 8, 2)); - $body = sprintf(_("Hi %s,"),$user['fname'])."\n"; - $body .= _("You are receiving this email because you or someone else")."\n"; - $body .= _("has viewed your lost password questions.")."\n"; + $body = sprintf(_("Hi %s,"),$user['fname'])."\n\n"; + $body .= _("You receive this automatic mail since you yourself or")."\n"; + $body .= _("someone else looked up your secret questions and answers")."\n"; + $body .= _("for a forgotten password.")."\n\n"; + $body .= _("If it was you who looked up or changed that data, or clicked")."\n"; + $body .= _("through the menu in your account, everything is in best order and")."\n"; + $body .= _("you can ignore this mail.")."\n\n"; + $body .= _("But if you received this mail without a recognisable reason,")."\n"; + $body .= _("there is a danger that an unauthorised person accessed your")."\n"; + $body .= _("account, and you should promptly change your password and your")."\n"; + $body .= _("secret questions and answers.")."\n\n"; - $body .= _("Best regards")."\n"._("CAcert.org Support!"); + $body .= _("With kind regards,")."\n\n"._("CAcert Support"); sendmail($user['email'], "[CAcert.org] "._("Email Notification"), $body, "support@cacert.org", "", "", "CAcert Support"); ?> @@ -125,24 +133,24 @@ - 1)  - + 1)  + - 2)  - + 2)  + - 3)  - + 3)  + - 4)  - + 4)  + - 5)  - + 5)  + "> diff --git a/cacert/pages/account/40.php b/cacert/pages/account/40.php index 0142682..1b76f9c 100755 --- a/cacert/pages/account/40.php +++ b/cacert/pages/account/40.php @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - $_SESSION['_config']['secrethash'] = md5(date("YmdHis").rand(0, intval(date("u")))); +if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['secrethash'] = md5(date("YmdHis").rand(0, intval(date("u")))); ?>

diff --git a/cacert/pages/index/1.php b/cacert/pages/index/1.php index c5b181e..d9ce8a8 100644 --- a/cacert/pages/index/1.php +++ b/cacert/pages/index/1.php @@ -46,7 +46,7 @@
() - " autocomplete="off"> + " autocomplete="off">
','')?>
diff --git a/cacert/pages/index/11.php b/cacert/pages/index/11.php index 0142682..1b76f9c 100644 --- a/cacert/pages/index/11.php +++ b/cacert/pages/index/11.php @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - $_SESSION['_config']['secrethash'] = md5(date("YmdHis").rand(0, intval(date("u")))); +if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['secrethash'] = md5(date("YmdHis").rand(0, intval(date("u")))); ?>

diff --git a/cacert/pages/index/19.php b/cacert/pages/index/19.php index bd3a3d1..c58eb68 100644 --- a/cacert/pages/index/19.php +++ b/cacert/pages/index/19.php @@ -15,6 +15,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> + +Note that the TTP programme is effectively Frozen
+Until a subsidiary policy under AP is written, it is against AP rules.
+

diff --git a/cacert/pages/index/8.php b/cacert/pages/index/8.php index 368760b..26acaa9 100644 --- a/cacert/pages/index/8.php +++ b/cacert/pages/index/8.php @@ -17,12 +17,11 @@ */ ?>

-Nick Bebout -
-Mark Lipscombe -
-Philipp Dunkel -
+Lambert Hofstra -
+Daniel Black -
+Mark Lipscombe - ,
Ernestine Schwob -
-Andreas Bürki -
-Guillaume Romagny -
+Nick Bebout -
Ian Grigg -
-Robert Cruikshank -
+Mario Lipinski -

diff --git a/cacert/pages/wot/1.php b/cacert/pages/wot/1.php index 8eaab6b..a45b5df 100644 --- a/cacert/pages/wot/1.php +++ b/cacert/pages/wot/1.php @@ -87,7 +87,8 @@ } elseif($locid > 0){ echo "\n\n\n\n\n\n\n
\n"; } - + if($locid>0 || $regid>0 || $ccid>0) + { $query = "select *, `users`.`id` as `id` from `users`,`notary` where `listme`='1' and `ccid`='".$ccid."' and `regid`='".$regid."' and `locid`='".$locid."' and `users`.`id`=`notary`.`to` @@ -102,6 +103,8 @@ + + @@ -109,8 +112,12 @@ + + - +
"._("Not yet!")."")?>

diff --git a/cacert/pages/wot/2.php b/cacert/pages/wot/2.php index 692d552..a75bc57 100644 --- a/cacert/pages/wot/2.php +++ b/cacert/pages/wot/2.php @@ -15,6 +15,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> + +Note that the TTP programme is effectively Frozen
+Until a subsidiary policy under AP is written, it is against AP rules.
+

@@ -28,6 +33,4 @@ Australia

-

-

https://cats.cacert.org/!'?>

diff --git a/cacert/pages/wot/4.php b/cacert/pages/wot/4.php index 8ad267f..0da72da 100644 --- a/cacert/pages/wot/4.php +++ b/cacert/pages/wot/4.php @@ -15,6 +15,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> + +Note that the TTP programme is effectively Frozen
+Until a subsidiary policy under AP is written, it is against AP rules.
+

diff --git a/cacert/pages/wot/6.php b/cacert/pages/wot/6.php index 5cc6f32..bc37aa2 100644 --- a/cacert/pages/wot/6.php +++ b/cacert/pages/wot/6.php @@ -82,7 +82,7 @@ - + : @@ -143,11 +143,15 @@ > - + > - + + + + : + - :
(Max ) @@ -158,7 +162,7 @@ A4 - US - - "> "> + "> "> -- cgit v1.2.1