From 0490cf02347083dd143269ee528894254fa522a9 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Thu, 2 Dec 2010 19:27:33 +0100 Subject: [PATCH] Build multipart message when sending notifications about shared calendars. --- kronolith/config/hooks.php.dist | 36 ------------------- kronolith/lib/Kronolith.php | 43 +++++++---------------- kronolith/templates/share/notification.html.php | 23 ++++++++++++ kronolith/templates/share/notification.plain.php | 10 ++++++ kronolith/themes/default/graphics/big_share.png | Bin 0 -> 3218 bytes 5 files changed, 46 insertions(+), 66 deletions(-) create mode 100644 kronolith/templates/share/notification.html.php create mode 100644 kronolith/templates/share/notification.plain.php create mode 100644 kronolith/themes/default/graphics/big_share.png diff --git a/kronolith/config/hooks.php.dist b/kronolith/config/hooks.php.dist index a6b01f872..53d6cfb9b 100644 --- a/kronolith/config/hooks.php.dist +++ b/kronolith/config/hooks.php.dist @@ -31,40 +31,4 @@ class Kronolith_Hooks // // throw new Horde_Exception('Unknown action'); // } - - /** - * Generates the e-mail notification message when the share owner changes. - * - * @param string $user The new owner. - * @param Horde_Share $share A calendar or tasklist. - */ -// public function shareOwnerNotification($user, Horde_Share $share) -// { -// return 'Some fancy text including the ' . $user . ' and the ' . $share->get('name'); -// } - - /** - * Generates the e-mail notification message when the share permissions - * change. - * - * @param string $user A user who has been added to the permissions. - * @param Horde_Share $share A calendar or tasklist. - */ -// public function shareUserNotification($user, Horde_Share $share) -// { -// return 'Some fancy text including the ' . $user . ' and the ' . $share->get('name'); -// } - - /** - * Generates the e-mail notification message when the share permissions - * change. - * - * @param mixed $group The id of a group that has been added to the - * permissions. - * @param Horde_Share $share A calendar or tasklist. - */ -// public function shareGroupNotification($group, Horde_Share $share) -// { -// return 'Some fancy text including the ' . $group . ' and the ' . $share->get('name'); -// } } diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 227599a7e..e659ae874 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -1735,12 +1735,21 @@ class Kronolith $identity = $GLOBALS['injector'] ->getInstance('Horde_Core_Factory_Identity') ->create(); - $userName = $identity->getName(); $mail = new Horde_Mime_Mail( array('from' => $identity->getDefaultFromAddress(true), 'charset' => 'UTF-8') ); $mail->addHeader('User-Agent', 'Kronolith ' . $GLOBALS['registry']->getVersion()); + $image = self::getImagePart('big_share.png'); + $view = new Horde_View(array('templatePath' => KRONOLITH_TEMPLATES . '/share')); + new Horde_View_Helper_Text($view); + $view->user = $identity->getName(); + $view->calendar = $share->get('name'); + $view->imageId = $image->getContentId(); + if ($GLOBALS['conf']['share']['hidden']) { + $view->subscribe = Horde::url('calendars/subscribe.php', true)->add('calendar', $share->getName()); + } + $multipart = Kronolith::buildMimeMessage($view, 'notification', $image); } // Process owner and owner permissions. @@ -1764,7 +1773,7 @@ class Kronolith $message = Horde::callHook('shareOwnerNotification', array($new_owner, $share)); } catch (Horde_Exception_HookNotSet $e) { $message = sprintf(_("%s has assigned the ownership of \"%s\" to you"), - $userName, + $view->user, $share->get('name')); } $mail->addHeader('Subject', _("Ownership assignment")); @@ -1859,15 +1868,6 @@ class Kronolith $perm->removeCreatorPermission(Kronolith::PERMS_DELEGATE, false); } - // Build subscription link if necessary. - $subscription = $sublink = ''; - if ($GLOBALS['conf']['share']['hidden']) { - $sublink = Horde::url('calendars/subscribe.php', true)->add('calendar', $share->getName()); - $subscription = "\n" - . _("To subscribe to this calendar, you need to click the following link:") - . ' ' . $sublink; - } - // Process user permissions. $u_names = Horde_Util::getFormData('u_names'); $u_show = Horde_Util::getFormData('u_show'); @@ -1924,16 +1924,8 @@ class Kronolith ->getInstance('Horde_Core_Factory_Identity') ->create($user) ->getDefaultFromAddress(true); - try { - $message = Horde::callHook('shareUserNotification', array($user, $share, $sublink)); - } catch (Horde_Exception_HookNotSet $e) { - $message = sprintf(_("%s has given you access to \"%s\"."), - $userName, - $share->get('name')) - . $subscription; - } $mail->addHeader('To', $to, 'UTF-8', false); - $mail->setBody($message, 'UTF-8'); + $mail->setBasePart($multipart); $mail->send($GLOBALS['injector']->getInstance('Horde_Mail')); } } @@ -1980,17 +1972,8 @@ class Kronolith !isset($current[$group]) && $has_perms) { $groupOb = $GLOBALS['injector']->getInstance('Horde_Group')->getGroupById($group); if (!empty($groupOb->data['email'])) { - try { - $message = Horde::callHook('shareGroupNotification', array($group, $share, $sublink)); - } catch (Horde_Exception_HookNotSet $e) { - $message = sprintf(_("%s has given your group \"%s\" access to \"%s\"."), - $userName, - $groupOb->getName(), - $share->get('name')) - . $subscription; - } $mail->addHeader('To', $groupOb->getName() . ' <' . $groupOb->data['email'] . '>', 'UTF-8', false); - $mail->setBody($message, 'UTF-8'); + $mail->setBasePart($multipart); $mail->send($GLOBALS['injector']->getInstance('Horde_Mail')); } } diff --git a/kronolith/templates/share/notification.html.php b/kronolith/templates/share/notification.html.php new file mode 100644 index 000000000..951331030 --- /dev/null +++ b/kronolith/templates/share/notification.html.php @@ -0,0 +1,23 @@ +

h($this->user), $this->h($this->calendar)) ?>

+ + + + +
+ + + + + + +
+ + ' . $this->h($this->user) . '', '' . $this->h($this->calendar) . '') ?> + subscribe): ?> + +

+ h($this->subscribe) ?> + + +
+
diff --git a/kronolith/templates/share/notification.plain.php b/kronolith/templates/share/notification.plain.php new file mode 100644 index 000000000..dbd942462 --- /dev/null +++ b/kronolith/templates/share/notification.plain.php @@ -0,0 +1,10 @@ +user, $this->calendar) ?> + + +user, $this->calendar) ?> +subscribe): ?> + + + +subscribe ?> + diff --git a/kronolith/themes/default/graphics/big_share.png b/kronolith/themes/default/graphics/big_share.png new file mode 100644 index 0000000000000000000000000000000000000000..02652ca4f4a3ed2b4b41dc2296705bfa12a519fd GIT binary patch literal 3218 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 Ef|PZATmS$7 literal 0 HcmV?d00001 -- 2.11.0