X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUtils.php;h=0166ee2ac0e132035af72e132a50ceb4368933e7;hb=ba0fd80732acbff0fcda57a0b31e4edfaa337001;hp=9a8ca6d1000c10eb586a3738fde49f464f7fa53f;hpb=649af5b501d2a90448242f53764ff693e9854039;p=github%2Fshaarli%2FShaarli.git diff --git a/application/Utils.php b/application/Utils.php index 9a8ca6d1..0166ee2a 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -32,6 +32,10 @@ function logm($logFile, $clientIp, $message) * * In Shaarli, they are used as a tinyurl-like link to individual entries, * e.g. smallHash('20111006_131924') --> yZH23w + * + * @param string $text Create a hash from this text. + * + * @return string generated small hash. */ function smallHash($text) { @@ -106,7 +110,9 @@ function unescape($str) } /** - * Link sanitization before templating + * Sanitize link before rendering. + * + * @param array $link Link to escape. */ function sanitizeLink(&$link) { @@ -197,59 +203,6 @@ function is_session_id_valid($sessionId) return true; } -/** - * In a string, converts URLs to clickable links. - * - * @param string $text input string. - * @param string $redirector if a redirector is set, use it to gerenate links. - * - * @return string returns $text with all links converted to HTML links. - * - * @see Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722 - */ -function text2clickable($text, $redirector) -{ - $regex = '!(((?:https?|ftp|file)://|apt:|magnet:)\S+[[:alnum:]]/?)!si'; - - if (empty($redirector)) { - return preg_replace($regex, '$1', $text); - } - // Redirector is set, urlencode the final URL. - return preg_replace_callback( - $regex, - function ($matches) use ($redirector) { - return ''. $matches[1] .''; - }, - $text - ); -} - -/** - * This function inserts where relevant so that multiple spaces are properly displayed in HTML - * even in the absence of
(This is used in description to keep text formatting). - * - * @param string $text input text. - * - * @return string formatted text. - */ -function space2nbsp($text) -{ - return preg_replace('/(^| ) /m', '$1 ', $text); -} - -/** - * Format Shaarli's description - * TODO: Move me to ApplicationUtils when it's ready. - * - * @param string $description shaare's description. - * @param string $redirector if a redirector is set, use it to gerenate links. - * - * @return string formatted description. - */ -function format_description($description, $redirector = false) { - return nl2br(space2nbsp(text2clickable($description, $redirector))); -} - /** * Sniff browser language to set the locale automatically. * Note that is may not work on your server if the corresponding locale is not installed.