[add] markdown support

inc/user.css

@@ -1,28 +1,31 @@
 html {
+  overflow-y: scroll;
   background: #434343; /* Old browsers */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#434343), color-stop(100%,#cdcdcd)) no-repeat scroll 0 0 transparent;; /* Chrome,Safari4+ */
+  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#434343), color-stop(100%,#cdcdcd) )no-repeat scroll 0 0 transparent;/* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #434343 0%,#cdcdcd 100%) no-repeat scroll 0 0 transparent;; /* Chrome10+,Safari5.1+ */
+  background: -webkit-linear-gradient(top,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent;
-  background: -o-linear-gradient(top, #434343 0%,#cdcdcd 100%) no-repeat scroll 0 0 transparent;; /* Opera 11.10+ */
+  background: -o-linear-gradient(top,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent;
-  background: -ms-linear-gradient(top, #434343 0%,#cdcdcd 100%) no-repeat scroll 0 0 transparent;; /* IE10+ */
+  background: -ms-linear-gradient(top,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent;
-  background: linear-gradient(to bottom, #434343 0%,#cdcdcd 100%) no-repeat scroll 0 0 transparent;; /* W3C */
+  background: linear-gradient(to bottom,#434343 0,#cdcdcd 100%) no-repeat scroll 0 0 transparent;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#434343', endColorstr='#cdcdcd',GradientType=0 ); /* IE6-9 */
   background: -moz-linear-gradient(center top,#434343,#cdcdcd) no-repeat scroll 0 0 transparent;
+  filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#434343', endColorstr='#cdcdcd', GradientType=0);
 }
 
 body {
   background-color: inherit;
 }
 
-a {
+a,
+.linkdescription a {
+  color: #E28E3F;
+  -webkit-transition: all 100ms ease-in-out;
   -moz-transition: all 100ms ease-in-out;
   -ms-transition: all 100ms ease-in-out;
   -o-transition: all 100ms ease-in-out;
-  -webkit-transition: all 100ms ease-in-out;
   transition: all 100ms ease-in-out;
-  color: #E28E3F;
 }
 
-a:hover {
+a:hover,
+.linkdescription a:hover {
   color: #F57900;
 }
 
@@ -44,18 +47,23 @@ pre code {
   border-radius: 0.3em;
   background-color: #fff;
 }
+
 .linkcontainer {
   position: static;
   margin-left: 130px;
 }
-#linklist, #cloudtag {
+
-  max-width: 80%;
+#linklist,
+#cloudtag {
   margin: 0 auto;
   padding: 0.3em;
+  max-width: 80%;
 }
-#linklist li, #linklist li.private {
+
-  padding: 0.3em;
+#linklist li,
+#linklist li.private {
   margin: 1em 0;
+  padding: 0.3em;
   border: 1px solid #cdcdcd;
   border-radius: 0.3em;
   background: #fff;
@@ -65,24 +73,40 @@ pre code {
   background: #fff;
 }
 
-.linktitle, .linkeditbuttons {
+#linklist li .linkdescription li {
+  margin: 0;
+  border: none;
+  list-style-position: outside;
+  list-style-type: disc;
+}
+
+#linklist li .linkdescription ol li {
+  list-style: decimal;
+}
+
+#linklist li .linkdescription ol {
+  list-style: decimal outside;
+}
+
+.linktitle,
+.linkeditbuttons {
   font-size: 1.6em;
   font-weight: bold;
 }
 
 .linkeditbuttons {
-  background-color: inherit;
-  border-radius: 0;
-  box-shadow: none;
   float: right;
+  position: relative;
   margin-right: 0.3em;
   padding: 0;
-  position: relative;
+  border-radius: 0;
+  background-color: inherit;
+  box-shadow: none;
 }
 
 #linklist li.private .linkeditbuttons {
-  background: url('../images/private.png') no-repeat 10px center;
   padding: 0 0 0 55px;
+  background: url('../images/private.png') no-repeat 10px center;
 }
 
 .picwall_pictureframe img {
@@ -93,14 +117,15 @@ pre code {
 .picwall_pictureframe {
   display: inline-block;
   float: none;
+  width: auto;
   height: auto;
+  padding: 0.3em;
   min-height: 90px;
   min-width: 120px;
-  padding: 0.3em;
   text-align: center;
   vertical-align: middle;
-  width: auto;
 }
+
 .picwall_container {
   width: auto;
   margin: 0 auto;
@@ -114,23 +139,23 @@ pre code {
   top: 0;
   left: 0;
   width: 120px;
-  font-weight: bold;
   padding: 0.3em;
-  font-size: 8pt;
-  color: #fff;
   text-align: center;
+  text-shadow: 1px 1px 2px #000000;
+  font-size: 8pt;
+  font-weight: bold;
+  color: #fff;
   background-color: transparent;
   background-color: rgba(0,0,0,0.5);
-  text-shadow: 1px 1px 2px #000000;
 }
 
 .clearFix {
-  clear: both;
   display: block;
-  min-width: 1px;
+  clear: both;
-  min-height: 1px;
-  margin: 0;
   height: 0;
+  margin: 0;
+  min-height: 1px;
+  min-width: 1px;
 }
 
 .paging {
@@ -143,32 +168,271 @@ pre code {
 }
 
 #cloudtag {
-  background-color: #ababab;
   border-radius: 0.3em;
+  background-color: #ababab;
 }
 
 #cloudtag > span {
   padding: 0 0.3em;
-  color: #fff;
   font-size: 0.9em;
+  color: #fff;
 }
 
 #cloudtag a {
+  text-decoration: none;
   font-weight: bold;
   color: black;
-  text-decoration: none
 }
 
 #cloudtag a:hover {
+  text-decoration: none;
   font-weight: bold;
   color: #ffffc9;
-  text-decoration: none
 }
 
-@media handheld, only screen and (max-width: 560px) , only screen and (max-device-width: 854px) {
+@media handheld,
+only screen and (max-width:560px) ,
+only screen and (max-device-width:854px) {
   #linklist {
-    max-width: 100%;
     margin: 0 auto;
     padding: 0.3em;
+    max-width: 100%;
+  }
+}
+
+p {
+  margin: 1em 0;
+}
+
+img {
+  max-width: 100%;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-weight: normal;
+  line-height: 1em;
+  color: #111;
+}
+
+h4,
+h5,
+h6 {
+  font-weight: bold;
+}
+
+h1 {
+  font-size: 2.5em;
+}
+
+h2 {
+  font-size: 2em;
+}
+
+h3 {
+  font-size: 1.5em;
+}
+
+h4 {
+  font-size: 1.2em;
+}
+
+h5 {
+  font-size: 1em;
+}
+
+h6 {
+  font-size: 0.9em;
+}
+
+blockquote {
+  margin: 1.2em;
+  padding-left: 0.3em;
+  border-left: 0.5em #EEE solid;
+  color: #666666;
+}
+
+hr {
+  display: block;
+  height: 2px;
+  margin: 1em 0;
+  padding: 0;
+  border: 0;
+  border-top: 1px solid #aaa;
+  border-bottom: 1px solid #eee;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: monospace,monospace;
+  font-size: 0.98em;
+  color: #000;
+  _font-family: 'courier new',monospace;
+}
+
+pre {
+  padding: 0.3em;
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+
+pre {
+  background-color: #f7f7f7;
+}
+
+b,
+strong {
+  font-weight: bold;
+}
+
+dfn {
+  font-style: italic;
+}
+
+ins {
+  text-decoration: none;
+  color: #000;
+  background: #ff9;
+}
+
+mark {
+  font-style: italic;
+  font-weight: bold;
+  color: #000;
+  background: #ff0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+ul,
+ol {
+  margin: 1em 0;
+  padding: 0 0 0 2em;
+}
+
+li p:last-child {
+  margin: 0;
+}
+
+dd {
+  margin: 0 0 0 2em;
+}
+
+img {
+  border: 0;
+  vertical-align: middle;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td {
+  vertical-align: top;
+}
+
+del,
+ins {
+  text-decoration: line-through;
+}
+
+em {
+  font-style: italic;
+}
+
+@media print {
+  * {
+    color: black !important;
+    background: transparent !important;
+    filter: none !important;
+    -ms-filter: none !important;
+  }
+
+  body {
+    max-width: 100%;
+    font-size: 12pt;
+  }
+
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+
+  hr {
+    height: 1px;
+    border: 0;
+    border-bottom: 1px solid black;
+  }
+
+  a[href]:after {
+    content: " (" attr(href) ") ";
+  }
+
+  abbr[title]:after {
+    content: " (" attr(title) ") ";
+  }
+
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+
+  pre,
+  blockquote {
+    padding-right: 1em;
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+
+  img {
+    max-width: 100% !important;
+  }
+
+  @page:left {
+    margin: 15mm 20mm 15mm 10mm;
+  }
+
+  @page:right {
+    margin: 15mm 10mm 15mm 20mm;
+  }
+
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+
+  h2,
+  h3 {
+    page-break-after: avoid;
   }
 }

index.php

@@ -66,7 +66,7 @@
 checkphpversion();
 error_reporting(E_ALL^E_WARNING);  // See all error except warnings.
 //error_reporting(-1); // See all errors (for debugging only)
-
+include 'inc/Parsedown.php';
 include "inc/rain.tpl.class.php"; //include Rain TPL
 raintpl::$tpl_dir = "tpl/"; // template directory
 if (!is_dir('tmp')) { mkdir('tmp',0705); chmod('tmp',0705); }
@@ -967,13 +967,19 @@ function showRSS()
         $descriptionlink = '(<a href="'.$guid.'">Permalink</a>)';
         // If user wants permalinks first, put the final link in description
         if ($usepermalinks===true) $descriptionlink = '(<a href="'.$absurl.'">Link</a>)';
-        if (strlen($link['description'])>0) $descriptionlink = '<br>'.$descriptionlink;
+        if (strlen($link['description'])>0){
+          $descriptionlink = '<br>'.$descriptionlink;
+        }
         if(!empty($link['via'])){
           $via = '<br>Origine => <a href="'.htmlspecialchars($link['via']).'">'.htmlspecialchars(getJustDomain($link['via'])).'</a>';
         } else {
          $via = '';
         }
-        echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$via.$descriptionlink.']]></description>'."\n</item>\n";
+        $Parsedown = new Parsedown();
+        echo '<description><![CDATA['.$Parsedown->setMarkupEscaped(true)->text($link['description']).$via.$descriptionlink.']]>
+        </description>'."\n</item>\n";
+        /*echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$via.$descriptionlink.']]>
+        </description>'."\n</item>\n";*/
         $i++;
     }
     echo '</channel></rss><!-- Cached version of '.htmlspecialchars(pageUrl()).' -->';
@@ -1031,7 +1037,9 @@ function showATOM()
             $entries.='<link href="'.$guid.'" /><id>'.$guid.'</id>';
         else
             $entries.='<link href="'.$absurl.'" /><id>'.$guid.'</id>';
-        if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $entries.='<updated>'.htmlspecialchars($iso8601date).'</updated>';
+        if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) {
+          $entries.='<updated>'.htmlspecialchars($iso8601date).'</updated>';
+        }
 
         // Add permalink in description
         $descriptionlink = htmlspecialchars('(<a href="'.$guid.'">Permalink</a>)');
@@ -1044,7 +1052,9 @@ function showATOM()
         if ($usepermalinks===true) $descriptionlink = htmlspecialchars('(<a href="'.$absurl.'">Link</a>)');
         if (strlen($link['description'])>0) $descriptionlink = '&lt;br&gt;'.$descriptionlink;
 
-        $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."</content>\n";
+        $Parsedown = new Parsedown();
+        $entries.='<content type="html">'.htmlspecialchars($Parsedown->setMarkupEscaped(true)->text($link['description'])).' '.$descriptionlink.$via."</content>\n";
+        //$entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."</content>\n";
         if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification)
         {
             foreach(explode(' ',$link['tags']) as $tag)
@@ -1110,6 +1120,8 @@ function showDailyRSS()
     header('Content-Type: application/rss+xml; charset=utf-8');
     $pageaddr=htmlspecialchars(indexUrl());
     echo '<?xml version="1.0" encoding="UTF-8"?><rss version="2.0">';
+    echo '<?xml-stylesheet type="text/css" href="http://shaarli.local/inc/shaarli.css?version=0.0.41+beta" ?>';
+    echo '<?xml-stylesheet type="text/css" href="http://shaarli.local/inc/user.css?version=0.0.41%20beta" ?>';
     echo '<channel><title>Daily - '.htmlspecialchars($GLOBALS['title']).'</title><link>'.$pageaddr.'</link>';
     echo '<description>Daily shared links</description><language>en-en</language><copyright>'.$pageaddr.'</copyright>'."\n";
 
@@ -1867,7 +1879,9 @@ function buildLinkList($PAGE,$LINKSDB)
     while ($i<$end && $i<count($keys))
     {
         $link = $linksToDisplay[$keys[$i]];
-        $link['description']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))));
+        //$link['description']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))));
+        $Parsedown = new Parsedown();
+        $link['description'] = $Parsedown->setMarkupEscaped(true)->text($link['description']);
         $title=$link['title'];
         $classLi =  $i%2!=0 ? '' : 'publicLinkHightLight';
         $link['class'] = ($link['private']==0 ? $classLi : 'private');