Nicer invitation mails.

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index ef1369a..c9d9152 100644 (file)
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -581,8 +581,8 @@ abstract class Kronolith_Event
             }
 
             // Tags
-            $tags = implode(', ', $this->tags);
-            if (!empty($tags)) {
+            if ($this->tags) {
+                $tags = implode(', ', $this->tags);
                 $vEvent->setAttribute('CATEGORIES', $tags);
             }
 

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index bf9cf72..cb17a5a 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -2254,10 +2254,20 @@ class Kronolith
             return;
         }
 
+        // Generate image mime part first and only once, because we
+        // need the Content-ID.
+        $background = new Horde_Themes_Image('big_invitation.png');
+        $image = new Horde_Mime_Part();
+        $image->setType('image/png');
+        $image->setContents(file_get_contents($background->fs));
+        $image->setContentId();
+        $image->setDisposition('attachment');
+
         $share = $GLOBALS['kronolith_shares']->getShare($event->calendar);
         $view = new Horde_View(array('templatePath' => KRONOLITH_TEMPLATES . '/itip'));
         new Horde_View_Helper_Text($view);
         $view->event = $event;
+        $view->imageId = $image->getContentId();
 
         foreach ($event->attendees as $email => $status) {
             /* Don't bother sending an invitation/update if the recipient does
@@ -2346,12 +2356,19 @@ class Kronolith
             $bodyText->setType('text/plain');
             $bodyText->setCharset('UTF-8');
             $bodyText->setContents($view->render('notification.plain.php'));
+            $bodyText->setDisposition('inline');
             $multipart->addPart($bodyText);
             $bodyHtml = new Horde_Mime_Part();
             $bodyHtml->setType('text/html');
             $bodyHtml->setCharset('UTF-8');
             $bodyHtml->setContents($view->render('notification.html.php'));
-            $multipart->addPart($bodyHtml);
+            $bodyHtml->setDisposition('inline');
+            $related = new Horde_Mime_Part();
+            $related->setType('multipart/related');
+            $related->setContentTypeParameter('start', $bodyHtml->setContentId());
+            $related->addPart($bodyHtml);
+            $related->addPart($image);
+            $multipart->addPart($related);
             $multipart->addPart($ics);
             $recipient = empty($status['name']) ? $email : Horde_Mime_Address::trimAddress($status['name'] . ' <' . $email . '>');
             $mail = new Horde_Mime_Mail(array('subject' => $view->subject,

diff --git a/kronolith/templates/itip/notification.html.php b/kronolith/templates/itip/notification.html.php
index b0119b1..432dcc3 100644 (file)
--- a/kronolith/templates/itip/notification.html.php
+++ b/kronolith/templates/itip/notification.html.php
@@ -1,47 +1,76 @@
-<h3><?php echo $this->h($this->header) ?></h3>
-
-<table style="border-collapse:collapse;border:1px solid #000" border="1">
-  <thead><tr>
-    <th colspan="2" style="font-weight:bold;font-size:120%;background-color:#ddd"><?php echo $this->h($this->event->getTitle()) ?></th>
-  </tr></thead>
-  <tbody>
-    <tr>
-      <td style="font-weight:bold;vertical-align:top"><?php echo _("Start:") ?></td>
-      <td><?php echo $this->h($this->event->start->strftime('%x %X')) ?></td>
-    </tr>
-    <tr>
-      <td style="font-weight:bold;vertical-align:top"><?php echo _("End:") ?></td>
-      <td><?php echo $this->h($this->event->end->strftime('%x %X')) ?></td>
-    </tr>
-    <?php if (strlen($this->event->location)): ?>
-    <tr>
-      <td style="font-weight:bold;vertical-align:top"><?php echo _("Location:") ?></td>
-      <td><?php echo $this->h($this->event->location) ?></td>
-    </tr>
-    <?php endif; ?>
-    <?php if (strlen($this->event->description)): ?>
-    <tr>
-      <td style="font-weight:bold;vertical-align:top"><?php echo _("Description:") ?></td>
-         <td><?php echo $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($this->event->description, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'callback' => null)) ?></td>
-    </tr>
-    <?php endif; ?>
-    <?php if ($this->attendees): ?>
-    <tr>
-      <td style="font-weight:bold;vertical-align:top"><?php echo _("Attendees:") ?></td>
-      <td>
-        <?php foreach ($this->attendees as $attendee): ?>
-        <?php if (strpos('@', $attendee) === false): ?>
-        <?php echo $attendee ?><br />
-        <?php else: ?>
-        <a href="mailto:<?php echo $attendee ?>"><?php echo $attendee ?></a><br />
-        <?php endif; ?>
-        <?php endforeach; ?>
-      </td>
-    </tr>
-    <?php endif; ?>
-  </tbody>
-</table>
-
-<p><?php echo _("Attached is an iCalendar file with more information about the event. If your mail client supports iTip requests you can use this file to easily update your local copy of the event.") ?></p>
-
-<p><?php printf(_("If your email client doesn't support iTip requests you can use the following links to: %saccept%s, %saccept tentatively%s or %sdecline%s the event."), '<strong><a href="' . htmlspecialchars($this->linkAccept) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkTentative) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkDecline) . '">', '</a></strong>') ?></p>
+<p><font size="4"><strong><?php echo $this->h($this->header) ?></strong></font></p>
+<table width="100%" border="0" cellspacing="0" cellpadding="0"><tr>
+  <td width="140" valign="top">
+    <img src="cid:<?php echo $this->imageId ?>" />
+  </td>
+  <td valign="top">
+    <table width="100%" border="0" cellpadding="5" cellspacing="0">
+      <thead><tr>
+        <th colspan="3" align="left"><font size="3"><strong><?php echo $this->h($this->event->getTitle()) ?></strong></font></th>
+      </tr></thead>
+      <tbody>
+        <?php $i = 1 ?>
+
+        <tr<?php if ($i++ % 2) echo ' bgcolor="#f1f1f1"' ?>>
+          <td nowrap="nowrap" align="right">
+            <font size="2"><strong><?php echo _("Start:") ?></strong></font>
+          </td>
+          <td width="5">&nbsp;</td>
+          <td width="100%"><font size="2"><strong><?php echo $this->event->start->strftime('%x %X') ?></strong></font></td>
+        </tr>
+        <tr<?php if ($i++ % 2) echo ' bgcolor="#f1f1f1"' ?>>
+          <td nowrap="nowrap" align="right">
+            <font size="2"><strong><?php echo _("End:") ?></strong></font>
+          </td>
+          <td width="5">&nbsp;</td>
+          <td width="100%"><font size="2"><strong><?php echo $this->event->end->strftime('%x %X') ?></strong></font></td>
+        </tr>
+        <?php if (strlen($this->event->location)): ?>
+
+        <tr<?php if ($i++ % 2) echo ' bgcolor="#f1f1f1"' ?>>
+          <td nowrap="nowrap" align="right">
+            <font size="2"><strong><?php echo _("Location:") ?></strong></font>
+          </td>
+          <td width="5">&nbsp;</td>
+          <td width="100%"><font size="2"><strong><?php echo $this->h($this->event->location) ?></strong></font></td>
+        </tr>
+        <?php endif ?>
+        <?php if ($this->attendees): ?>
+
+        <tr<?php if ($i++ % 2) echo ' bgcolor="#f1f1f1"' ?>>
+          <td nowrap="nowrap" align="right" valign="top">
+            <font size="2"><strong><?php echo _("Attendees:") ?></strong></font>
+          </td>
+          <td width="5">&nbsp;</td>
+          <td width="100%"><font size="2"><strong>
+            <?php foreach ($this->attendees as $attendee): ?>
+            <?php if (strpos('@', $attendee) === false): ?>
+            <?php echo $this->h($attendee) ?><br />
+            <?php else: ?>
+            <a href="mailto:<?php echo $attendee ?>"><?php echo $this->h($attendee) ?></a><br />
+            <?php endif; ?>
+            <?php endforeach; ?>
+
+          </strong></font></td>
+        </tr>
+        <?php endif ?>
+
+        <?php if (strlen($this->event->description)): ?>
+
+        <tr<?php if ($i++ % 2) echo ' bgcolor="#f1f1f1"' ?>>
+          <td nowrap="nowrap" align="right" valign="top">
+            <font size="2"><strong><?php echo _("Description:") ?></strong></font>
+          </td>
+          <td width="5">&nbsp;</td>
+          <td width="100%"><font size="2"><strong><?php echo $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($this->event->description, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'callback' => null)) ?></strong></font></td>
+        </tr>
+        <?php endif ?>
+
+      </tbody>
+    </table>
+  </td>
+</tr></table>
+
+<p><font size="2"><?php echo _("Attached is an iCalendar file with more information about the event. If your mail client supports iTip requests you can use this file to easily update your local copy of the event.") ?></font></p>
+
+<p><font size="2"><?php printf(_("If your email client doesn't support iTip requests you can use the following links to: %saccept%s, %saccept tentatively%s or %sdecline%s the event."), '<strong><a href="' . htmlspecialchars($this->linkAccept) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkTentative) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkDecline) . '">', '</a></strong>') ?></font></p>

diff --git a/kronolith/templates/view/view.inc b/kronolith/templates/view/view.inc
index 35a4cf6..4d948a3 100644 (file)
--- a/kronolith/templates/view/view.inc
+++ b/kronolith/templates/view/view.inc
@@ -172,7 +172,7 @@ if ($this->event->initialized && $this->event->alarm > 0):
  </tr>
  <?php $link_emails = $GLOBALS['registry']->hasMethod('mail/compose'); foreach ($attendees as $email => $status): $full = empty($status['name']) ? $email : Horde_Mime_Address::trimAddress($status['name'] . (strpos($email, '@') === false ? '' : ' <' . $email . '>')) ?>
  <tr>
-  <td class="nowrap"><?php echo ($link_emails && strpos($email, '@') !== false) ? (Horde::url($GLOBALS['registry']->call('mail/compose', array(array('to' => $full))))->link(array('title' => sprintf(_("Send an email to %s"), empty($status['name']) ? $email : $status['name']))) . htmlspecialchars($full) . '</a>') : htmlspecialchars($full) ?></td>
+  <td class="nowrap"><?php echo ($link_emails && strpos($email, '@') !== false) ? ($GLOBALS['registry']->call('mail/compose', array(array('to' => $full)))->link(array('title' => sprintf(_("Send an email to %s"), empty($status['name']) ? $email : $status['name']))) . htmlspecialchars($full) . '</a>') : htmlspecialchars($full) ?></td>
   <td><?php echo Kronolith::partToString($status['attendance']) ?></td>
   <td><?php echo Kronolith::responseToString($status['response']) ?></td>
  </tr>

diff --git a/kronolith/themes/graphics/big_invitation.png b/kronolith/themes/graphics/big_invitation.png
new file mode 100644 (file)
index 0000000..c6d7606
Binary files /dev/null and b/kronolith/themes/graphics/big_invitation.png differ