kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged changeset 3036 from branch stable 1.0 to trunk.

This commit is contained in:
Alexis Lahouze 2011-06-05 08:15:32 +00:00
parent bd61ae98b6
commit 2ca2bec39a
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bureau/admin/head.php
View File

@ -27,7 +27,7 @@
Purpose of file: Main header of all html files 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"); @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"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

5
bureau/admin/index.php
View File

@ -41,6 +41,9 @@ $H=getenv("HTTP_HOST");
if (!isset($restrictip)) { if (!isset($restrictip)) {
$restrictip=1; $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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
@ -48,7 +51,7 @@ if (!isset($restrictip)) {
<title>AlternC Desktop</title> <title>AlternC Desktop</title>
<link rel="stylesheet" href="styles/style.css" type="text/css" /> <link rel="stylesheet" href="styles/style.css" type="text/css" />
<script type="text/javascript" src="js/alternc.js"></script> <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> </head>
<body> <body>

5
bureau/admin/mem_logout.php
View File

@ -31,13 +31,16 @@ require_once("../class/config.php");
$mem->del_session(); $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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
<head> <head>
<title><?php __("Disconnected"); ?></title> <title><?php __("Disconnected"); ?></title>
<link rel="stylesheet" href="styles/style.css" type="text/css" /> <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> </head>
<body style="margin: 20px;"> <body style="margin: 20px;">
<h3 style="text-align: center"><?php __("Disconnected"); ?></h3> <h3 style="text-align: center"><?php __("Disconnected"); ?></h3>

2
bureau/class/lang_env.php
View File

@ -69,5 +69,7 @@ textdomain("alternc");
if (_("") && preg_match("#charset=([A-Za-z0-9\.-]*)#",_(""),$mat)) { if (_("") && preg_match("#charset=([A-Za-z0-9\.-]*)#",_(""),$mat)) {
$charset=$mat[1]; $charset=$mat[1];
} }
if (!$charset) $charset="UTF-8";
bind_textdomain_codeset("alternc","$charset");
?> ?>