Imported Debian patch 0.5.2+dfsg-1

[roundcube.git] / plugins / markasjunk / markasjunk.php

diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index 959111d84e9641a9f8a05e4db7f0b352a741a3ab..697d880ca2738e8e75214f60ee00e3a045e8286f 100644 (file)
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -6,7 +6,7 @@
  * 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@
  * @author Thomas Bruederli
  */
 class markasjunk extends rcube_plugin
@@ -15,25 +15,36 @@ class markasjunk extends rcube_plugin
 
   function init()
   {
-    $this->register_action('plugin.markasjunk', array($this, 'request_action'));
-    $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk';
-    
     $rcmail = rcmail::get_instance();
+
+    $this->register_action('plugin.markasjunk', array($this, 'request_action'));
+      
     if ($rcmail->action == '' || $rcmail->action == 'show') {
+      $skin_path = $this->local_skin_path();
       $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'), 'toolbar');
+      $this->add_button(array(
+        'command' => 'plugin.markasjunk',
+        'imagepas' => $skin_path.'/junk_pas.png',
+        'imageact' => $skin_path.'/junk_act.png',
+        'width' => 32,
+        'height' => 32,
+        'title' => 'markasjunk.buttontitle'), 'toolbar');
     }
   }
 
   function request_action()
   {
     $this->add_texts('localization');
+
+    $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk';
+    $GLOBALS['IMAP_FLAGS']['NONJUNK'] = 'NonJunk';
     
     $uids = get_input_value('_uid', RCUBE_INPUT_POST);
     $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
     
     $rcmail = rcmail::get_instance();
+    $rcmail->imap->unset_flag($uids, 'NONJUNK');
     $rcmail->imap->set_flag($uids, 'JUNK');
     
     if (($junk_mbox = $rcmail->config->get('junk_mbox')) && $mbox != $junk_mbox) {
@@ -44,4 +55,4 @@ class markasjunk extends rcube_plugin
     $rcmail->output->send();
   }
 
-}
\ No newline at end of file
+}