steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.1, 1.2 misc.php, 1.1, 1.2 resmgr.php, 1.48, 1.49 smtp.php, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Fri Nov 5 12:11:03 CET 2004
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv16684/kolab-resource-handlers/resmgr
Modified Files:
kolabfilter.php misc.php resmgr.php smtp.php
Log Message:
cleanup and (C)-notice
Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabfilter.php 4 Nov 2004 12:31:07 -0000 1.1
+++ kolabfilter.php 5 Nov 2004 11:11:01 -0000 1.2
@@ -1,5 +1,24 @@
#!@l_prefix@/bin/php
<?php
+/*
+ * Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *
+ * Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
require_once 'PEAR.php';
require_once 'kolabfilter/misc.php';
require_once 'kolabfilter/smtp.php';
Index: misc.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- misc.php 4 Nov 2004 12:31:07 -0000 1.1
+++ misc.php 5 Nov 2004 11:11:01 -0000 1.2
@@ -1,4 +1,23 @@
<?php
+/*
+ * Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *
+ * Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
// What myLog levels we can use
define('RM_LOG_SUPER', -1);
define('RM_LOG_SILENT', 0);
Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- resmgr.php 4 Nov 2004 12:31:07 -0000 1.48
+++ resmgr.php 5 Nov 2004 11:11:01 -0000 1.49
@@ -1,5 +1,24 @@
#!@l_prefix@/bin/php
<?php
+/*
+ * Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *
+ * Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
require_once 'kolabfilter/misc.php';
// What actions we can take when receiving an event request
@@ -648,19 +667,6 @@
return $imap;
}
-function imapAppend($text)
-{
- global $imap, $calmbox;
-
- myLog("Appending to $calmbox", RM_LOG_DEBUG);
-
- $rc = $imap->appendMessage($text);
- if( PEAR::isError( $rc ) ) {
- myLog("Failed to append message: ".$rc->getMessage(), RM_LOG_ERROR);
- return false;
- } else return true;
-}
-
function iCalDate2Kolab($ical_date)
{
// $ical_date should be a timestamp
@@ -966,7 +972,7 @@
// Get out as early as possible if manual
if( $params['action'] == RM_ACT_MANUAL ) {
- myLog("Passing through $method method to $resource");
+ myLog("Passing through message to $resource");
return;
}
@@ -1102,7 +1108,7 @@
//myLog("Conflict detected; tentatively accepting");
//sendITipReply(RM_ITIP_TENTATIVE);
myLog("Conflict detected; Passing mail through");
- break;
+ return;
} else if ($params['action'] == RM_ACT_REJECT_IF_CONFLICTS) {
myLog("Conflict detected; rejecting");
sendITipReply($resource,$itip,RM_ITIP_DECLINE);
@@ -1152,7 +1158,7 @@
$message->toString(false)
);
- myLog("Appending message to $mcalbox", RM_LOG_DEBUG);
+ myLog("Appending message to $calmbox", RM_LOG_DEBUG);
$rc = $imap->appendMessage($message);
if( PEAR::isError($rc) ) {
myLog("Error appending message: ".$rc->getMessage(), RM_LOG_ERROR);
Index: smtp.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/smtp.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smtp.php 4 Nov 2004 12:31:07 -0000 1.1
+++ smtp.php 5 Nov 2004 11:11:01 -0000 1.2
@@ -1,4 +1,22 @@
<?php
+/*
+ * Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *
+ * Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You can view the GNU General Public License, online, at the GNU
+ * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
class KolabSMTP {
function KolabSMTP( $host, $port ) {
More information about the commits
mailing list