bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-07 22:51:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removal fixes

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2019-08-04 08:09:21 +02:00
parent 8e89ecca56
commit 8e920260a8
8 changed files with 119 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/db-mysql.sql
View File

@ -479,8 +479,7 @@ create table if not exists `deleted` (
`approver` varchar(128) default null,
`reason2` varchar(128) default null,
`date2` int unsigned default 0,
`approved` tinyint(1) default 0,
`deleted` tinyint(1) default 0,
`deleted` tinyint(1) default -1,
key (`id`),
key (deleted)
) Engine=InnoDB;

2
webui/controller/audit/removal.php
View File

@ -7,7 +7,7 @@ class ControllerAuditRemoval extends Controller {
$this->id = "content";
$this->template = "audit/removal.tpl";
$this->layout = "common/layout-audit";
$this->layout = "common/layout-audit-removal";
$request = Registry::get('request');
$db = Registry::get('db');

2
webui/controller/message/bulkremove.php
View File

@ -36,7 +36,7 @@ class ControllerMessageBulkremove extends Controller {
if(NEED_TO_APPROVE_DELETE) {
$deleted = 0;
} else {
$deleted = 1;
$deleted = -1;
}
foreach($idlist as $id) {

4
webui/controller/message/remove.php
View File

@ -6,8 +6,8 @@ class ControllerMessageRemove extends Controller {
public function index(){
$this->id = "content";
$this->template = "message/bulkremove.tpl";
$this->layout = "common/layout-empty";
$this->template = "audit/remove.tpl";
$this->layout = "common/layout";
$session = Registry::get('session');
$request = Registry::get('request');

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

@ -8,7 +8,7 @@ class ModelAuditRemoval extends Model {
if($page_len > 0) { $limit = " LIMIT " . (int)$from . ", " . (int)$page_len; }
$query = $this->db->query("SELECT * FROM " . TABLE_DELETED . " WHERE deleted=0 ORDER BY date1 DESC $limit");
$query = $this->db->query("SELECT * FROM " . TABLE_DELETED . " WHERE deleted=-1 ORDER BY date1 DESC $limit");
return $query->rows;
}

17
webui/view/theme/default/templates/audit/removal.tpl
View File

@ -1,16 +1,3 @@
<div id="deleteconfirm-modal" class="modal hide fade">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
<h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
</div>
<div class="modal-body">
<p>Remove message <span id="name">ERROR</span>?</p>
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
<a href="index.php?route=message/remove&amp;id=Error&amp;confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
</div>
</div>
<table id="resultstable" class="table table-striped table-condensed">
<thead id="resultstop">
@ -39,6 +26,9 @@
<th class="auditcell removal header">
&nbsp;
</th>
<th class="auditcell cancel header">
&nbsp;
</th>
</tr>
</thead>
@ -52,6 +42,7 @@
<td class="auditcell ip"><?php print $d['reason']; ?></td>
<td class="auditcell ref"><?php if($d['deleted'] == 0) { ?><a href="#" onclick="Piler.view_message(<?php print $d['id']; ?>);"><?php } print $d['id']; if($d['deleted'] == 0) { ?></a><?php } ?></td>
<td class="auditcell aaa"><a href="#" class="confirm-delete" data-id="<?php print $d['id']; ?>" data-name="<?php print $d['id']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
<td class="auditcell bbb"><a href="#" class="confirm-delete" data-id="<?php print $d['id']; ?>" data-name="<?php print $d['id']; ?>"><i class="icon-ban-circle"></i>&nbsp;<?php print $text_cancel; ?></a></td>
</tr>
<?php } ?>

104
webui/view/theme/default/templates/common/layout-audit-removal.tpl Normal file
View File

@ -0,0 +1,104 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print DEFAULT_LANG; ?>" lang="<?php print DEFAULT_LANG; ?>">
<head>
<title><?php print $title; ?></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="<?php print DEFAULT_LANG; ?>" />
<?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
<?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
<?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
<meta name="rating" content="general" />
<meta name="robots" content="all" />
<link href="/view/theme/default/assets/css/metro-bootstrap.css" rel="stylesheet" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!-- original location: http://html5shim.googlecode.com/svn/trunk/html5.js -->
<!--[if lt IE 9]>
<script src="/view/theme/default/assets/js/html5.js"></script>
<style>body{padding-top:70px;}</style>
<![endif]-->
<script type="text/javascript" src="/view/javascript/jquery.min.js"></script>
<script type="text/javascript" src="/view/javascript/jquery-ui-custom.min.js"></script>
<script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
<script type="text/javascript" src="/view/theme/default/assets/js/bootstrap.js"></script>
<script type="text/javascript" src="/view/javascript/piler.js"></script>
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/view/theme/default/assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
<?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
</head>
<body onload="Piler.add_shortcuts();">
<div id="menu">
<?php print $menu; ?>
</div>
<div id="messagebox1" class="audit audit-info"></div>
<div id="deleteconfirm-modal" class="modal hide fade">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
<h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
</div>
<div class="modal-body">
<p>Remove message <span id="name">ERROR</span>?</p>
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
<a href="index.php?route=message/remove&amp;id=Error&amp;confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
</div>
</div>
<div id="mainscreen">
<div id="mailleftcontainer">
</div>
<div id="mailrightcontainernofolder">
<div id="mailrightcontent">
<div id="mailcontframe">
<div id="sspinner" class="alert alert-info lead"><i class="icon-spinner icon-spin icon-2x pull-left"></i><?php print $text_working; ?></div>
<div id="resultscontainer" class="boxlistcontent">
<?php print $content; ?>
</div>
</div>
<?php if(Registry::get('auditor_user') == 1 || Registry::get('data_officer') == 1) { ?>
<script type="text/javascript">
var mailviewsplit = new rcube_splitter({id:'splitter2', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 341});
split.add_onload('mailviewsplit.init()');
</script>
<div id="mailpreviewframe"></div>
<?php } ?>
</div>
</div>
</div>
<?php if(Registry::get('auditor_user') == 1 || Registry::get('data_officer') == 1) { ?>
<script type="text/javascript">
$(document).ready(function(){
split.init();
});
</script>
<?php } ?>
<?php if(TRACKING_CODE) { print TRACKING_CODE; } ?>
</body>
</html>

10
webui/view/theme/default/templates/common/layout-audit.tpl
View File

@ -39,9 +39,9 @@
<?php print $menu; ?>
</div>
<div id="messagebox1" class="audit audit-info"></div>
<div id="messagebox1" class="audit audit-info"></div>
<div id="piler1" class="container">
<div id="piler1" class="container">
<div id="searchcontainer">
@ -60,8 +60,8 @@
</div>
</div>
</div>
</div>
<div id="mainscreen">
</div>
<div id="mainscreen">
<div id="mailleftcontainer">
</div>
@ -92,7 +92,7 @@
</div>
</div>
</div>
<?php if(Registry::get('auditor_user') == 1 || Registry::get('data_officer') == 1) { ?>