Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-webportal-module

Browse Source
This commit is contained in:
VESSILLER
2023-11-17 10:40:51 +01:00
parent 4e07243056 0a3bc87b72
commit 1ace52251a
1455 changed files with 54518 additions and 34526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/core/lib/functions2.lib.php
View File

@@ -259,7 +259,7 @@ function dol_print_object_info($object, $usetable = 0)
}
} else {
$userstatic = new User($db);
$userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
$userstatic->fetch($object->user_creation_id);
if ($userstatic->id) {
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
} else {
@@ -314,7 +314,7 @@ function dol_print_object_info($object, $usetable = 0)
}
} else {
$userstatic = new User($db);
$userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
$userstatic->fetch($object->user_modification_id);
if ($userstatic->id) {
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
} else {
@@ -563,10 +563,7 @@ function dol_print_object_info($object, $usetable = 0)
}
// User close
if (!empty($object->user_cloture) || !empty($object->user_closing) || !empty($object->user_closing_id)) {
if (isset($object->user_cloture) && !empty($object->user_cloture)) {
$object->user_closing = $object->user_cloture;
}
if (!empty($object->user_closing_id)) {
if ($usetable) {
print '<tr><td class="titlefield">';
}
@@ -576,20 +573,12 @@ function dol_print_object_info($object, $usetable = 0)
} else {
print ': ';
}
if (is_object($object->user_closing)) {
if ($object->user_closing->id) {
print $object->user_closing->getNomUrl(-1, '', 0, 0, 0);
} else {
print $langs->trans("Unknown");
}
$userstatic = new User($db);
$userstatic->fetch($object->user_closing_id);
if ($userstatic->id) {
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
} else {
$userstatic = new User($db);
$userstatic->fetch($object->user_closing_id ? $object->user_closing_id : $object->user_closing);
if ($userstatic->id) {
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
} else {
print $langs->trans("Unknown");
}
print $langs->trans("Unknown");
}
if ($usetable) {
print '</td></tr>';
@@ -1284,6 +1273,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
// To ensure that all variables within the MAX() brackets are integers
// This avoid bad detection of max when data are noised with non numeric values at the position of the numero
if (getDolGlobalInt('MAIN_NUMBERING_FILTER_ON_INT_ONLY')) {
$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', true);
}
@@ -2047,7 +2037,7 @@ function dol_buildlogin($lastname, $firstname)
global $conf;
//$conf->global->MAIN_BUILD_LOGIN_RULE = 'f.lastname';
if (!empty($conf->global->MAIN_BUILD_LOGIN_RULE) && $conf->global->MAIN_BUILD_LOGIN_RULE == 'f.lastname') { // f.lastname
if (getDolGlobalString('MAIN_BUILD_LOGIN_RULE') == 'f.lastname') { // f.lastname
$login = strtolower(dol_string_unaccent(dol_trunc($firstname, 1, 'right', 'UTF-8', 1)));
$login .= ($login ? '.' : '');
$login .= strtolower(dol_string_unaccent($lastname));
@@ -2727,7 +2717,7 @@ function getModuleDirForApiClass($moduleobject)
$moduledirforclass = 'mrp';
} elseif ($moduleobject == 'accounting') {
$moduledirforclass = 'accountancy';
} elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms', 'receptions'))) {
} elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms', 'receptions', 'partnerships', 'recruitments'))) {
$moduledirforclass = preg_replace('/s$/', '', $moduleobject);
}
@@ -2946,10 +2936,12 @@ function acceptLocalLinktoMedia()
}
//var_dump($iptocheck.' '.$acceptlocallinktomedia);
if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
$allowParamName = 'MAIN_ALLOW_WYSIWYG_LOCAL_MEDIAS_ON_PRIVATE_NETWORK';
$allowPrivateNetworkIP = getDolGlobalInt($allowParamName);
if (!$allowPrivateNetworkIP && !filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
// If ip of public url is a private network IP, we do not allow this.
$acceptlocallinktomedia = 0;
// TODO Show a warning
//dol_syslog("WYSIWYG Editor : local media not allowed (checked IP: {$iptocheck}). Use {$allowParamName} = 1 to allow local URL into WYSIWYG html content");
}
if (preg_match('/http:/i', $urlwithouturlroot)) {