Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur
2019-07-04 12:27:00 +02:00
23 changed files with 113 additions and 32 deletions

View File

@@ -8,6 +8,36 @@ use \DebugBar\DataCollector\RequestDataCollector;
class DolRequestDataCollector extends RequestDataCollector
{
/**
* Collects the data from the collectors
*
* @return array
*/
public function collect()
{
$vars = array('_GET', '_POST', '_SESSION', '_COOKIE', '_SERVER');
$data = array();
foreach ($vars as $var) {
if (isset($GLOBALS[$var])) {
$arrayofvalues = $GLOBALS[$var];
if ($var == '_COOKIE')
{
foreach($arrayofvalues as $key => $val)
{
if (preg_match('/^DOLSESSID_/', $key)) $arrayofvalues[$key]='*****hidden*****';
}
//var_dump($arrayofvalues);
}
$data["$" . $var] = $this->getDataFormatter()->formatVar($arrayofvalues);
}
}
return $data;
}
/**
* Return widget settings
*
@@ -20,7 +50,7 @@ class DolRequestDataCollector extends RequestDataCollector
$langs->load("other");
return array(
$langs->transnoentities('Request') => array(
$langs->transnoentities('Variables') => array(
"icon" => "tags",
"widget" => "PhpDebugBar.Widgets.VariableListWidget",
"map" => "request",