Merge pull request #379 from ArthurHoaro/plugin-markdown

[github/shaarli/Shaarli.git] / application / Utils.php

diff --git a/application/Utils.php b/application/Utils.php
index a9a10ece572a02e36c151931c719be739894faaa..10d606987c826990e94fad0489f36aad66f6a969 100644 (file)
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -6,14 +6,19 @@
 /**
  * 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)
 {
-    $line = strval(date('Y/m/d_H:i:s')).' - '.$clientIp.' - '.strval($message).'\n';
-    file_put_contents($logFile, $line, FILE_APPEND);
+    file_put_contents(
+        $logFile,
+        date('Y/m/d H:i:s').' - '.$clientIp.' - '.strval($message).PHP_EOL,
+        FILE_APPEND
+    );
 }
 
 /**
@@ -56,14 +61,6 @@ function endsWith($haystack, $needle, $case=true)
     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
  */