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

Fix custom reports for external modules

Browse Source
This commit is contained in:
Laurent Destailleur
2024-02-15 18:40:04 +01:00
parent 75cdfcbf52
commit a549f095b7
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/customreports.php
View File

@@ -33,7 +33,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
$mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'graph';
$objecttype = GETPOST('objecttype', 'aZ09');
$objecttype = GETPOST('objecttype', 'aZ09arobase');
$tabfamily = GETPOST('tabfamily', 'aZ09');
if (empty($objecttype)) {
@@ -137,10 +137,15 @@ if ($objecttype) {
} else {
dol_include_once("/".$objecttype."/class/".$objecttype.".class.php");
}
$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
if (class_exists($ObjectClassName)) {
$object = new $ObjectClassName($db);
} else {
print 'Failed to load class for type '.$objecttype.'. Class file found but class object '.$ObjectClassName.' not found.';
}
} catch (Exception $e) {
print 'Failed to load class for type '.$objecttype;
print 'Failed to load class for type '.$objecttype.'. Class path not found.';
}
}
@@ -148,7 +153,7 @@ if ($objecttype) {
$socid = 0;
if ($user->socid > 0) { // Protection if external user
//$socid = $user->socid;
accessforbidden();
accessforbidden('Access forbidden to external users');
}
// Fetch optionals attributes and labels
@@ -186,7 +191,7 @@ if (!empty($object->element_for_permission)) {
$features = $object->element_for_permission;
}
restrictedArea($user, $features, 0, '');
restrictedArea($user, $features.(empty($object->module) ? '' : '@'.$object->module), 0, '');
$error = 0;

2
htdocs/core/lib/functions.lib.php
View File

@@ -625,7 +625,7 @@ function GETPOSTISARRAY($paramname, $method = 0)
* 'alphanohtml'=check there is no html content and no " and no ../
* 'aZ'=check it's a-z only
* 'aZ09'=check it's simple alpha string (recommended for keys)
* 'aZ09arobase'=check it's a string for an element type
* 'aZ09arobase'=check it's a string for an element type ('myobject@mymodule')
* 'aZ09comma'=check it's a string for a sortfield or sortorder
* 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
* 'nohtml'=check there is no html content