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

Yess!! Switching finally works!!!

Browse Source
This commit is contained in:
Boris Gulay
2016-05-12 22:19:01 +03:00
parent 92ed8e8364
commit 12df24e675
2 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ident_switch.js
View File

@@ -10,5 +10,6 @@ $(function() {
}); });
function plugin_switchIdent_switch(val) { function plugin_switchIdent_switch(val) {
console.log("qwe1");
rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val }); rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val });
} }

54
ident_switch.php
View File

@@ -201,16 +201,31 @@ class ident_switch extends rcube_plugin
{ {
$rc = rcmail::get_instance(); $rc = rcmail::get_instance();
$my_postfix = '_iswitch';
$my_postfix_len = strlen($my_postfix);
error_log('Switcing account!'); // TODO: Add nornal logging here!
$identId = rcube_utils::get_input_value('_ident-id', RCUBE_INPUT_POST); $identId = rcube_utils::get_input_value('_ident-id', RCUBE_INPUT_POST);
error_log($identId); error_log($identId);
if (-1 == $identId) if (-1 == $identId)
{ // Switch to main account { // Switch to main account
// TODO: Erite code! foreach ($_SESSION as $k => $v)
{
if (substr($k, 0, 7) == 'STORAGE' && substr($k, -$my_postfix_len) == $my_postfix)
{
error_log($k . '=>' . $v);
$_SESSION[$k] = $_SESSION[$k . $my_postfix];
$rc->session->remove($k . $my_postfix);
}
}
$_SESSION['username'] = $rc->user->data['username'];
$_SESSION['password'] = $_SESSION['password' . $my_postfix];
} }
else else
{ {
$sql = 'SELECT server, username, password FROM ' . $rc->db->table_name($this->table) . ' WHERE id = ? AND user_id = ?'; $sql = 'SELECT host, flags, port, username, password 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))
@@ -226,13 +241,39 @@ class ident_switch extends rcube_plugin
if (!$port) if (!$port)
$port = 143; // Default port here! $port = 143; // Default port here!
// If we are in default account now
// save everything with STORAGE
if ($_SESSION['username'] == $rc->user->data['username'])
{
foreach ($_SESSION as $k => $v)
{
if (substr($k, 0, 7) == 'STORAGE' && substr($k, -$my_postfix_len) != $my_postfix)
{
error_log($k . '=>' . $v);
$_SESSION[$k . $my_postfix] = $_SESSION[$k];
$rc->session->remove($k);
}
}
}
$_SESSION['password' . $my_postfix] = $_SESSION['password'];
error_log('Pwd: ' . $_SESSION['password']);
$_SESSION['storage_host'] = $r['host']; $_SESSION['storage_host'] = $r['host'];
$_SESSION['storage_ssl'] = $ssl; $_SESSION['storage_ssl'] = $ssl;
$_SESSION['storage_port'] = $port; $_SESSION['storage_port'] = $port;
$_SESSION['username'] = $r['username']; $_SESSION['username'] = $r['username'];
$_SESSION['password'] = $rc->decrypt($r['password']); $_SESSION['password'] = $r['password'];
$rc->session->remove('folders'); $rc->session->remove('folders');
}
else
{
// TODO: Show message in browser
error_log('Requested account not found!');
return;
}
}
$rc->output->redirect( $rc->output->redirect(
array( array(
'_task' => 'mail', '_task' => 'mail',
@@ -240,11 +281,4 @@ class ident_switch extends rcube_plugin
) )
); );
} }
else
{
// TODO: Show message in browser
error_log('Requested account not found!');
}
}
}
} }