lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loosing html content in edit

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-27 15:22:48 +01:00
parent d5bab315e3
commit a2c2d46e5c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/externalsite/admin/index.php
View File

@ -58,7 +58,7 @@ if ($action == 'update') {
$exturl = GETPOST('EXTERNALSITE_URL', 'none'); $exturl = GETPOST('EXTERNALSITE_URL', 'none');
$exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1); $exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1);
$exturl = dol_string_onlythesehtmlattributes($exturl); $exturl = trim(dol_string_onlythesehtmlattributes($exturl));
$i += dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity); $i += dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity);
$i += dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity); $i += dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity);
@ -108,7 +108,12 @@ print "</tr>";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>"; print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>";
print '<td><textarea class="flat minwidth500" name="EXTERNALSITE_URL">'; print '<td><textarea class="flat minwidth500" name="EXTERNALSITE_URL">';
print (GETPOST('EXTERNALSITE_URL', 'restricthtml') ?GETPOST('EXTERNALSITE_URL', 'restricthtml') : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
$exturl = GETPOST('EXTERNALSITE_URL', 'none');
$exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1);
$exturl = trim(dol_string_onlythesehtmlattributes($exturl));
print (GETPOSTISSET('EXTERNALSITE_URL') ? $exturl : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
print '</textarea></td>'; print '</textarea></td>';
print "<td>http://localhost/myurl/"; print "<td>http://localhost/myurl/";
print "<br>https://wikipedia.org/"; print "<br>https://wikipedia.org/";

2
htdocs/langs/en_US/externalsite.lang
View File

@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite # Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=Setup link to external website ExternalSiteSetup=Setup link to external website
ExternalSiteURL=External Site URL ExternalSiteURL=External Site URL of HTML iframe content
ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
ExampleMyMenuEntry=My menu entry ExampleMyMenuEntry=My menu entry