1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 22:57:14 +02:00

CHARSET deprecated

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

View File

@@ -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";
}
}
}

View File

@@ -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'