gunnar: server/patches/horde/3.2-rc3/mnemo HK-GW-Config_mnemo-3.2-rc3.patch, NONE, 1.1 HK-GW-Syncml_support_mnemo-3.2-rc3.patch, NONE, 1.1
cvs at kolab.org
cvs at kolab.org
Thu Mar 13 16:37:28 CET 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde/3.2-rc3/mnemo
In directory doto:/tmp/cvs-serv17251/mnemo
Added Files:
HK-GW-Config_mnemo-3.2-rc3.patch
HK-GW-Syncml_support_mnemo-3.2-rc3.patch
Log Message:
Horde patches for horde-3.2-rc3
--- NEW FILE: HK-GW-Config_mnemo-3.2-rc3.patch ---
diff -r 3eafb3ec364b mnemo/config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mnemo/config/conf.php Thu Mar 13 14:16:24 2008 +0100
@@ -0,0 +1,9 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: mnemo/config/conf.xml,v 1.17.10.1 2007/12/20 14:17:38 jan Exp $
+$conf['storage']['driver'] = 'kolab';
+$conf['utils']['gnupg'] = '/usr/bin/gpg';
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: HK-GW-Syncml_support_mnemo-3.2-rc3.patch ---
diff -r 3bdd07983ef2 mnemo/lib/Driver/kolab.php
--- a/mnemo/lib/Driver/kolab.php Thu Mar 13 13:27:42 2008 +0100
+++ b/mnemo/lib/Driver/kolab.php Thu Mar 13 13:28:10 2008 +0100
@@ -596,9 +596,11 @@ class Mnemo_Driver_kolab_wrapper_new ext
if (empty($uid)) {
$note_uid = $this->_store->generateUID();
$old_uid = null;
+ $action = array('action' => 'add');
} else {
list($note_uid, $notepad) = $this->_splitId($uid);
$old_uid = $note_uid;
+ $action = array('action' => 'modify');
}
if ($passphrase) {
@@ -618,6 +620,10 @@ class Mnemo_Driver_kolab_wrapper_new ext
if (is_a($result, 'PEAR_Error')) {
return $result;
}
+
+ /* Log the action in the history log. */
+ $history = &Horde_History::singleton();
+ $history->log('mnemo:' . $this->_notepad . ':' . $this->_uniqueId($note_uid), $action, true);
return $this->_uniqueId($note_uid);
}
@@ -685,7 +691,15 @@ class Mnemo_Driver_kolab_wrapper_new ext
{
list($noteId, $notepad) = $this->_splitId($noteId);
- return $this->_store->delete($noteId);
+ $result = $this->_store->delete($noteId);
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
+ }
+
+ $history = &Horde_History::singleton();
+ $history->log('mnemo:' . $this->_notepad . ':' . $this->_uniqueId($noteId), array('action' => 'delete'), true);
+
+ return $result;
}
/**
More information about the commits
mailing list