From 94c354e9078c73e28540f04c958a360fee0c56a0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 1 Jul 2005 13:12:14 +0000 Subject: [PATCH] updates lang+bug fixes --- includes/account.php | 25 +- includes/account_stuff.php | 4 +- includes/general.php | 29 +- includes/general_stuff.php | 4 +- locale/bg.po | 498 +++-- locale/cs.po | 659 +++--- locale/de.po | 113 +- locale/el.po | 351 +++- locale/es.po | 88 +- locale/fi.po | 1163 ++++++----- locale/fr.po | 315 ++- locale/hu.po | 550 ++--- locale/it.po | 635 ++++-- locale/ja.po | 1155 ++++++----- locale/nl.po | 172 +- locale/pl.po | 527 +++-- locale/pt.po | 499 +++-- locale/ru.po | 773 ++++--- locale/zh.po | 359 +++- messages.po | 148 +- pages/account/13.php | 4 +- pages/index/0.php | 4 +- pages/index/1.php | 38 +- pages/index/4.php | 2 +- pages/index/5.php | 2 +- pages/index/6.php | 47 +- pages/wot/10.php | 6 +- pages/wot/5.php | 2 +- pages/wot/6.php | 4 +- www/cap.php | 108 +- www/disputes.php | 7 +- www/docs/CAP-Super.pdf | 2379 ---------------------- www/docs/CAP-Super.sxw | Bin 20433 -> 0 bytes www/docs/CAP.pdf | 2432 ----------------------- www/docs/CAcert Assurance Programme.sxw | Bin 20478 -> 0 bytes www/docs/TTP.pdf | Bin 46987 -> 0 bytes www/docs/TTP.sxw | Bin 9394 -> 0 bytes www/docs/certdata.patch.bz2 | Bin 4868 -> 0 bytes www/docs/mass assure.sxw | Bin 20697 -> 0 bytes www/index.php | 60 +- www/news.php | 4 +- www/ttp.php | 100 +- www/wot.php | 13 +- 43 files changed, 5510 insertions(+), 7769 deletions(-) delete mode 100644 www/docs/CAP-Super.pdf delete mode 100644 www/docs/CAP-Super.sxw delete mode 100644 www/docs/CAP.pdf delete mode 100644 www/docs/CAcert Assurance Programme.sxw delete mode 100644 www/docs/TTP.pdf delete mode 100644 www/docs/TTP.sxw delete mode 100644 www/docs/certdata.patch.bz2 delete mode 100644 www/docs/mass assure.sxw diff --git a/includes/account.php b/includes/account.php index 821c46b..9e117d8 100644 --- a/includes/account.php +++ b/includes/account.php @@ -44,10 +44,12 @@ showfooter(); exit; } - if(!checkEmail($newemail)) + $checkemail = checkEmail($newemail); + if($checkemail != true) { showheader(_("My CAcert.org Account!")); - echo _("Email Address given was invalid, or a test connection couldn't be made to your server, or the server rejected the email address as invalid"); + echo "

"._("Email Address given was invalid, or a test connection couldn't be made to your server, or the server rejected the email address as invalid")."

\n"; + echo "

$checkemail

\n"; showfooter(); exit; } @@ -353,7 +355,8 @@ unset($oldid); $id = 8; $addy = array(); - $adds = explode("\n", trim(`/usr/bin/whois $newdom|grep "@"`)); + if(strtolower(substr($newdom, -4, 3)) != ".jp") + $adds = explode("\n", trim(`/usr/bin/whois $newdom|grep "@"`)); if(substr($newdomain, -4) == ".org" || substr($newdomain, -5) == ".info") { if(is_array($adds)) @@ -398,7 +401,15 @@ $authaddy = trim(mysql_escape_string(stripslashes($_POST['authaddy']))); - if(!in_array($authaddy, $_SESSION['_config']['addy']) || $authaddy == "") + if($authaddy == "" || !is_array($_SESSION['_config']['addy'])) + { + showheader(_("My CAcert.org Account!")); + echo _("The address you submitted isn't a valid authority address for the domain."); + showfooter(); + exit; + } + + if(!in_array($authaddy, $_SESSION['_config']['addy'])) { showheader(_("My CAcert.org Account!")); echo _("The address you submitted isn't a valid authority address for the domain."); @@ -415,10 +426,12 @@ showfooter(); exit; } - if(!checkEmail($authaddy)) + $checkemail = checkEmail($newemail); + if($checkemail != true) { showheader(_("My CAcert.org Account!")); - echo _("Email Address given was invalid, or a test connection couldn't be made to your server, or the server rejected the email address as invalid"); + echo "

"._("Email Address given was invalid, or a test connection couldn't be made to your server, or the server rejected the email address as invalid")."

\n"; + echo "

$checkemail

\n"; showfooter(); exit; } diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 5304933..5f9c214 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -1,5 +1,5 @@ + Copyright (C) 2004-2005 by Duane Groth This file is part of CAcert. @@ -149,7 +149,7 @@ function hideall() {

-

+