-
diff --git a/includes/general.php b/includes/general.php
index ccde38f..8c5e8b7 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -20,6 +20,9 @@
session_register("signup");
session_register("lostpw");
+ $junk = array(_("Face to Face Meeting"), _("Trusted Third Parties"), _("Thawte Points Transfer"), _("Administrative Increase"),
+ _("CT Magazine - Germany"), _("Temporary Increase"), _("Unknown"));
+
$_SESSION['_config']['filepath'] = "/www";
require_once($_SESSION['_config']['filepath']."/includes/mysql.php");
@@ -75,7 +78,7 @@
if($_SESSION['_config']['language'] == "")
{
- $bits = explode(",", strtolower(str_replace(" ", "", $_SERVER[HTTP_ACCEPT_LANGUAGE])));
+ $bits = explode(",", strtolower(str_replace(" ", "", $_SERVER['HTTP_ACCEPT_LANGUAGE'])));
foreach($bits as $lang)
{
$b = explode(";", $lang);
@@ -125,22 +128,20 @@
}
}
+ $_SESSION['_config']['recode'] = "html..latin-1";
if($_SESSION['_config']['language'] == "zh_CN")
{
- header("Content-Type: text/html; charset=gb2312");
- $_SESSION['_config']['header'] = "\n";
-// header("Content-Transfer-Encoding: 8bit");
+ $_SESSION['_config']['recode'] = "html..gb2312";
+ } else if($_SESSION['_config']['language'] == "pl_PL" || $_SESSION['_config']['language'] == "hu_HU") {
+ $_SESSION['_config']['recode'] = "html..ISO-8859-2";
+ } else if($_SESSION['_config']['language'] == "ja_JP") {
+ $_SESSION['_config']['recode'] = "html..SHIFT-JIS";
} else if($_SESSION['_config']['language'] == "ru_RU") {
- header("Content-Type: text/html; charset=ISO-8859-5");
- $_SESSION['_config']['header'] = "\n";
-// header("Content-Transfer-Encoding: 8bit");
- } else {
- unset($_SESSION['_config']['header']);
+ $_SESSION['_config']['recode'] = "html..ISO-8859-5";
}
putenv("LANG=".$_SESSION['_config']['language']);
- setlocale(LC_ALL, $_SESSION['_config']['language']);
-
+ setlocale(LC_ALL, $_SESSION['_config']['language'].".utf-8");
$domain = 'messages';
bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale");
textdomain("$domain");
@@ -572,7 +573,7 @@
function checkEmail($email)
{
- if(preg_match("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/" , $email))
+ if(preg_match("/^([a-zA-Z0-9])+([a-zA-Z0-9\+\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/" , $email))
{
list($username,$domain)=split('@',$email);
$dom = escapeshellarg($domain);
@@ -606,13 +607,13 @@
fclose($fp);
if(substr($line, 0, 3) != "250")
- return false;
+ return trim($line);
else
break;
}
}
return true;
}
- return false;
+ return _("Failed to make a connection to the mail server");
}
?>
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 3947565..aab99a8 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -1,5 +1,5 @@
+ Copyright (C) 2004-2005 by Duane Groth
This file is part of CAcert.
@@ -30,7 +30,7 @@ if(!function_exists("showheader"))
-
+
-