Merge pull request #1110 from laf/issue-279

Updated mysql DATE_FORMAT() and php date() to use $config variables
This commit is contained in:
Paul Gear
2015-06-13 10:15:23 +10:00
26 changed files with 63 additions and 35 deletions

View File

@@ -583,8 +583,14 @@ $config['perf_times_purge'] = 30; # Number in days
# Date format for PHP date()s
$config['dateformat']['long'] = "r"; # RFC2822 style
$config['dateformat']['compact'] = "Y-m-d H:i:s";
$config['dateformat']['byminute'] = "Y-m-d H:i";
$config['dateformat']['time'] = "H:i:s";
# Date format for MySQL DATE_FORMAT
$config['dateformat']['mysql']['compact'] = "%Y-%m-%d %H:%i:%s";
$config['dateformat']['mysql']['date'] = "%Y-%m-%d";
$config['dateformat']['mysql']['time'] = "%H:%i:%s";
$config['enable_clear_discovery'] = 1;// Set this to 0 if you want to disable the web option to rediscover devices
$config['enable_port_relationship'] = TRUE;// Set this to false to not display neighbour relationships for ports