diff --git a/class2.php b/class2.php
index 1117785a7..8a4fb6341 100644
--- a/class2.php
+++ b/class2.php
@@ -9,8 +9,8 @@
* General purpose file
*
* $Source: /cvs_backup/e107_0.8/class2.php,v $
-* $Revision: 1.109 $
-* $Date: 2009-07-18 10:17:56 $
+* $Revision: 1.110 $
+* $Date: 2009-07-19 11:44:26 $
* $Author: marj_nl_fr $
*
*/
@@ -209,6 +209,11 @@ if (strpos($_SERVER['PHP_SELF'], 'trackback') === false)
}
}
+/**
+ * set CHARSET for backward compatibility
+ */
+define('CHARSET', 'utf-8');
+
//
// G: Retrieve Query data from URI
// (Until this point, we have no idea what the user wants to do)
@@ -1918,23 +1923,18 @@ function loadLanFiles($unitName, $type='runtime')
if(!function_exists('print_a'))
{
- function print_a($var, $return = false)
- {
- $charset = 'utf-8';
- if(defined('CHARSET'))
+ function print_a($var, $return = FALSE)
{
- $charset = CHARSET;
+ if( ! $return)
+ {
+ echo '<pre>'.htmlspecialchars(print_r($var, TRUE), ENT_QUOTES, 'utf-8').'</pre>';
+ return TRUE;
+ }
+ else
+ {
+ return '<pre>'.htmlspecialchars(print_r($var, true), ENT_QUOTES, 'utf-8').'</pre>';
+ }
}
- if(!$return)
- {
- echo '<pre>'.htmlspecialchars(print_r($var, true), ENT_QUOTES, $charset).'</pre>';
- return true;
- }
- else
- {
- return '<pre>'.htmlspecialchars(print_r($var, true), ENT_QUOTES, $charset).'</pre>';
- }
- }
}
diff --git a/e107_admin/credits.php b/e107_admin/credits.php
index 712d4c516..d67ef6b29 100644
--- a/e107_admin/credits.php
+++ b/e107_admin/credits.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/credits.php,v $
-| $Revision: 1.4 $
-| $Date: 2008-04-01 20:08:38 $
-| $Author: e107steved $
+| $Revision: 1.5 $
+| $Date: 2009-07-19 11:44:27 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -98,11 +98,11 @@ $contentA = array(
"<h1>Pete Holzmann<\/h1>[ MrPete ]<br /><br /><br />".CRELAN_28
);
-echo "<?xml version='1.0' encoding='".CHARSET."' ?><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+echo "<!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>
<title>".PAGE_NAME."</title>
-<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' />
<link rel='stylesheet' href='".THEME."style.css' type='text/css' />
</head>
@@ -253,5 +253,3 @@ echo "
</body>
</html>
";
-
-?>
diff --git a/e107_admin/db.php b/e107_admin/db.php
index cde4763fd..a56400704 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -9,9 +9,9 @@
* Administration - Database Utilities
*
* $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $
- * $Revision: 1.9 $
- * $Date: 2009-01-16 01:02:41 $
- * $Author: mcfly_e107 $
+ * $Revision: 1.10 $
+ * $Date: 2009-07-19 11:44:27 $
+ * $Author: marj_nl_fr $
*
*/
@@ -396,7 +396,7 @@ function pref_editor()
foreach($pref as $key => $val)
{
- $ptext = (is_array($val)) ? "<pre>".print_r($val, TRUE)."</pre>" : htmlspecialchars($val, ENT_QUOTES, CHARSET);
+ $ptext = (is_array($val)) ? "<pre>".print_r($val, TRUE)."</pre>" : htmlspecialchars($val, ENT_QUOTES, 'utf-8');
$ptext = $e107->tp->textclean($ptext, 80);
$text .= "
diff --git a/e107_admin/header.php b/e107_admin/header.php
index ccc13bedb..60656e603 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-| $Revision: 1.39 $
-| $Date: 2009-07-18 15:14:38 $
+| $Revision: 1.40 $
+| $Date: 2009-07-19 11:44:28 $
| $Author: marj_nl_fr $
+---------------------------------------------------------------+
*/
@@ -69,10 +69,10 @@ if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
//
// send the charset to the browser - overrides spurious server settings with the lan pack settings.
-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";
//
// B.2: Include admin LAN defines
@@ -188,7 +188,7 @@ if (!defined('ADMIN_UPGRADEPLUGIN_ICON'))
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" : "";
diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
index f7241113e..fb47ebf53 100644
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -10,8 +10,8 @@
* With code from Izydor and Lolo.
*
* $Source: /cvs_backup/e107_0.8/e107_admin/lancheck.php,v $
- * $Revision: 1.13 $
- * $Date: 2009-07-14 12:19:40 $
+ * $Revision: 1.14 $
+ * $Date: 2009-07-19 11:44:28 $
* $Author: marj_nl_fr $
*
*/
@@ -765,7 +765,8 @@ function is_utf8($str) {
/*
* @see http://hsivonen.iki.fi/php-utf8/ validation.php
*/
- if(strtolower(CHARSET) != "utf-8" || $str == "")
+//@TODO: always TRUE
+// if(strtolower(CHARSET) != "utf-8" || $str == "")
{
return TRUE;
}
diff --git a/e107_files/bbcode/code.bb b/e107_files/bbcode/code.bb
index 3dd06df5c..80b359d60 100644
--- a/e107_files/bbcode/code.bb
+++ b/e107_files/bbcode/code.bb
@@ -25,7 +25,7 @@ if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/
$geshi = new GeSHi($code_text, ($pref['defaultLanGeshi'] ? $pref['defaultLanGeshi'] : 'php'), e_PLUGIN."geshi/geshi/");
}
$geshi->line_style1 = "font-family: 'Courier New', Courier, monospace; font-weight: normal; font-style: normal;";
- $geshi->set_encoding(CHARSET);
+ $geshi->set_encoding('utf-8');
$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
$geshi->set_header_type(GESHI_HEADER_DIV);
$CodeCache = $geshi->parse_code();
@@ -35,7 +35,7 @@ if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/
}
else
{
- $code_text = html_entity_decode($code_text, ENT_QUOTES, CHARSET);
+ $code_text = html_entity_decode($code_text, ENT_QUOTES, 'utf-8');
$highlighted_text = highlight_string($code_text, TRUE);
$divClass = ($parm) ? $parm : 'code_highlight';
$ret = "<div class='".$tp -> toAttribute($divClass)." code-box' style='unicode-bidi: embed; direction: ltr'>{$highlighted_text}</div>";
diff --git a/e107_files/shortcode/batch/admin_shortcodes_class.php b/e107_files/shortcode/batch/admin_shortcodes_class.php
index 34cf2a9a5..b5bf1c8f5 100644
--- a/e107_files/shortcode/batch/admin_shortcodes_class.php
+++ b/e107_files/shortcode/batch/admin_shortcodes_class.php
@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: admin_shortcodes_class.php,v 1.13 2009-07-18 11:51:44 marj_nl_fr Exp $
+* $Id: admin_shortcodes_class.php,v 1.14 2009-07-19 11:44:28 marj_nl_fr Exp $
*
* Admin shortcode batch - class
*/
@@ -792,7 +792,7 @@ class admin_shortcodes
".FOOTLAN_16.": ".$mySQLdefaultdb."
<br /><br />
<b>".FOOTLAN_17."</b>
- <br />".CHARSET;
+ <br />utf-8"; //@TODO is this still needed?
return $ns->tablerender(FOOTLAN_13, $text, '', TRUE);
}
}
@@ -921,7 +921,7 @@ class admin_shortcodes
{
/*
* e107 website system (c) 2001-2008 Steve Dunstan (e107.org)
- * $Id: admin_shortcodes_class.php,v 1.13 2009-07-18 11:51:44 marj_nl_fr Exp $
+ * $Id: admin_shortcodes_class.php,v 1.14 2009-07-19 11:44:28 marj_nl_fr Exp $
*/
if (ADMIN)
diff --git a/e107_files/utilities/resetcore.php b/e107_files/utilities/resetcore.php
index 297b76104..bc2120ecd 100644
--- a/e107_files/utilities/resetcore.php
+++ b/e107_files/utilities/resetcore.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/utilities/resetcore.php,v $
-| $Revision: 1.1 $
-| $Date: 2008-10-14 20:24:29 $
-| $Author: e107steved $
+| $Revision: 1.2 $
+| $Date: 2009-07-19 11:44:28 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -28,12 +28,9 @@ If you don't, the script will not be usable.
When you have finished with resetcore you should swap true for false so it can't be used by
people it shouldn't be used by.
-If your site uses a different charset than utf-8, change the CHARSET to reflect the correct encoding.
-
*/
define("ACTIVE", false);
-define("CHARSET", 'utf-8');
/* #################################################### */
@@ -64,14 +61,13 @@ define("e107_INIT", TRUE);
require_once('../../'.$HANDLERS_DIRECTORY.'arraystorage_class.php');
$eArrayStorage = new ArrayData();
-echo "<?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">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><e107 resetcore></title>
<link rel="stylesheet" href="style.css" />
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="content-style-type" content="text/css" />
</head>
<body>
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index fd1943701..6bf43e0e5 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -9,9 +9,9 @@
* Text processing and parsing functions
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
-* $Revision: 1.53 $
-* $Date: 2009-07-17 02:28:49 $
-* $Author: e107coders $
+* $Revision: 1.54 $
+* $Date: 2009-07-19 11:44:28 $
+* $Author: marj_nl_fr $
*
*/
if (!defined('e107_INIT')) { exit; }
@@ -158,6 +158,7 @@ class e_parse
// This has to be a separate function - can't be called until CHARSET known
+ //@TODO deprecated
function initCharset()
{
// Start by working out what, if anything, we do about utf-8 handling.
diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php
index 14dd7661c..ec1ff3fe3 100644
--- a/e107_handlers/mail.php
+++ b/e107_handlers/mail.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
-| $Revision: 1.10 $
-| $Date: 2007-11-04 20:25:02 $
-| $Author: e107steved $
+| $Revision: 1.11 $
+| $Date: 2009-07-19 11:44:28 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -105,7 +105,7 @@ function sendemail($send_to, $subject, $message, $to_name, $send_from='', $from_
$from_name = $tp->toEmail(varsettrue($pref['replyto_name'],$pref['siteadmin']),"","RAWTEXT");
$send_from = $tp->toEmail(varsettrue($pref['replyto_email'],$pref['siteadminemail']),"","RAWTEXT");
}
- $mail->CharSet = CHARSET;
+ $mail->CharSet = 'utf-8';
$mail->From = $send_from;
$mail->FromName = $from_name;
$mail->Subject = $subject;
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index 75d04a21e..b0bed23a3 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -9,9 +9,9 @@
* News handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $
- * $Revision: 1.15 $
- * $Date: 2009-07-07 06:50:55 $
- * $Author: e107coders $
+ * $Revision: 1.16 $
+ * $Date: 2009-07-19 11:44:28 $
+ * $Author: marj_nl_fr $
*/
if (!defined('e107_INIT')) { exit; }
@@ -259,6 +259,7 @@ class news {
}
}
+ //@TDODO deprecated?
function make_xml_compatible($original)
{
global $e107;
diff --git a/e107_handlers/user_select_class.php b/e107_handlers/user_select_class.php
index ecd2fb291..de7ba832c 100644
--- a/e107_handlers/user_select_class.php
+++ b/e107_handlers/user_select_class.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/user_select_class.php,v $
-| $Revision: 1.4 $
-| $Date: 2009-07-07 07:25:27 $
-| $Author: e107coders $
+| $Revision: 1.5 $
+| $Date: 2009-07-19 11:44:28 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -155,8 +155,8 @@ class user_select {
}
// send the charset to the browser - overrides spurious server settings with the lan pack settings.
- header("Content-type: text/html; charset=".CHARSET, 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";
+ header("Content-type: text/html; charset=utf-8", TRUE);
+ 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";
echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "").">
<head>
<title>".SITENAME."</title>\n";
diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index 708090667..58ebef934 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/English.php,v $
-| $Revision: 1.11 $
-| $Date: 2009-07-18 15:53:10 $
+| $Revision: 1.12 $
+| $Date: 2009-07-19 11:44:28 $
| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -13,7 +13,8 @@ setlocale(LC_ALL, 'en');
define('CORE_LC', 'en');
define('CORE_LC2', 'gb');
// define("TEXTDIRECTION","rtl");
-define('CHARSET', 'utf-8'); // for a true multi-language site. :)
+// deprecated: all language packs must be UTF-8
+//define('CHARSET', 'utf-8'); // for a true multi-language site. :)
define('CORE_LAN1',"Error : theme is missing.\\n\\nChange the used themes in your preferences (admin area) or upload files for the current theme to the server.");
//obsolete define('CORE_LAN2'," \\1 wrote:");// "\\1" represents the username.
//obsolete define('CORE_LAN3', 'file attachment disabled'); // Not used in 0.8
diff --git a/e107_plugins/content/handlers/content_preset.php b/e107_plugins/content/handlers/content_preset.php
index f4ed741db..cf656de81 100644
--- a/e107_plugins/content/handlers/content_preset.php
+++ b/e107_plugins/content/handlers/content_preset.php
@@ -109,12 +109,11 @@ if(isset($_POST['addpreset'])){
}
-$text .= "
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'>\n
+$text = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'>\n
<html>\n
<head>\n
<title>".CONTENT_PRESET_LAN_7."</title>\n
-<meta http-equiv='content-type' content='text/html; charset=".CHARSET."' />\n
+<meta http-equiv='content-type' content='text/html; charset=utf-8' />\n
<script type='text/javascript' src='../../../e107_files/e107.js'></script>
".$js."
<style type='text/css'>\n
diff --git a/e107_plugins/linkwords/e_tohtml.php b/e107_plugins/linkwords/e_tohtml.php
index b856b77e8..712f76fe2 100755
--- a/e107_plugins/linkwords/e_tohtml.php
+++ b/e107_plugins/linkwords/e_tohtml.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/e_tohtml.php,v $
-| $Revision: 1.5 $
-| $Date: 2009-02-03 11:59:02 $
-| $Author: lisa_ $
+| $Revision: 1.6 $
+| $Date: 2009-07-19 11:44:28 $
+| $Author: marj_nl_fr $
|
| *utf - flags functions which need utf-8-aware code
TODO:
@@ -130,6 +130,7 @@ class e_tohtml_linkwords
}
}
$this->area_opts = $pref['lw_context_visibility'];
+ //@TODO utfMode probably obsolete
$this->utfMode = (strtolower(CHARSET) == 'utf-8') ? 'u' : ''; // Flag to enable utf-8 on regex
$this->lwAjaxEnabled = varset($pref['lw_ajax_enable'],0);
}
diff --git a/e107_plugins/newsletter/admin_config.php b/e107_plugins/newsletter/admin_config.php
index 5a48d8a4e..949cdaaa4 100644
--- a/e107_plugins/newsletter/admin_config.php
+++ b/e107_plugins/newsletter/admin_config.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/admin_config.php,v $
-| $Revision: 1.8 $
-| $Date: 2009-03-05 22:22:18 $
-| $Author: e107steved $
+| $Revision: 1.9 $
+| $Date: 2009-07-19 11:44:28 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
require_once('../../class2.php');
@@ -407,7 +407,7 @@ class newsletter
}
$mail->WordWrap = 50;
- $mail->CharSet = CHARSET;
+ $mail->CharSet = 'utf-8';
$mail->Subject = $newsletterParentInfo['newsletter_title'] . ": ".$newsletterInfo['newsletter_title'];
$mail->IsHTML(true);
diff --git a/e107_plugins/rss_menu/e_meta.php b/e107_plugins/rss_menu/e_meta.php
index 4ec7cb09e..2cdc20c20 100644
--- a/e107_plugins/rss_menu/e_meta.php
+++ b/e107_plugins/rss_menu/e_meta.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/e_meta.php,v $
-| $Revision: 1.5 $
-| $Date: 2008-12-13 12:34:53 $
-| $Author: e107steved $
+| $Revision: 1.6 $
+| $Date: 2009-07-19 11:44:29 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
@@ -30,7 +30,7 @@ global $tp,$PLUGINS_DIRECTORY;
$url = SITEURL.$PLUGINS_DIRECTORY."rss_menu/rss.php?".$tp->toHTML($row['rss_url'], TRUE, 'constants, no_hook, emotes_off').".2";
$url .= ($row['rss_topicid']) ? ".".$row['rss_topicid'] : "";
$name = $tp->toHTML($row['rss_name'], TRUE, 'no_hook, emotes_off');
- echo "<link rel='alternate' type='application/rss+xml' title='".htmlspecialchars(SITENAME, ENT_QUOTES, CHARSET)." ".htmlspecialchars($name, ENT_QUOTES, CHARSET)."' href='".$url."' />\n";
+ echo "<link rel='alternate' type='application/rss+xml' title='".htmlspecialchars(SITENAME, ENT_QUOTES, 'utf-8')." ".htmlspecialchars($name, ENT_QUOTES, 'utf-8')."' href='".$url."' />\n";
}
}
}
diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php
index c8959becb..5505ca958 100644
--- a/e107_plugins/rss_menu/rss.php
+++ b/e107_plugins/rss_menu/rss.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss.php,v $
-| $Revision: 1.12 $
-| $Date: 2009-06-29 06:30:05 $
-| $Author: e107coders $
+| $Revision: 1.13 $
+| $Date: 2009-07-19 11:44:29 $
+| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -415,7 +415,7 @@ class rssCreate {
$time = time();
switch ($this -> rssType) {
case 1: // Rss 1.0
- echo "<?xml version=\"1.0\" encoding=\"".CHARSET."\" ?>
+ echo "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
<!-- generator=\"e107\" -->
<!-- content type=\"".$this -> contentType."\" -->
<rss version=\"0.92\">
@@ -447,7 +447,7 @@ class rssCreate {
case 2: // rss 2.0
$sitebutton = (strstr(SITEBUTTON, "http:") ? SITEBUTTON : SITEURL.str_replace("../", "", e_IMAGE).SITEBUTTON);
- echo "<?xml version=\"1.0\" encoding=\"".CHARSET."\"?>
+ echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>
<!-- generator=\"e107\" -->
<!-- content type=\"".$this -> contentType."\" -->
<rss {$rss_namespace} version=\"2.0\">
@@ -541,7 +541,7 @@ class rssCreate {
break;
case 3: // rdf
- echo "<?xml version=\"1.0\" encoding=\"".CHARSET."\" ?>
+ echo "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
<!-- generator=\"e107\" -->
<!-- content type=\"".$this -> contentType."\" -->
<rdf:RDF xmlns=\"http://purl.org/rss/1.0/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\" xmlns:admin=\"http://webns.net/mvcb/\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">
@@ -599,7 +599,7 @@ class rssCreate {
//new feed for atom - still in development, and not yet tested
case 4:
- echo "<?xml version='1.0' encoding='".CHARSET."'?>\n
+ echo "<?xml version='1.0' encoding='utf-8'?>\n
<feed xmlns='http://www.w3.org/2005/Atom'>\n";
/*
<feed version='0.3'
diff --git a/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php b/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
index e21b805c6..d5fc87dc6 100644
--- a/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
+++ b/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
@@ -9,13 +9,13 @@
// ------------------------------------------------
// www.j-cons.com
// ================================================
-// $Revision: 1.5 $Date: 2004/10/04
+// $Revision: 1.6 $Date: 2004/10/04
// ================================================
//
// $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php,v $
-// $Revision: 1.5 $
-// $Date: 2009-07-02 03:24:14 $
-// $Author: e107coders $
+// $Revision: 1.6 $
+// $Date: 2009-07-19 11:44:29 $
+// $Author: marj_nl_fr $
// +----------------------------------------------------------------------------+
// Major Re-work by CaMer0n
@@ -81,15 +81,14 @@ else
$d = @dir(e_BASE.$imglib);
-echo "
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">
+echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">
<html>
<head>
<title>".$lang_ibrowser_title."</title>
<script type=\"text/javascript\" src=\"../../tiny_mce_popup.js\"></script>
<meta http-equiv=\"Pragma\" content=\"no-cache\" />
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=". CHARSET."\" />
+<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
<script type=\"text/javascript\">
//<![CDATA[
diff --git a/e107_themes/templates/email_template.php b/e107_themes/templates/email_template.php
index eb322e5f9..40f3e1d2d 100644
--- a/e107_themes/templates/email_template.php
+++ b/e107_themes/templates/email_template.php
@@ -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>
diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php
index f20431d7c..424797841 100644
--- a/e107_themes/templates/header_default.php
+++ b/e107_themes/templates/header_default.php
@@ -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" : "";
diff --git a/e107_themes/templates/sitedown_template.php b/e107_themes/templates/sitedown_template.php
index f294633d3..732f98ae9 100644
--- a/e107_themes/templates/sitedown_template.php
+++ b/e107_themes/templates/sitedown_template.php
@@ -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>