loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-03-18 04:00:12 +01:00
Code Issues Releases Activity

Miglioramento gestione debug

Browse Source
This commit is contained in:
Thomas Zilio 2018-07-03 15:39:29 +02:00
parent 065008d3a3
commit c48d66b519
6 changed files with 64 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core.php
View File

@ -38,8 +38,8 @@ if (!empty($redirectHTTPS) && !isHTTPS(true)) {
exit();
}
// Forzamento del debug
// $debug = true;
// Forza l'abilitazione del debug
// $debug = App::debug(true);
// Logger per la segnalazione degli errori
$logger = new Monolog\Logger('Logs');

8
include/bottom.php
View File

@ -28,12 +28,14 @@ if (Auth::check()) {
<script> setInterval("session_keep_alive()", 5*60*1000); </script>';
}
if (!empty($debug)) {
if (App::debug()) {
echo '
<!-- Fix per le icone di debug -->
<style>div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before {
font-family: FontAwesome;
}</style>';
echo $debugbarRenderer->render();
}
$custom_css = get_var('CSS Personalizzato');
@ -42,10 +44,6 @@ if (Auth::check()) {
<style>'.$custom_css.'</style>';
}
if (!empty($debugbarRenderer)) {
echo $debugbarRenderer->render();
}
// Rimozione del messaggio automatico riguardante la modifica di valori nella pagina
echo '
<script>

2
include/init/update.php
View File

@ -73,7 +73,7 @@ if (filter('action') == 'do_update') {
Update::updateCleanup();
echo '
<p><strong>'.tr('Aggiornamento completato!!!').'</strong> <i class="fa fa-smile-o"></i></p>';
<p><strong>'.tr('Aggiornamento completato').'</strong> <i class="fa fa-smile-o"></i></p>';
// Istruzioni per la prima installazione
if ($_GET['firstuse'] == 'true') {

36
include/top.php
View File

@ -5,24 +5,6 @@ include_once __DIR__.'/../core.php';
$paths = App::getPaths();
$user = Auth::user();
// Istanziamento della barra di debug
if (!empty($debug)) {
$debugbar = new DebugBar\DebugBar();
$debugbar->addCollector(new DebugBar\DataCollector\MemoryCollector());
$debugbar->addCollector(new DebugBar\DataCollector\PhpInfoCollector());
$debugbar->addCollector(new DebugBar\DataCollector\RequestDataCollector());
$debugbar->addCollector(new DebugBar\DataCollector\TimeDataCollector());
$debugbar->addCollector(new DebugBar\Bridge\MonologCollector($logger));
$debugbar->addCollector(new DebugBar\DataCollector\PDO\PDOCollector($dbo->getPDO()));
$debugbarRenderer = $debugbar->getJavascriptRenderer();
$debugbarRenderer->setIncludeVendors(false);
$debugbarRenderer->setBaseUrl($paths['assets'].'/php-debugbar');
}
echo '<!DOCTYPE html>
<html>
<head>
@ -163,7 +145,23 @@ echo '
</script>';
if (Auth::check()) {
if (!empty($debugbarRenderer)) {
// Barra di debug
if (App::debug()) {
$debugbar = new DebugBar\DebugBar();
$debugbar->addCollector(new DebugBar\DataCollector\MemoryCollector());
$debugbar->addCollector(new DebugBar\DataCollector\PhpInfoCollector());
$debugbar->addCollector(new DebugBar\DataCollector\RequestDataCollector());
$debugbar->addCollector(new DebugBar\DataCollector\TimeDataCollector());
$debugbar->addCollector(new DebugBar\Bridge\MonologCollector($logger));
$debugbar->addCollector(new DebugBar\DataCollector\PDO\PDOCollector($dbo->getPDO()));
$debugbarRenderer = $debugbar->getJavascriptRenderer();
$debugbarRenderer->setIncludeVendors(false);
$debugbarRenderer->setBaseUrl($paths['assets'].'/php-debugbar');
echo $debugbarRenderer->renderHead();
}

51
src/App.php
View File

@ -12,6 +12,9 @@ class App
/** @var int Identificativo dell'elemento corrente */
protected static $current_element;
/** @var bool Stato di debug */
protected static $config = [];
/** @var array Elenco degli assets del progetto */
protected static $assets = [
// CSS
@ -78,6 +81,12 @@ class App
include DOCROOT.'/config.example.php';
}
$db_host = '';
$db_username = '';
$db_password = '';
$db_name = '';
$port = '';
return get_defined_vars();
}
@ -88,22 +97,42 @@ class App
*/
public static function getConfig()
{
if (file_exists(DOCROOT.'/config.inc.php')) {
include DOCROOT.'/config.inc.php';
if (empty(self::$config['db_host'])) {
if (file_exists(DOCROOT.'/config.inc.php')) {
include DOCROOT.'/config.inc.php';
$config = get_defined_vars();
} else {
$config = [];
$config = get_defined_vars();
} else {
$config = [];
}
$defaultConfig = self::getDefaultConfig();
$result = array_merge($defaultConfig, $config);
// Operazioni di normalizzazione sulla configurazione
$result['debug'] = isset(self::$config['debug']) ? self::$config['debug'] : !empty($result['debug']);
self::$config = $result;
}
$defaultConfig = self::getDefaultConfig();
return self::$config;
}
$result = array_merge($defaultConfig, $config);
/**
* Imposta e restituisce lo stato di debug del progetto.
*
* @param bool $value
*
* @return bool
*/
public static function debug($value = null)
{
if (is_bool($value)) {
self::$config['debug'] = $value;
}
// Operazioni di normalizzazione sulla configurazione
$result['debug'] = !empty($result['debug']);
return $result;
return self::$config['debug'];
}
/**

2
src/Database.php
View File

@ -145,7 +145,7 @@ class Database extends Util\Singleton
*
* @since 2.3
*
* @return \DebugBar\DataCollector\PDO\TraceablePDO
* @return \DebugBar\DataCollector\PDO\TraceablePDO|PDO
*/
public function getPDO()
{