From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
plugins/markasjunk/markasjunk.php | 92 ++++++++++++++++++++++++++++++---------------
1 files changed, 61 insertions(+), 31 deletions(-)
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index b269637..1f92390 100644
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -6,43 +6,73 @@
* Sample plugin that adds a new button to the mailbox toolbar
* to mark the selected messages as Junk and move them to the Junk folder
*
- * @version 1.0
+ * @version @package_version@
+ * @license GNU GPLv3+
* @author Thomas Bruederli
*/
class markasjunk extends rcube_plugin
{
- public $task = 'mail';
+ public $task = 'mail';
- function init()
- {
- $this->register_action('plugin.markasjunk', array($this, 'request_action'));
- $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk';
-
- $rcmail = rcmail::get_instance();
- if ($rcmail->action == '' || $rcmail->action == 'show') {
- $this->include_script('markasjunk.js');
- $this->add_texts('localization', true);
- $this->add_button(array('command' => 'plugin.markasjunk', 'imagepas' => 'junk_pas.png',
- 'imageact' => 'junk_act.png', 'title' => 'markasjunk.buttontitle'), 'toolbar');
+ function init()
+ {
+ $rcmail = rcmail::get_instance();
+
+ $this->register_action('plugin.markasjunk', array($this, 'request_action'));
+ $this->add_hook('storage_init', array($this, 'storage_init'));
+
+ if ($rcmail->action == '' || $rcmail->action == 'show') {
+ $skin_path = $this->local_skin_path();
+
+ $this->add_texts('localization', true);
+ $this->include_script('markasjunk.js');
+
+ if (is_file($this->home . "/$skin_path/markasjunk.css")) {
+ $this->include_stylesheet("$skin_path/markasjunk.css");
+ }
+
+ $this->add_button(array(
+ 'type' => 'link',
+ 'label' => 'buttontext',
+ 'command' => 'plugin.markasjunk',
+ 'class' => 'button buttonPas junk disabled',
+ 'classact' => 'button junk',
+ 'title' => 'buttontitle',
+ 'domain' => 'markasjunk'
+ ),'toolbar');
+ }
}
- }
- function request_action()
- {
- $this->add_texts('localization');
-
- $uids = get_input_value('_uid', RCUBE_INPUT_POST);
- $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-
- $rcmail = rcmail::get_instance();
- $rcmail->imap->set_flag($uids, 'JUNK');
-
- if (($junk_mbox = $rcmail->config->get('junk_mbox')) && $mbox != $junk_mbox) {
- $rcmail->output->command('move_messages', $junk_mbox);
+ function storage_init($args)
+ {
+ $flags = array(
+ 'JUNK' => 'Junk',
+ 'NONJUNK' => 'NonJunk',
+ );
+
+ // register message flags
+ $args['message_flags'] = array_merge((array)$args['message_flags'], $flags);
+
+ return $args;
}
-
- $rcmail->output->command('display_message', $this->gettext('reportedasjunk'), 'confirmation');
- $rcmail->output->send();
- }
-}
\ No newline at end of file
+ function request_action()
+ {
+ $this->add_texts('localization');
+
+ $rcmail = rcmail::get_instance();
+ $storage = $rcmail->get_storage();
+
+ foreach (rcmail::get_uids() as $mbox => $uids) {
+ $storage->unset_flag($uids, 'NONJUNK', $mbox);
+ $storage->set_flag($uids, 'JUNK', $mbox);
+ }
+
+ if (($junk_mbox = $rcmail->config->get('junk_mbox'))) {
+ $rcmail->output->command('move_messages', $junk_mbox);
+ }
+
+ $rcmail->output->command('display_message', $this->gettext('reportedasjunk'), 'confirmation');
+ $rcmail->output->send();
+ }
+}
--
Gitblit v1.9.1