stuart: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.19, 1.20
cvs at intevation.de
cvs at intevation.de
Wed Sep 15 12:51:21 CEST 2004
Author: stuart
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv28505
Modified Files:
resmgr.php
Log Message:
- Changed the wording of the notifications that we send out
Fix for Issue387: Fixed the argument order for the setAnnotation call.
Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- resmgr.php 14 Sep 2004 22:09:36 -0000 1.19
+++ resmgr.php 15 Sep 2004 10:51:19 -0000 1.20
@@ -1,4 +1,4 @@
-#!/kolab/bin/php
+#!@l_prefix@/bin/php
<?php
// What myLog levels we can use
@@ -518,24 +518,24 @@
switch ($type) {
case RM_ITIP_DECLINE:
myLog("Sending DECLINE iTip reply to $organiser", RM_LOG_DEBUG);
- $message = $is_update ? sprintf(_("%s has declined the update to %s."), $resource, $summary) :
- sprintf(_("%s has declined the invitation to %s."), $resource, $summary);
+ $message = $is_update ? sprintf(_("%s has declined the update to the following event:\r\n\r\n%s"), $resource, $summary) :
+ sprintf(_("%s has declined the invitation to the following event:\r\n\r\n%s"), $resource, $summary);
$subject = 'Declined: ' . $summary;
$params['PARTSTAT'] = 'DECLINED';
break;
case RM_ITIP_ACCEPT:
myLog("Sending ACCEPT iTip reply to $organiser", RM_LOG_DEBUG);
- $message = $is_update ? sprintf(_("%s has accepted the update to %s."), $resource, $summary) :
- sprintf(_("%s has accepted the invitation to %s."), $resource, $summary);
+ $message = $is_update ? sprintf(_("%s has accepted the update to the following event:\r\n\r\n%s"), $resource, $summary) :
+ sprintf(_("%s has accepted the invitation to the following event:\r\n\r\n%s"), $resource, $summary);
$subject = 'Accepted: ' . $summary;
$params['PARTSTAT'] = 'ACCEPTED';
break;
case RM_ITIP_TENTATIVE:
myLog("Sending TENTATIVE iTip reply to $organiser", RM_LOG_DEBUG);
- $message = $is_update ? sprintf(_("%s has tentatively accepted the update to %s."), $resource, $summary) :
- sprintf(_("%s has tentatively accepted the invitation to %s."), $resource, $summary);
+ $message = $is_update ? sprintf(_("%s has tentatively accepted the update to the following event:\r\n\r\n%s"), $resource, $summary) :
+ sprintf(_("%s has tentatively accepted the invitation to the following event:\r\n\r\n%s"), $resource, $summary);
$subject = 'Tentative: ' . $summary;
$params['PARTSTAT'] = 'TENTATIVE';
break;
@@ -678,8 +678,9 @@
myLog('Unable to login with the Net_IMAP object: ' . $result->getMessage(),
RM_LOG_ERROR);
} else {
- $result = $net_imap->setAnnotation($cal_mbox, '/vendor/kolab/folder-type',
- array('value.shared' => 'event.default'));
+ $result = $net_imap->setAnnotation('/vendor/kolab/folder-type',
+ array('value.shared' => 'event.default'),
+ $cal_mbox);
if (is_a($result, 'PEAR_Error')) {
myLog("Unable to set the folder-type annotation on mailbox $mymailbox: "
. $result->getMessage(), RM_LOG_ERROR);
@@ -1036,11 +1037,11 @@
testIMAPError();
if (empty($deleted_messages)) {
myLog("Canceled event $uid is not present in $resource's calendar", RM_LOG_WARN);
- $body = sprintf(_("The canceled event %s is not present in %s's calendar."), $summary, $resource);
- $subject = sprintf(_("Error canceling event %s"), $summary);
+ $body = sprintf(_("The following event that was canceled is not present in %s's calendar:\r\n\r\n%s"), $resource, $summary);
+ $subject = sprintf(_("Error processing '%s'"), $summary);
} else {
- $body = sprintf(_("Event %s has been successfully removed from %s's calendar."), $summary, $resource);
- $subject = sprintf(_("Confirmation of cancellation of event %s"), $summary);
+ $body = sprintf(_("The following event has been successfully removed:\r\n\r\n%s"), $summary);
+ $subject = sprintf(_("%s has been cancelled"), $summary);
}
if (!is_array($deleted_messages)) {
More information about the commits
mailing list