diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 08453c6bcb8..58f2be24da9 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -664,25 +664,25 @@ function getSocialNetworkSharingLinks()
 	$fullurl = $website->alias.'/'.$websitepage->pageurl.'.php';
 	$hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords))));
 
-	print '<!-- section for social network sharing of page -->'."\n";
-	print '<div class="dol-social-share">'."\n";
+	$out = '<!-- section for social network sharing of page -->'."\n";
+	$out.= '<div class="dol-social-share">'."\n";
 
 	// Twitter
-	print '<div class="dol-social-share-tw">'."\n";
-    print '<a href="https://twitter.com/share" class="twitter-share-button" data-url="'.$fullurl.'" data-text="'.dol_escape_htmltag($websitepage->description).'" data-lang="'.$websitepage->lang.'" data-size="small" data-related="" data-hashtags="'.preg_replace('/^#/', '', $hashtags).'" data-count="horizontal">Tweet</a>';
-	print '<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+\'://platform.twitter.com/widgets.js\';fjs.parentNode.insertBefore(js,fjs);}}(document, \'script\', \'twitter-wjs\');</script>';
-	print '</div>'."\n";
+	$out.= '<div class="dol-social-share-tw">'."\n";
+	$out.= '<a href="https://twitter.com/share" class="twitter-share-button" data-url="'.$fullurl.'" data-text="'.dol_escape_htmltag($websitepage->description).'" data-lang="'.$websitepage->lang.'" data-size="small" data-related="" data-hashtags="'.preg_replace('/^#/', '', $hashtags).'" data-count="horizontal">Tweet</a>';
+	$out.= '<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+\'://platform.twitter.com/widgets.js\';fjs.parentNode.insertBefore(js,fjs);}}(document, \'script\', \'twitter-wjs\');</script>';
+	$out.= '</div>'."\n";
 
 	// Reddit
-	print '<div class="dol-social-share-reddit">'."\n";
-	print '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
-    print '<img src="https://www.reddit.com/static/spreddit7.gif" alt="Submit to reddit" border="0" /> </a>';
-	print '</div>'."\n";
+	$out.= '<div class="dol-social-share-reddit">'."\n";
+	$out.= '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
+	$out.= '<img src="https://www.reddit.com/static/spreddit7.gif" alt="Submit to reddit" border="0" /> </a>';
+	$out.= '</div>'."\n";
 
 	// Facebook
-	print '<div class="dol-social-share-fbl">'."\n";
-	print '<div id="fb-root"></div>'."\n";
-	print '<script>(function(d, s, id) {
+	$out.= '<div class="dol-social-share-fbl">'."\n";
+	$out.= '<div id="fb-root"></div>'."\n";
+	$out.= '<script>(function(d, s, id) {
 			  var js, fjs = d.getElementsByTagName(s)[0];
 			  if (d.getElementById(id)) return;
 			  js = d.createElement(s); js.id = id;
@@ -697,10 +697,12 @@ function getSocialNetworkSharingLinks()
 			        colorscheme="light"
 			        share="1"
 			        action="like" ></fb:like>'."\n";
-	print '</div>'."\n";
+	$out.= '</div>'."\n";
 
-	print "\n</div>\n";
-	print '<!-- section end for social network sharing of page -->'."\n";
+	$out.= "\n</div>\n";
+	$out.= '<!-- section end for social network sharing of page -->'."\n";
+
+	return $out;
 }
 
 /**
@@ -881,6 +883,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 	$urltograb = dirname($urltograb); // So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
 
 	// Search X in "img...src=X"
+	$regs = array();
 	preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $tmp, $regs);
 
 	foreach ($regs[0] as $key => $val)
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 78b9923d82d..2a599aa3fc3 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -520,3 +520,21 @@ function showWebsiteTemplates(Website $website)
 	print '</td></tr>';
 	print '</table>';
 }
+
+
+
+/**
+ * Return HTML content to add structured data for an article, news or Blog Post.
+ *
+ * @return  string							HTML content
+ */
+function getRSSForBlogPosts()
+{
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+
+
+
+	return $out;
+}
+
+
diff --git a/htdocs/website/samples/wrapper.html b/htdocs/website/samples/wrapper.php
similarity index 57%
rename from htdocs/website/samples/wrapper.html
rename to htdocs/website/samples/wrapper.php
index 7a3932c1608..8f38c0b2043 100644
--- a/htdocs/website/samples/wrapper.html
+++ b/htdocs/website/samples/wrapper.php
@@ -5,11 +5,17 @@ if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_
 include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 $encoding = '';
