X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=73e591c55398e58077d838d3af22ac3e2e8eb4ba;hb=02ea9f07691adf79f3f9d6cddfb1e045777927b6;hp=c6cde82f822268805d7fa8397315a74d83467a9b;hpb=2987031bc3d30437e7b34c3fe912a0ccbcc87f10;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/functions.php b/inc/functions.php
index c6cde82f..73e591c5 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -23,6 +23,11 @@ function get_poche_url()
     return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 }
 
+function encode_string($string) 
+{
+    return sha1($string . SALT);
+}
+
 // function define to retrieve url content
 function get_external_file($url)
 {
@@ -110,8 +115,6 @@ function get_external_file($url)
  */
 function prepare_url($url)
 {
-    global $msg;
-
     $parametres = array();
     $url        = html_entity_decode(trim($url));
 
@@ -129,6 +132,12 @@ function prepare_url($url)
         $html = Encoding::toUTF8(get_external_file($url,15));
     }
 
+    if (function_exists('tidy_parse_string')) {
+        $tidy = tidy_parse_string($html, array(), 'UTF8');
+        $tidy->cleanRepair();
+        $html = $tidy->value;
+    }
+
     if (isset($html) and strlen($html) > 0)
     {
         $r = new Readability($html, $url);
@@ -281,7 +290,13 @@ function display_view($view, $id = 0, $full_head = 'yes')
                 $tpl->assign('id', $entry['id']);
                 $tpl->assign('url', $entry['url']);
                 $tpl->assign('title', $entry['title']);
-                $tpl->assign('content', $entry['content']);
+                $content = $entry['content'];
+                if (function_exists('tidy_parse_string')) {
+                    $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8');
+                    $tidy->cleanRepair();
+                    $content = $tidy->value;
+                }
+                $tpl->assign('content', $content);
                 $tpl->assign('is_fav', $entry['is_fav']);
                 $tpl->assign('is_read', $entry['is_read']);
                 $tpl->assign('load_all_js', 0);
@@ -365,12 +380,10 @@ function action_to_do($action, $url, $id = 0)
             break;
         case 'toggle_fav' :
             $store->favoriteById($id);
-            $msg->add('s', 'the favorite toggle has been done successfully');
             logm('mark as favorite link #' . $id);
             break;
         case 'toggle_archive' :
             $store->archiveById($id);
-            $msg->add('s', 'the archive toggle has been done successfully');
             logm('archive link #' . $id);
             break;
         default: