From f9e9d0dbbee9a625b958a7f5ee4ba9c2dcf08a21 Mon Sep 17 00:00:00 2001 From: Mitsukarenai Date: Sun, 7 Apr 2013 13:04:19 +0200 Subject: [PATCH] fix & optim autoblogs: broken RSS feed :-> working ATOM feed index: index added to sitemap --- 0.3/autoblog.php | 50 ++++++++++++++++++++++++----------------------- 0.3/functions.php | 4 ++-- 0.3/index.php | 25 +++++++++++++----------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/0.3/autoblog.php b/0.3/autoblog.php index b8b35ed..c7e67db 100755 --- a/0.3/autoblog.php +++ b/0.3/autoblog.php @@ -557,36 +557,38 @@ $site_type = escape($config->site_type); if (isset($_GET['feed'])) // FEED { - header('Content-Type: application/xhtml+xml; charset=utf-8'); + header('Content-Type: application/atom+xml; charset=UTF-8'); echo ' - - - '.escape($config->site_title).' - '.escape($config->site_url).' - '.escape(html_entity_decode(strip_tags($config->site_description), ENT_COMPAT, 'UTF-8')).' - - '; + + '.escape($config->site_title).' + '.escape(html_entity_decode(strip_tags($config->site_description), ENT_COMPAT, 'UTF-8')).' + '.date(DATE_ATOM, filemtime(ARTICLES_DB_FILE)).' + + '.LOCAL_URL.' + + Projet Autoblog'; foreach($vvb->listLastArticles() as $art) { echo ' - - '.escape($art['title']).' - '.escape($art['feed_id']).' - '.$vvb->getLocalURL($art).' - '.date(DATE_RSS, $art['date']).' - - - - - - - '; + + + '.escape($config->site_title).' + '.escape($config->site_url).' + + <![CDATA['.escape($art['title']).']]> + + '.str_replace('?feed', '?', LOCAL_URL).urlencode(str_replace('./?', '', $vvb->getLocalURL($art))).' + '.date(DATE_ATOM, $art['date']).' + + + source)
'.escape_content($art['content']).']]> + + '; } echo ' - - '; + '; exit; } @@ -713,7 +715,7 @@ echo ' '.escape($config->site_title).' - + @@ -826,7 +828,7 @@ else echo '
-

Propulsé par Projet Autoblog '.$vvbversion.' - '.__('RSS Feed').'

+

Propulsé par Projet Autoblog '.$vvbversion.' - '.__('ATOM Feed').'

'.__('Download:').' '.__('configuration').' (OPML) - '.__('articles').'

'.__('Media export').' JSON

diff --git a/0.3/functions.php b/0.3/functions.php index 2aacef1..fa6f140 100755 --- a/0.3/functions.php +++ b/0.3/functions.php @@ -178,8 +178,8 @@ function __($str) return 'Plus anciens'; case 'Newer': return 'Plus récents'; - case 'RSS Feed': - return 'Flux RSS'; + case 'ATOM Feed': + return 'Flux ATOM'; case 'Update complete!': return 'Mise à jour terminée !'; case 'Click here to reload this webpage.': diff --git a/0.3/index.php b/0.3/index.php index aa2715e..30fe190 100755 --- a/0.3/index.php +++ b/0.3/index.php @@ -255,7 +255,7 @@ if (isset($_GET['export'])) { $subdirs = glob($directory . "*"); foreach($subdirs as $unit) { - if(is_dir($unit) && strpos($unit.'/', DOC_FOLDER) === FALSE) { + if(is_dir($unit)) { $unit=substr($unit, 2); $ini = parse_ini_file($unit.'/vvb.ini'); $config = new stdClass; @@ -289,7 +289,7 @@ if (isset($_GET['export_twitter'])) { $response = array(); foreach($subdirs as $unit) { - if(is_dir($unit) && strpos($unit.'/', DOC_FOLDER) === FALSE) { + if(is_dir($unit)) { $unit=substr($unit, 2); $ini = parse_ini_file($unit.'/vvb.ini'); if( $ini['SITE_TYPE'] == 'twitter' ) { @@ -323,7 +323,7 @@ if (isset($_GET['exportopml'])) // OPML $subdirs = glob($directory . "*"); foreach($subdirs as $unit) { - if(is_dir($unit) && strpos($unit.'/', DOC_FOLDER) === FALSE) { + if(is_dir($unit)) { $unit=substr($unit, 2); $ini = parse_ini_file($unit.'/vvb.ini'); $config = new stdClass; @@ -352,6 +352,9 @@ if (isset($_GET['sitemap'])) { header('Content-Type: application/xml'); echo ''; + echo ''.'http' . (!empty($_SERVER['HTTPS']) ? 's' : '')."://{$_SERVER['HTTP_HOST']}".str_replace('?sitemap', '', $_SERVER['REQUEST_URI'])."\n"; + echo ''.date('c', time())."\n"; + echo 'daily'; $directory = "./"; $subdirs = glob($directory . "*"); foreach($subdirs as $unit) { @@ -392,7 +395,7 @@ if( isset($_GET['updateall']) && ALLOW_FULL_UPDATE) { $directory = "./"; $subdirs = glob($directory . "*"); foreach($subdirs as $unit) { - if(is_dir($unit) && strpos($unit.'/', DOC_FOLDER) === FALSE) { + if(is_dir($unit)) { if( !file_exists(ROOT_DIR . '/' . $unit . '/.disabled')) { file_get_contents(serverUrl() . substr($_SERVER['PHP_SELF'], 0, -9) . $unit . '/index.php'); } @@ -403,7 +406,7 @@ if( isset($_GET['updateall']) && ALLOW_FULL_UPDATE) { $antibot = generate_antibot(); $form = '

-
+
'; @@ -586,7 +589,7 @@ if( !empty($_POST['generic']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY_L


-
+
'; } @@ -775,7 +778,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY Identica

-
+
@@ -787,7 +790,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY

-
+
@@ -801,7 +804,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY

-
+
@@ -816,7 +819,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY

-
+
@@ -872,7 +875,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY $autoblogs = array(); foreach($subdirs as $unit) { - if(is_dir($unit) && strpos($unit.'/', DOC_FOLDER) === FALSE) + if(is_dir($unit)) { if( !file_exists(ROOT_DIR . '/' . $unit . '/.disabled')) { $ini = parse_ini_file(ROOT_DIR . '/' . $unit . '/vvb.ini');