[github/shaarli/Shaarli.git] / doc / Example-patch---add-new-via-field-for-links.html

<!DOCTYPE html>
<html>
<head>
  <meta charset="utf-8">
  <meta name="generator" content="pandoc">
  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
  <title>Shaarli - Example patch   add new via field for links</title>
  <style type="text/css">code{white-space: pre;}</style>
  <!--[if lt IE 9]>
    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
  <![endif]-->
  <link rel="stylesheet" href="github-markdown.css">
</head>
<body>
<div id="local-sidebar">
<ul>
<li><a href="Home.html">Home</a></li>
<li>Installation
<ul>
<li><a href="Server-requirements.html">Server requirements</a></li>
<li><a href="Server-configuration.html">Server configuration</a></li>
<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
</ul></li>
<li><a href="Usage.html">Usage</a>
<ul>
<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
<li><a href="Firefox-share.html">Firefox share</a></li>
<li><a href="RSS-feeds.html">RSS feeds</a></li>
</ul></li>
<li>How To
<ul>
<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
<li><a href="Copy-an-existing-installation-over-SSH-and-serve-it-locally.html">Copy an existing installation over SSH and serve it locally</a></li>
<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
</ul></li>
<li><a href="Troubleshooting.html">Troubleshooting</a></li>
<li><a href="Development.html">Development</a>
<ul>
<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
<li><a href="Directory-structure.html">Directory structure</a></li>
<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
<li><a href="Plugin-System.html">Plugin System</a></li>
<li><a href="Security.html">Security</a></li>
<li><a href="Static-analysis.html">Static analysis</a></li>
<li><a href="Theming.html">Theming</a></li>
<li><a href="Unit-tests.html">Unit tests</a></li>
</ul></li>
<li>About
<ul>
<li><a href="FAQ.html">FAQ</a></li>
<li><a href="Community-&amp;-Related-software.html">Community &amp; Related software</a></li>
<li><a href="TODO.html">TODO</a></li>
</ul></li>
</ul>
</div>
<h1 id="example-patch-add-new-via-field-for-links">Example patch add new via field for links</h1>
<p>Example patch to add a new field (&quot;via&quot;) for links, an input field to set the &quot;via&quot; property from the &quot;edit link&quot; dialog, and display the &quot;via&quot; field in the link list display. <strong>Untested, use at your own risk</strong></p>
<p>Thanks to @Knah-Tsaeb in <a href="https://github.com/sebsauvage/Shaarli/pull/158" class="uri">https://github.com/sebsauvage/Shaarli/pull/158</a></p>
<pre><code>From e0f363c18e8fe67990ed2bb1a08652e24e70bbcb Mon Sep 17 00:00:00 2001
From: Knah Tsaeb &lt;knah-tsaeb@knah-tsaeb.org&gt;
Date: Fri, 11 Oct 2013 15:18:37 +0200
Subject: [PATCH] Add a &quot;via&quot;/origin property for links, add new input in &quot;edit link&quot; dialog[](.html)
Thanks to:
* https://github.com/Knah-Tsaeb/Shaarli/commit/040eb18ec8cdabd5ea855e108f81f97fbf0478c4
* https://github.com/Knah-Tsaeb/Shaarli/commit/4123658eae44d7564d1128ce52ddd5689efee813
* https://github.com/Knah-Tsaeb/Shaarli/commit/f1a8ca9cc8fe49b119d51b2d8382cc1a34542f96

