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

Debug website module

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-17 16:24:47 +01:00
parent 5cd003973b
commit 8d671b2b26
4 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart=0)
if ($removephppart) $replacewith=''; if ($removephppart) $replacewith='';
$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content); $content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
$replacewith='<span style="background: #ddd; border: 1px solid #ccc; border-radius: 4px;">...php...</span>'; $replacewith='<span class="phptag">...php...</span>';
if ($removephppart) $replacewith=''; if ($removephppart) $replacewith='';
$content = preg_replace('/<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content); $content = preg_replace('/<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);

4
htdocs/theme/eldy/style.css.php
View File

@ -3468,6 +3468,10 @@ tr.visible {
/* Module website */ /* Module website */
/* ============================================================================== */ /* ============================================================================== */
.phptag {
background: #ddd; border: 1px solid #ccc; border-radius: 4px;
}
.nobordertransp { .nobordertransp {
border: 0px; border: 0px;
background-color: transparent; background-color: transparent;

4
htdocs/theme/md/style.css.php
View File

@ -3533,6 +3533,10 @@ tr.visible {
/* Module website */ /* Module website */
/* ============================================================================== */ /* ============================================================================== */
.phptag {
background: #ddd; border: 1px solid #ccc; border-radius: 4px;
}
.nobordertransp { .nobordertransp {
border: 0px; border: 0px;
background-color: transparent; background-color: transparent;

44
htdocs/website/index.php
View File

@ -110,6 +110,15 @@ if ($pageid < 0) $pageid = 0;
if (($pageid > 0 || $pageref) && $action != 'addcontainer') if (($pageid > 0 || $pageref) && $action != 'addcontainer')
{ {
$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref); $res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
// Check if pageid is inside the new website, if not we reset param pageid
if ($object->id > 0 && ($objectpage->fk_website != $object->id))
{
$res = $objectpage->fetch(0, $object->id, '');;
if ($res == 0) // Page was not found, we reset it
{
$objectpage=new WebsitePage($db);
}
}
$pageid = $objectpage->id; $pageid = $objectpage->id;
} }
@ -1202,6 +1211,7 @@ $arrayofjs = array(
'/includes/ace/ext-statusbar.js', '/includes/ace/ext-statusbar.js',
'/includes/ace/ext-language_tools.js', '/includes/ace/ext-language_tools.js',
//'/includes/ace/ext-chromevox.js' //'/includes/ace/ext-chromevox.js'
//'/includes/jquery/plugins/jqueryscoped/jquery.scoped.js',
); );
$arrayofcss = array(); $arrayofcss = array();
@ -2016,11 +2026,30 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
// REPLACEMENT OF LINKS When page called by website editor // REPLACEMENT OF LINKS When page called by website editor
$out.='<style scoped>'."\n"; // "scoped" means "apply to parent element only". Not yet supported by browsers $out.='<style scoped>'."\n"; // "scoped" means "apply to parent element only". No more supported by browsers, snif !
$out.= '/* Include website CSS file */'."\n"; $tmpout='';
$out.=dolWebsiteReplacementOfLinks($object, $csscontent, 1); $tmpout.= '/* Include website CSS file */'."\n";
$out.= '/* Include HTML header from the inline block */'."\n"; $tmpout.= dolWebsiteReplacementOfLinks($object, $csscontent, 1);
$out.= $objectpage->htmlheader."\n"; $tmpout.= '/* Include style from the HTML header of page */'."\n";
// Clean the html header of page to get only <style> content
$tmp = preg_split('(<style[^>]*>|</style>)', $objectpage->htmlheader);
$tmpstyleinheader ='';
$i=0;
foreach($tmp as $valtmp)
{
$i++;
if ($i % 2 == 0) $tmpstyleinheader.=$valtmp."\n";
}
//$tmpstyleinheader.='</style>';
//$pos=strpos($tmpstyleinheader, '<style');
//if ($pos) $tmpstyleinheader = substr($tmpstyleinheader, $pos);
//$tmpstyleinheader = preg_replace('/^.*(<style[^>]*>)+/ims','aaa', $tmpstyleinheader);
//$tmpstyleinheader = preg_replace('/(</style>).*$/ims','$1', $tmpstyleinheader);
//$tmpstyleinheader = preg_replace('/</style>.*<style[^>]*>/ims','', $tmpstyleinheader);
$tmpout.= $tmpstyleinheader."\n";
// Clean style that may affect global style of Dolibarr
$tmpout=preg_replace('/}[\s\n]*body\s*{[^}]+}/ims','}',$tmpout);
$out.=$tmpout;
$out.='</style>'."\n"; $out.='</style>'."\n";
// Do not enable the contenteditable when page was grabbed, ckeditor is removing span and adding borders, // Do not enable the contenteditable when page was grabbed, ckeditor is removing span and adding borders,
@ -2032,10 +2061,13 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
$out.='</div>'; $out.='</div>';
$out.='</div>'; $out.='</div> <!-- End div id=websitecontentundertopmenu -->';
$out.= "\n".'<!-- End page content '.$filetpl.' -->'."\n\n"; $out.= "\n".'<!-- End page content '.$filetpl.' -->'."\n\n";
// For jqueryscoped (does not work as expected)
//$out.="<script>$.scoped();</script>";
print $out; print $out;
/*file_put_contents($filetpl, $out); /*file_put_contents($filetpl, $out);