senior/roundcube-ident_switch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

load and set special folders from db

Browse Source
This commit is contained in:
Christian Landvogt
2019-12-13 10:49:50 +01:00
parent 67fc6b8b66
commit f30f72099b
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ident_switch.php
View File

@@ -33,6 +33,15 @@ class ident_switch extends rcube_plugin
$this->add_hook('template_object_composeheaders', array($this, 'on_template_object_composeheaders')); $this->add_hook('template_object_composeheaders', array($this, 'on_template_object_composeheaders'));
$this->register_action('plugin.ident_switch.switch', array($this, 'on_switch')); $this->register_action('plugin.ident_switch.switch', array($this, 'on_switch'));
$rc = rcmail::get_instance();
$saveFromConfig = Array('drafts_mbox', 'sent_mbox', 'trash_mbox', 'junk_mbox');
foreach ($saveFromConfig as $k)
{
$key = $k . '_default' . self::MY_POSTFIX;
if (!$_SESSION[$key])
$_SESSION[$key] = $rc->config->get($k);
}
} }
function on_startup($args) function on_startup($args)
@@ -51,6 +60,15 @@ class ident_switch extends rcube_plugin
} }
} }
$setConfig = Array('drafts_mbox', 'sent_mbox', 'trash_mbox', 'junk_mbox');
foreach ($setConfig as $k)
{
$defaultKey = $k . '_default' . self::MY_POSTFIX;
$otherKey = $k . self::MY_POSTFIX;
$val = $_SESSION[$otherKey] ? $_SESSION[$otherKey] : $_SESSION[$defaultKey];
$rc->config->set($k, $val);
}
return $args; return $args;
} }
@@ -531,6 +549,9 @@ class ident_switch extends rcube_plugin
$my_postfix_len = strlen(self::MY_POSTFIX); $my_postfix_len = strlen(self::MY_POSTFIX);
$identId = rcube_utils::get_input_value('_ident-id', rcube_utils::INPUT_POST); $identId = rcube_utils::get_input_value('_ident-id', rcube_utils::INPUT_POST);
$rc->session->remove('folders');
$rc->session->remove('unseen_count');
if (-1 == $identId) if (-1 == $identId)
{ // Switch to main account { // Switch to main account
self::write_log('Switching mailbox back to default.'); self::write_log('Switching mailbox back to default.');
@@ -548,10 +569,18 @@ class ident_switch extends rcube_plugin
$_SESSION['username'] = $rc->user->data['username']; $_SESSION['username'] = $rc->user->data['username'];
$_SESSION['password'] = $_SESSION['password' . self::MY_POSTFIX]; $_SESSION['password'] = $_SESSION['password' . self::MY_POSTFIX];
$_SESSION['iid' . self::MY_POSTFIX] = -1; $_SESSION['iid' . self::MY_POSTFIX] = -1;
$delFromConfig = Array('drafts_mbox', 'sent_mbox', 'trash_mbox', 'junk_mbox');
foreach ($delFromConfig as $k)
{
$otherKey = $k . self::MY_POSTFIX;
if ($_SESSION[$otherKey])
$rc->session->remove($otherKey);
}
} }
else else
{ {
$sql = 'SELECT imap_host, flags, imap_port, imap_delimiter, username, password, iid FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE id = ? AND user_id = ?'; $sql = 'SELECT imap_host, flags, imap_port, imap_delimiter, drafts_mbox, sent_mbox, junk_mbox, trash_mbox, username, password, iid FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE id = ? AND user_id = ?';
$q = $rc->db->query($sql, $identId ,$rc->user->ID); $q = $rc->db->query($sql, $identId ,$rc->user->ID);
$r = $rc->db->fetch_assoc($q); $r = $rc->db->fetch_assoc($q);
if (is_array($r)) if (is_array($r))
@@ -613,7 +642,14 @@ class ident_switch extends rcube_plugin
$_SESSION['password'] = $r['password']; $_SESSION['password'] = $r['password'];
$_SESSION['iid' . self::MY_POSTFIX] = $r['iid']; $_SESSION['iid' . self::MY_POSTFIX] = $r['iid'];
$rc->session->remove('folders'); $saveToSessiong = Array('drafts_mbox', 'sent_mbox', 'trash_mbox', 'junk_mbox');
foreach ($saveToSessiong as $k)
{
if ($r[$k]) {
$otherKey = $k . self::MY_POSTFIX;
$_SESSION[$otherKey] = $r[$k];
}
}
} }
else else
{ {