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

Fix missing creation of master.inc.php file in website import

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-18 14:27:22 +01:00
parent 90d8299c92
commit 25e4791497
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/website/index.php
View File

@ -598,16 +598,13 @@ if ($action == 'addcontainer')
$db->begin(); $db->begin();
$objectpage->fk_website = $object->id; $objectpage->fk_website = $object->id;
if (GETPOSTISSET('fetchexternalurl'))
if (GETPOSTISSET('fetchexternalurl')) // Fetch from external url
{ {
$urltograb = GETPOST('externalurl', 'alpha'); $urltograb = GETPOST('externalurl', 'alpha');
$grabimages = GETPOST('grabimages', 'alpha'); $grabimages = GETPOST('grabimages', 'alpha');
$grabimagesinto = GETPOST('grabimagesinto', 'alpha'); $grabimagesinto = GETPOST('grabimagesinto', 'alpha');
//var_dump($grabimages);exit;
}
if (GETPOSTISSET('fetchexternalurl'))
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
if (empty($urltograb)) if (empty($urltograb))
@ -749,6 +746,7 @@ if ($action == 'addcontainer')
// Now loop to fetch JS // Now loop to fetch JS
$tmp = $objectpage->htmlheader; $tmp = $objectpage->htmlheader;
// We grab files found into <script> tags
preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs); preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs);
$errorforsubresource = 0; $errorforsubresource = 0;
foreach ($regs[0] as $key => $val) foreach ($regs[0] as $key => $val)
@ -814,7 +812,7 @@ if ($action == 'addcontainer')
$objectpage->htmlheader = trim($tmp)."\n"; $objectpage->htmlheader = trim($tmp)."\n";
// Now loop to fetch CSS // Now we grab CSS found into <link> tags
$pagecsscontent = "\n".'<style>'."\n"; $pagecsscontent = "\n".'<style>'."\n";
preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs); preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs);
@ -914,7 +912,7 @@ if ($action == 'addcontainer')
$objectpage->htmlheader .= trim($pagecsscontent)."\n"; $objectpage->htmlheader .= trim($pagecsscontent)."\n";
// Now loop to fetch all images into page // Now we have to fetch all images into page
$tmp = $objectpage->content; $tmp = $objectpage->content;
getAllImages($object, $objectpage, $urltograb, $tmp, $action, 1, $grabimages, $grabimagesinto); getAllImages($object, $objectpage, $urltograb, $tmp, $action, 1, $grabimages, $grabimagesinto);
@ -1049,6 +1047,7 @@ if ($action == 'addcontainer')
} }
} }
} }
if (!$error) if (!$error)
{ {
$db->commit(); $db->commit();
@ -1075,6 +1074,17 @@ if ($action == 'addcontainer')
$result = symlink($pathtomedias, $pathtomediasinwebsite); $result = symlink($pathtomedias, $pathtomediasinwebsite);
} }
// Now generate the master.inc.php page if it does not exists yet
if (!dol_is_file($filemaster))
{
$result = dolSaveMasterFile($filemaster);
if (!$result)
{
$error++;
setEventMessages('Failed to write file '.$filemaster, null, 'errors');
}
}
if (!dol_is_file($filehtmlheader)) if (!dol_is_file($filehtmlheader))
{ {
$htmlheadercontent = "<html>\n"; $htmlheadercontent = "<html>\n";