extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added in common->display_fullname()

Browse Source
This commit is contained in:
jengo 2000-10-04 21:30:53 +00:00
parent 622f01935d
commit 679d9841f3
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/edit_entry.php
View File

@ -277,12 +277,9 @@ function validate_and_submit() {
if ($participants[$phpgw->db->f("account_lid")]) if ($participants[$phpgw->db->f("account_lid")])
echo " selected"; echo " selected";
// Change this to use accounts->display_full_name() echo ">" . $phpgw->common->display_fullname($phpgw->db->f("account_lid"),
if (! $phpgw->db->f("account_lastname")) $phpgw->db->f("account_firstname"),
echo ">" . $phpgw->db->f("account_loginid"); $phpgw->db->f("account_lastname"));
else
echo ">" . $phpgw->db->f("account_lastname") . ", " . $phpgw->db->f("account_firstname");
echo "</option>\n"; echo "</option>\n";
} }

8
calendar/edit_entry_handler.php
View File

@ -165,7 +165,6 @@ if (! $error) {
$phpgw->db->query("SELECT MAX(cal_id) FROM webcal_entry"); $phpgw->db->query("SELECT MAX(cal_id) FROM webcal_entry");
$phpgw->db->next_record(); $phpgw->db->next_record();
$id = $phpgw->db->f(0); $id = $phpgw->db->f(0);
while ($participant = each($participants)) { while ($participant = each($participants)) {
$phpgw->db->query("INSERT INTO webcal_entry_user (cal_id,cal_login,cal_status ) " $phpgw->db->query("INSERT INTO webcal_entry_user (cal_id,cal_login,cal_status ) "
@ -196,11 +195,11 @@ if (! $error) {
} }
$phpgw->db->query("insert into webcal_entry_repeats (cal_id,cal_type," $phpgw->db->query("insert into webcal_entry_repeats (cal_id,cal_type,"
. "cal_end,cal_days,cal_frequency) values($id,'$rpt_type'," . "cal_end,cal_days,cal_frequency) values($id,'$rpt_type',"
. "$end,'$days',$freq)"); . "$end,'$days',$freq)");
} }
$phpgw->db->query("insert into webcal_entry_groups values ($id,'" $phpgw->db->query("insert into webcal_entry_groups values ($id,'"
. $phpgw->accounts->array_to_string($access,$n_groups) . "') "); . $phpgw->accounts->array_to_string($access,$n_groups) . "') ");
Header("Location: ".$phpgw->link("index.php","year=$year&month=$month&cd=14")); Header("Location: ".$phpgw->link("index.php","year=$year&month=$month&cd=14"));
@ -215,7 +214,6 @@ $phpgw->common->phpgw_header();
<?php <?php
$time = sprintf("%d:%02d",$hour,$minute); $time = sprintf("%d:%02d",$hour,$minute);
echo lang("Your suggested time of <B> x - x </B> conflicts with the following existing calendar entries:", display_time($time),display_time(add_duration($time,$duration))); ?> echo lang("Your suggested time of <B> x - x </B> conflicts with the following existing calendar entries:", display_time($time),display_time(add_duration($time,$duration))); ?>
?> ?>
<UL> <UL>