---
 index.php         | 43 ++++++++++++++++++++++++++++++++-----------
 tpl/editlink.html |  1 +
 tpl/linklist.html |  1 +
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index 6fae2f8..53f798e 100644
--- a/index.php
+++ b/index.php
@@ -436,6 +436,12 @@ if (isset($_POST[&#39;login&#39;]))[](.html)
 // ------------------------------------------------------------------------------------------
 // Misc utility functions:
 
+// Try to get just domain for @via
+function getJustDomain($url){
+    $parts = parse_url($url);   
+    return trim($parts[&#39;host&#39;]);[](.html)
+    }
+
 // Returns the server URL (including port and http/https), without path.
 // e.g. &quot;http://myserver.com:8080&quot;
 // You can append $_SERVER[&#39;SCRIPT_NAME&#39;] to get the current script URL.[](.html)
@@ -799,7 +805,8 @@ class linkdb implements Iterator, Countable, ArrayAccess
             $found=   (strpos(strtolower($l[&#39;title&#39;]),$s)!==false)[](.html)
                    || (strpos(strtolower($l[&#39;description&#39;]),$s)!==false)[](.html)
                    || (strpos(strtolower($l[&#39;url&#39;]),$s)!==false)[](.html)
-                   || (strpos(strtolower($l[&#39;tags&#39;]),$s)!==false);[](.html)
+                   || (strpos(strtolower($l[&#39;tags&#39;]),$s)!==false)[](.html)
+                   || (!empty($l[&#39;via&#39;]) &amp;&amp; (strpos(strtolower($l[&#39;via&#39;]),$s)!==false));[](.html)
             if ($found) $filtered[$l[&#39;linkdate&#39;[ = $l;](-=-$l;.html)
         }
         krsort($filtered);
@@ -814,7 +821,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
         $t = str_replace(&#39;,&#39;,&#39; &#39;,($casesensitive?$tags:strtolower($tags)));
         $searchtags=explode(&#39; &#39;,$t);
         $filtered=array();
-        foreach($this-&gt;links as $l)
+        foreach($this-&gt; links as $l)
         {
             $linktags = explode(&#39; &#39;,($casesensitive?$l[&#39;tags&#39;]:strtolower($l[&#39;tags&#39;])));[](.html)
             if (count(array_intersect($linktags,$searchtags)) == count($searchtags))
@@ -905,7 +912,7 @@ function showRSS()
     else $linksToDisplay = $LINKSDB;
     $nblinksToDisplay = 50;  // Number of links to display.
     if (!empty($_GET[&#39;nb&#39;]))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html)
-    { 
+    {
         $nblinksToDisplay = $_GET[&#39;nb&#39;]==&#39;all&#39; ? count($linksToDisplay) : max($_GET[&#39;nb&#39;]+0,1) ;[](.html)
     }
 
@@ -944,7 +951,12 @@ function showRSS()
         // If user wants permalinks first, put the final link in description
         if ($usepermalinks===true) $descriptionlink = &#39;(&lt;a href=&quot;&#39;.$absurl.&#39;&quot;&gt;Link&lt;/a&gt;)&#39;;
         if (strlen($link[&#39;description&#39;])&gt;0) $descriptionlink = &#39;&lt;br&gt;&#39;.$descriptionlink;[](.html)
-        echo &#39;&lt;description&gt;&lt;![CDATA[&#39;.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link[&#39;description&#39;])))).$descriptionlink.&#39;[&gt;&lt;/description&gt;&#39;.&quot;\n&lt;/item&gt;\n&quot;;](&gt;&lt;/description&gt;&#39;.&quot;\n&lt;/item&gt;\n&quot;;.html)
+        if(!empty($link[&#39;via&#39;])){[](.html)
+          $via = &#39;&lt;br&gt;Origine =&gt; &lt;a href=&quot;&#39;.htmlspecialchars($link[&#39;via&#39;]).&#39;&quot;&gt;&#39;.htmlspecialchars(getJustDomain($link[&#39;via&#39;])).&#39;&lt;/a&gt;&#39;;[](.html)
+        } else {
+         $via = &#39;&#39;;
+        }
+        echo &#39;&lt;description&gt;&lt;![CDATA[&#39;.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link[&#39;description&#39;])))).$via.$descriptionlink.&#39;[&gt;&lt;/description&gt;&#39;.&quot;\n&lt;/item&gt;\n&quot;;](&gt;&lt;/description&gt;&#39;.&quot;\n&lt;/item&gt;\n&quot;;.html)
         $i++;
     }
     echo &#39;&lt;/channel&gt;&lt;/rss&gt;&lt;!-- Cached version of &#39;.htmlspecialchars(pageUrl()).&#39; --&gt;&#39;;
@@ -980,7 +992,7 @@ function showATOM()
     else $linksToDisplay = $LINKSDB;
     $nblinksToDisplay = 50;  // Number of links to display.
     if (!empty($_GET[&#39;nb&#39;]))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html)
-    { 
+    {
         $nblinksToDisplay = $_GET[&#39;nb&#39;]==&#39;all&#39; ? count($linksToDisplay) : max($_GET[&#39;nb&#39;]+0,1) ;[](.html)
     }
 
@@ -1006,11 +1018,16 @@ function showATOM()
 
         // Add permalink in description
         $descriptionlink = htmlspecialchars(&#39;(&lt;a href=&quot;&#39;.$guid.&#39;&quot;&gt;Permalink&lt;/a&gt;)&#39;);
+        if(isset($link[&#39;via&#39;]) &amp;&amp; !empty($link[&#39;via&#39;])){[](.html)
+          $via = htmlspecialchars(&#39;&lt;/br&gt; Origine =&gt; &lt;a href=&quot;&#39;.$link[&#39;via&#39;].&#39;&quot;&gt;&#39;.getJustDomain($link[&#39;via&#39;]).&#39;&lt;/a&gt;&#39;);[](.html)
+        } else {
+          $via = &#39;&#39;;
+        }
         // If user wants permalinks first, put the final link in description
         if ($usepermalinks===true) $descriptionlink = htmlspecialchars(&#39;(&lt;a href=&quot;&#39;.$absurl.&#39;&quot;&gt;Link&lt;/a&gt;)&#39;);
         if (strlen($link[&#39;description&#39;])&gt;0) $descriptionlink = &#39;&amp;lt;br&amp;gt;&#39;.$descriptionlink;[](.html)
 
-        $entries.=&#39;&lt;content type=&quot;html&quot;&gt;&#39;.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link[&#39;description&#39;]))))).$descriptionlink.&quot;&lt;/content&gt;\n&quot;;[](.html)
+        $entries.=&#39;&lt;content type=&quot;html&quot;&gt;&#39;.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link[&#39;description&#39;]))))).$descriptionlink.$via.&quot;&lt;/content&gt;\n&quot;;[](.html)
         if ($link[&#39;tags&#39;]!=&#39;&#39;) // Adding tags to each ATOM entry (as mentioned in ATOM specification)[](.html)
         {
             foreach(explode(&#39; &#39;,$link[&#39;tags&#39;]) as $tag)[](.html)
@@ -1478,7 +1495,7 @@ function renderPage()
         if (!startsWith($url,&#39;http:&#39;) &amp;&amp; !startsWith($url,&#39;https:&#39;) &amp;&amp; !startsWith($url,&#39;ftp:&#39;) &amp;&amp; !startsWith($url,&#39;magnet:&#39;) &amp;&amp; !startsWith($url,&#39;?&#39;))
             $url = &#39;http://&#39;.$url;
         $link = array(&#39;title&#39;=&gt;trim($_POST[&#39;lf_title&#39;]),&#39;url&#39;=&gt;$url,&#39;description&#39;=&gt;trim($_POST[&#39;lf_description&#39;]),&#39;private&#39;=&gt;(isset($_POST[&#39;lf_private&#39;]) ? 1 : 0),[](.html)
-                      &#39;linkdate&#39;=&gt;$linkdate,&#39;tags&#39;=&gt;str_replace(&#39;,&#39;,&#39; &#39;,$tags));
+                      &#39;linkdate&#39;=&gt;$linkdate,&#39;tags&#39;=&gt;str_replace(&#39;,&#39;,&#39; &#39;,$tags), &#39;via&#39;=&gt;trim($_POST[&#39;lf_via&#39;]));[](.html)
         if ($link[&#39;title&#39;]==&#39;&#39;) $link[&#39;title&#39;]=$link[&#39;url&#39;]; // If title is empty, use the URL as title.[](.html)
         $LINKSDB[$linkdate] = $link;[](.html)
         $LINKSDB-&gt;savedb(); // Save to disk.
@@ -1556,7 +1573,8 @@ function renderPage()
             $title = (empty($_GET[&#39;title&#39;]) ? &#39;&#39; : $_GET[&#39;title&#39;] ); // Get title if it was provided in URL (by the bookmarklet).[](.html)
             $description = (empty($_GET[&#39;description&#39;]) ? &#39;&#39; : $_GET[&#39;description&#39;]); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that][](.html)
             $tags = (empty($_GET[&#39;tags&#39;]) ? &#39;&#39; : $_GET[&#39;tags&#39;] ); // Get tags if it was provided in URL[](.html)
-            $private = (!empty($_GET[&#39;private&#39;]) &amp;&amp; $_GET[&#39;private&#39;] === &quot;1&quot; ? 1 : 0); // Get private if it was provided in URL [](.html)
+            $via = (empty($_GET[&#39;via&#39;]) ? &#39;&#39; : $_GET[&#39;via&#39;] );[](.html)
+            $private = (!empty($_GET[&#39;private&#39;]) &amp;&amp; $_GET[&#39;private&#39;] === &quot;1&quot; ? 1 : 0); // Get private if it was provided in URL[](.html)
             if (($url!=&#39;&#39;) &amp;&amp; parse_url($url,PHP_URL_SCHEME)==&#39;&#39;) $url = &#39;http://&#39;.$url;
             // If this is an HTTP link, we try go get the page to extract the title (otherwise we will to straight to the edit form.)
             if (empty($title) &amp;&amp; parse_url($url,PHP_URL_SCHEME)==&#39;http&#39;)
@@ -1567,7 +1585,7 @@ function renderPage()
                     {
                         // Look for charset in html header.
                        preg_match(&#39;#&lt;meta .*charset=.*&gt;#Usi&#39;, $data, $meta);
- 
+
                        // If found, extract encoding.
                        if (!empty($meta[0]))[](.html)
                        {
@@ -1577,7 +1595,7 @@ function renderPage()
                            $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : &#39;utf-8&#39;;[](.html)
                        }
                        else { $html_charset = &#39;utf-8&#39;; }
- 
+
                        // Extract title
                        $title = html_extract_title($data);
                        if (!empty($title))
@@ -1592,7 +1610,7 @@ function renderPage()
                 $url=&#39;?&#39;.smallHash($linkdate);
                 $title=&#39;Note: &#39;;
             }
-            $link = array(&#39;linkdate&#39;=&gt;$linkdate,&#39;title&#39;=&gt;$title,&#39;url&#39;=&gt;$url,&#39;description&#39;=&gt;$description,&#39;tags&#39;=&gt;$tags,&#39;private&#39;=&gt;$private);
+            $link = array(&#39;linkdate&#39;=&gt;$linkdate,&#39;title&#39;=&gt;$title,&#39;url&#39;=&gt;$url,&#39;description&#39;=&gt;$description,&#39;tags&#39;=&gt;$tags,&#39;via&#39; =&gt; $via,&#39;private&#39;=&gt;$private);
         }
 
         $PAGE = new pageBuilder;
@@ -1842,6 +1860,9 @@ function buildLinkList($PAGE,$LINKSDB)
         $taglist = explode(&#39; &#39;,$link[&#39;tags&#39;]);[](.html)
         uasort($taglist, &#39;strcasecmp&#39;);
         $link[&#39;taglist&#39;]=$taglist;[](.html)
+        if(!empty($link[&#39;via&#39;])){[](.html)
+          $link[&#39;via&#39;]=htmlspecialchars($link[&#39;via&#39;]);[](.html)
+        }
         $linkDisp[$keys[$i[ = $link;](-=-$link;.html)
         $i++;
     }
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 4a2c30c..14d4f9c 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -16,6 +16,7 @@
            &lt;i&gt;Title&lt;/i&gt;&lt;br&gt;&lt;input type=&quot;text&quot; name=&quot;lf_title&quot; value=&quot;{$link.title|htmlspecialchars}&quot; style=&quot;width:100%&quot;&gt;&lt;br&gt;
            &lt;i&gt;Description&lt;/i&gt;&lt;br&gt;&lt;textarea name=&quot;lf_description&quot; rows=&quot;4&quot; cols=&quot;25&quot; style=&quot;width:100%&quot;&gt;{$link.description|htmlspecialchars}&lt;/textarea&gt;&lt;br&gt;
            &lt;i&gt;Tags&lt;/i&gt;&lt;br&gt;&lt;input type=&quot;text&quot; id=&quot;lf_tags&quot; name=&quot;lf_tags&quot; value=&quot;{$link.tags|htmlspecialchars}&quot; style=&quot;width:100%&quot;&gt;&lt;br&gt;
+           &lt;i&gt;Origine&lt;/i&gt;&lt;br&gt;&lt;input type=&quot;text&quot; name=&quot;lf_via&quot; value=&quot;{$link.via|htmlspecialchars}&quot; style=&quot;width:100%&quot;&gt;&lt;br&gt;
            {if condition=&quot;($link_is_new &amp;&amp; $GLOBALS[&#39;privateLinkByDefault&#39;]==true) || $link.private == true&quot;}[](.html)
             &lt;input type=&quot;checkbox&quot; checked=&quot;checked&quot; name=&quot;lf_private&quot; id=&quot;lf_private&quot;&gt;
             &amp;nbsp;&lt;label for=&quot;lf_private&quot;&gt;&lt;i&gt;Private&lt;/i&gt;&lt;/label&gt;&lt;br&gt;
diff --git a/tpl/linklist.html b/tpl/linklist.html
index ddc38cb..0a8475f 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -43,6 +43,7 @@
                 &lt;span class=&quot;linktitle&quot;&gt;&lt;a href=&quot;{$redirector}{$value.url|htmlspecialchars}&quot;&gt;{$value.title|htmlspecialchars}&lt;/a&gt;&lt;/span&gt;
                 &lt;br&gt;
                 {if=&quot;$value.description&quot;}&lt;div class=&quot;linkdescription&quot;{if condition=&quot;$search_type==&#39;permalink&#39;&quot;} style=&quot;max-height:none !important;&quot;{/if}&gt;{$value.description}&lt;/div&gt;{/if}
+                {if condition=&quot;isset($value.via) &amp;&amp; !empty($value.via)&quot;}&lt;div&gt;&lt;a href=&quot;{$value.via}&quot;&gt;Origine =&gt; {$value.via|getJustDomain}&lt;/a&gt;&lt;/div&gt;{/if}
                 {if=&quot;!$GLOBALS[&#39;config&#39;[&#39;HIDE_TIMESTAMPS&#39;] || isLoggedIn()&quot;}](&#39;HIDE_TIMESTAMPS&#39;]-||-isLoggedIn()&quot;}.html)
                     &lt;span class=&quot;linkdate&quot; title=&quot;Permalink&quot;&gt;&lt;a href=&quot;?{$value.linkdate|smallHash}&quot;&gt;{$value.localdate|htmlspecialchars} - permalink&lt;/a&gt; - &lt;/span&gt;
                 {else}
-- 
2.1.1</code></pre>
</body>
</html>
Commit	Line	Data
7a32b172	1	<!DOCTYPE html>
	2	<html>
	3	<head>
	4	<meta charset="utf-8">
	5	<meta name="generator" content="pandoc">
	6	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
992af0b9	7	<title>Shaarli - Example patch add new via field for links</title>
7a32b172	8	<style type="text/css">code{white-space: pre;}</style>
	9	<!--[if lt IE 9]>
	10	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
	11	<![endif]-->
	12	<link rel="stylesheet" href="github-markdown.css">
	13	</head>
	14	<body>
992af0b9 V	15	<div id="local-sidebar">
	16	<ul>
	17	<li><a href="Home.html">Home</a></li>
	18	<li>Installation
	19	<ul>
	20	<li><a href="Server-requirements.html">Server requirements</a></li>
	21	<li><a href="Server-configuration.html">Server configuration</a></li>
	22	<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
	23	</ul></li>
	24	<li><a href="Usage.html">Usage</a>
	25	<ul>
	26	<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
	27	<li><a href="Firefox-share.html">Firefox share</a></li>
	28	<li><a href="RSS-feeds.html">RSS feeds</a></li>
	29	</ul></li>
	30	<li>How To
	31	<ul>
	32	<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
	33	<li><a href="Copy-an-existing-installation-over-SSH-and-serve-it-locally.html">Copy an existing installation over SSH and serve it locally</a></li>
	34	<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
6335a0fc	35	<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
992af0b9 V	36	</ul></li>
	37	<li><a href="Troubleshooting.html">Troubleshooting</a></li>
	38	<li><a href="Development.html">Development</a>
	39	<ul>
	40	<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
	41	<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
	42	<li><a href="Directory-structure.html">Directory structure</a></li>
	43	<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
	44	<li><a href="Plugin-System.html">Plugin System</a></li>
	45	<li><a href="Security.html">Security</a></li>
	46	<li><a href="Static-analysis.html">Static analysis</a></li>
	47	<li><a href="Theming.html">Theming</a></li>
	48	<li><a href="Unit-tests.html">Unit tests</a></li>
	49	</ul></li>
	50	<li>About
	51	<ul>
	52	<li><a href="FAQ.html">FAQ</a></li>
	53	<li><a href="Community-&-Related-software.html">Community & Related software</a></li>
	54	<li><a href="TODO.html">TODO</a></li>
	55	</ul></li>
	56	</ul>
	57	</div>
	58	<h1 id="example-patch-add-new-via-field-for-links">Example patch add new via field for links</h1>
7a32b172	59	<p>Example patch to add a new field ("via") for links, an input field to set the "via" property from the "edit link" dialog, and display the "via" field in the link list display. <strong>Untested, use at your own risk</strong></p>
992af0b9	60	<p>Thanks to @Knah-Tsaeb in <a href="https://github.com/sebsauvage/Shaarli/pull/158" class="uri">https://github.com/sebsauvage/Shaarli/pull/158</a></p>
7a32b172	61	<pre><code>From e0f363c18e8fe67990ed2bb1a08652e24e70bbcb Mon Sep 17 00:00:00 2001
	62	From: Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
	63	Date: Fri, 11 Oct 2013 15:18:37 +0200
992af0b9	64	Subject: [PATCH] Add a "via"/origin property for links, add new input in "edit link" dialog[](.html)
7a32b172	65	Thanks to:
	66	* https://github.com/Knah-Tsaeb/Shaarli/commit/040eb18ec8cdabd5ea855e108f81f97fbf0478c4
	67	* https://github.com/Knah-Tsaeb/Shaarli/commit/4123658eae44d7564d1128ce52ddd5689efee813
	68	* https://github.com/Knah-Tsaeb/Shaarli/commit/f1a8ca9cc8fe49b119d51b2d8382cc1a34542f96
	69
	70	---
	71	index.php \| 43 ++++++++++++++++++++++++++++++++-----------
	72	tpl/editlink.html \| 1 +
	73	tpl/linklist.html \| 1 +
	74	3 files changed, 34 insertions(+), 11 deletions(-)
	75
	76	diff --git a/index.php b/index.php
	77	index 6fae2f8..53f798e 100644
	78	--- a/index.php
	79	+++ b/index.php
992af0b9	80	@@ -436,6 +436,12 @@ if (isset($_POST['login']))[](.html)
7a32b172	81	// ------------------------------------------------------------------------------------------
	82	// Misc utility functions:
	83
	84	+// Try to get just domain for @via
	85	+function getJustDomain($url){
	86	+ $parts = parse_url($url);
992af0b9	87	+ return trim($parts['host']);[](.html)
7a32b172	88	+ }
	89	+
	90	// Returns the server URL (including port and http/https), without path.
	91	// e.g. "http://myserver.com:8080"
992af0b9	92	// You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.[](.html)
7a32b172	93	@@ -799,7 +805,8 @@ class linkdb implements Iterator, Countable, ArrayAccess
992af0b9 V	94	$found= (strpos(strtolower($l['title']),$s)!==false)[](.html)
	95	\|\| (strpos(strtolower($l['description']),$s)!==false)[](.html)
	96	\|\| (strpos(strtolower($l['url']),$s)!==false)[](.html)
	97	- \|\| (strpos(strtolower($l['tags']),$s)!==false);[](.html)
	98	+ \|\| (strpos(strtolower($l['tags']),$s)!==false)[](.html)
	99	+ \|\| (!empty($l['via']) && (strpos(strtolower($l['via']),$s)!==false));[](.html)
	100	if ($found) $filtered[$l['linkdate'[ = $l;](-=-$l;.html)
7a32b172	101	}
	102	krsort($filtered);
	103	@@ -814,7 +821,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
	104	$t = str_replace(',',' ',($casesensitive?$tags:strtolower($tags)));
	105	$searchtags=explode(' ',$t);
	106	$filtered=array();
	107	- foreach($this->links as $l)
	108	+ foreach($this-> links as $l)
	109	{
992af0b9	110	$linktags = explode(' ',($casesensitive?$l['tags']:strtolower($l['tags'])));[](.html)
7a32b172	111	if (count(array_intersect($linktags,$searchtags)) == count($searchtags))
	112	@@ -905,7 +912,7 @@ function showRSS()
	113	else $linksToDisplay = $LINKSDB;
	114	$nblinksToDisplay = 50; // Number of links to display.
992af0b9	115	if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html)
7a32b172	116	- {
7a32b172	117	+ {
992af0b9	118	$nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;[](.html)
7a32b172	119	}
	120
	121	@@ -944,7 +951,12 @@ function showRSS()
	122	// If user wants permalinks first, put the final link in description
	123	if ($usepermalinks===true) $descriptionlink = '(<a href="'.$absurl.'">Link</a>)';
992af0b9 V	124	if (strlen($link['description'])>0) $descriptionlink = '<br>'.$descriptionlink;[](.html)
	125	- echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$descriptionlink.'[></description>'."\n</item>\n";](></description>'."\n</item>\n";.html)
	126	+ if(!empty($link['via'])){[](.html)
	127	+ $via = '<br>Origine => <a href="'.htmlspecialchars($link['via']).'">'.htmlspecialchars(getJustDomain($link['via'])).'</a>';[](.html)
7a32b172	128	+ } else {
	129	+ $via = '';
	130	+ }
992af0b9	131	+ echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$via.$descriptionlink.'[></description>'."\n</item>\n";](></description>'."\n</item>\n";.html)
7a32b172	132	$i++;
	133	}
	134	echo '</channel></rss><!-- Cached version of '.htmlspecialchars(pageUrl()).' -->';
	135	@@ -980,7 +992,7 @@ function showATOM()
	136	else $linksToDisplay = $LINKSDB;
	137	$nblinksToDisplay = 50; // Number of links to display.
992af0b9	138	if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html)
7a32b172	139	- {
7a32b172	140	+ {
992af0b9	141	$nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;[](.html)
7a32b172	142	}
	143
	144	@@ -1006,11 +1018,16 @@ function showATOM()
	145
	146	// Add permalink in description
	147	$descriptionlink = htmlspecialchars('(<a href="'.$guid.'">Permalink</a>)');
992af0b9 V	148	+ if(isset($link['via']) && !empty($link['via'])){[](.html)
992af0b9 V	149	+ $via = htmlspecialchars('</br> Origine => <a href="'.$link['via'].'">'.getJustDomain($link['via']).'</a>');[](.html)
7a32b172	150	+ } else {
	151	+ $via = '';
	152	+ }
	153	// If user wants permalinks first, put the final link in description
	154	if ($usepermalinks===true) $descriptionlink = htmlspecialchars('(<a href="'.$absurl.'">Link</a>)');
992af0b9	155	if (strlen($link['description'])>0) $descriptionlink = '&lt;br&gt;'.$descriptionlink;[](.html)
7a32b172	156
992af0b9 V	157	- $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink."</content>\n";[](.html)
	158	+ $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."</content>\n";[](.html)
	159	if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification)[](.html)
7a32b172	160	{
992af0b9	161	foreach(explode(' ',$link['tags']) as $tag)[](.html)
7a32b172	162	@@ -1478,7 +1495,7 @@ function renderPage()
	163	if (!startsWith($url,'http:') && !startsWith($url,'https:') && !startsWith($url,'ftp:') && !startsWith($url,'magnet:') && !startsWith($url,'?'))
	164	$url = 'http://'.$url;
992af0b9	165	$link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),[](.html)
7a32b172	166	- 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
992af0b9 V	167	+ 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags), 'via'=>trim($_POST['lf_via']));[](.html)
	168	if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.[](.html)
	169	$LINKSDB[$linkdate] = $link;[](.html)
7a32b172	170	$LINKSDB->savedb(); // Save to disk.
7a32b172	171	@@ -1556,7 +1573,8 @@ function renderPage()
992af0b9 V	172	$title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet).[](.html)
	173	$description = (empty($_GET['description']) ? '' : $_GET['description']); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that][](.html)
	174	$tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL[](.html)
	175	- $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL [](.html)
	176	+ $via = (empty($_GET['via']) ? '' : $_GET['via'] );[](.html)
	177	+ $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL[](.html)
7a32b172	178	if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url;
	179	// If this is an HTTP link, we try go get the page to extract the title (otherwise we will to straight to the edit form.)
	180	if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http')
	181	@@ -1567,7 +1585,7 @@ function renderPage()
	182	{
	183	// Look for charset in html header.
	184	preg_match('#<meta .charset=.>#Usi', $data, $meta);
	185	-
	186	+
	187	// If found, extract encoding.
992af0b9	188	if (!empty($meta[0]))[](.html)
7a32b172	189	{
7a32b172	190	@@ -1577,7 +1595,7 @@ function renderPage()
992af0b9	191	$html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8';[](.html)
7a32b172	192	}
	193	else { $html_charset = 'utf-8'; }
	194	-
	195	+
	196	// Extract title
	197	$title = html_extract_title($data);
	198	if (!empty($title))
	199	@@ -1592,7 +1610,7 @@ function renderPage()
	200	$url='?'.smallHash($linkdate);
	201	$title='Note: ';
	202	}
	203	- $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>$private);
	204	+ $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'via' => $via,'private'=>$private);
	205	}
	206
	207	$PAGE = new pageBuilder;
	208	@@ -1842,6 +1860,9 @@ function buildLinkList($PAGE,$LINKSDB)
992af0b9	209	$taglist = explode(' ',$link['tags']);[](.html)
7a32b172	210	uasort($taglist, 'strcasecmp');
992af0b9 V	211	$link['taglist']=$taglist;[](.html)
	212	+ if(!empty($link['via'])){[](.html)
	213	+ $link['via']=htmlspecialchars($link['via']);[](.html)
7a32b172	214	+ }
992af0b9	215	$linkDisp[$keys[$i[ = $link;](-=-$link;.html)
7a32b172	216	$i++;
	217	}
	218	diff --git a/tpl/editlink.html b/tpl/editlink.html
	219	index 4a2c30c..14d4f9c 100644
	220	--- a/tpl/editlink.html
	221	+++ b/tpl/editlink.html
	222	@@ -16,6 +16,7 @@
	223	<i>Title</i><br><input type="text" name="lf_title" value="{$link.title\|htmlspecialchars}" style="width:100%"><br>
	224	<i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description\|htmlspecialchars}</textarea><br>
	225	<i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags\|htmlspecialchars}" style="width:100%"><br>
	226	+ <i>Origine</i><br><input type="text" name="lf_via" value="{$link.via\|htmlspecialchars}" style="width:100%"><br>
992af0b9	227	{if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) \|\| $link.private == true"}[](.html)
7a32b172	228	<input type="checkbox" checked="checked" name="lf_private" id="lf_private">
	229	&nbsp;<label for="lf_private"><i>Private</i></label><br>
	230	diff --git a/tpl/linklist.html b/tpl/linklist.html
	231	index ddc38cb..0a8475f 100644
	232	--- a/tpl/linklist.html
	233	+++ b/tpl/linklist.html
	234	@@ -43,6 +43,7 @@
	235	<span class="linktitle"><a href="{$redirector}{$value.url\|htmlspecialchars}">{$value.title\|htmlspecialchars}</a></span>
	236	<br>
	237	{if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
	238	+ {if condition="isset($value.via) && !empty($value.via)"}<div><a href="{$value.via}">Origine => {$value.via\|getJustDomain}</a></div>{/if}
992af0b9	239	{if="!$GLOBALS['config'['HIDE_TIMESTAMPS'] \|\| isLoggedIn()"}]('HIDE_TIMESTAMPS']-\|\|-isLoggedIn()"}.html)
7a32b172	240	<span class="linkdate" title="Permalink"><a href="?{$value.linkdate\|smallHash}">{$value.localdate\|htmlspecialchars} - permalink</a> - </span>
	241	{else}
	242	--
	243	2.1.1</code></pre>
	244	</body>
	245	</html>