Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move escape() and sanitizeLink() to application/Utils.php

Browse source 
prevents 'PHP Fatal error:  Call to undefined function sanitizeLink() in Shaarli/application/LinkDB.php on line 255' in tests
This commit is contained in:
nodiscc 2015-06-24 01:04:50 +02:00
parent eaefcba724
commit 64bc92e3ac
2 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
application/Utils.php
View file

@ -42,4 +42,31 @@ function endsWith($haystack, $needle, $case=true)
} }
return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0); 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
*/
function escape($str)
{
return htmlspecialchars($str, ENT_COMPAT, 'UTF-8', false);
}
/**
* Link sanitization before templating
*/
function sanitizeLink(&$link)
{
$link['url'] = escape($link['url']); // useful?
$link['title'] = escape($link['title']);
$link['description'] = escape($link['description']);
$link['tags'] = escape($link['tags']);
}
?> ?>

17
index.php
View file

@ -269,23 +269,6 @@ function logm($message)
file_put_contents($GLOBALS['config']['DATADIR'].'/log.txt',$t,FILE_APPEND); file_put_contents($GLOBALS['config']['DATADIR'].'/log.txt',$t,FILE_APPEND);
} }
// Same as nl2br(), but escapes < and >
function nl2br_escaped($html)
{
return str_replace('>','&gt;',str_replace('<','&lt;',nl2br($html)));
}
function escape($str) {
return htmlspecialchars($str, ENT_COMPAT, 'UTF-8', false);
}
function sanitizeLink(&$link) {
$link['url'] = escape($link['url']); // useful?
$link['title'] = escape($link['title']);
$link['description'] = escape($link['description']);
$link['tags'] = escape($link['tags']);
}
// In a string, converts URLs to clickable links. // In a string, converts URLs to clickable links.
// Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722 // Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722
function text2clickable($url) function text2clickable($url)