diff --git a/config.php.in b/config.php.in index 6135618..8f33fb7 100644 --- a/config.php.in +++ b/config.php.in @@ -277,6 +277,15 @@ $config['MEMCACHED_PREFIX'] = '_piler:'; $config['MEMCACHED_TTL'] = 900; +$config['JS_CODE'] = ' + + + + + + +'; + $SUPPRESS_RECIPIENTS = array(); diff --git a/webui/controller/login/login.php b/webui/controller/login/login.php index 04625da..67efb2f 100644 --- a/webui/controller/login/login.php +++ b/webui/controller/login/login.php @@ -75,6 +75,9 @@ if(isAdminUser() == 1) { header("Location: " . SITE_URL . "index.php?route=health/health"); exit; + } else ifisAdminUser() == 4) { + header("Location: " . SITE_URL . "index.php?route=audit/removal"); + exit; } header("Location: " . SITE_URL . "search.php"); diff --git a/webui/controller/message/bulkremove.php b/webui/controller/message/bulkremove.php index fcd7d40..6282640 100644 --- a/webui/controller/message/bulkremove.php +++ b/webui/controller/message/bulkremove.php @@ -34,9 +34,9 @@ } if(NEED_TO_APPROVE_DELETE) { - $deleted = 0; - } else { $deleted = -1; + } else { + $deleted = 1; } foreach($idlist as $id) { diff --git a/webui/model/audit/removal.php b/webui/model/audit/removal.php index 1d27652..2daecc5 100644 --- a/webui/model/audit/removal.php +++ b/webui/model/audit/removal.php @@ -9,7 +9,7 @@ if($page_len > 0) { $limit = " LIMIT " . (int)$from . ", " . (int)$page_len; } $query = $this->db->query("SELECT * FROM " . TABLE_DELETED . " WHERE deleted=-1 ORDER BY date1 DESC $limit"); - + return $query->rows; } diff --git a/webui/view/theme/default/templates/audit/removal.tpl b/webui/view/theme/default/templates/audit/removal.tpl index fd630be..53da88e 100644 --- a/webui/view/theme/default/templates/audit/removal.tpl +++ b/webui/view/theme/default/templates/audit/removal.tpl @@ -13,7 +13,7 @@ - + @@ -31,18 +31,18 @@ - + - - - - -   -   + + + + +   +   diff --git a/webui/view/theme/default/templates/common/layout-audit-removal.tpl b/webui/view/theme/default/templates/common/layout-audit-removal.tpl index 53c4ec2..8742550 100644 --- a/webui/view/theme/default/templates/common/layout-audit-removal.tpl +++ b/webui/view/theme/default/templates/common/layout-audit-removal.tpl @@ -13,18 +13,8 @@ - - - + - - - - - @@ -41,7 +31,21 @@
-