Commit 2ca2bec3 authored by Alexis Lahouze's avatar Alexis Lahouze
Browse files

Merged changeset 3036 from branch stable 1.0 to trunk.

parent bd61ae98
......@@ -27,7 +27,7 @@
Purpose of file: Main header of all html files
----------------------------------------------------------------------
*/
if (!$charset) $charset="iso-8859-1";
if (!$charset) $charset="UTF-8";
@header("Content-Type: text/html; charset=$charset");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
......
......@@ -41,6 +41,9 @@ $H=getenv("HTTP_HOST");
if (!isset($restrictip)) {
$restrictip=1;
}
if (!$charset) $charset="UTF-8";
@header("Content-Type: text/html; charset=$charset");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
......@@ -48,7 +51,7 @@ if (!isset($restrictip)) {
<title>AlternC Desktop</title>
<link rel="stylesheet" href="styles/style.css" type="text/css" />
<script type="text/javascript" src="js/alternc.js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
</head>
<body>
......
......@@ -31,13 +31,16 @@ require_once("../class/config.php");
$mem->del_session();
if (!$charset) $charset="UTF-8";
@header("Content-Type: text/html; charset=$charset");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
<head>
<title><?php __("Disconnected"); ?></title>
<link rel="stylesheet" href="styles/style.css" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
</head>
<body style="margin: 20px;">
<h3 style="text-align: center"><?php __("Disconnected"); ?></h3>
......
......@@ -69,5 +69,7 @@ textdomain("alternc");
if (_("") && preg_match("#charset=([A-Za-z0-9\.-]*)#",_(""),$mat)) {
$charset=$mat[1];
}
if (!$charset) $charset="UTF-8";
bind_textdomain_codeset("alternc","$charset");
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment