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

Merge pull request #16514 from frederic34/stickler_test

Browse Source 
test stickler
This commit is contained in:
Laurent Destailleur 2021-03-02 19:12:17 +01:00 committed by GitHub
commit c0395d2d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/eventorganization.php
View File

@ -248,7 +248,7 @@ if ($action == 'edit') {
$tmp = explode(':', $val['type']);
print img_picto('', 'category', 'class="pictofixedwidth"');
print $formother->select_categories($tmp[1], $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
print $formother->select_categories($tmp[1], $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
} else {
print '<input name="'.$constname.'" class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
}

15
htdocs/website/index.php
View File

@ -2192,27 +2192,24 @@ if ($action == 'generatesitemaps') {
setEventMessages($object->error, $object->errors, 'errors');
}
}
}else {
} else {
dol_print_error($db);
}
$robotcontent = @file_get_contents($filerobot);
$result = preg_replace('/<?php // BEGIN PHP[^?]END PHP ?>\n/ims', '', $robotcontent);
if ($result)
{
if ($result) {
$robotcontent = $result;
}
$robotsitemap = "Sitemap: ".$domainname."/".$xmlname;
$result = strpos($robotcontent, 'Sitemap: ');
if ($result)
{
if ($result) {
$result = preg_replace("/Sitemap.*\n/", $robotsitemap, $robotcontent);
$robotcontent = $result ? $result : $robotcontent;
}else {
} else {
$robotcontent .= $robotsitemap."\n";
}
$result = dolSaveRobotFile($filerobot, $robotcontent);
if (!$result)
{
if (!$result) {
$error++;
setEventMessages('Failed to write file '.$filerobot, null, 'errors');
}
@ -2229,7 +2226,7 @@ $formwebsite = new FormWebsite($db);
$formother = new FormOther($db);
// Confirm generation of website sitemaps
if ($action == 'confirmgeneratesitemaps'){
if ($action == 'confirmgeneratesitemaps') {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$website->ref, $langs->trans('ConfirmSitemapsCreation'), $langs->trans('ConfirmGenerateSitemaps', $object->ref), 'generatesitemaps', '', "yes", 1);
$action = 'preview';
}