Copy localization updates for 0.4.2 release

thomascube

2010-10-06 2fe8d6bdebbaa160ee062b18e78fe7e77b430e00

 plugins/subscriptions_option/subscriptions_option.php

@@ -31,11 +31,11 @@
        $this->add_texts('localization/', false);
        $dont_override = rcmail::get_instance()->config->get('dont_override', array());
        if (!in_array('use_subscriptions', $dont_override)) {
            $this->add_hook('user_preferences', array($this, 'settings_blocks'));
            $this->add_hook('save_preferences', array($this, 'save_prefs'));
            $this->add_hook('preferences_list', array($this, 'settings_blocks'));
            $this->add_hook('preferences_save', array($this, 'save_prefs'));
        }
        $this->add_hook('list_mailboxes', array($this, 'list_mailboxes'));
        $this->add_hook('manage_folders', array($this, 'manage_folders'));
        $this->add_hook('mailboxes_list', array($this, 'mailboxes_list'));
        $this->add_hook('folders_list', array($this, 'folders_list'));
    }

    function settings_blocks($args)
@@ -46,9 +46,9 @@
            $checkbox = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));

            $args['blocks']['main']['options']['use_subscriptions'] = array(
      'title' => html::label($field_id, Q($this->gettext('useimapsubscriptions'))),
                'title' => html::label($field_id, Q($this->gettext('useimapsubscriptions'))),
                'content' => $checkbox->show($use_subscriptions?1:0),
       );
            );
        }

        return $args;
@@ -57,31 +57,31 @@
    function save_prefs($args)
    {
        if ($args['section'] == 'server') {
           $rcmail = rcmail::get_instance();
            $rcmail = rcmail::get_instance();
            $use_subscriptions = $rcmail->config->get('use_subscriptions');

           $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;
            $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;

           // if the use_subscriptions preference changes, flush the folder cache
           if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
           (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
                   $rcmail->imap_init(true);
                   $rcmail->imap->clear_cache('mailboxes');
           }
   }
        return $args;
    }

    function list_mailboxes($args)
    {
        $rcmail = rcmail::get_instance();
        if (!$rcmail->config->get('use_subscriptions', true)) {
            $args['folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->mod_mailbox($args['root']), $args['filter']);
            // if the use_subscriptions preference changes, flush the folder cache
            if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
                (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
                    $rcmail->imap_connect();
                    $rcmail->imap->clear_cache('mailboxes');
            }
        }
        return $args;
    }

    function manage_folders($args)
    function mailboxes_list($args)
    {
        $rcmail = rcmail::get_instance();
        if (!$rcmail->config->get('use_subscriptions', true)) {
            $args['folders'] = $rcmail->imap->conn->listMailboxes($rcmail->imap->mod_mailbox($args['root']), $args['filter']);
        }
        return $args;
    }

    function folders_list($args)
    {
        $rcmail = rcmail::get_instance();
        if (!$rcmail->config->get('use_subscriptions', true)) {