From: Arthur <arthur@hoa.ro>
Date: Sun, 31 Jan 2016 17:57:29 +0000 (+0100)
Subject: Merge pull request #379 from ArthurHoaro/plugin-markdown
X-Git-Tag: v0.6.3~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=893338f0d407a0989454d5e3c0e43c97f7eface5;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge pull request #379 from ArthurHoaro/plugin-markdown

PLUGIN Markdown
---

893338f0d407a0989454d5e3c0e43c97f7eface5
diff --combined application/Utils.php
index 551db3e7,ac8bfbfc..10d60698
--- a/application/Utils.php
+++ b/application/Utils.php
@@@ -3,24 -3,6 +3,24 @@@
   * Shaarli utilities
   */
  
 +/**
 + * Logs a message to a text file
 + *
 + * The log format is compatible with fail2ban.
 + *
 + * @param string $logFile  where to write the logs
 + * @param string $clientIp the client's remote IPv4/IPv6 address
 + * @param string $message  the message to log
 + */
 +function logm($logFile, $clientIp, $message)
 +{
 +    file_put_contents(
 +        $logFile,
 +        date('Y/m/d H:i:s').' - '.$clientIp.' - '.strval($message).PHP_EOL,
 +        FILE_APPEND
 +    );
 +}
 +
  /**
   *  Returns the small hash of a string, using RFC 4648 base64url format
   *
@@@ -61,14 -43,6 +61,6 @@@ function endsWith($haystack, $needle, $
      return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);
  }
  
- /**
-  * Same as nl2br(), but escapes < and >
-  */
- function nl2br_escaped($html)
- {
-     return str_replace('>', '&gt;', str_replace('<', '&lt;', nl2br($html)));
- }
- 
  /**
   * htmlspecialchars wrapper
   */
@@@ -90,14 -64,12 +82,14 @@@ function sanitizeLink(&$link
  
  /**
   * Checks if a string represents a valid date
 +
 + * @param string $format The expected DateTime format of the string
 + * @param string $string A string-formatted date
 + *
 + * @return bool whether the string is a valid date
   *
 - * @param string        a string-formatted date
 - * @param format        the expected DateTime format of the string
 - * @return              whether the string is a valid date
 - * @see                 http://php.net/manual/en/class.datetime.php
 - * @see                 http://php.net/manual/en/datetime.createfromformat.php
 + * @see http://php.net/manual/en/class.datetime.php
 + * @see http://php.net/manual/en/datetime.createfromformat.php
   */
  function checkDateFormat($format, $string)
  {
diff --combined inc/shaarli.css
index 96e2cae1,79ba1d69..7a69d575
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@@ -467,7 -467,6 +467,6 @@@ h1 
      margin-top: 0;
      margin-bottom: 12px;
      font-weight: normal;
-     max-height: 400px;
      overflow: auto;
  }
  
@@@ -739,6 -738,25 +738,6 @@@
      background: #ffffff;
  }
  
 -div#permalinkQrcode {
 -    padding: 20px;
 -    width: 220px;
 -    height: 220px;
 -    background-color: #ffffff;
 -    border: 1px solid black;
 -    position: absolute;
 -    top: -100px;
 -    left: -100px;
 -    text-align: center;
 -    font-size: 8pt;
 -    z-index: 50;
 -    -webkit-box-shadow: 2px 2px 20px 2px #333333;
 -    -moz-box-shadow: 2px 2px 20px 2px #333333;
 -    -o-box-shadow: 2px 2px 20px 2px #333333;
 -    -ms-box-shadow: 2px 2px 20px 2px #333333;
 -    box-shadow: 2px 2px 20px 2px #333333;
 -}
 -
  div.daily {
      font-family: Georgia, 'DejaVu Serif', Norasi, serif;
      background-color: #E6D6BE;
@@@ -1101,17 -1119,4 +1100,17 @@@ div.dailyNoEntry 
  ul.errors {
      color: red;
      float: left;
 -}
 +}
 +
 +/* 404 page */
 +.error-container {
 +
 +    margin: 50px;
 +    margin-top: 20px;
 +}
 +
 +.error-container h1 {
 +    text-decoration: none;
 +    font-style: normal;
 +    color: #80AD48;
 +}