From 2cb5b5a9e5c6fe9575fe2c40aee8af4002b69c81 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 27 Oct 2009 08:02:24 -0400
Subject: [PATCH] - markasjunk: added NonJunk flag unsetting, added ru_RU localization
---
plugins/markasjunk/markasjunk.php | 10 +++++++---
plugins/markasjunk/localization/ru_RU.inc | 7 +++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc
new file mode 100644
index 0000000..32d00c2
--- /dev/null
+++ b/plugins/markasjunk/localization/ru_RU.inc
@@ -0,0 +1,7 @@
+<?php
+
+$labels = array();
+$labels['buttontitle'] = 'Переместить в "СПАМ"';
+$labels['reportedasjunk'] = 'Перемещено в "СПАМ"';
+
+?>
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index 961a446..f3e652d 100644
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -16,14 +16,14 @@
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') {
$skin_path = 'skins/'.$rcmail->output->config['skin'];
$this->include_script('markasjunk.js');
$this->add_texts('localization', true);
- $this->add_button(array('command' => 'plugin.markasjunk',
+ $this->add_button(array(
+ 'command' => 'plugin.markasjunk',
'imagepas' => $skin_path.'/junk_pas.png',
'imageact' => $skin_path.'/junk_act.png',
'title' => 'markasjunk.buttontitle'), 'toolbar');
@@ -33,11 +33,15 @@
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) {
@@ -48,4 +52,4 @@
$rcmail->output->send();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1