step 1 to improve delete feature

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2019-07-14 19:20:49 +02:00
parent 7015e76a11
commit d1da0c93e7
23 changed files with 92 additions and 537 deletions

View File

@ -160,6 +160,7 @@ $config['PASSWORD_CHANGE_ENABLED'] = 0;
$config['ENABLE_STATISTICS'] = 1;
$config['ENABLE_HISTORY'] = 1;
$config['ENABLE_DELETE'] = 0;
$config['AUTHORIZE_DELETE'] = 0;
$config['ENABLE_REMOTE_IMAGES'] = '0';
$config['ENABLE_ON_THE_FLY_VERIFICATION'] = 0;
$config['ENABLE_LDAP_IMPORT_FEATURE'] = 0;
@ -396,6 +397,7 @@ define('TABLE_AUTOSEARCH', 'autosearch');
define('TABLE_LEGAL_HOLD', 'legal_hold');
define('TABLE_TIMESTAMP', 'timestamp');
define('TABLE_PRIVATE', 'private');
define('TABLE_DELETED', 'deleted');
define('VIEW_MESSAGES', 'v_messages');
define('EOL', "\n");
@ -467,6 +469,7 @@ define('ACTION_UNAUTHORIZED_DOWNLOAD_ATTACHMENT', 16);
define('ACTION_VIEW_JOURNAL', 17);
define('ACTION_NOT_SPAM', 18);
define('ACTION_MARK_AS_PRIVATE', 19);
define('ACTION_MARK_MESSAGE_FOR_REMOVAL, 20);
$actions = array(
'unknown' => 1,

View File

@ -470,3 +470,13 @@ create table if not exists `timestamp` (
primary key (`id`)
) Engine=InnoDB;
create table if not exists `deleted` (
`id` bigint unsigned not null auto_increment,
`email` varchar(128) not null,
`reason` varchar(128) not null,
`date1` int unsigned not null,
`date2` int unsigned not null,
`deleted` tinyint(1) default 0,
primary key (`id`)
) Engine=InnoDB;

View File

@ -131,5 +131,3 @@ class ControllerCustomerList extends Controller {
}
?>

View File

@ -21,6 +21,7 @@ class ControllerMessageBulkremove extends Controller {
$this->document->title = $this->data['text_message'];
if(!isset($this->request->post['idlist']) || $this->request->post['idlist'] == '') { die("no idlist parameter given"); }
if(!isset($this->request->post['reason']) || $this->request->post['reason'] == '') { die("no reason parameter given"); }
$idlist = $this->model_search_search->check_your_permission_by_id_list(explode(",", $this->request->post['idlist']));
@ -33,12 +34,16 @@ class ControllerMessageBulkremove extends Controller {
}
foreach($idlist as $id) {
$db->query("INSERT INTO " . TABLE_DELETED . " (id, email, reason, date1) VALUES(?,?,?,?)", [$id, $this->data['username'], $this->request->post['reason'], NOW]);
AUDIT(ACTION_REMOVE_MESSAGE, '', '', $id, '');
$db->query("UPDATE " . TABLE_META . " SET retained=? WHERE id=?", array(NOW, $id));
syslog(LOG_INFO, $this->data['username'] . " removed message: $id");
if(AUTHORIZE_DELETE) {
AUDIT(ACTION_MARK_MESSAGE_FOR_REMOVAL, '', '', $id, '');
syslog(LOG_INFO, $this->data['username'] . " marked message for removal: $id");
} else {
AUDIT(ACTION_REMOVE_MESSAGE, '', '', $id, '');
$db->query("UPDATE " . TABLE_META . " SET retained=? WHERE id=?", [NOW, $id]);
syslog(LOG_INFO, $this->data['username'] . " removed message: $id");
}
$this->data['removed']++;
}
@ -48,5 +53,3 @@ class ControllerMessageBulkremove extends Controller {
}
?>

View File

@ -481,5 +481,4 @@ $_['text_with_selected'] = 'S označenými';
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_private'] = "Private";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -488,4 +488,4 @@ $_['text_compliance_warning'] = 'Die Löschfunktion ist aktiviert, aus diesem Gr
$_['text_folder_rules'] = "Verzeichnisregeln";
$_['text_private'] = "Privat";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -79,6 +79,7 @@ $_['text_deferred_queue'] = "deferred queue";
$_['text_deferred_queue_sender'] = "deferred queue vs. sender";
$_['text_delay'] = "Delay";
$_['text_delete_confirm_message'] = "Do you wish to delete";
$_['text_delete_reason'] = "Delete reason";
$_['text_deleted_users'] = "deleted";
$_['text_deliver'] = "Deliver";
$_['text_delivered'] = "Delivered";
@ -483,5 +484,3 @@ $_['text_customer_delete_confirm_message'] = 'Do you wish to delete the customer
$_['text_with_selected'] = 'With Selected';
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
?>

View File

@ -486,5 +486,4 @@ $_['text_legal_hold'] = "Legal hold";
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_folder_rules'] = "Folder rules";
$_['text_private'] = "Private";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -483,5 +483,4 @@ $_['text_legal_hold'] = "Legal hold";
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_folder_rules'] = "Folder rules";
$_['text_private'] = "Private";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -1,489 +0,0 @@
<?php
$_['text_60_minutes'] = "60 perc";
$_['text_action'] = "M<EFBFBD>velet";
$_['text_active_incoming_queue'] = "akt<EFBFBD>v + bej<65>v<EFBFBD> <20>zenetsor";
$_['text_active_incoming_queue_sender'] = "akt<EFBFBD>v + bej<65>v<EFBFBD> <20>zenetsor (felad<61> szerint)";
$_['text_ad_sync_status'] = "AD szinkroniz<69>ci<63> st<73>tusz";
$_['text_add'] = "Felvesz";
$_['text_add_new_email_address'] = "<EFBFBD>j email c<>m";
$_['text_add_new_entry'] = "<EFBFBD>j bejegyz<79>s";
$_['text_add_new_domain'] = "<EFBFBD>j domain";
$_['text_add_new_group'] = "<EFBFBD>j csoport";
$_['text_add_new_rule'] = "<EFBFBD>j szab<61>ly";
$_['text_add_new_user_alias'] = "<EFBFBD>j felhaszn<7A>l<EFBFBD>";
$_['text_add_policy'] = "<EFBFBD>j h<>zirend";
$_['text_administration'] = "Adminisztr<EFBFBD>ci<EFBFBD>";
$_['text_admin_user'] = "Admin felhaszn<7A>l<EFBFBD>";
$_['text_advanced'] = "<EFBFBD>sszetett";
$_['text_advanced_search'] = "<EFBFBD>sszetett keres<65>s";
$_['text_all'] = "<EFBFBD>sszes";
$_['text_any'] = "mindegy";
$_['text_applied'] = "Alkalmazva";
$_['text_apply_changes'] = "Be<EFBFBD>ll<EFBFBD>t<EFBFBD>sok alkalmaz<61>sa";
$_['text_archive_size'] = "Arch<EFBFBD>vum m<>ret";
$_['text_archive_size_before_compression'] = "Arch<EFBFBD>vum m<>ret t<>m<EFBFBD>r<EFBFBD>t<EFBFBD>s n<>lk<6C>l";
$_['text_archived_messages'] = "Archiv<EFBFBD>lt levelek";
$_['text_archiving_rules'] = "Archiv<EFBFBD>l<EFBFBD>si szab<61>lyok";
$_['text_assigned_email_addresses'] = "Extra email c<>mek";
$_['text_attachment'] = "Mell<EFBFBD>klet";
$_['text_attachment_name'] = "Mell<EFBFBD>klet n<>v";
$_['text_attachment_size'] = "Mell<EFBFBD>klet m<>ret";
$_['text_attachment_type'] = "Mell<EFBFBD>klet t<>pus";
$_['text_audit'] = "Audit";
$_['text_automated_search'] = "Automatikus keres<65>s";
$_['text_back'] = "Vissza";
$_['text_background_colour'] = "H<EFBFBD>tt<EFBFBD>rsz<EFBFBD>n";
$_['text_branding_logo'] = "Brand logo";
$_['text_branding_text'] = "Brand sz<73>veg";
$_['text_branding_url'] = "Brand URL";
$_['text_body'] = "Sz<EFBFBD>veg";
$_['text_bulk_edit_selected_uids'] = "Kiv<EFBFBD>lasztott azonos<6F>t<EFBFBD>k szerkeszt<7A>se";
$_['text_bulk_restore_selected_emails'] = "Kiv<EFBFBD>lasztott levelek vissza<7A>ll<6C>t<EFBFBD>sa";
$_['text_bulk_update_selected_uids'] = "Kiv<EFBFBD>lasztott azonos<6F>t<EFBFBD>k szerkeszt<7A>se";
$_['text_cancel'] = "M<EFBFBD>gse";
$_['text_change_user_settings'] = "be<EFBFBD>ll<EFBFBD>t<EFBFBD>sok ment<6E>se";
$_['text_clienthost'] = "Kliens g<>p";
$_['text_close'] = "Bez<EFBFBD>r";
$_['text_colour'] = "Sz<EFBFBD>n";
$_['text_compressed'] = "t<EFBFBD>m<EFBFBD>r<EFBFBD>tett";
$_['text_confirm_to_reset_counters'] = "Sz<EFBFBD>ml<EFBFBD>l<EFBFBD>k null<6C>z<EFBFBD>s<EFBFBD>nak meger<65>s<EFBFBD>t<EFBFBD>se";
$_['text_connection_failed'] = "Sikertelen kapcsolat";
$_['text_connection_ok'] = "Sikeres kapcsolat";
$_['text_contact_support'] = "Seg<EFBFBD>t<EFBFBD>g";
$_['text_content_filter'] = "Tartalomsz<EFBFBD>r<EFBFBD>";
$_['text_conversation_available'] = "Lev<EFBFBD>lv<EFBFBD>lt<EFBFBD>s el<65>rhet<65>";
$_['text_copied'] = "<EFBFBD>tm<EFBFBD>solva";
$_['text_counters'] = "Sz<EFBFBD>ml<EFBFBD>l<EFBFBD>k";
$_['text_cpu_load'] = "CPU terhel<65>s";
$_['text_cpu_usage'] = "CPU haszn<7A>lat";
$_['text_create_new_secret'] = "<EFBFBD>j k<>d";
$_['text_cumulative_counts'] = "<EFBFBD>sszes<EFBFBD>tett sz<73>ml<6D>l<EFBFBD>k";
$_['text_customers'] = "<EFBFBD>gyfelek";
$_['text_daily_quarantine_report'] = "Napi karant<6E>n riport";
$_['text_daily_quarantine_report_status'] = "Napi karant<6E>n <20>rtes<65>t<EFBFBD>s";
$_['text_daily_report'] = "Napi jelent<6E>s";
$_['text_daily_piler_report'] = "Napi piler jelent<6E>s";
$_['text_database_emails'] = "email c<>m a piler adatb<74>zisban";
$_['text_date'] = "D<EFBFBD>tum";
$_['text_date_from'] = "D<EFBFBD>tumt<EFBFBD>l";
$_['text_date_to'] = "D<EFBFBD>tumig";
$_['text_days'] = "Napok";
$_['text_days2'] = "nap";
$_['text_days_to_retain'] = "Meg<EFBFBD>rz<EFBFBD>si id<69> (nap)";
$_['text_deferred_queue'] = "k<EFBFBD>s<EFBFBD>bbi kik<69>ld<6C>sre v<>r<EFBFBD> <20>zenetsor";
$_['text_deferred_queue_sender'] = "k<EFBFBD>s<EFBFBD>bbi kik<69>ld<6C>sre v<>r<EFBFBD> <20>zenetsor (felad<61> szerint)";
$_['text_delay'] = "K<EFBFBD>sleltet<EFBFBD>s";
$_['text_delete_confirm_message'] = "T<EFBFBD>r<EFBFBD>lni akarja";
$_['text_deleted_users'] = "t<EFBFBD>r<EFBFBD>lt";
$_['text_deliver'] = "K<EFBFBD>zbes<EFBFBD>t<EFBFBD>s";
$_['text_delivered'] = "K<EFBFBD>zbes<EFBFBD>tett";
$_['text_deliver_and_train_selected_messages'] = "Kiv<EFBFBD>lasztott <20>zenetek tan<61>t<EFBFBD>sa <20>s k<>zbes<65>t<EFBFBD>se";
$_['text_deliver_and_train_selected_messages_as_ham'] = "Kiv<EFBFBD>lasztott <20>zenetek tan<61>t<EFBFBD>sa J<> LEV<45>LK<4C>NT, <20>s k<>zbes<65>t<EFBFBD>se";
$_['text_deliver_selected_messages'] = "Kiv<EFBFBD>lasztott <20>zenetek k<>zbes<65>t<EFBFBD>se";
$_['text_description'] = "Le<EFBFBD>r<EFBFBD>s";
$_['text_direction'] = "Ir<EFBFBD>ny";
$_['text_disable'] = "Letilt";
$_['text_disabled'] = "letiltva";
$_['text_disk_usage'] = "Diszk haszn<7A>lat";
$_['text_dn_asterisk_means_skip_sync'] = "A csillag (*) azt jelenti, hogy ez a felhaszn<7A>l<EFBFBD> nem r<>sze az AD szerverr<72>l szinkroniz<69>l<EFBFBD>snak";
$_['text_domain'] = "Domain";
$_['text_domains'] = "Domain(ek)";
$_['text_domainname'] = "Domainn<EFBFBD>v";
$_['text_download_all_hits_as_eml'] = "<EFBFBD>sszes tal<61>lat let<65>lt<6C>se (EML)";
$_['text_download_selected_hits_as_pdf'] = "<EFBFBD>sszes tal<61>lat let<65>lt<6C>se (PDF)";
$_['text_download_attachment2'] = "mell<EFBFBD>klet let<65>lt<6C>s";
$_['text_download_message'] = "Lev<EFBFBD>l let<65>lt<6C>se (EML)";
$_['text_download_message2'] = "lev<EFBFBD>l let<65>lt<6C>se";
$_['text_edit'] = "Szerkeszt";
$_['text_edit_entry'] = "Bejegyz<EFBFBD>s szerkeszt<7A>se";
$_['text_edit_group'] = "Csoport szerkeszt<7A>se";
$_['text_edit_user'] = "Felhaszn<EFBFBD>l<EFBFBD> szerkeszt<7A>se";
$_['text_edit_or_view'] = "Szerkeszt/Megn<67>z";
$_['text_email'] = "Email c<>m";
$_['text_email_addresses'] = "Email c<>mek";
$_['text_email_aliases'] = "Email <20>lc<6C>mek";
$_['text_email_in_unknown_domain'] = "Az email c<>m ismeretlen domainben van";
$_['text_empty_search_criteria'] = "'<27>res felt<6C>tel'";
$_['text_empty_search_result'] = "Nincs tal<61>lat a keres<65>sre. Pr<50>b<EFBFBD>ljon meg csillagot (*) tenni a sz<73>t<EFBFBD>red<65>k (min. " . MIN_PREFIX_LEN . " karakter) ut<75>n, pl. titkos*, hogy megtal<61>lja a \"titkos<EFBFBD>t<EFBFBD>s\", \"titkos<EFBFBD>tott\", stb. szavakat tartalmaz<61> leveleket.";
$_['text_enable'] = "Enged<EFBFBD>lyez";
$_['text_enabled'] = "enged<EFBFBD>lyezve";
$_['text_enter_google_authenticator_code'] = "Adja meg a Google Authenticator k<>dot";
$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email c<>met <20>rjon";
$_['text_enter_one_group_per_line'] = "Egy sorba egy csoportnevet <20>rjon";
$_['text_enter_search_terms'] = "<EFBFBD>rja be a keres<65>si felt<6C>teleket";
$_['text_error'] = "Hiba";
$_['text_exact_domain_name_or_email_address'] = "pontos domainn<6E>v vagy email c<>m";
$_['text_exclude'] = "Kihagy";
$_['text_existing'] = "L<EFBFBD>tez<EFBFBD>";
$_['text_existing_domains'] = "L<EFBFBD>tez<EFBFBD> domainek";
$_['text_existing_email'] = "L<EFBFBD>tez<EFBFBD> email";
$_['text_existing_entries'] = "Jelenlegi bejegyz<79>sek";
$_['text_existing_groups'] = "L<EFBFBD>tez<EFBFBD> mapp<70>k";
$_['text_existing_groups'] = "L<EFBFBD>tez<EFBFBD> csoportok";
$_['text_existing_policies'] = "L<EFBFBD>tez<EFBFBD> h<>zirendek";
$_['text_existing_rules'] = "L<EFBFBD>tez<EFBFBD> szab<61>lyok";
$_['text_existing_user'] = "L<EFBFBD>tez<EFBFBD> felhaszn<7A>l<EFBFBD>";
$_['text_existing_users'] = "L<EFBFBD>tez<EFBFBD> felhaszn<7A>l<EFBFBD>k";
$_['text_expert'] = "Halad<EFBFBD>";
$_['text_expert_search'] = "Halad<EFBFBD> keres<65>s";
$_['text_failed'] = "sikertelen";
$_['text_failed_to_add'] = "Hiba a hozz<7A>ad<61>s sor<6F>n";
$_['text_failed_to_change_password'] = "Nem siker<65>lt jelsz<73>t v<>ltani";
$_['text_failed_to_deliver'] = "Nem siker<65>lt k<>zbes<65>teni";
$_['text_failed_to_mark_for_removal'] = "Nem siker<65>lt t<>rl<72>sre jel<65>lni";
$_['text_failed_to_modify'] = "Nem siker<65>lt m<>dos<6F>tani";
$_['text_failed_to_remove'] = "Hiba az elt<6C>vol<6F>t<EFBFBD>skor";
$_['text_failed_to_restore'] = "Hiba a vissza<7A>ll<6C>t<EFBFBD>s sor<6F>n";
$_['text_failed_to_update'] = "Nem siker<65>lt m<>dos<6F>tani";
$_['text_first'] = "Els<EFBFBD>";
$_['text_folder'] = "Mappa";
$_['text_folder_rules'] = "Mappa szab<61>lyok";
$_['text_folders'] = "Mapp<EFBFBD>k";
$_['text_forward_selected_emails_to'] = "Kijel<EFBFBD>lt levelek tov<6F>bb<62>t<EFBFBD>sa";
$_['text_from'] = "Felad<EFBFBD>";
$_['text_from_domain'] = "Felad<EFBFBD> domain";
$_['text_health'] = "Rendszer<EFBFBD>llapot";
$_['text_health_monitor'] = "Rendszer<EFBFBD>llapot";
$_['text_help'] = "Seg<EFBFBD>ts<EFBFBD>g";
$_['text_history'] = "T<EFBFBD>rt<EFBFBD>net";
$_['text_home'] = "Kezd<EFBFBD>lap";
$_['text_google_authenticator_code'] = "Google Authenticator k<>d";
$_['text_google_authenticator_settings'] = "Google Authenticator be<62>ll<6C>t<EFBFBD>sok";
$_['text_group_id'] = "Csoport azonos<6F>t<EFBFBD>";
$_['text_groupname'] = "Csoportn<EFBFBD>v";
$_['text_groups'] = "Csoportok";
$_['text_group_management'] = "Csoportok";
$_['text_group_membership'] = "Csoport tags<67>g";
$_['text_image'] = "k<EFBFBD>p";
$_['text_import'] = "Import";
$_['text_import_job_delete_confirm_message'] = "T<EFBFBD>r<EFBFBD>lni akarja ezt az import job-ot?";
$_['text_import_users'] = "Felhaszn<EFBFBD>l<EFBFBD>k import<72>l<EFBFBD>sa";
$_['text_import_users_from_LDAP'] = "Felhaszn<EFBFBD>l<EFBFBD>k import<72>l<EFBFBD>sa LDAP-b<>l";
$_['text_inbound'] = "bej<EFBFBD>v<EFBFBD>";
$_['text_indexer_job'] = "Indexer fut<75>s";
$_['text_install_sudo_apply'] = "Adja az al<61>bbi sort a /etc/sudoers file-hoz: 'www-data ALL=NOPASSWD: /etc/init.d/rc.piler reload'";
$_['text_internal'] = "bels<EFBFBD>";
$_['text_invalid_data'] = "<EFBFBD>rv<EFBFBD>nytelen adat(ok)";
$_['text_invalid_email'] = "<EFBFBD>rv<EFBFBD>nytelen email c<>m";
$_['text_invalid_email_or_password'] = "<EFBFBD>rv<EFBFBD>nytelen email c<>m vagy jelsz<73>";
$_['text_invalid_gid'] = "<EFBFBD>rv<EFBFBD>nytelen csoportazonos<6F>t<EFBFBD>";
$_['text_invalid_password'] = "<EFBFBD>rv<EFBFBD>nytelen jelsz<73>";
$_['text_invalid_pin_code'] = "<EFBFBD>rv<EFBFBD>nytelen pin k<>d";
$_['text_invalid_policy_group'] = "<EFBFBD>rv<EFBFBD>nytelen h<>zirend szonos<6F>t<EFBFBD>";
$_['text_invalid_policy_name'] = "<EFBFBD>rv<EFBFBD>nytelen h<>zirend n<>v";
$_['text_invalid_policy_setting'] = "<EFBFBD>rv<EFBFBD>nytelen be<62>ll<6C>t<EFBFBD>s(ok)";
$_['text_invalid_uid'] = "<EFBFBD>rv<EFBFBD>nytelen felhaszn<7A>l<EFBFBD>azonos<6F>t<EFBFBD>";
$_['text_invalid_username'] = "<EFBFBD>rv<EFBFBD>nytelen felhaszn<7A>l<EFBFBD>n<EFBFBD>v";
$_['text_ipaddr'] = "IP c<>m";
$_['text_language'] = "Nyelv";
$_['text_last'] = "Utols<EFBFBD>";
$_['text_last_activity'] = "Utols<EFBFBD> aktivit<69>s";
$_['text_latest_emails'] = "Legfrissebb emailek";
$_['text_last_update'] = "Utols<EFBFBD> friss<73>t<EFBFBD>s";
$_['text_ldap'] = "LDAP";
$_['text_ldap_auditor_member_dn'] = "Auditor DN";
$_['text_ldap_base_dn'] = "LDAP alap<61>rtelmezett DN";
$_['text_ldap_bind_dn'] = "LDAP csatlakoz<6F>si DN";
$_['text_ldap_bind_pw'] = "LDAP csatlakoz<6F>si jelsz<73>";
$_['text_ldap_host'] = "LDAP kiszolg<6C>l<EFBFBD>";
$_['text_ldap_type'] = "LDAP t<>pus";
$_['text_legal_hold'] = "Legal hold";
$_['text_load'] = "Bet<EFBFBD>lt<EFBFBD>s";
$_['text_loading'] = "t<EFBFBD>lt<EFBFBD>dik";
$_['text_logged_in'] = "Bejelentkez<EFBFBD>s";
$_['text_logged_out'] = "<EFBFBD>n kijelentkezett";
$_['text_login'] = "Bejelentkez<EFBFBD>s";
$_['text_login2'] = "bejelentkez<EFBFBD>s";
$_['text_login_failed'] = "sikertelen bejelentkez<65>s";
$_['text_login_via_google'] = "Bejelentkez<EFBFBD>s Google fi<66>kkal";
$_['text_logout'] = "Kijelentkez<EFBFBD>s";
$_['text_logout2'] = "kijelentkez<EFBFBD>s";
$_['text_maillog_status'] = "maillog gy<67>jt<6A> st<73>tusz";
$_['text_main_title'] = "clapf web UI";
$_['text_mapped_domain'] = "Hozz<EFBFBD>rendelt domain";
$_['text_marked_for_removal'] = "Lev<EFBFBD>l t<>rl<72>sre jel<65>lve";
$_['text_memory_usage'] = "Mem<EFBFBD>ria haszn<7A>lat";
$_['text_message'] = "<EFBFBD>zenet";
$_['text_messages'] = "<EFBFBD>zenet";
$_['text_message_disposition'] = "<EFBFBD>zenet t<>pusok";
$_['text_message_text'] = "Lev<EFBFBD>l sz<73>veg";
$_['text_min_2_chars'] = "Min. 2 karakter";
$_['text_missing_data'] = "Hi<EFBFBD>nyz<EFBFBD> adat";
$_['text_missing_password'] = "Hi<EFBFBD>nyz<EFBFBD> jelsz<73>";
$_['text_modify'] = "M<EFBFBD>dos<EFBFBD>t<EFBFBD>s";
$_['text_monitor'] = "Monitor";
$_['text_months'] = "h<EFBFBD>nap";
$_['text_monthly_report'] = "Havi jelent<6E>s";
$_['text_new'] = "<EFBFBD>j";
$_['text_new_users'] = "<EFBFBD>j";
$_['text_next'] = "K<EFBFBD>vetkez<EFBFBD>";
$_['text_no_domain_found'] = 'Nem tal<61>ltam domaineket';
$_['text_no_email_found'] = 'Nem tal<61>ltam emaileket';
$_['text_no_message_in_the_quarantine'] = "Nincs a keres<65>si felt<6C>telnek megfelel<65> <20>zenet a karant<6E>nban";
$_['text_no_records'] = "nincs tal<61>lat";
$_['text_no_sender'] = "nincs felad<61>";
$_['text_no_spam_message_in_the_quarantine_yet'] = "Nincs spam a karant<6E>nban";
$_['text_no_subject'] = "nincs t<>rgy";
$_['text_no_such_policy'] = "Nincs ilyen h<>zirend";
$_['text_non_existent_queue_directory'] = "A megadott queue k<>nyvt<76>r nem l<>tezik";
$_['text_non_existing_user'] = "Nem l<>tez<65> felhaszn<7A>l<EFBFBD>";
$_['text_notes'] = "Megjegyz<EFBFBD>sek";
$_['text_not_found'] = "Nincs tal<61>lat";
$_['text_not_running'] = "nem fut";
$_['text_not_spam'] = "nem spam";
$_['title_not_found'] = "Az oldal nem tal<61>lhat<61>";
$_['text_number_of_messages_in_quarantine'] = "A keres<65>si felt<6C>telnek megfelel<65> <20>zenetek sz<73>ma a karant<6E>nban";
$_['text_number_of_spam_messages_in_quarantine'] = "A keres<65>si felt<6C>telnek megfelel<65> spam <20>zenetek sz<73>ma a karant<6E>nban";
$_['text_off'] = "ki";
$_['text_on'] = "be";
$_['text_online_users'] = "Online felhaszn<7A>l<EFBFBD>k";
$_['text_other'] = "egy<EFBFBD>b";
$_['text_outbound'] = "kimen<EFBFBD>";
$_['text_password'] = "Jelsz<EFBFBD>";
$_['text_password_again'] = "Jelsz<EFBFBD> ism<73>t";
$_['text_password_changed'] = "Jelsz<EFBFBD> megv<67>ltozott";
$_['text_password_mismatch'] = "A k<>t jelsz<73> nem egyezik meg";
$_['text_page_length'] = "Oldalank<EFBFBD>nti tal<61>latok sz<73>ma";
$_['text_periodic_purge'] = "Peri<EFBFBD>dikus lev<65>lt<6C>rl<72>s";
$_['text_policy'] = "H<EFBFBD>zirend";
$_['text_policy_group'] = "H<EFBFBD>zirend azonos<6F>t<EFBFBD>";
$_['text_policy_name'] = "H<EFBFBD>zirend neve";
$_['text_previous'] = "El<EFBFBD>z<EFBFBD>";
$_['text_print_message'] = "Nyomtat<EFBFBD>s";
$_['text_private'] = "Priv<EFBFBD>t";
$_['text_processed_emails'] = "Feldolgozott levelek";
$_['text_progress'] = "St<EFBFBD>tusz";
$_['text_purge_all_messages_from_quarantine'] = "<EFBFBD>sszes saj<61>t <20>zenet t<>rl<72>se a karant<6E>nb<6E>l";
$_['text_purge_selected_messages'] = "Kiv<EFBFBD>lasztott <20>zenetek elt<6C>vol<6F>t<EFBFBD>sa";
$_['text_purged'] = "Elt<EFBFBD>vol<EFBFBD>tva";
$_['text_qr_code'] = "QR";
$_['text_queue_status'] = "Queue st<73>tusz";
$_['text_quick_search'] = "Gyorskeres<EFBFBD>s";
$_['text_realname'] = "N<EFBFBD>v";
$_['text_recipient'] = "C<EFBFBD>mzett";
$_['text_ref'] = "Hivatkoz<EFBFBD>s";
$_['text_refresh_period'] = "Friss<EFBFBD>t<EFBFBD>si peri<72>dus";
$_['text_refresh_qr_code'] = "QR k<>d friss<73>t<EFBFBD>se";
$_['text_relay_details'] = "Relay r<>szletek";
$_['text_relay_status'] = "Relay st<73>tusz";
$_['text_remove'] = "T<EFBFBD>rl<EFBFBD>s";
$_['text_remove_domain'] = "Domain t<>rl<72>se";
$_['text_remove_message'] = "Lev<EFBFBD>l t<>rl<72>se";
$_['text_remove_message2'] = "lev<EFBFBD>l t<>rl<72>se";
$_['text_remove_selected_uids'] = "Kijel<EFBFBD>lt azonos<6F>t<EFBFBD>k t<>rl<72>se";
$_['text_remove_policy'] = "H<EFBFBD>zirend t<>rl<72>se";
$_['text_remove_rule'] = "Szab<EFBFBD>ly t<>rl<72>se";
$_['text_remove_this_group'] = "Csoport t<>rl<72>se";
$_['text_remove_this_policy'] = "H<EFBFBD>zirend t<>rl<72>se";
$_['text_remove_this_user'] = "Felhaszn<EFBFBD>l<EFBFBD> t<>rl<72>se";
$_['text_removed'] = "T<EFBFBD>r<EFBFBD>lve";
$_['text_reset_counters'] = "Sz<EFBFBD>ml<EFBFBD>l<EFBFBD>k null<6C>z<EFBFBD>sa";
$_['text_restore'] = "Vissza<EFBFBD>ll<EFBFBD>t";
$_['text_restored'] = "Vissza<EFBFBD>ll<EFBFBD>tva";
$_['text_restore_message'] = "lev<EFBFBD>l vissza<7A>ll<6C>t<EFBFBD>sa";
$_['text_restore_to_mailbox'] = "Lev<EFBFBD>l vissza<7A>ll<6C>t<EFBFBD>sa postafi<66>kba";
$_['text_restored'] = "Vissza<EFBFBD>ll<EFBFBD>tva";
$_['text_result'] = "Eredm<EFBFBD>ny";
$_['text_retention_days'] = "Megtart<EFBFBD>si id<69> [nap]";
$_['text_retention_rules'] = "Megtart<EFBFBD>si szab<61>lyok";
$_['text_role'] = "Felhaszn<EFBFBD>l<EFBFBD>t<EFBFBD>pus";
$_['text_running'] = "fut";
$_['text_save'] = "Ment<EFBFBD>s";
$_['text_saved'] = "Elmentve";
$_['text_save_search'] = "keres<EFBFBD>s ment<6E>se";
$_['text_save_search_terms'] = "Keres<EFBFBD>si felt<6C>tel ment<6E>se";
$_['text_saved_search_terms'] = "Elmentett keres<65>sek";
$_['text_search'] = "Keres<EFBFBD>s";
$_['text_search2'] = "keres<EFBFBD>s";
$_['text_search_emails'] = "Email c<>mek keres<65>se";
$_['text_search_email_to_add'] = "<EFBFBD>rja be az email c<>m elej<65>t";
$_['text_search_expression'] = "Keres<EFBFBD>si kifejez<65>s";
$_['text_search_folders'] = "Mapp<EFBFBD>k keres<65>se";
$_['text_search_folder_to_add'] = "<EFBFBD>rja be a mappa elej<65>t";
$_['text_search_groups'] = "Csoportok keres<65>se";
$_['text_search_group_to_add'] = "<EFBFBD>rja be a csoport nev<65>nek elej<65>t";
$_['text_search_terms'] = "Keres<EFBFBD>si felt<6C>telek";
$_['text_select_action'] = "M<EFBFBD>velet v<>laszt<7A>s";
$_['text_select_all'] = "Mindegyik kijel<65>l<EFBFBD>se";
$_['text_select_image'] = "V<EFBFBD>lasszon k<>pet";
$_['text_select_recipients'] = "C<EFBFBD>mzettek kijel<65>l<EFBFBD>se";
$_['text_sender'] = "Felad<EFBFBD>";
$_['text_sending_domains'] = "k<EFBFBD>ld<EFBFBD> domain";
$_['text_server_name'] = "Szerver n<>v";
$_['text_server_operating_system'] = "Oper<EFBFBD>ci<EFBFBD>s rendszer";
$_['text_set'] = "Be<EFBFBD>ll<EFBFBD>t";
$_['text_settings'] = "Be<EFBFBD>ll<EFBFBD>t<EFBFBD>sok";
$_['text_simple'] = "Egyszer<EFBFBD>";
$_['text_simple_search'] = "Egyszer<EFBFBD> keres<65>s";
$_['text_size'] = "M<EFBFBD>ret";
$_['text_smtp_status'] = "SMTP st<73>tusz";
$_['text_spam'] = "Spam";
$_['text_spam2'] = "spam";
$_['text_statistics'] = "Statisztika";
$_['text_status'] = "St<EFBFBD>tusz";
$_['text_storage'] = "T<EFBFBD>rol<EFBFBD>";
$_['text_subject'] = "T<EFBFBD>rgy";
$_['text_submit'] = "Mehet";
$_['text_successful'] = "Sikeres";
$_['text_successfully_added'] = "Sikeresen felv<6C>ve";
$_['text_successfully_delivered'] = "Sikeresen k<>zbes<65>tve";
$_['text_successfully_modified'] = "Sikeresen m<>dos<6F>tva";
$_['text_successfully_removed'] = "Sikeresen elt<6C>vol<6F>tva";
$_['text_successfully_trained'] = "Sikeresen tan<61>tva";
$_['text_successfully_updated'] = "Sikeresen m<>dos<6F>tva";
$_['text_support_link'] = "T<EFBFBD>mogat<EFBFBD>s link";
$_['text_swap_usage'] = "Swap haszn<7A>lat";
$_['text_tag_selected_messages'] = "Kijel<EFBFBD>lt <20>zenetek c<>mk<6D>z<EFBFBD>se";
$_['text_tagged'] = "C<EFBFBD>mk<EFBFBD>zve";
$_['text_tags'] = "C<EFBFBD>mk<EFBFBD>k";
$_['text_test_connection'] = "Kapcsolat tesztel<65>se";
$_['text_text'] = "Sz<EFBFBD>veg";
$_['text_text_colour'] = "Sz<EFBFBD>vegsz<EFBFBD>n";
$_['text_text2'] = "sz<EFBFBD>veg";
$_['text_theme'] = "St<EFBFBD>lus";
$_['text_time'] = "Id<EFBFBD>pont";
$_['text_to'] = "C<EFBFBD>mzett";
$_['text_to_domain'] = "C<EFBFBD>mzett domain";
$_['text_too_short_password'] = "T<EFBFBD>l r<>vid jelsz<73>";
$_['text_total'] = "<EFBFBD>sszes";
$_['text_total_ratio'] = "<EFBFBD>sszes ar<61>ny";
$_['text_total_query_time'] = "SQL lek<65>rdez<65>sek <20>sszideje";
$_['text_total_users'] = "<EFBFBD>sszes";
$_['text_type'] = "T<EFBFBD>pus";
$_['text_uids'] = "Felhaszn<EFBFBD>l<EFBFBD> azonos<6F>t<EFBFBD>k";
$_['text_unknown'] = "ismeretlen";
$_['text_unauthorized_domain'] = "Nem megengedett domain";
$_['text_unauthorized_download_attachment'] = "jogosulatlan mell<6C>klet let<65>lt<6C>s";
$_['text_unauthorized_remove_message'] = "jogosulatlan <20>zenet t<>rl<72>s";
$_['text_unauthorized_view_message'] = "jogosulatlan <20>zenet megtekint<6E>s";
$_['text_update_retention_within_this_domain'] = "Megtart<EFBFBD>si id<69> friss<73>t<EFBFBD>se ebben a domainben";
$_['text_update_selected_uids'] = "Kijel<EFBFBD>lt azonos<6F>t<EFBFBD>k m<>dos<6F>t<EFBFBD>sa";
$_['text_updated_records'] = "Friss<EFBFBD>tett rekordok";
$_['text_uptime'] = "Uptime";
$_['text_user'] = "Felhaszn<EFBFBD>l<EFBFBD>";
$_['text_users'] = "Felhaszn<EFBFBD>l<EFBFBD>k";
$_['text_user_id'] = "Felhaszn<EFBFBD>l<EFBFBD> azonos<6F>t<EFBFBD>";
$_['text_user_auditor'] = "Auditor";
$_['text_user_domainadmin'] = "Domain admin";
$_['text_user_management'] = "Felhaszn<EFBFBD>l<EFBFBD>k";
$_['text_user_masteradmin'] = "Mester admin";
$_['text_user_read_only_admin'] = "Read-only admin";
$_['text_user_regular'] = "Sima felhaszn<7A>l<EFBFBD>";
$_['text_userlist'] = "Felhaszn<EFBFBD>l<EFBFBD>k list<73>ja";
$_['text_username'] = "Felhaszn<EFBFBD>l<EFBFBD>n<EFBFBD>v";
$_['text_users_quarantine'] = "Felhaszn<EFBFBD>l<EFBFBD>k karant<6E>nja";
$_['text_view_formatted_email'] = "Form<EFBFBD>zott lev<65>l megtekint<6E>se";
$_['text_view_header'] = "fejl<EFBFBD>c megtekint<6E>se";
$_['text_view_headers'] = "Lev<EFBFBD>l fejl<6A>ce";
$_['text_view_journal'] = "journal";
$_['text_view_journal_envelope'] = "Journal envelope";
$_['text_view_message'] = "Lev<EFBFBD>l megtekint<6E>se";
$_['text_view_message2'] = "lev<EFBFBD>l megtekint<6E>se";
$_['text_view_progress'] = "folyamatban l<>v<EFBFBD> import<72>l<EFBFBD>sok";
$_['text_view_raw_email'] = "Form<EFBFBD>zatlan lev<65>l megtekint<6E>se";
$_['text_view_user_quarantine'] = "Felhaszn<EFBFBD>l<EFBFBD> karant<6E>n megtekint<6E>se";
$_['text_warning_about_default_policy'] = "Az alap<61>rtelmezett h<>zirend a clapf.conf f<>jlban van";
$_['text_whitelist'] = "Feh<EFBFBD>rlista";
$_['text_whitelist_settings'] = "Feh<EFBFBD>rlista be<62>ll<6C>t<EFBFBD>sok";
$_['text_with_attachment'] = "mell<EFBFBD>kletekkel";
$_['text_without_attachment'] = "mell<EFBFBD>kletek n<>lk<6C>l";
$_['text_years'] = "<EFBFBD>v";
$_['text_you_are'] = "<EFBFBD>n";
$_['text_you_are_not_admin'] = "<EFBFBD>nnek nincs jogosults<74>ga a m<>velethez";
$_['rcvd'] = "fogadott lev<65>l";
$_['virus'] = "v<EFBFBD>rusos lev<65>l";
$_['duplicate'] = "duplik<EFBFBD>lt lev<65>l";
$_['ignore'] = "ignor<EFBFBD>lt lev<65>l";
$_['counters_last_update'] = "sz<EFBFBD>ml<EFBFBD>l<EFBFBD>k friss<73>tve";
$_['text_24_hours'] = "24 <20>ra";
$_['text_1_week'] = "1 h<>t";
$_['text_30_days'] = "30 nap";
$_['text_access_settings'] = 'Hozz<7A>f<EFBFBD>r<EFBFBD>sek';
$_['text_access_setting_explanation'] = "A saj<61>t email c<>meihez mindig hozz<7A>f<EFBFBD>rhet. Az egyes domainekhez ill. csoportokhoz val<61> auditor hozz<7A>f<EFBFBD>r<EFBFBD>s<EFBFBD>rt, k<>rj<72>k l<>pjen kapcsolatba az arch<63>vum adminisztr<74>torokkal.";
$_['text_display_settings'] = 'Megjelen<65>t<EFBFBD>s';
$_['text_change_password'] = "Jelsz<EFBFBD> m<>dos<6F>t<EFBFBD>s";
$_['text_none_found'] = "Nincs";
$_['text_primary_domain'] = "Els<EFBFBD>dleges Domain";
$_['text_search_domains'] = "Domainek keres<65>se";
$_['text_search_domain_to_add'] = "<EFBFBD>rja be a domain nev<65>nek elej<65>t";
$_['text_space_projection'] = 'T<>rter<65>let el<65>rejelz<6C>s';
$_['text_average_messages_day'] = 'Levelek sz<73>m<EFBFBD>nak napi <20>tlaga';
$_['text_average_message_size'] = '<27>tlagos lev<65>lm<6C>ret + Meta adatok + Index m<>ret';
$_['text_average_size_day'] = 'Napi <20>tlag m<>ret';
$_['text_partition_full'] = 'part<72>ci<63> betel<65>s<EFBFBD>ig h<>tralev<65> id<69>';
$_['text_usage_trend'] = 'Kihaszn<7A>lts<74>g trend';
$_['text_usage_increasing'] = 'n<>';
$_['text_usage_decreasing'] = 'cs<63>kken';
$_['text_usage_neutral'] = 'nem v<>ltozik';
$_['text_accounting'] = 'Arch<63>vum statisztika';
$_['text_accounting_email'] = 'Email szerint';
$_['text_accounting_domain'] = 'Domain szerint';
$_['text_options'] = 'Opci<63>k';
$_['text_spam_flag'] = 'SPAM lev<65>l';
$_['text_attachment_flag'] = 'Mell<6C>klet';
$_['text_notes_flag'] = 'Megjegyz<79>s';
$_['text_tag_flag'] = 'C<>mke';
$_['text_verified_flag'] = 'Ellen<65>rz<72>tt';
$_['text_unverified_flag'] = 'M<>dos<6F>tott lev<65>l';
$_['text_bulk_download'] = 'Kiv<69>lasztott levelek let<65>lt<6C>se';
$_['text_clear'] = 'T<>rl<72>s';
$_['text_select_letter'] = 'C<>m kiv<69>laszt<7A>sa bet<65> szerint';
$_['text_working'] = 'Keres<65>s...';
$_['text_use_browser_settings'] = 'B<>ng<6E>sz<73> be<62>ll<6C>t<EFBFBD>sainak haszn<7A>lata';
$_['text_sent'] = 'K<>ld<6C>tt';
$_['text_received'] = 'Fogadott';
$_['text_oldest_record'] = 'Legr<67>gebbi rekord';
$_['text_newest_record'] = 'Leg<65>jabb rekord';
$_['text_items'] = 'T<>telek';
$_['text_average_size'] = '<27>tlag m<>ret';
$_['text_return_to'] = 'Vissza';
$_['text_error_message'] = 'K<>rj<72>k, jav<61>tsa ki az al<61>bbi hib<69>kat, <20>s k<>ldje el <20>jra a formot.';
$_['text_field_required'] = 'K<>telez<65> mez<65>.';
$_['text_field_length'] = 'Ennek a mez<65>nek hosszabbnak kell lennie ? karaktern<72>l.';
$_['text_field_domain'] = 'Ennek a mez<65>nek <20>rv<72>nyes domainn<6E>vnek kell lennie (pl. - domain.com).';
$_['text_field_colour'] = 'Ennek a mez<65>nek <20>rv<72>nyes sz<73>nk<6E>dnak kell lennie (pl. - #fcfcfc).';
$_['text_delete'] = 'T<>rl<72>s';
$_['text_confirm'] = 'Meger<65>s<EFBFBD>t<EFBFBD>s';
$_['text_user_delete_confirm_message'] = 'T<>r<EFBFBD>lni akarja a felhaszn<7A>l<EFBFBD>t';
$_['text_domain_delete_confirm_message'] = 'T<>r<EFBFBD>lni akarja a domaint';
$_['text_group_delete_confirm_message'] = 'T<>r<EFBFBD>lni akarja a csoportot';
$_['text_ldap_delete_confirm_message'] = 'T<>r<EFBFBD>lni akarja az LDAP bejegyz<79>st';
$_['text_customer_delete_confirm_message'] = 'T<>r<EFBFBD>lni akarja az <20>gyfelet';
$_['text_with_selected'] = 'Kiv<69>lasztott levelek';
$_['text_compliance_warning'] = 'A t<>rl<72>s funkci<63> enged<65>lyezett, ez<65>rt az arch<63>vum NEM teljes<65>ti a megfelel<65>s<EFBFBD>get!';
?>

View File

@ -79,6 +79,7 @@ $_['text_deferred_queue'] = "későbbi kiküldésre váró üzenetsor";
$_['text_deferred_queue_sender'] = "későbbi kiküldésre váró üzenetsor (feladó szerint)";
$_['text_delay'] = "Késleltetés";
$_['text_delete_confirm_message'] = "Törölni akarja";
$_['text_delete_reason'] = "Törlés oka";
$_['text_deleted_users'] = "törölt";
$_['text_deliver'] = "Kézbesítés";
$_['text_delivered'] = "Kézbesített";
@ -485,5 +486,3 @@ $_['text_customer_delete_confirm_message'] = 'Törölni akarja az ügyfelet';
$_['text_with_selected'] = 'Kiválasztott levelek';
$_['text_compliance_warning'] = 'A törlés funkció engedélyezett, ezért az archívum NEM teljesíti a megfelelőséget!';
?>

View File

@ -483,5 +483,4 @@ $_['text_with_selected'] = 'wraz z zaznaczonymi';
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_folder_rules'] = "Folder rules";
$_['text_private'] = "Private";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -476,5 +476,4 @@ $_['text_legal_hold'] = "Legal hold";
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_folder_rules'] = "Folder rules";
$_['text_private'] = "Private";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -484,3 +484,4 @@ $_['text_legal_hold'] = "Legal hold";
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_folder_rules'] = "Folder rules";
$_['text_private'] = "Private";
$_['text_delete_reason'] = "Delete reason";

View File

@ -484,5 +484,4 @@ $_['text_legal_hold'] = "Legal hold";
$_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
$_['text_folder_rules'] = "Folder rules";
$_['text_private'] = "Private";
?>
$_['text_delete_reason'] = "Delete reason";

View File

@ -484,7 +484,8 @@ class ModelSearchSearch extends Model {
$rcpt = $srcpt = array();
$tag = array();
$note = array();
$private = array();
$private = [];
$deleted = [];
$q = '';
global $SUPPRESS_RECIPIENTS;
@ -516,12 +517,20 @@ class ModelSearchSearch extends Model {
if(isset($query->rows)) {
$privates = $this->db->query("SELECT `id` FROM `" . TABLE_PRIVATE . "` WHERE id IN ($q)", $ids);
$s = $this->db->query("SELECT `id` FROM `" . TABLE_PRIVATE . "` WHERE id IN ($q)", $ids);
foreach ($privates->rows as $p) {
foreach ($s->rows as $p) {
$private[$p['id']] = 1;
}
if(ENABLE_DELETE) {
$s = $this->db->query("SELECT `id` FROM `" . TABLE_DELETED . "` WHERE id IN ($q)", $ids);
foreach ($s->rows as $p) {
$deleted[$p['id']] = 1;
}
}
array_unshift($ids, (int)$session->get("uid"));
$tags = $this->db->query("SELECT `id`, `tag` FROM `" . TABLE_TAG . "` WHERE `uid`=? AND `id` IN ($q)", $ids);
@ -540,7 +549,8 @@ class ModelSearchSearch extends Model {
foreach($query->rows as $m) {
if(ENABLE_DELETE == 1 && $m['retained'] < NOW) $m['deleted'] = 1; else $m['deleted'] = 0;
// We mark it as deleted even if it's only marked for removal
if(ENABLE_DELETE == 1 && ($m['retained'] < NOW || isset($deleted[$m['id']])) ) $m['deleted'] = 1; else $m['deleted'] = 0;
$m['shortfrom'] = make_short_string($m['from'], MAX_CGI_FROM_SUBJ_LEN);
$m['from'] = escape_gt_lt_quote_symbols($m['from']);

View File

@ -17,6 +17,7 @@ var Piler =
extra_folders: '',
bulkrestore_url: '/bulkrestore.php',
bulkpdf_url: '/bulkpdf.php',
text_successfully_removed: '<?php print $text_successfully_removed; ?>'
/*
* variables used at search listing
@ -357,7 +358,14 @@ var Piler =
},
bulk_remove_messages:function(msg)
show_bulk_remove_modal:function()
{
Piler.log("[show_bulk_remove_modal]");
$('#deletebox-modal').modal('show');
},
bulk_remove_messages:function(reason)
{
Piler.log("[bulk_remove_messages]");
@ -368,13 +376,13 @@ var Piler =
if(!idlist) return;
jQuery.ajax('/bulkremove.php', {
data: { idlist: idlist },
data: { idlist: idlist, reason: reason },
type: "POST"
})
.done( function( a ) {})
.fail(function( a, b ) { alert("Problem retrieving XML data:" + b) });
Piler.show_message('messagebox1', msg, 0.8);
Piler.show_message('messagebox1', text_successfully_removed, 0.8);
},

View File

@ -51,6 +51,22 @@
</div>
</div>
<?php if(Registry::get('auditor_user') == 1) { ?>
<div id="deletebox-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_delete_reason; ?></h3>
</div>
<div class="modal-body">
<input type="text" id="reason" name="reason" />
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
<a href="#" onclick="var reason = $('#reason').val(); if(reason) { Piler.bulk_remove_messages(reason); }" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</a>
</div>
</div>
<?php } ?>
<?php if(!(OUTLOOK == 1 && SHOW_MENU_FOR_OUTLOOK == 0)) { ?>
<div id="menu">
<?php print $menu; ?>
@ -72,7 +88,7 @@
<div class="controls row-fluid">
<div id="input-span" class="span6">
<label for="_search"><?php print $text_search; ?></label>
<input type="text" id="_search" name="_search" placeholder="<?php print $text_enter_search_terms; ?>" <?php if(ENABLE_DELETE == 1) { ?>style="background: #faafbe;"<?php } ?> />
<input type="text" id="_search" name="_search" placeholder="<?php print $text_enter_search_terms; ?>" />
</div>
<div class="span6 input-append btn-group">
<button id="button_search" class="btn btn-large btn-danger" onclick="Piler.expert(this); return false;"><i class="icon-search icon-large"></i>&nbsp;<?php print $text_search; ?></button>

View File

@ -57,10 +57,6 @@
<p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
<?php } ?>
<?php if(ENABLE_DELETE == 1) { ?>
<p><?php print $text_compliance_warning; ?></p>
<?php } ?>
<p><?php print COMPATIBILITY; ?></p>
</div>

View File

@ -134,8 +134,6 @@
<?php if($page < $total_pages) { ?><a href="#" class="navlink" onclick="Piler.navigation(<?php print $total_pages; ?>);"><i class="icon-double-angle-right icon-large"></i></a><?php } else { ?> <span class="navlink"><i class="icon-double-angle-right icon-large muted"></i></span><?php } ?>
&nbsp;
<?php if(ENABLE_DELETE == 1) { ?><i class="icon-exclamation-sign" title="<?php print $text_compliance_warning; ?>"></i><?php } ?>
<?php if(Registry::get('auditor_user') == 1 && $session->get("sphx_query")) { ?>
<span style="margin-left: 30px;"><a href="#" onclick="Piler.show_message('messagebox1', '<?php print $session->get("sphx_query"); ?>', 5);">sphinx</a></span>
<?php } ?>
@ -155,7 +153,7 @@
<?php } ?>
<a href="#" class="btn btn-custom btn-inverse" onclick="Piler.download_messages();" title="<?php print $text_bulk_download; ?>"><i class="icon-download-alt"></i></a>
<!--a href="#" class="btn btn-custom btn-inverse" onclick="Piler.download_selected_as_pdf();" title="<?php print $text_download_selected_hits_as_pdf; ?>"><i class="icon-file"></i></a-->
<?php if(ENABLE_DELETE == 1 && isAuditorUser() == 1) { ?><a href="#" class="btn btn-custom btn-inverse" onclick="Piler.bulk_remove_messages('<?php print $text_successfully_removed; ?>');" title="<?php print $text_remove; ?>"><i class="icon-remove-sign"></i></a><?php } ?>
<?php if(ENABLE_DELETE == 1 && isAuditorUser() == 1) { ?><a href="#" class="btn btn-custom btn-inverse" onclick="Piler.show_bulk_remove_modal();" title="<?php print $text_remove; ?>"><i class="icon-remove-sign"></i></a><?php } ?>
<input type="text" id="tag_value" name="tag_value" class="tagtext" />
<a href="#" class="btn btn-custom btn-inverse" onclick="Piler.tag_search_results('<?php print $text_tagged; ?>');" title="<?php print $text_tag_selected_messages; ?>"><i class="icon-tags" title="Tag"></i></a>
</div>

View File

@ -50,6 +50,21 @@
</div>
</div>
<?php if(Registry::get('auditor_user') == 1) { ?>
<div id="deletebox-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_delete_reason; ?></h3>
</div>
<div class="modal-body">
<input type="text" id="reason" name="reason" />
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
<a href="#" onclick="var reason = $('#reason').val(); if(reason) { alert(reason); }" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</a>
</div>
</div>
<?php } ?>
<div id="messagebox1"></div>
@ -71,7 +86,7 @@
<input type="hidden" name="ref" id="ref" value="" />
<input type="hidden" name="prefix" id="prefix" value="" />
<input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" <?php if(ENABLE_DELETE == 1) { ?>style="background: #faafbe;"<?php } ?> />
<input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" />
<?php if(OUTLOOK == 0) { ?>
<a id="advsearch_caret" href="#" onclick="$('#searchpopup1').show();"><b class="caret"></b></a>

View File

@ -60,10 +60,6 @@
<p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
<?php } ?>
<?php if(ENABLE_DELETE == 1) { ?>
<p><?php print $text_compliance_warning; ?></p>
<?php } ?>
<p><?php print COMPATIBILITY; ?></p>
</div>

View File

@ -115,8 +115,6 @@
<a href="#" onclick="Piler.download_messages();" title="<?php print $text_bulk_download; ?>"><i class="icon-download-alt"></i></a>
<a href="#" onclick="Piler.download_selected_as_pdf();" title="<?php print $text_download_selected_hits_as_pdf; ?>"><i class="icon-file"></i></a>
<?php if(ENABLE_DELETE == 1 && isAuditorUser() == 1) { ?><a href="#" onclick="Piler.bulk_remove_messages('<?php print $text_successfully_removed; ?>');" title="<?php print $text_remove; ?>"><i class="icon-remove-sign"></i></a><?php } ?>
<input type="text" id="tag_value" name="tag_value" class="input-xlarge" placeholder="<?php print $text_tag_selected_messages; ?>" />
<button class="btn" onclick="Piler.tag_search_results('<?php print $text_tagged; ?>'); return false;" >OK</button>