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

Fixed set of errors when two identities have same user name. Closes #4,

Browse Source 
thanx Wouter de Geus.
This commit is contained in:
Boris Gulay
2016-05-30 01:41:50 +03:00
parent f7b650db3e
commit d93dd2be03
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ident_switch.php
View File

@@ -59,14 +59,25 @@ class ident_switch extends rcube_plugin
$rc = rcmail::get_instance(); $rc = rcmail::get_instance();
error_log('Template: ' . $args['template']); error_log('Template: ' . $args['template']);
// Currently selected identity
$iid = $_SESSION['iid' . $this->my_postfix];
$iid_int = 0;
if (is_int($iid))
$iid_int = $iid;
elseif ($iid === '-1')
$iid_int = -1;
elseif (ctype_digit($iid))
$iid_int = intval($iid);
// Get list of alternative accounts // Get list of alternative accounts
$sOpt = ''; $sOpt = '';
$sql = 'SELECT id, label, username FROM ' . $rc->db->table_name($this->table) . ' WHERE user_id = ? AND flags & ? > 0'; $sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name($this->table) . ' WHERE user_id = ? AND flags & ? > 0';
$q = $rc->db->query($sql, $rc->user->data['user_id'], $this->db_enabled); $q = $rc->db->query($sql, $rc->user->data['user_id'], $this->db_enabled);
while ($r = $rc->db->fetch_assoc($q)) while ($r = $rc->db->fetch_assoc($q))
{ {
$opts = array('value' => $r['id']); $opts = array('value' => $r['id']);
if (strcasecmp($_SESSION['username'], $r['username']) === 0) if ($iid_int == $r['iid'])
$opts['selected'] = 'selected'; $opts['selected'] = 'selected';
// Make label // Make label
@@ -91,7 +102,7 @@ class ident_switch extends rcube_plugin
{ {
// Add main account // Add main account
$opts = array('value' => -1); $opts = array('value' => -1);
if (strcasecmp($_SESSION['username'], $rc->user->data['username']) === 0) if (!$iid || $iid_int == -1)
$opts['selected'] = 'selected'; $opts['selected'] = 'selected';
$sOpt = html::tag( $sOpt = html::tag(