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

Now correct identity is selected when creating new message in remote

Browse Source 
account.
This commit is contained in:
Boris Gulay
2016-05-16 22:18:20 +03:00
parent 0925fca08a
commit 3e41e57888
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ident_switch.js
View File

@@ -13,3 +13,8 @@ function plugin_switchIdent_switch(val) {
console.log("qwe1"); console.log("qwe1");
rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val }); rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val });
} }
function plugin_switchIdent_fixIdent(iid) {
if (parseInt(iid) > 0)
$("#_from").val(iid);
}

18
ident_switch.php
View File

@@ -27,6 +27,7 @@ class ident_switch extends rcube_plugin
$this->add_hook('identity_form', array($this, 'on_identity_form')); $this->add_hook('identity_form', array($this, 'on_identity_form'));
$this->add_hook('identity_update', array($this, 'on_identity_update')); $this->add_hook('identity_update', array($this, 'on_identity_update'));
$this->add_hook('identity_delete', array($this, 'on_identity_delete')); $this->add_hook('identity_delete', array($this, 'on_identity_delete'));
$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'));
} }
@@ -223,6 +224,19 @@ class ident_switch extends rcube_plugin
return $args; return $args;
} }
function on_template_object_composeheaders($args)
{
if ($args['id'] == '_from')
{
$rc = rcmail::get_instance();
if (strcasecmp($_SESSION['username'], $rc->user->data['username']) !== 0)
{
if (isset($_SESSION['iid' . $this->my_postfix]))
$rc->output->add_script('plugin_switchIdent_fixIdent(' . $_SESSION['iid' . $this->my_postfix] . ');', 'docready');
}
}
}
function on_switch() function on_switch()
{ {
$rc = rcmail::get_instance(); $rc = rcmail::get_instance();
@@ -247,10 +261,11 @@ class ident_switch extends rcube_plugin
} }
$_SESSION['username'] = $rc->user->data['username']; $_SESSION['username'] = $rc->user->data['username'];
$_SESSION['password'] = $_SESSION['password' . $this->my_postfix]; $_SESSION['password'] = $_SESSION['password' . $this->my_postfix];
$_SESSION['iid' . $this->my_postfix] = -1;
} }
else else
{ {
$sql = 'SELECT host, flags, port, username, password FROM ' . $rc->db->table_name($this->table) . ' WHERE id = ? AND user_id = ?'; $sql = 'SELECT host, flags, port, username, password, iid FROM ' . $rc->db->table_name($this->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))
@@ -287,6 +302,7 @@ class ident_switch extends rcube_plugin
$_SESSION['storage_port'] = $port; $_SESSION['storage_port'] = $port;
$_SESSION['username'] = $r['username']; $_SESSION['username'] = $r['username'];
$_SESSION['password'] = $r['password']; $_SESSION['password'] = $r['password'];
$_SESSION['iid' . $this->my_postfix] = $r['iid'];
$rc->session->remove('folders'); $rc->session->remove('folders');
} }