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

Fix deprecated call and hide pass in debug

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-22 18:42:24 +02:00
parent 662afe8a36
commit e456cd27d1
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/debugbar/class/DataCollector/DolConfigCollector.php
View File

@ -77,6 +77,7 @@ class DolConfigCollector extends ConfigCollector
protected function objectToArray($obj)
{
// phpcs:enable
$arr=array();
$_arr = is_object($obj) ? get_object_vars($obj) : $obj;
foreach ($_arr as $key => $val) {
$val = (is_array($val) || is_object($val)) ? $this->objectToArray($val) : $val;

4
htdocs/debugbar/class/DataCollector/DolQueryCollector.php
View File

@ -44,9 +44,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
$queries[] = array(
'sql' => $query['sql'],
'duration' => $query['duration'],
'duration_str' => $this->formatDuration($query['duration']),
'memory' => $query['memory_usage'],
'memory_str' => $this->formatBytes($query['memory_usage']),
'is_success' => $query['is_success'],
'error_code' => $query['error_code'],
'error_message' => $query['error_message']
@ -62,9 +60,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
'nb_statements' => count($queries),
'nb_failed_statements' => $totalFailed,
'accumulated_duration' => $totalExecTime,
'accumulated_duration_str' => $this->formatDuration($totalExecTime),
'memory_usage' => $totalMemoryUsage,
'memory_usage_str' => $this->formatBytes($totalMemoryUsage),
'statements' => $queries
);
}

6
htdocs/debugbar/class/DataCollector/DolibarrCollector.php
View File

@ -66,7 +66,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
$info .= $langs->trans('Currency') . ': <strong>' . $conf->currency . '</strong><br>';
$info .= $langs->trans('DolEntity') . ': <strong>' . $conf->entity . '</strong><br>';
$info .= $langs->trans('ListLimit') . ': <strong>' . ($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT) . '</strong><br>';
$info .= $langs->trans('UploadSize') . ': <strong>' . $conf->global->MAIN_UPLOAD_DOC . '</strong>';
$info .= $langs->trans('MaxSizeForUploadedFiles') . ': <strong>' . $conf->global->MAIN_UPLOAD_DOC . '</strong>';
return $info;
}
@ -84,9 +84,9 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
$info .= $langs->trans('Server') . ': <strong>' . $conf->global->MAIN_MAIL_SMTP_SERVER . '</strong><br>';
$info .= $langs->trans('Port') . ': <strong>' . $conf->global->MAIN_MAIL_SMTP_PORT . '</strong><br>';
$info .= $langs->trans('ID') . ': <strong>' . $conf->global->MAIN_MAIL_SMTPS_ID . '</strong><br>';
$info .= $langs->trans('Pwd') . ': <strong>' . $conf->global->MAIN_MAIL_SMTPS_PW . '</strong><br>';
$info .= $langs->trans('Pwd') . ': <strong>' . preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW) . '</strong><br>';
$info .= $langs->trans('TLS/STARTTLS') . ': <strong>' . $conf->global->MAIN_MAIL_EMAIL_TLS . '</strong> / <strong>' . $conf->global->MAIN_MAIL_EMAIL_STARTTLS . '</strong><br>';
$info .= $langs->trans('Status') . ': <strong>' . ($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('StatusDisabled') : $langs->trans('StatusEnabled')) . '</strong>';
$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS') . ': <strong>' . ($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('Yes') : $langs->trans('No')) . '</strong>';
return $info;
}