Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug website module

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-02 17:27:00 +02:00
parent 3cd302605e
commit 1415ad5b53
5 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/langs/en_US/website.lang
View File

@ -97,4 +97,7 @@ ThisPageHasTranslationPages=This page/container has translation
NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
GoTo=Go to
DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
ReplaceWebsiteContent=Replace website content
DeleteAlsoJs=Delete also all javascript files specific to this website?
DeleteAlsoMedias=Delete also all medias files specific to this website?

2
htdocs/theme/eldy/global.inc.php
View File

@ -313,7 +313,7 @@ hr { border: 0; border-top: 1px solid #ccc; }
-webkit-box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
.button:disabled, .buttonDelete:disabled {
.button:disabled, .buttonDelete:disabled, .button.disabled {
opacity: 0.4;
box-shadow: none;
-webkit-box-shadow: none;

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

@ -540,7 +540,7 @@ hr { border: 0; border-top: 1px solid #ccc; }
-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
.button:disabled, .buttonDelete:disabled {
.button:disabled, .buttonDelete:disabled, .button.disabled {
opacity: 0.4;
box-shadow: none;
-webkit-box-shadow: none;

21
htdocs/website/class/website.class.php
View File

@ -489,8 +489,7 @@ class Website extends CommonObject
if (! $error && ! empty($this->ref))
{
global $dolibarr_main_data_root;
$pathofwebsite=$dolibarr_main_data_root.'/website/'.$this->ref;
$pathofwebsite=DOL_DATA_ROOT.'/website/'.$this->ref;
dol_delete_dir_recursive($pathofwebsite);
}
@ -519,7 +518,7 @@ class Website extends CommonObject
*/
public function createFromClone($user, $fromid, $newref, $newlang = '')
{
global $conf, $hookmanager;
global $conf;
global $dolibarr_main_data_root;
$now = dol_now();
@ -542,8 +541,9 @@ class Website extends CommonObject
$object->fetch($fromid);
$oldidforhome=$object->fk_default_home;
$oldref=$object->ref;
$pathofwebsiteold=$dolibarr_main_data_root.'/website/'.$object->ref;
$pathofwebsiteold=$dolibarr_main_data_root.'/website/'.$oldref;
$pathofwebsitenew=$dolibarr_main_data_root.'/website/'.$newref;
dol_delete_dir_recursive($pathofwebsitenew);
@ -575,8 +575,8 @@ class Website extends CommonObject
dolCopyDir($pathofwebsiteold, $pathofwebsitenew, $conf->global->MAIN_UMASK, 0);
// Check symlink to medias and restore it if ko
$pathtomedias=DOL_DATA_ROOT.'/medias';
$pathtomediasinwebsite=$pathofwebsitenew.'/medias';
$pathtomedias=DOL_DATA_ROOT.'/medias'; // Target
$pathtomediasinwebsite=$pathofwebsitenew.'/medias'; // Source / Link name
if (! is_link(dol_osencode($pathtomediasinwebsite)))
{
dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
@ -584,6 +584,15 @@ class Website extends CommonObject
$result = symlink($pathtomedias, $pathtomediasinwebsite);
}
// Copy images and js dir
$pathofmediasjsold=DOL_DATA_ROOT.'/medias/js/'.$oldref;
$pathofmediasjsnew=DOL_DATA_ROOT.'/medias/js/'.$newref;
dolCopyDir($pathofmediasjsold, $pathofmediasjsnew, $conf->global->MAIN_UMASK, 0);
$pathofmediasimageold=DOL_DATA_ROOT.'/medias/image/'.$oldref;
$pathofmediasimagenew=DOL_DATA_ROOT.'/medias/image/'.$newref;
dolCopyDir($pathofmediasimageold, $pathofmediasimagenew, $conf->global->MAIN_UMASK, 0);
$newidforhome=0;
// Duplicate pages

69
htdocs/website/index.php
View File

@ -799,13 +799,13 @@ if ($action == 'addcontainer')
}
// Delete site
if ($action == 'deletesite')
if ($action == 'confirm_deletesite' && $confirm == 'yes')
{
$error = 0;
$db->begin();
$res = $object->fetch(0, $websitekey);
$res = $object->fetch(GETPOST('id', 'int'));
$website = $object;
if ($res > 0)
@ -817,13 +817,28 @@ if ($action == 'deletesite')
setEventMessages($object->error, $object->errors, 'errors');
}
}
if (! $error)
{
if (GETPOST('delete_also_js', 'alpha') == 'on')
{
$pathofwebsitejs=DOL_DATA_ROOT.'/medias/js/'.$object->ref;
dol_delete_dir_recursive($pathofwebsitejs);
}
if (GETPOST('delete_also_medias', 'alpha') == 'on')
{
$pathofwebsitemedias=DOL_DATA_ROOT.'/medias/image/'.$object->ref;
dol_delete_dir_recursive($pathofwebsitemedias);
}
}
if (! $error)
{
$db->commit();
setEventMessages($langs->trans("SiteDeleted", $object->ref, $websitekey), null, 'mesgs');
setEventMessages($langs->trans("SiteDeleted", $object->ref), null, 'mesgs');
header("Location: ".$_SERVER["PHP_SELF"]);
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
}
else
@ -1815,7 +1830,7 @@ if (! GETPOST('hide_websitemenu'))
if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
$atleastonepage=(is_array($array) && count($array) > 0);
if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
{
$disabled='';
if (empty($user->rights->website->write)) $disabled=' disabled="disabled"';
@ -1862,7 +1877,7 @@ if (! GETPOST('hide_websitemenu'))
*/
//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="<span class="fa fa-globe"><span>'.dol_escape_htmltag($langs->trans("Replace")).'" name="replacesite">';
print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebSiteContent")).'"><span class="fa fa-file-code"><span></a>';
print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-file-code"><span></a>';
}
print '</div>';
@ -1872,7 +1887,7 @@ if (! GETPOST('hide_websitemenu'))
print '<div class="websitetools websiteselection">';
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
{
$urlext=$virtualurl;
$urlint=$urlwithroot.'/public/website/index.php?website='.$websitekey;
@ -2038,11 +2053,26 @@ if (! GETPOST('hide_websitemenu'))
$websitepage->fetch($pageid);
}
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
{
$disabled='';
if (empty($user->rights->website->write)) $disabled=' disabled="disabled"';
// Confirmation delete site
if ($action == 'deletesite') {
// Create an array for form
$formquestion = array(
array('type' => 'checkbox', 'name' => 'delete_also_js', 'label' => $langs->trans("DeleteAlsoJs"), 'value' => 0),
array('type' => 'checkbox', 'name' => 'delete_also_medias', 'label' => $langs->trans("DeleteAlsoMedias"), 'value' => 0),
//array('type' => 'other','name' => 'newlang','label' => $langs->trans("Language"), 'value' => $formadmin->select_language(GETPOST('newlang', 'az09')?GETPOST('newlang', 'az09'):$langs->defaultlang, 'newlang', 0, null, '', 0, 0, 'minwidth200')),
//array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0))
);
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id='.$object->id, $langs->trans('DeleteWebsite'), '', 'confirm_deletesite', $formquestion, 0, 1, 200);
print $formconfirm;
}
// Confirmation to clone
if ($action == 'createfromclone') {
// Create an array for form
@ -2058,7 +2088,7 @@ if (! GETPOST('hide_websitemenu'))
print $formconfirm;
}
if ($pageid > 0 && $atleastonepage) // pageid can be set without pages, if homepage of site is set and all page were removed
if ($pageid > 0 && $atleastonepage) // pageid can be set without pages, if homepage of site is set and all pages were removed
{
// Confirmation to clone
if ($action == 'createpagefromclone') {
@ -2125,8 +2155,19 @@ if (! GETPOST('hide_websitemenu'))
print '</div>';
print '</div>';
if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button nobordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
else print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
// @TODO Move this action into a combo list
if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home)
{
//$disabled=' disabled="disabled"';
//print '<span class="button nobordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
print '<input type="submit" class="button nobordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
}
else
{
//$disabled='';
//print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"><span></a>';
print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
}
print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
}
@ -2136,7 +2177,7 @@ if (! GETPOST('hide_websitemenu'))
print '<div class="websitetools">';
if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
{
$realpage=$urlwithroot.'/public/website/index.php?website='.$websitekey.'&pageref='.$websitepage->pageurl;
$pagealias = $websitepage->pageurl;
@ -2167,7 +2208,7 @@ if (! GETPOST('hide_websitemenu'))
// TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
}
if (! in_array($action, array('editcss','editmenu','file_manager','replacesite','createsite','createcontainer','createpagefromclone')))
if (! in_array($action, array('editcss','editmenu','file_manager','replacesite','createsite','createcontainer','createfromclone','createpagefromclone','deletesite')))
{
if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
@ -2842,7 +2883,7 @@ if ($action == 'replacesite')
print '<!-- Edit Media -->'."\n";
print '<div class="fiche"><br>';
print load_fiche_titre($langs->trans("ReplaceWebSiteContent"));
print load_fiche_titre($langs->trans("ReplaceWebsiteContent"));
print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';