mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

CHARSET deprecated

Browse Source
This commit is contained in:
marj
2009-07-19 11:44:30 +00:00
parent 7a62bec60d
commit 5e462df2c7
22 changed files with 109 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_themes/templates/email_template.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/email_template.php,v $
| $Revision: 1.6 $
| $Date: 2009-07-06 07:50:44 $
| $Revision: 1.7 $
| $Date: 2009-07-19 11:44:29 $
| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -39,10 +39,10 @@ $EMAIL_FROM_NAME = ""; // Admin
$EMAIL_HEADER = "
<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
$EMAIL_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
<html xmlns='http://www.w3.org/1999/xhtml' >
<head><meta http-equiv='content-type' content='text/html; charset=".CHARSET."' />
<head>
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
{STYLESHEET}
</head>
<body>

14
e107_themes/templates/header_default.php
View File

@@ -6,9 +6,9 @@
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
| $Revision: 1.36 $
| $Date: 2009-07-14 11:05:54 $
| $Author: e107coders $
| $Revision: 1.37 $
| $Date: 2009-07-19 11:44:30 $
| $Author: marj_nl_fr $
+-----------------------------------------------------------------------------------------------+
*/
@@ -74,19 +74,19 @@ if (!function_exists("parseheader")) {
// send the charset to the browser - overrides spurious server settings with the lan pack settings.
// Would like to set the MIME type appropriately - but it broke other things
//if (stristr($_SERVER["HTTP_ACCEPT"], "application/xhtml+xml"))
// header("Content-type: application/xhtml+xml; charset=".CHARSET, true);
// header("Content-type: application/xhtml+xml; charset=utf-8", TRUE);
//else
header("Content-type: text/html; charset=".CHARSET, true);
header("Content-type: text/html; charset=utf-8", TRUE);
echo (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET."' "."?".">\n")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
echo (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='utf-8' "."?".">\n")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
//
// C: Send start of HTML
//
echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "").">
<head>
<meta http-equiv='content-type' content='text/html; charset=".CHARSET."' />
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
<meta http-equiv='content-style-type' content='text/css' />
";
echo (defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";

10
e107_themes/templates/sitedown_template.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/sitedown_template.php,v $
| $Revision: 1.5 $
| $Date: 2007-12-06 21:35:55 $
| $Author: e107steved $
| $Revision: 1.6 $
| $Date: 2009-07-19 11:44:30 $
| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -22,12 +22,12 @@ if (!defined('e107_INIT')) { exit; }
// ##### SITEDOWN TABLE -----------------------------------------------------------------
if(!isset($SITEDOWN_TABLE))
{
$SITEDOWN_TABLE = (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET."' "."?".">")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
$SITEDOWN_TABLE = (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='utf-8' "."?".">")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
";
$SITEDOWN_TABLE .= "
<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "").">
<head>
<meta http-equiv='content-type' content='text/html; charset=".CHARSET."' />
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
<meta http-equiv='content-style-type' content='text/css' />\n
<link rel='stylesheet' href='".THEME_ABS."style.css' type='text/css' media='all' />
<title>{SITEDOWN_TABLE_PAGENAME}</title>