mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
More updates for the new accounts table
This commit is contained in:
parent
5f4b9d6a04
commit
dcceb352ce
@ -261,11 +261,9 @@ function validate_and_submit() {
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
// This will cause problems if there are more then 13 permissions.
|
$phpgw->db->query("select account_lid,account_lastname, account_firstname from accounts where "
|
||||||
// The permissions class needs to be updated to handle this.
|
. "account_status !='L' and account_lid != '" . $phpgw_info["user"]["userid"] . "' and "
|
||||||
$phpgw->db->query("select loginid, lastname, firstname from accounts where "
|
. "account_permissions like '%:calendar:%' order by account_lastname,account_firstname,account_lid");
|
||||||
. "status !='L' and loginid != '" . $phpgw_info["user"]["userid"] . "' and "
|
|
||||||
. "permissions like '%:calendar:%' order by lastname,firstname,loginid");
|
|
||||||
|
|
||||||
if ($phpgw->db->num_rows() > 50)
|
if ($phpgw->db->num_rows() > 50)
|
||||||
$size = 15;
|
$size = 15;
|
||||||
@ -279,14 +277,15 @@ function validate_and_submit() {
|
|||||||
|
|
||||||
while ($phpgw->db->next_record()) {
|
while ($phpgw->db->next_record()) {
|
||||||
echo "<option value=\"" . $phpgw->db->f("loginid") . "\"";
|
echo "<option value=\"" . $phpgw->db->f("loginid") . "\"";
|
||||||
if (($participants[$phpgw->db->f("loginid")]
|
if (($participants[$phpgw->db->f("account_lid")]
|
||||||
|| $phpgw->db->f("loginid") == $loginid))
|
|| $phpgw->db->f("account_lid") == $loginid))
|
||||||
echo " selected";
|
echo " selected";
|
||||||
|
|
||||||
if (! $phpgw->db->f("lastname"))
|
// Change this to use accounts->display_full_name()
|
||||||
echo ">" . $phpgw->db->f("loginid");
|
if (! $phpgw->db->f("account_lastname"))
|
||||||
|
echo ">" . $phpgw->db->f("account_loginid");
|
||||||
else
|
else
|
||||||
echo ">" . $phpgw->db->f("lastname") . ", " . $phpgw->db->f("firstname");
|
echo ">" . $phpgw->db->f("account_lastname") . ", " . $phpgw->db->f("account_firstname");
|
||||||
|
|
||||||
echo "</option>\n";
|
echo "</option>\n";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user