Source code taken from cacert-20120125.tar.bz2

1 files changed, 3 insertions, 124 deletions

diff --git a/includes/general.php b/includes/general.php
index 8481018..4919c84 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -39,6 +39,7 @@
 
 	require_once($_SESSION['_config']['filepath']."/includes/mysql.php");
 	require_once($_SESSION['_config']['filepath'].'/includes/lib/account.php');
+	require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
 
 	if(array_key_exists('HTTP_HOST',$_SERVER) &&
 			$_SERVER['HTTP_HOST'] != $_SESSION['_config']['normalhostname'] &&
@@ -70,122 +71,8 @@
 		}
 	}
 
-	$lang = "";
-	if(array_key_exists("lang",$_REQUEST))
-	  $lang=mysql_escape_string(substr(trim($_REQUEST['lang']), 0, 5));
-	if($lang != "")
-		$_SESSION['_config']['language'] = $lang;
-
-	//if($_SESSION['profile']['id'] == 1 && 1 == 2)
-	//	echo $_SESSION['_config']['language'];
-
-	$_SESSION['_config']['translations'] = array(
-				"ar_JO" => "العربية",
-				"bg_BG" => "Български",
-				"cs_CZ" => "Čeština",
-				"da_DK" => "Dansk",
-				"de_DE" => "Deutsch",
-				"el_GR" => "Ελληνικά",
-				"en_AU" => "English",
-				"eo_EO" => "Esperanto",
-				"es_ES" => "Español",
-				"fa_IR" => "Farsi",
-				"fi_FI" => "Suomi",
-				"fr_FR" => "Français",
-				"he_IL" => "עברית",
-				"hr_HR" => "Hrvatski",
-				"hu_HU" => "Magyar",
-				"is_IS" => "Íslenska",
-				"it_IT" => "Italiano",
-				"ja_JP" => "日本語",
-				"ka_GE" => "Georgian",
-				"nl_NL" => "Nederlands",
-				"pl_PL" => "Polski",
-				"pt_PT" => "Português",
-				"pt_BR" => "Português Brasileiro",
-				"ru_RU" => "Русский",
-				"ro_RO" => "Română",
-				"sv_SE" => "Svenska",
-				"tr_TR" => "Türkçe",
-				"zh_CN" => "中文(简体)");
-
-        $value=array();
-
-	if(!(array_key_exists('language',$_SESSION['_config']) && $_SESSION['_config']['language'] != ""))
-	{
-		$bits = explode(",", strtolower(str_replace(" ", "", mysql_real_escape_string(array_key_exists('HTTP_ACCEPT_LANGUAGE',$_SERVER)?$_SERVER['HTTP_ACCEPT_LANGUAGE']:""))));
-		foreach($bits as $lang)
-		{
-			$b = explode(";", $lang);
-			if(count($b)>1 && substr($b[1], 0, 2) == "q=")
-				$c = floatval(substr($b[1], 2));
-			else
-				$c = 1;
-			$value["$c"] = trim($b[0]);
-		}
-
-		krsort($value);
-
-		reset($value);
-
-		foreach($value as $key => $val)
-		{
-			$val = substr(escapeshellarg($val), 1, -1);
-			$short = substr($val, 0, 2);
-			if($val == "en" || $short == "en")
-			{
-				$_SESSION['_config']['language'] = "en";
-				break;
-			}
-			if(file_exists($_SESSION['_config']['filepath']."/locale/$val/LC_MESSAGES/messages.mo"))
-			{
-				$_SESSION['_config']['language'] = $val;
-				break;
-			}
-			if(file_exists($_SESSION['_config']['filepath']."/locale/$short/LC_MESSAGES/messages.mo"))
-			{
-				$_SESSION['_config']['language'] = $short;
-				break;
-			}
-		}
-	}
-	if(!array_key_exists('_config',$_SESSION) || !array_key_exists('language',$_SESSION['_config']) || strlen($_SESSION['_config']['language']) != 5)
-	{
-		$lang = array_key_exists('language',$_SESSION['_config'])?$_SESSION['_config']['language']:"";
-		$_SESSION['_config']['language'] = "en_AU";
-		foreach($_SESSION['_config']['translations'] as $key => $val)
-		{
-			if(substr($lang, 0, 2) == substr($key, 0, 2))
-			{
-				$_SESSION['_config']['language'] = $val;
-				break;
-			}
-		}
-	}
-
-	$_SESSION['_config']['recode'] = "html..latin-1";
-	if($_SESSION['_config']['language'] == "zh_CN")
-	{
-		$_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") {
-		$_SESSION['_config']['recode'] = "html..ISO-8859-5";
-	} else if($_SESSION['_config']['language'] == "lt_LT") {
-		$_SESSION['_config']['recode'] = "html..ISO-8859-13";
-	}
-
-	putenv("LANG=".$_SESSION['_config']['language']);
-	setlocale(LC_ALL, $_SESSION['_config']['language']);
-	$domain = 'messages';
-	bindtextdomain($domain, $_SESSION['_config']['filepath']."/locale");
-	textdomain($domain);
-
-	//if($_SESSION['profile']['id'] == -1)
-	//	echo $_SESSION['_config']['language']." - ".$_SESSION['_config']['filepath']."/locale";
-
+	L10n::detect_language();
+	L10n::init_gettext();
 
         if(array_key_exists('profile',$_SESSION) && is_array($_SESSION['profile']) && array_key_exists('id',$_SESSION['profile']) && $_SESSION['profile']['id'] > 0)
 	{
@@ -632,14 +519,6 @@
 		return(utf8_decode($data));
 	}
 
-	function screenshot($img)
-	{
-		if(file_exists("../screenshots/".$_SESSION['_config']['language']."/$img"))
-			return("/screenshots/".$_SESSION['_config']['language']."/$img");
-		else
-			return("/screenshots/en/$img");
-	}
-
 	function signmail($to, $subject, $message, $from, $replyto = "")
 	{
 		if($replyto == "")