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

NEW Add permission "export website"

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-20 19:30:08 +01:00
parent e5a94d9257
commit 6a8f4ac892
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/exports/export.php
View File

@ -154,6 +154,9 @@ $upload_dir = $conf->export->dir_temp.'/'.$user->id;
//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1); //$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
$usefilters = 1; $usefilters = 1;
// Security check
$result = restrictedArea($user, 'export');
/* /*
* Actions * Actions

5
htdocs/exports/index.php
View File

@ -27,11 +27,12 @@ require_once DOL_DOCUMENT_ROOT.'/exports/class/export.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->load("exports"); $langs->load("exports");
$export = new Export($db);
$export->load_arrays($user);
// Security check // Security check
$result = restrictedArea($user, 'export'); $result = restrictedArea($user, 'export');
$export = new Export($db);
$export->load_arrays($user);
/* /*
* View * View

32
htdocs/website/index.php
View File

@ -477,7 +477,7 @@ if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $us
} }
// Replacement of string into pages // Replacement of string into pages
if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha')) { if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && $usercanedit) {
$replacestring = GETPOST('replacestring', 'none'); $replacestring = GETPOST('replacestring', 'none');
if (empty($user->rights->website->writephp)) { if (empty($user->rights->website->writephp)) {
@ -567,7 +567,7 @@ if ($action == 'adddir' && $permtouploadfile)
*/ */
// Add site // Add site
if ($action == 'addsite') { if ($action == 'addsite' && $usercanedit) {
$db->begin(); $db->begin();
if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha'))) { if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha'))) {
@ -625,7 +625,7 @@ if ($action == 'addsite') {
} }
// Add page/container // Add page/container
if ($action == 'addcontainer') { if ($action == 'addcontainer' && $usercanedit) {
dol_mkdir($pathofwebsite); dol_mkdir($pathofwebsite);
$db->begin(); $db->begin();
@ -1148,7 +1148,7 @@ if ($action == 'addcontainer') {
} }
// Delete site // Delete site
if ($action == 'confirm_deletesite' && $confirm == 'yes') { if ($action == 'confirm_deletesite' && $confirm == 'yes' && $permissiontodelete) {
$error = 0; $error = 0;
$db->begin(); $db->begin();
@ -1276,7 +1276,7 @@ if (!GETPOSTISSET('pageid')) {
} }
// Update css Update site properties // Update css Update site properties
if ($action == 'updatecss') { if ($action == 'updatecss' && $usercanedit) {
// If we tried to reload another site/page, we stay on editcss mode. // If we tried to reload another site/page, we stay on editcss mode.
if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) { if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {
$action = 'editcss'; $action = 'editcss';
@ -1523,7 +1523,7 @@ if ($action == 'updatecss') {
} }
// Update page // Update page
if ($action == 'setashome') { if ($action == 'setashome' && $usercanedit) {
$db->begin(); $db->begin();
$object->fetch(0, $websitekey); $object->fetch(0, $websitekey);
$website = $object; $website = $object;
@ -1556,7 +1556,7 @@ if ($action == 'setashome') {
} }
// Update page properties (meta) // Update page properties (meta)
if ($action == 'updatemeta') { if ($action == 'updatemeta' && $usercanedit) {
$db->begin(); $db->begin();
$result = $object->fetch(0, $websitekey); $result = $object->fetch(0, $websitekey);
@ -1778,8 +1778,8 @@ if ($action == 'updatemeta') {
} }
// Update page // Update page
if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'confirm_createfromclone' || $action == 'confirm_createpagefromclone') if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' || $action == 'confirm_createfromclone' || $action == 'confirm_createpagefromclone')
|| ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview')))) { || ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))))) {
$object->fetch(0, $websitekey); $object->fetch(0, $websitekey);
$website = $object; $website = $object;
@ -2041,7 +2041,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
} }
// Export site // Export site
if ($action == 'exportsite') { if ($action == 'exportsite' && !empty($user->rights->website->export)) {
$fileofzip = $object->exportWebSite(); $fileofzip = $object->exportWebSite();
if ($fileofzip) { if ($fileofzip) {
@ -2060,7 +2060,7 @@ if ($action == 'exportsite') {
} }
// Regenerate site // Regenerate site
if ($action == 'regeneratesite') { if ($action == 'regeneratesite' && $usercanedit) {
// Check symlink to medias and restore it if ko. Recreate also dir of website if not found. // Check symlink to medias and restore it if ko. Recreate also dir of website if not found.
$pathtomedias = DOL_DATA_ROOT.'/medias'; $pathtomedias = DOL_DATA_ROOT.'/medias';
$pathtomediasinwebsite = $pathofwebsite.'/medias'; $pathtomediasinwebsite = $pathofwebsite.'/medias';
@ -2085,7 +2085,7 @@ if ($action == 'regeneratesite') {
} }
// Import site // Import site
if ($action == 'importsiteconfirm') { if ($action == 'importsiteconfirm' && $usercanedit) {
if (empty($_FILES) && !GETPOSTISSET('templateuserfile')) { if (empty($_FILES) && !GETPOSTISSET('templateuserfile')) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
$action = 'importsite'; $action = 'importsite';
@ -2162,7 +2162,7 @@ $domainname = '0.0.0.0:8080';
$tempdir = $conf->website->dir_output.'/'.$websitekey.'/'; $tempdir = $conf->website->dir_output.'/'.$websitekey.'/';
// Generate web site sitemaps // Generate web site sitemaps
if ($action == 'generatesitemaps') { if ($action == 'generatesitemaps' && $usercanedit) {
$domtree = new DOMDocument('1.0', 'UTF-8'); $domtree = new DOMDocument('1.0', 'UTF-8');
$root = $domtree->createElementNS('http://www.sitemaps.org/schemas/sitemap/0.9', 'urlset'); $root = $domtree->createElementNS('http://www.sitemaps.org/schemas/sitemap/0.9', 'urlset');
$domtree->formatOutput = true; $domtree->formatOutput = true;
@ -2331,6 +2331,10 @@ if (!GETPOST('hide_websitemenu')) {
if (empty($user->rights->website->write)) { if (empty($user->rights->website->write)) {
$disabled = ' disabled="disabled"'; $disabled = ' disabled="disabled"';
} }
$disabledexport = '';
if (empty($user->rights->website->export)) {
$disabledexport = ' disabled="disabled"';
}
if ($websitekey) { if ($websitekey) {
$virtualurl = ''; $virtualurl = '';
@ -2446,7 +2450,7 @@ if (!GETPOST('hide_websitemenu')) {
} }
//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">'; //print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">'; print '<input type="submit" class="button bordertransp"'.$disabledexport.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">'; print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';