Merge branch 'memiks-gestion_erreur_readability' into dev

diff --combined inc/functions.php
index 750d430e125cfe1a95d6589c89a544d60a3b044e,0303aab6b835c8c0115c8171fd0b14236ee11807..b830b616edf62756299186f25a6b988e594b940e
--- 1/inc/functions.php
--- 2/inc/functions.php
+++ b/inc/functions.php
@@@ -39,6 -39,10 +39,10 @@@ function get_external_file($url
          curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
          curl_setopt($curl, CURLOPT_HEADER, false);
  
+               // FOR SSL do not verified certificate
+         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+               curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE );
+ 
          // FeedBurner requires a proper USER-AGENT...
          curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
          curl_setopt($curl, CURLOPT_ENCODING, "gzip, deflate");
@@@ -54,7 -58,15 +58,15 @@@
      } else {
  
          // create http context and add timeout and user-agent
-         $context = stream_context_create(array('http'=>array('timeout' => $timeout,'header'=> "User-Agent: ".$useragent,/*spoot Mozilla Firefox*/'follow_location' => true)));
+         $context = stream_context_create(array(
+                                                               'http'=>array('timeout' => $timeout,
+                                                                               'header'=> "User-Agent: ".$useragent,   /*spoot Mozilla Firefox*/
+                                                                               'follow_location' => true),
+                                                               // FOR SSL do not verified certificate
+                                                               'ssl' => array('verify_peer' => false,
+                                                                               'allow_self_signed' => true)
+                                                               )
+                                               );
  
          // only download page lesser than 4MB
          $data = @file_get_contents($url, false, $context, -1, 4000000); // We download at most 4 MB from source.
@@@ -98,6 -110,8 +110,8 @@@
   */
  function prepare_url($url)
  {
+     global $msg;
+ 
      $parametres = array();
      $url        = html_entity_decode(trim($url));
  
@@@ -108,14 -122,20 +122,20 @@@
      $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i);
  
      $title = $url;
-     if (!preg_match('!^https?://!i', $url))
-         $url = 'http://' . $url;
+       $html = Encoding::toUTF8(get_external_file($url,15));
+       // If get_external_file if not able to retrieve HTTPS content try the same URL with HTTP protocol
+       if (!preg_match('!^https?://!i', $url) && (!isset($html) || strlen($html) <= 0)) {
+                       $url = 'http://' . $url;
+                       $html = Encoding::toUTF8(get_external_file($url,15));
+       }
  
-     $html = Encoding::toUTF8(get_external_file($url,15));
      if (isset($html) and strlen($html) > 0)
      {
          $r = new Readability($html, $url);
+               
          $r->convertLinksToFootnotes = CONVERT_LINKS_FOOTNOTES;
+       $r->revertForcedParagraphElements = REVERT_FORCED_PARAGRAPH_ELEMENTS;
+ 
          if($r->init())
          {
              $content = $r->articleContent->innerHTML;
@@@ -125,6 -145,8 +145,6 @@@
          }
      }
  
 -    $msg->add('e', 'error during url preparation');
 -    logm('error during url preparation');
      return FALSE;
  }
  
@@@ -309,39 -331,26 +329,39 @@@ function action_to_do($action, $url, $i
  
              if (MyTool::isUrl($url)) {
                  if($parametres_url = prepare_url($url)) {
 -                    $store->add($url, $parametres_url['title'], $parametres_url['content']);
 -                    $last_id = $store->getLastId();
 -                    if (DOWNLOAD_PICTURES) {
 -                        $content = filtre_picture($parametres_url['content'], $url, $last_id);
 +                    if ($store->add($url, $parametres_url['title'], $parametres_url['content'])) {
 +                        $last_id = $store->getLastId();
 +                        if (DOWNLOAD_PICTURES) {
 +                            $content = filtre_picture($parametres_url['content'], $url, $last_id);
 +                        }
 +                        $msg->add('s', 'the link has been added successfully');
                      }
 -                    $msg->add('s', 'the link has been added successfully');
 +                    else {
 +                        $msg->add('e', 'error during insertion : the link wasn\'t added');
 +                    }
 +                }
 +                else {
 +                    $msg->add('e', 'error during url preparation : the link wasn\'t added');
 +                    logm('error during url preparation');
                  }
              }
              else {
 -                $msg->add('e', 'the link has been added successfully');
 +                $msg->add('e', 'error during url preparation : the link is not valid');
                  logm($url . ' is not a valid url');
              }
  
              logm('add link ' . $url);
              break;
          case 'delete':
 -            remove_directory(ABS_PATH . $id);
 -            $store->deleteById($id);
 -            $msg->add('s', 'the link has been deleted successfully');
 -            logm('delete link #' . $id);
 +            if ($store->deleteById($id)) {
 +                remove_directory(ABS_PATH . $id);
 +                $msg->add('s', 'the link has been deleted successfully');
 +                logm('delete link #' . $id);
 +            }
 +            else {
 +                $msg->add('e', 'the link wasn\'t deleted');
 +                logm('error : can\'t delete link #' . $id);
 +            }
              break;
          case 'toggle_fav' :
              $store->favoriteById($id);
@@@ -362,4 -371,4 +382,4 @@@ function logm($message
  {
      $t = strval(date('Y/m/d_H:i:s')).' - '.$_SERVER["REMOTE_ADDR"].' - '.strval($message)."\n";
      file_put_contents('./log.txt',$t,FILE_APPEND);
- }
+ }