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

Fix: Fix regression after removing pre.inc.php

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-16 01:18:25 +00:00
parent 3c9f50d34a
commit d38f72f50a
1 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
htdocs/main.inc.php
View File

@ -1227,65 +1227,68 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$
* \remarks Close 2 div * \remarks Close 2 div
* \param foot A text to add in HTML generated page * \param foot A text to add in HTML generated page
*/ */
function llxFooter($foot='') if (! function_exists("llxFooter"))
{ {
global $conf, $dolibarr_auto_user, $micro_start_time; function llxFooter($foot='')
print "\n\n".'</div> <!-- end div class="fiche" -->'."\n";
// print "\n".'</div> <!-- end div class="vmenuplusfiche" -->'."\n";
print "\n".'</td></tr></table> <!-- end right area -->'."\n";
if (! empty($_SERVER['DOL_TUNING']))
{ {
$micro_end_time=dol_microtime_float(true); global $conf, $dolibarr_auto_user, $micro_start_time;
print "\n".'<script type="text/javascript">window.status="MAIN_OPTIMIZE_SPEED '.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off').' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
if (function_exists("memory_get_usage"))
{
print ' - Mem: '.memory_get_usage();
}
if (function_exists("xdebug_memory_usage"))
{
print ' - XDebug time: '.ceil(1000*xdebug_time_index()).' ms';
print ' - XDebug mem: '.xdebug_memory_usage();
print ' - XDebug mem peak: '.xdebug_peak_memory_usage();
}
if (function_exists("zend_loader_file_encoded"))
{
print ' - Zend encoded file: '.(zend_loader_file_encoded()?'yes':'no');
}
print '"</script>'."\n";
// Add Xdebug coverage of code print "\n\n".'</div> <!-- end div class="fiche" -->'."\n";
if (defined('XDEBUGCOVERAGE')) { var_dump(xdebug_get_code_coverage()); }
}
if ($conf->use_javascript_ajax) // print "\n".'</div> <!-- end div class="vmenuplusfiche" -->'."\n";
{ print "\n".'</td></tr></table> <!-- end right area -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>'."\n";
} if (! empty($_SERVER['DOL_TUNING']))
{
$micro_end_time=dol_microtime_float(true);
print "\n".'<script type="text/javascript">window.status="MAIN_OPTIMIZE_SPEED '.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off').' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
if (function_exists("memory_get_usage"))
{
print ' - Mem: '.memory_get_usage();
}
if (function_exists("xdebug_memory_usage"))
{
print ' - XDebug time: '.ceil(1000*xdebug_time_index()).' ms';
print ' - XDebug mem: '.xdebug_memory_usage();
print ' - XDebug mem peak: '.xdebug_peak_memory_usage();
}
if (function_exists("zend_loader_file_encoded"))
{
print ' - Zend encoded file: '.(zend_loader_file_encoded()?'yes':'no');
}
print '"</script>'."\n";
// Add Xdebug coverage of code
if (defined('XDEBUGCOVERAGE')) { var_dump(xdebug_get_code_coverage()); }
}
if ($conf->use_javascript_ajax)
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>'."\n";
}
// If there is some logs in buffer to show
if (sizeof($conf->logbuffer))
{
print "\n";
print "<!-- Start of log output\n";
//print '<div class="hidden">'."\n";
foreach($conf->logbuffer as $logline)
{
print $logline."<br>\n";
}
//print '</div>'."\n";
print "End of log output -->\n";
}
// If there is some logs in buffer to show
if (sizeof($conf->logbuffer))
{
print "\n"; print "\n";
print "<!-- Start of log output\n"; if ($foot) print '<!-- '.$foot.' -->'."\n";
//print '<div class="hidden">'."\n";
foreach($conf->logbuffer as $logline) if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
{
print $logline."<br>\n"; print "</body>\n";
} print "</html>\n";
//print '</div>'."\n";
print "End of log output -->\n";
} }
print "\n";
if ($foot) print '<!-- '.$foot.' -->'."\n";
if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
print "</body>\n";
print "</html>\n";
} }
?> ?>