Add hidden options MAIN_HTML_HEADER and MAIN_HTML_FOOTER

This commit is contained in:
Laurent Destailleur 2009-10-16 17:24:18 +00:00
parent 0ce52bad02
commit a34de44b79
2 changed files with 7 additions and 4 deletions

View File

@ -96,6 +96,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
else print "document.getElementById('password').focus();\n";
print "}\n";
print '</script>'."\n";
if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
print '<!-- HTTP_USER_AGENT = '.$_SERVER["HTTP_USER_AGENT"].' -->'."\n";
print '</head>'."\n";
@ -232,7 +233,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '</td>';
print '</tr>'."\n";
}
print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
print '<tr><td colspan="3" style="text-align:center;"><br>';
@ -261,7 +262,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
print ')</a>';
print '</td></tr>';
}
print '</table>'."\n";
// Hidden fields
@ -313,6 +314,8 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '<!-- cookie name used for this session = '.session_name().' -->'."\n";
print '<!-- urlfrom in this session = '.(isset($_SESSION["urlfrom"])?$_SESSION["urlfrom"]:'').' -->'."\n";
if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
// Fin entete html
print "\n</body>\n</html>";
}

View File

@ -816,7 +816,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '""];';
print '</script>'."\n";
if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."<br>\n";
if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
print "</head>\n\n";
}
@ -1212,7 +1212,7 @@ function llxFooter($foot='')
print "\n";
if ($foot) print '<!-- '.$foot.' -->'."\n";
if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."<br>\n";
if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
print "</body>\n";
print "</html>\n";