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

ender account selector in a modern way

Browse Source
This commit is contained in:
Boris Gulay
2020-06-01 16:50:15 +03:00
parent 072ef65fdf
commit 2e09a92bc3
1 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ident_switch.php
View File

@@ -106,16 +106,19 @@ class ident_switch extends rcube_plugin
$iid = -1; $iid = -1;
elseif (ctype_digit($iid_s)) elseif (ctype_digit($iid_s))
$iid = intval($iid_s); $iid = intval($iid_s);
$accNames = array($_SESSION['global_alias'] ? $_SESSION['global_alias'] : $rc->user->data['username']);
$accValues = array(-1);
$accSelected = -1;
// Get list of alternative accounts // Get list of alternative accounts
$sOpt = '';
$sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE user_id = ? AND flags & ? > 0'; $sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE user_id = ? AND flags & ? > 0';
$qRec = $rc->db->query($sql, $rc->user->data['user_id'], self::DB_ENABLED); $qRec = $rc->db->query($sql, $rc->user->data['user_id'], self::DB_ENABLED);
while ($r = $rc->db->fetch_assoc($qRec)) while ($r = $rc->db->fetch_assoc($qRec))
{ {
$opts = array('value' => $r['id']); $accValues[] = $r['id'];
if ($iid == $r['iid']) if ($iid == $r['iid'])
$opts['selected'] = 'selected'; $accSelected = $r['id'];
// Make label // Make label
$lbl = $r['label']; $lbl = $r['label'];
@@ -135,39 +138,21 @@ class ident_switch extends rcube_plugin
else else
$lbl = $r['username']; $lbl = $r['username'];
} }
$accNames[] = rcube::Q($lbl);
$sOpt .= html::tag(
'option',
$opts,
rcube::Q($lbl)
);
} }
// Render UI if user has extra accounts // Render UI if user has extra accounts
if (!empty($sOpt)) if (count($accValues) > 1)
{ {
// Add main account
$opts = array('value' => -1);
if ($iid <= 0)
$opts['selected'] = 'selected';
$sOpt = html::tag(
'option',
$opts,
$_SESSION['global_alias'] ? $_SESSION['global_alias'] : $rc->user->data['username']
) . $sOpt;
$this->include_script('ident_switch-switch.js'); $this->include_script('ident_switch-switch.js');
$sw = html::tag(
'select', $select = new html_select(array(
array( 'id' => 'plugin-ident_switch-account',
'id' => 'plugin-ident_switch-account', 'style' => 'display: none; padding: 0;',
'style' => 'display: none; padding: 0;', 'onchange' => 'plugin_switchIdent_switch(this.value);',
'onchange' => 'plugin_switchIdent_switch(this.value);', ));
), $select->add($accNames, $accValues);
$sOpt $rc->output->add_footer($select->show(array($accSelected)));
);
$rc->output->add_footer($sw);
} }
} }