X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUtils.php;h=7d7eaffdb71b86abe8b56b879fcbb968a7fb511e;hb=7329118e9cfb41e4db0d898183304fcb0b204f7b;hp=da521cceff728376178f11fe9fea0dae121d46eb;hpb=3fdcc7bd47114776a5a8a280783529ee2dd690a1;p=github%2Fshaarli%2FShaarli.git diff --git a/application/Utils.php b/application/Utils.php index da521cce..7d7eaffd 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -197,59 +197,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. @@ -273,4 +220,4 @@ function autoLocale($headerLocale) } } setlocale(LC_ALL, $attempts); -} \ No newline at end of file +}