YunoHost-Apps/z-push_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/z-push_ynh.git synced 2024-09-03 18:05:58 +02:00
Code Issues Activity Actions

Update to latest sources

Browse source
This commit is contained in:
polytan02 2015-08-14 17:15:16 +01:00
parent 2b1360cf93
commit 3c87adeda5
5 changed files with 54 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sources/INSTALL_UPDATE_FROM_GIT Normal file
View file

@ -0,0 +1,21 @@
Installing and updating from GIT can be time consuming, because we will have conflicts
with the config.php files.
Until upstream finds a good solution we can use this trick:
Setup
Clone the repository to your web server
git checkout -b config to create the new config branch with the local configuration
Updating
Backup the local repository (or even better: also do this on a non-live copy)
git checkout master
git pull origin master to update the local master branch
git checkout config
git rebase master to rebase the offline config branch
Solve the conflicts (which will occur if the configuration files have been changed in the master)
Instructions provided by Martin Porcheron (@mporcheron)

9
sources/backend/zarafa/mapiprovider.php
View file

@ -792,6 +792,15 @@ class MAPIProvider {
$message->lastverbexecuted = Utils::GetLastVerbExecuted($message->lastverbexecuted);
}
// OL 2013 doesn't show sender and subject for signed emails because the headers are missing
if(isset($message->messageclass) && strpos($message->messageclass, "IPM.Note.SMIME.MultipartSigned") === 0 &&
isset($message->asbody->type) && $message->asbody->type == SYNC_BODYPREFERENCE_MIME) {
ZLog::Write(LOGLEVEL_DEBUG, "Attach the transport message headers to a signed message");
$transportHeaders = array(PR_TRANSPORT_MESSAGE_HEADERS_W);
$messageHeaders = $this->getProps($mapimessage, $transportHeaders);
$message->asbody->data = $messageHeaders[PR_TRANSPORT_MESSAGE_HEADERS] ."\r\n\r\n" . $message->asbody->data;
}
return $message;
}

22
sources/lib/core/synccollections.php
View file

@ -506,15 +506,19 @@ class SyncCollections implements Iterator {
$validNotifications = false;
foreach ($notifications as $folderid) {
// check if the notification on the folder is within our filter
if ($this->CountChange($folderid)) {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s'", $folderid));
$validNotifications = true;
$this->waitingTime = time()-$started;
}
else {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s', but it is not relevant", $folderid));
}
// ZP-631 - temporary disable checking validity of notifications
// notify mobile for all received notifications
$this->changes[$folderid] = 1;
$validNotifications = true;
// // check if the notification on the folder is within our filter
// if ($this->CountChange($folderid)) {
// ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s'", $folderid));
// $validNotifications = true;
// $this->waitingTime = time()-$started;
// }
// else {
// ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s', but it is not relevant", $folderid));
// }
}
if ($validNotifications)
return true;

10
sources/lib/wbxml/wbxmldecoder.php
View file

@ -233,6 +233,16 @@ class WBXMLDecoder extends WBXMLDefs {
return $this->isWBXML;
}
/**
* Reads the remaning data from the input stream
*
* @access public
* @return void
*/
public function readRemainingData() {
ZLog::Write(LOGLEVEL_DEBUG, "WBXMLDecoder->readRemainingData() reading remaining data from input stream");
while ($this->getElement());
}
/**
* Returns the WBXML data read from the stream

2
sources/version.php
View file

@ -42,4 +42,4 @@
************************************************/
define("ZPUSH_VERSION", "SVN-trunk-r1975");
define("ZPUSH_VERSION", "SVN-trunk-r1981");