bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-07-03 02:03:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into ui-updates-1

Browse Source
This commit is contained in:
Remi S
2013-08-07 13:30:39 -04:00
parent 12219380b1 4b9d07dd23
commit a83ecff4b9
23 changed files with 112 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webui/model/audit/audit.php
View File

@ -39,7 +39,7 @@ class ModelAuditAudit extends Model {
$where .= " AND ( " . $this->append_search_criteria("meta_id", $data['ref'], $arr) . " )";
}
if(Registry::get('admin_user') == 0) {
if(Registry::get('admin_user') == 0 && RESTRICTED_AUDITOR == 1) {
while(list($k, $v) = each($_SESSION['auditdomains'])) {
if($q) { $q .= ","; }
$q .= "?";

2
webui/model/policy/retention.php
View File

@ -47,7 +47,7 @@ class ModelPolicyRetention extends Model {
$default_retention = DEFAULT_RETENTION * 86400;
$delta = NOW + 86400 * $data['days'] - $default_retention;
$start_ts = NOW - $default_retention;
$start_ts = NOW - 2*$default_retention;
$query = $this->db->query("UPDATE " . VIEW_MESSAGES . " SET retained=? WHERE arrived > ? AND (todomain=? OR fromdomain=?)", array($delta, $start_ts, $data['domain'], $data['domain']));