Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 14:31:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rename of alias

Browse Source
This commit is contained in:
Laurent Destailleur
2021-01-26 13:38:41 +01:00
parent 26c22e1b28
commit aa2d581b41
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ function dolSavePageAlias($filealias, $object, $objectpage)
if ($objectpage->lang && in_array($objectpage->lang, explode(',', $object->otherlang))) { if ($objectpage->lang && in_array($objectpage->lang, explode(',', $object->otherlang))) {
$dirname = dirname($filealias); $dirname = dirname($filealias);
$filename = basename($filealias); $filename = basename($filealias);
$filealias = $dirname.'/'.$objectpage->lang.'/'.$filename; $filealiassub = $dirname.'/'.$objectpage->lang.'/'.$filename;
$aliascontent = '<?php'."\n"; $aliascontent = '<?php'."\n";
$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n"; $aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
@@ -94,12 +94,12 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; '; $aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';
$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; $aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
$aliascontent .= '?>'."\n"; $aliascontent .= '?>'."\n";
$result = file_put_contents($filealias, $aliascontent); $result = file_put_contents($filealiassub, $aliascontent);
if ($result === false) { if ($result === false) {
dol_syslog("Failed to write file ".$filealias, LOG_WARNING); dol_syslog("Failed to write file ".$filealiassub, LOG_WARNING);
} }
if (!empty($conf->global->MAIN_UMASK)) { if (!empty($conf->global->MAIN_UMASK)) {
@chmod($filealias, octdec($conf->global->MAIN_UMASK)); @chmod($filealiassub, octdec($conf->global->MAIN_UMASK));
} }
} }
// Save also alias into all language subdirectories if it is a main language // Save also alias into all language subdirectories if it is a main language
@@ -108,7 +108,7 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$dirname = dirname($filealias); $dirname = dirname($filealias);
$filename = basename($filealias); $filename = basename($filealias);
foreach (explode(',', $object->otherlang) as $sublang) { foreach (explode(',', $object->otherlang) as $sublang) {
$filealias = $dirname.'/'.$sublang.'/'.$filename; $filealiassub = $dirname.'/'.$sublang.'/'.$filename;
$aliascontent = '<?php'."\n"; $aliascontent = '<?php'."\n";
$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n"; $aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
@@ -116,12 +116,12 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; '; $aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';
$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; $aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
$aliascontent .= '?>'."\n"; $aliascontent .= '?>'."\n";
$result = file_put_contents($filealias, $aliascontent); $result = file_put_contents($filealiassub, $aliascontent);
if ($result === false) { if ($result === false) {
dol_syslog("Failed to write file ".$filealias, LOG_WARNING); dol_syslog("Failed to write file ".$filealiassub, LOG_WARNING);
} }
if (!empty($conf->global->MAIN_UMASK)) { if (!empty($conf->global->MAIN_UMASK)) {
@chmod($filealias, octdec($conf->global->MAIN_UMASK)); @chmod($filealiassub, octdec($conf->global->MAIN_UMASK));
} }
} }
} }

11
htdocs/website/index.php
View File

@@ -2037,6 +2037,17 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
{ {
dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias); dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
dol_delete_file($fileoldalias); dol_delete_file($fileoldalias);
// Delete also pages into language subdirectories
if (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
$dirname = dirname($fileoldalias);
$filename = basename($fileoldalias);
foreach (explode(',', $object->otherlang) as $sublang) {
$fileoldaliassub = $dirname.'/'.$sublang.'/'.$filename;
dol_delete_file($fileoldaliassub);
}
}
} }
// Save page alias // Save page alias