bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-24 18:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed minor webui bugs

Browse Source
This commit is contained in:
SJ 2012-07-06 15:02:23 +02:00
parent 2d803e31d3
commit baa062cc0a
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/example.conf
View File

@ -55,6 +55,7 @@ piler_header_field=X-piler: piler already archived this email
; whether to archive an email not having a Message-ID header line (1) ; whether to archive an email not having a Message-ID header line (1)
; or not (0). ; or not (0).
; If enabled then piler will assign piler_id as the message-id ; If enabled then piler will assign piler_id as the message-id
; to messages without message-id.
archive_emails_not_having_message_id=0 archive_emails_not_having_message_id=0

10
webui/model/search/search.php
View File

@ -293,11 +293,13 @@ class ModelSearchSearch extends Model {
$q = ""; $q = "";
foreach($query->rows as $a) { if(isset($query->rows)) {
array_push($ids, $a['id']); foreach($query->rows as $a) {
array_push($ids, $a['id']);
if($q) { $q .= ",?"; } if($q) { $q .= ",?"; }
else { $q = "?"; } else { $q = "?"; }
}
} }

2
webui/model/stat/counter.php
View File

@ -12,7 +12,7 @@ class ModelStatCounter extends Model {
$counter = $memcache->get(Registry::get('counters')); $counter = $memcache->get(Registry::get('counters'));
if(isset($counter[MEMCACHED_PREFIX . 'counters_last_update'])) { if(isset($counter[MEMCACHED_PREFIX . 'counters_last_update'])) {
$asize = nice_size($counter[MEMCACHED_PREFIX . 'size'], ' '); if(isset($counter[MEMCACHED_PREFIX . 'size'])) { $asize = nice_size($counter[MEMCACHED_PREFIX . 'size'], ' '); }
unset($counter[MEMCACHED_PREFIX . 'size']); unset($counter[MEMCACHED_PREFIX . 'size']);
return array ($asize, $counter); return array ($asize, $counter);

2
webui/model/user/auth.php
View File

@ -19,7 +19,7 @@ class ModelUserAuth extends Model {
$_SESSION['domain'] = $query->row['domain']; $_SESSION['domain'] = $query->row['domain'];
$_SESSION['realname'] = $query->row['realname']; $_SESSION['realname'] = $query->row['realname'];
$_SESSION['emails'] = $this->model_user_user->get_users_all_email_addresses($query->row['uid'], $query->row['gid']); $_SESSION['emails'] = $this->model_user_user->get_users_all_email_addresses($query->row['uid']);
AUDIT(ACTION_LOGIN, $username, '', '', 'successful auth against user table'); AUDIT(ACTION_LOGIN, $username, '', '', 'successful auth against user table');

4
webui/model/user/user.php
View File

@ -45,7 +45,7 @@ class ModelUserUser extends Model {
} }
public function get_users_all_email_addresses($uid = 0, $gid = 0) { public function get_users_all_email_addresses($uid = 0) {
$data = array(); $data = array();
$uids = $uid; $uids = $uid;
@ -73,7 +73,7 @@ class ModelUserUser extends Model {
if(isset($query->rows)) { if(isset($query->rows)) {
foreach ($query->rows as $q) { foreach ($query->rows as $q) {
if(!in_array($email, $data)) { array_push($data, $q['email']); } if(!in_array($q['email'], $data)) { array_push($data, $q['email']); }
} }
} }