From 679d9841f34df00cb3723f4003a39b3973878584 Mon Sep 17 00:00:00 2001
From: jengo <jengo@alumni.egroupware.org>
Date: Wed, 4 Oct 2000 21:30:53 +0000
Subject: [PATCH] Added in common->display_fullname()

---
 calendar/edit_entry.php         | 9 +++------
 calendar/edit_entry_handler.php | 8 +++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index fd8d12b0c9..77f1568701 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -277,12 +277,9 @@ function validate_and_submit() {
     if ($participants[$phpgw->db->f("account_lid")])
        echo " selected";
 
-    // Change this to use accounts->display_full_name()
-    if (! $phpgw->db->f("account_lastname"))
-       echo ">" . $phpgw->db->f("account_loginid");
-    else
-       echo ">" . $phpgw->db->f("account_lastname") . ", " . $phpgw->db->f("account_firstname");
-
+    echo ">" . $phpgw->common->display_fullname($phpgw->db->f("account_lid"),
+    											$phpgw->db->f("account_firstname"),
+    											$phpgw->db->f("account_lastname"));
     echo "</option>\n";
   }
 
diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index 1a5422f239..9a83d58cdb 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -165,7 +165,6 @@ if (! $error) {
   $phpgw->db->query("SELECT MAX(cal_id) FROM webcal_entry");
   $phpgw->db->next_record();
   $id = $phpgw->db->f(0);
-
   
   while ($participant = each($participants)) {
       $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,"
-	         . "cal_end,cal_days,cal_frequency) values($id,'$rpt_type',"
-	         . "$end,'$days',$freq)");
+	                 . "cal_end,cal_days,cal_frequency) values($id,'$rpt_type',"
+	                 . "$end,'$days',$freq)");
   }
   $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"));
@@ -215,7 +214,6 @@ $phpgw->common->phpgw_header();
 <?php
   $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))); ?>
-
 ?>
 
 <UL>