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

Add more logs

Browse Source
This commit is contained in:
Laurent Destailleur 2019-08-13 07:05:06 +02:00
parent 7891c8d856
commit 91cdb2a5a8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/website.lib.php
View File

@ -183,15 +183,16 @@ function dolKeepOnlyPhpCode($str)
* *
* @param string $content Content string * @param string $content Content string
* @param string $contenttype Content type * @param string $contenttype Content type
* @param string $contentlabel Content label
* @return void * @return void
* @see dolWebsiteReplacementOfLinks() for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on * @see dolWebsiteReplacementOfLinks() for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
*/ */
function dolWebsiteOutput($content, $contenttype='html') function dolWebsiteOutput($content, $contenttype='html', $contentlabel='')
{ {
global $db, $langs, $conf, $user; global $db, $langs, $conf, $user;
global $dolibarr_main_url_root, $dolibarr_main_data_root; global $dolibarr_main_url_root, $dolibarr_main_data_root;
dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')'); dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." contentlabel=".$contentlabel." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
// Define $urlwithroot // Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@ -294,7 +295,7 @@ function dolWebsiteOutput($content, $contenttype='html')
* *
* @param string $content Content string * @param string $content Content string
* @return void * @return void
* @see dolWebsiteOutput * @see dolWebsiteOutput()
*/ */
/* /*
function dolWebsiteSaveContent($content) function dolWebsiteSaveContent($content)

2
htdocs/core/lib/website2.lib.php
View File

@ -138,7 +138,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
$tplcontent.= '</html>'."\n"; $tplcontent.= '</html>'."\n";
$tplcontent.= '<?php // BEGIN PHP'."\n"; $tplcontent.= '<?php // BEGIN PHP'."\n";
$tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n"; $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.');'."\n";
$tplcontent.= "// END PHP ?>"."\n"; $tplcontent.= "// END PHP ?>"."\n";
//var_dump($filetpl);exit; //var_dump($filetpl);exit;