+
+// Parameters to download files
 $hashp=GETPOST('hashp', 'aZ09');
 $modulepart=GETPOST('modulepart', 'aZ09');
 $entity=GETPOST('entity', 'int')?GETPOST('entity', 'int'):$conf->entity;
 $original_file=GETPOST("file", "alpha");
 
+// Parameters for RSS
+$rss=GETPOST('rss', 'aZ09');
+if ($rss) $original_file = 'blog.rss';
+
 // If we have a hash public (hashp), we guess the original_file.
 if (! empty($hashp))
 {
@@ -60,7 +66,7 @@ if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment=false
 
 // Define mime type
 $type = 'application/octet-stream';
-if (GETPOST('type','none')) $type=GETPOST('type', 'alpha');
+if (GETPOSTISSET('type')) $type=GETPOST('type', 'alpha');
 else $type=dol_mimetype($original_file);
 
 // Security: Delete string ../ into $original_file
@@ -75,26 +81,119 @@ if (GETPOST("cache",'none') || image_format_supported($original_file) >= 0)
     header('Pragma: cache');       // This is to avoid having Pragma: no-cache
 }
 
-// Find the subdirectory name as the reference
 $refname=basename(dirname($original_file)."/");
 
-if ($_GET["modulepart"] == "mycompany" && preg_match('/^\/?logos\//', $original_file)) 
+// Get RSS news
+if ($rss) {
+	$format = 'rss';
+	$type = '';
+	$cachedelay = 0;
+	$filename = $original_file;
+	$filters = array('type_container'=>'blogpost', 'lang'=>'en_US');
+	$dir_temp = $conf->website->dir_temp;
+	include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+	$website = new Website($db);
+	$websitepage = new WebsitePage($db);
+
+	$website->fetch('', $websitekey);
+
+    $MAXNEWS = 20;
+    $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
+	$eventarray = $arrayofblogs;
+
+    require_once DOL_DOCUMENT_ROOT."/core/lib/xcal.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+
+    dol_syslog("build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
+
+    // Check parameters
+    if (empty($format)) return -1;
+
+    // Clean parameters
+    if (!$filename)
+    {
+    	$extension = 'vcs';
+    	if ($format == 'ical') $extension = 'ics';
+    	$filename = $format.'.'.$extension;
+    }
+
+    // Create dir and define output file (definitive and temporary)
+    $result = dol_mkdir($dir_temp);
+    $outputfile = $dir_temp.'/'.$filename;
+
+    $result = 0;
+
+    $buildfile = true;
+
+    if ($cachedelay)
+    {
+    	$nowgmt = dol_now();
+    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    	if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
+    	{
+    		dol_syslog("build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
+    		$buildfile = false;
+    	}
+    }
+
+    if ($buildfile)
+    {
+    	$title=$desc=$langs->transnoentities('LastBlogPosts');
+
+    	// Create temp file
+    	$outputfiletmp=tempnam($dir_temp, 'tmp');  // Temporary file (allow call of function by different threads
+    	@chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
+
+    	// Write file
+    	if ($format == 'vcal') $result=build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+    	elseif ($format == 'ical') $result=build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+    	elseif ($format == 'rss')  $result=build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+
+    	if ($result >= 0)
+    	{
+    		if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result=1;
+    		else
+    		{
+    			$error='Failed to rename '.$outputfiletmp.' into '.$outputfile;
+    			dol_syslog("build_exportfile ".$error, LOG_ERR);
+    			dol_delete_file($outputfiletmp, 0, 1);
+    			print $error;
+    			exit(-1);
+    		}
+    	}
+    	else
+    	{
+    		dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
+    		dol_delete_file($outputfiletmp, 0, 1);
+    		$langs->load("errors");
+    		print $langs->trans("ErrorFailToCreateFile", $outputfile);
+    		exit(-1);
+    	}
+    }
+
+    return $result;
+}
+// Get logos
+elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file))
 {
 	readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
 }
-else 
+else
 {
+	// Find the subdirectory name as the reference
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 	$accessallowed              = $check_access['accessallowed'];
 	$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 	$fullpath_original_file     = $check_access['original_file'];               // $fullpath_original_file is now a full path name
-	if (! empty($_GET["hashp"]))
+	if ($hashp)
 	{
 		$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed
 		$sqlprotectagainstexternals = '';
 	}
-	
+
 	// Security:
 	// Limit access if permissions are wrong
 	if (! $accessallowed)