github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Log date localization

pull/36/head
jerome 2014-03-24 22:19:16 +01:00
parent 9201c9fff6
commit c5a849eafc
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/psm/Module/Server/Controller/LogController.class.php
View File

@ -66,6 +66,7 @@ class LogController extends AbstractServerController {
$records[$x]['class'] = ($x & 1) ? 'odd' : 'even'; $records[$x]['class'] = ($x & 1) ? 'odd' : 'even';
$records[$x]['users'] = ''; $records[$x]['users'] = '';
$records[$x]['server'] = $records[$x]['label'] . ' (' . $records[$x]['label_adv'] . ')'; $records[$x]['server'] = $records[$x]['label'] . ' (' . $records[$x]['label_adv'] . ')';
$records[$x]['datetime_format'] = psm_date($records[$x]['datetime']);
// fix up user list // fix up user list
if($records[$x]['user_id'] == '') continue; if($records[$x]['user_id'] == '') continue;
@ -121,10 +122,7 @@ class LogController extends AbstractServerController {
') AS `label_adv`, '. ') AS `label_adv`, '.
'`log`.`type`, '. '`log`.`type`, '.
'`log`.`message`, '. '`log`.`message`, '.
'DATE_FORMAT('. '`log`.`datetime`, '.
'`log`.`datetime`, '.
'\'%H:%i:%s %d-%m-%y\''.
') AS `datetime_format`, '.
'`log`.`user_id` '. '`log`.`user_id` '.
'FROM `'.PSM_DB_PREFIX.'log` AS `log` '. 'FROM `'.PSM_DB_PREFIX.'log` AS `log` '.
'JOIN `'.PSM_DB_PREFIX.'servers` AS `servers` ON (`servers`.`server_id`=`log`.`server_id`) '. 'JOIN `'.PSM_DB_PREFIX.'servers` AS `servers` ON (`servers`.`server_id`=`log`.`server_id`) '.