X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FLinkUtils.php;h=da04ca9743870f555b5feea64ea9501eb4cbde30;hb=refs%2Fpull%2F560%2Fhead;hp=d8dc8b5e01a2dc01112cdb5b874626012c650d10;hpb=f66a1990e5d93a6f302ce594968e5e717b93da72;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/LinkUtils.php b/application/LinkUtils.php
index d8dc8b5e..da04ca97 100644
--- a/application/LinkUtils.php
+++ b/application/LinkUtils.php
@@ -9,8 +9,8 @@
  */
 function html_extract_title($html)
 {
-    if (preg_match('!<title>(.*?)</title>!is', $html, $matches)) {
-        return trim(str_replace("\n", ' ', $matches[1]));
+    if (preg_match('!<title.*?>(.*?)</title>!is', $html, $matches)) {
+        return trim(str_replace("\n", '', $matches[1]));
     }
     return false;
 }
@@ -70,10 +70,26 @@ function headers_extract_charset($headers)
 function html_extract_charset($html)
 {
     // Get encoding specified in HTML header.
-    preg_match('#<meta .*charset="?([^">/]+)"? */?>#Usi', $html, $enc);
+    preg_match('#<meta .*charset=["\']?([^";\'>/]+)["\']? */?>#Usi', $html, $enc);
     if (!empty($enc[1])) {
         return strtolower($enc[1]);
     }
 
     return false;
 }
+
+/**
+ * Count private links in given linklist.
+ *
+ * @param array $links Linklist.
+ *
+ * @return int Number of private links.
+ */
+function count_private($links)
+{
+    $cpt = 0;
+    foreach ($links as $link) {
+        $cpt = $link['private'] == true ? $cpt + 1 : $cpt;
+    }
+    return $cpt;
+}