@@ -2,7 +2,7 @@

 include_once( 'news-constants.php' );

 $rss_content = file_get_contents(NEWS_RSS_NYT);

-$orgStrings = array( 'media:content');

+$orgStrings = array( 'media:thumbnail');

 $newStrings = array( 'mediacontent');

 $rss_content  = str_replace($orgStrings, $newStrings, $rss_content);

 $xml = simplexml_load_string($rss_content);

@@ -27,7 +27,7 @@ if ($xml === false) {

     $article['image']=$item->mediacontent['url'];

     $articles[$cpt] = $article;

     echo '<div onclick="onArticle('.$cpt.')" style="display:inline;">';

-    echo '<img id="img-list" src="'.$article['image'].'" style="display:block;"><br>';

+    echo '<img id="img-list" src="'.$article['image'].'" style="display:inline;"><br>';

     echo '<div id="nav-up" style="display:inline;"><a href="#top"><i class="fa fa-home fa-2x"></i></a></div>&nbsp;&nbsp;';

     echo '<div id="nav-up" style="display:inline;"><a href="#article-top"><i class="fa fa-chevron-down fa-2x"></i></a></div>&nbsp;';

     echo $article['title'].'  ';

@@ -57,13 +57,36 @@ foreach ($articles as $article ) {

   $doc = new DOMDocument();

   $doc->preserveWhiteSpace = false;

   $doc->formatOutput       = true;

+  $libxml_previous_state = libxml_use_internal_errors(true);

   $doc->loadHTML($article_content);

+  libxml_clear_errors();

+  libxml_use_internal_errors($libxml_previous_state);

   $articles = $doc->getElementsByTagName('article');

   $article_only="";

   foreach ( $articles as $node) {

     $article_only = DOMinnerHTML($node);

   }

+  $SEARCH_SUB='<span class="ea_article">édition abonné</span>';

+  $pos_start=strpos($article_content, $SEARCH_SUB);

+  if($pos_start) {

+    $article_abonne = str_replace("www.lemonde.fr", "abonnes.lemonde.fr", $article['link']);

+    $article_content = file_get_contents($article_abonne);

+    $doc = new DOMDocument();

+    $doc->preserveWhiteSpace = false;

+    $doc->formatOutput       = true;

+    $libxml_previous_state = libxml_use_internal_errors(true);

+    $doc->loadHTML($article_content);

+    libxml_clear_errors();

+    libxml_use_internal_errors($libxml_previous_state);

+    $articles = $doc->getElementsByTagName('article');

+    $article_only="";

+    foreach ( $articles as $node) {

+      $article_only = DOMinnerHTML($node);

+    }

+  }

+

+

 	//Clean some sections

 	//$article_only = re_remove($article_only, '//');

 	$article_only = re_remove($article_only, '/<div id="(.+?)-slug" class="ResponsiveAd-(.+?)"><p>Advertisement<\/p><\/div>/');

@@ -1,7 +1,8 @@

 <?php

 include_once( 'news-constants.php' );

-$rss_content = file_get_contents(NEWS_RSS_WAPO);

+//$rss_content = file_get_contents(NEWS_RSS_WAPO);

+$rss_content = file_get_contents('https://sg.kawi.fr/feed-wapo.xml');

 $orgStrings = array( 'media:thumbnail');

 $newStrings = array( 'mediacontent');

 $rss_content  = str_replace($orgStrings, $newStrings, $rss_content);

@@ -58,7 +59,10 @@ foreach ($articles as $article ) {

   $doc = new DOMDocument();

   $doc->preserveWhiteSpace = false;

   $doc->formatOutput       = true;

+  $libxml_previous_state = libxml_use_internal_errors(true);

   $doc->loadHTML($article_content);

+  libxml_clear_errors();

+  libxml_use_internal_errors($libxml_previous_state);

   $articles = $doc->getElementsByTagName('article');

   $article_only="";

   foreach ( $articles as $node) {

@@ -71,7 +75,7 @@ foreach ($articles as $article ) {

   echo '<div id="nav-source" style="display:inline;"><a href="'.$article['link'].'" target="new-'.$cpt.'"><i class="fa fa-link fa-2x"></i></a></div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

   echo '<div id="nav-prev" onclick="onArticle('.$cpt_prev.')" style="display:inline;"><i class="fa fa-chevron-left fa-2x"></i></div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

   echo '<div id="nav-next" onclick="onArticle('.$cpt_next.')" style="display:inline;"><i class="fa fa-chevron-right fa-2x"></i></div>';

-  echo '<div class="extract-content" id="'.$cpt.'">'."<h1>".$article['title']."</h1>".$article_only.'</div>';

+  echo '<div class="extract-content" id="'.$cpt.'">'.$article_only.'</div>';

   echo '<div id="nav-up" style="display:inline;"><a href="#top"><i class="fa fa-home fa-2x"></i></a></div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

   echo '<div id="nav-up" style="display:inline;"><a href="#article-top"><i class="fa fa-chevron-up fa-2x"></i></a></div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

   echo '<div id="nav-source" style="display:inline;"><a href="'.$article['link'].'" target="new-'.$cpt.'"><i class="fa fa-link fa-2x"></i></a></div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';