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

Fix: difference between text and url into external web site module

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-10 18:10:57 +01:00
parent b35a9c0e64
commit 6105bb2bb6
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/externalsite/frames.php
View File

@ -22,7 +22,8 @@
* \brief Page that build two frames: One for menu, the other for the target page to show
* Usage:
* mydomain.com/externalsite/frames.php to show URL set into setup
* mydomain.com/externalsite/frames.php?keyforcontent to show content defined into conf->global->$keyforcontent
* mydomain.com/externalsite/frames.php?keyforcontent=EXTERNAL_SITE_CONTENT_abc to show html text defined into $conf->global->EXTERNAL_SITE_CONTENT_abc
* mydomain.com/externalsite/frames.php?keyforcontent=EXTERNAL_SITE_URL_abc to show URL defined into $conf->global->EXTERNAL_SITE_URL_abc
*/
require '../main.inc.php';
@ -56,10 +57,11 @@ if (! empty($keyforcontent))
print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight']-90).'px">';
if (! preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
if (! preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent)
&& ! preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
{
$langs->load("errors");
print $langs->trans("Variablekeyforcontentmustbenamed", 'EXTERNAL_SITE_CONTENT_');
print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
}
else if (empty($conf->global->$keyforcontent))
{
@ -68,7 +70,44 @@ if (! empty($keyforcontent))
}
else
{
print $conf->global->$keyforcontent;
if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
{
print $conf->global->$keyforcontent;
}
elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
{
print "
<html>
<head>
<title>Dolibarr frame for external web site</title>
</head>
<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
<frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
";
print '<frame name="main" src="';
print $conf->global->$keyforcontent;
print '">';
print "
<noframes>
<body>
</body>
</noframes>
</frameset>
<noframes>
<body>
<br><div class=\"center\">
Sorry, your browser is too old or not correctly configured to view this area.<br>
Your browser must support frames.<br>
</div>
</body>
</noframes>
</html>
";
}
}
print '<div>';

1
htdocs/langs/en_US/errors.lang
View File

@ -213,6 +213,7 @@ ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual prod
ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
# Warnings
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined