diff --git a/etc/sphinx.conf.in b/etc/sphinx.conf.in index 81c156c..6c919e8 100644 --- a/etc/sphinx.conf.in +++ b/etc/sphinx.conf.in @@ -1,5 +1,5 @@ # -# Minimal Sphinx configuration sample (clean, simple, functional) +# minimal sphinx configuration suited to piler # source base diff --git a/webui/controller/accounting/accounting.php b/webui/controller/accounting/accounting.php index fa20d1c..9531a72 100644 --- a/webui/controller/accounting/accounting.php +++ b/webui/controller/accounting/accounting.php @@ -92,7 +92,7 @@ $this->data['accounting'][$id]['display'] = $row[$this->data['sort']]; } if($this->data['sorttype'] == 1){ - $this->data['accounting'][$id]['display'] = date("d M Y",$row[$this->data['sort']]); + $this->data['accounting'][$id]['display'] = date(DATE_TEMPLATE, $row[$this->data['sort']]); } if($this->data['sorttype'] == 2){ $this->data['accounting'][$id]['display'] = nice_size($row[$this->data['sort']]); diff --git a/webui/model/accounting/accounting.php b/webui/model/accounting/accounting.php index 277af38..961acb5 100644 --- a/webui/model/accounting/accounting.php +++ b/webui/model/accounting/accounting.php @@ -85,7 +85,7 @@ } - if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, sprintf("processed %s to %s: %d records deleted, %d records added",date("d M Y",$return['starttimestamp']),date("d M Y",$return['endtimestamp']),$return['deletedstats'],$return['addedstats'])); } + if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, sprintf("processed %s to %s: %d records deleted, %d records added",date(DATE_TEMPLATE, $return['starttimestamp']),date(DATE_TEMPLATE, $return['endtimestamp']),$return['deletedstats'],$return['addedstats'])); } return $return; } diff --git a/webui/view/theme/default/templates/accounting/accounting.tpl b/webui/view/theme/default/templates/accounting/accounting.tpl index ed1ee92..c1613f4 100644 --- a/webui/view/theme/default/templates/accounting/accounting.tpl +++ b/webui/view/theme/default/templates/accounting/accounting.tpl @@ -56,8 +56,8 @@