Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #53: Wysiwyg links #73

Closed
wants to merge 11 commits into from
Closed

Closes #53: Wysiwyg links #73

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b6b1617
Work on payment loan
frederic34 Mar 29, 2015
b83e9ea
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
eldy Mar 30, 2015
f174b66
git push origin developMerge branch 'frederic34-loan' into develop
eldy Mar 30, 2015
86603b0
Merge pull request #2504 from marcosgdf/constants
eldy Mar 30, 2015
9d752c6
Sync from transifex
eldy Mar 30, 2015
62aa365
Fix: [ bug #1707 ] Links appears as raw HTML in calendar events
marcosgdf Mar 31, 2015
0432361
Useless test. We cannot say that something is HTML just because of us…
marcosgdf Mar 31, 2015
f01afcb
Removed second argument of dol_textishtml
marcosgdf Mar 31, 2015
93d3b90
Corrected dol_textishtml function
marcosgdf Mar 31, 2015
0a8f711
Corrected dol_textishtml function
marcosgdf Mar 31, 2015
731e76b
Corrected (again) regex of dol_textishtml
marcosgdf Apr 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: [ bug Dolibarr#1707 ] Links appears as raw HTML in calendar events
  • Loading branch information
@marcosgdf
marcosgdf committed Mar 31, 2015
commit 62aa365c5fd2e25b7dd633294f59df2f7959e280
23 changes: 5 additions & 18 deletions htdocs/core/lib/functions.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3872,6 +3872,7 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$removelasteolbr=1)
{
$newstring=$stringtoencode;

if (dol_textishtml($stringtoencode)) // Check if text is already HTML or not
{
$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
Expand Down Expand Up @@ -4050,26 +4051,12 @@ function dol_microtime_float()
*/
function dol_textishtml($msg,$option=0)
{
if ($option == 1)
{
if (preg_match('/<html/i',$msg)) return true;
elseif (preg_match('/<body/i',$msg)) return true;
elseif (preg_match('/<br/i',$msg)) return true;
return false;
}
else
{
if (preg_match('/<html/i',$msg)) return true;
elseif (preg_match('/<body/i',$msg)) return true;
elseif (preg_match('/<(b|em|i)>/i',$msg)) return true;
elseif (preg_match('/<(br|div|font|img|li|span|strong|table)>/i',$msg)) return true;
elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;
elseif (preg_match('/<h[0-9]>/i',$msg)) return true;
elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg)) return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
elseif (preg_match('/&#[0-9]{2,3};/i',$msg)) return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
//http://stackoverflow.com/questions/5732758/detect-html-tags-in-a-string
if ($msg == strip_tags($msg)) {
return false;
}

return true;
}

/**
Expand Down