From 75d4229fd93d00505dbac8a19e37337bf96729e4 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 15 Feb 2010 17:45:33 +0100
Subject: [PATCH] The attendees list in the session is the correct source.

---
 kronolith/attendees.php                     | 2 +-
 kronolith/templates/attendees/attendees.inc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kronolith/attendees.php b/kronolith/attendees.php
index 4fdab08fb..398c73949 100644
--- a/kronolith/attendees.php
+++ b/kronolith/attendees.php
@@ -214,7 +214,7 @@ try {
 }
 
 // Add the Free/Busy information for each attendee.
-foreach ($attendees as $email => $status) {
+foreach ($_SESSION['kronolith']['attendees'] as $email => $status) {
     if (strpos($email, '@') !== false &&
         ($status['attendance'] == Kronolith::PART_REQUIRED ||
          $status['attendance'] == Kronolith::PART_OPTIONAL)) {
diff --git a/kronolith/templates/attendees/attendees.inc b/kronolith/templates/attendees/attendees.inc
index 3b89c6d45..98e4cb73b 100644
--- a/kronolith/templates/attendees/attendees.inc
+++ b/kronolith/templates/attendees/attendees.inc
@@ -51,9 +51,9 @@ function switchDateView(view, date)
 </tr>
 
 <!-- attendees -->
-<?php $i = 0; if (empty($attendees)): ?>
+<?php $i = 0; if (empty($_SESSION['kronolith']['attendees'])): ?>
  <tr><td colspan="4"><em><?php echo _("No attendees") ?></em></td></tr>
-<?php else: foreach ($attendees as $email => $status): ?>
+<?php else: foreach ($_SESSION['kronolith']['attendees'] as $email => $status): ?>
  <tr>
   <td class="nowrap"><?php $name = strpos($email, '@') === false ? $status['name'] : $email; echo Horde::url('#')->link(array('title' => sprintf(_("Remove %s"), $name), 'onclick' => "performAction('remove', decodeURIComponent('" . rawurlencode($email) . "')); return false;")) . Horde::img('delete.png', '', null, $registry->getImageDir('horde')) . '</a> ' . Horde::url('#')->link(array('title' => sprintf(_("Edit %s"), $name), 'onclick' => "performAction('edit', decodeURIComponent('" . rawurlencode($email) . "')); return false;")) . Horde::img('edit.png', '', null, $registry->getImageDir('horde')) . '</a>' ?></td>
   <td><?php echo htmlspecialchars(empty($status['name']) ? $email : Horde_Mime_Address::trimAddress($status['name'] . (strpos($email, '@') === false ? '' : ' <' . $email . '>'))) ?></td>
@@ -147,7 +147,7 @@ function switchDateView(view, date)
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
- <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all")) ?>" /><?php endif; ?>
+ <?php if (!empty($_SESSION['kronolith']['attendees'])): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all")) ?>" /><?php endif; ?>
 </div>
 
 <br />
-- 
2.11.0