Projects
Kolab:3.4:Updates
kolab-syncroton
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 52
View file
kolab-syncroton.spec
Changed
@@ -28,7 +28,7 @@ Name: kolab-syncroton Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ActiveSync for Kolab Groupware Group: Applications/Internet @@ -39,6 +39,8 @@ Source1: kolab-syncroton.logrotate +Patch1: kolab-syncroton-2.2.5-fix-from-header.patch + BuildArch: noarch # Use this build requirement to make sure we are using @@ -72,6 +74,8 @@ %prep %setup -q -n %{name}-%{version} +%patch1 -p1 + rm -rf \ lib/ext/Auth/ \ lib/ext/MDB2/ \ @@ -199,6 +203,9 @@ %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog +* Tue Apr 8 2014 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.2.5-2 +- Include fix for From: header off iOS devices + * Sun Apr 6 2014 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.2.5-1 - New upstream version - #2664 - Fix for devices that do not support empty Sync responses
View file
kolab-syncroton-2.2.5-fix-from-header.patch
Added
@@ -0,0 +1,47 @@ +commit b2c0912d038584ef92267023045b7c72f74f5517 +Author: Aleksander Machniak <alec@alec.pl> +Date: Mon Feb 3 12:49:22 2014 +0100 + + Added option (activesync_fix_from) to enables adding sender name into the From: header + of send email when a device uses email address only (e.g. iOS devices) + $config['activesync_fix_from'] = false + +diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist +index 2ebe75d..c792377 100644 +--- a/config/main.inc.php.dist ++++ b/config/main.inc.php.dist +@@ -79,3 +79,7 @@ $config['activesync_quiet_time'] = 180; + // 16 - all subscribed folders in shared namespace + // 32 - all folders in shared namespace + $config['activesync_init_subscriptions'] = 0; ++ ++// Enables adding sender name in the From: header of send email ++// when a device uses email address only (e.g. iOS devices) ++$config['activesync_fix_from'] = false; +diff --git a/lib/kolab_sync_message.php b/lib/kolab_sync_message.php +index 026d557..c8b0a47 100644 +--- a/lib/kolab_sync_message.php ++++ b/lib/kolab_sync_message.php +@@ -169,6 +169,22 @@ class kolab_sync_message + if (empty($headers['From'])) { + $headers['From'] = $this->get_identity(); + } ++ // make sure there's sender name in From: ++ else if ($rcube->config->get('activesync_fix_from') ++ && preg_match('/^<?((\S+|("[^"]+"))@\S+)>?$/', trim($headers['From']), $m) ++ ) { ++ $identities = kolab_sync::get_instance()->user->list_identities(); ++ $email = $m[1]; ++ ++ foreach ((array) $identities as $ident) { ++ if ($ident['email'] == $email) { ++ if ($ident['name']) { ++ $headers['From'] = format_email_recipient($email, $ident['name']); ++ } ++ break; ++ } ++ } ++ } + + if (empty($headers['Message-ID'])) { + $headers['Message-ID'] = $rcube->gen_message_id();
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-syncroton (2.2.5-0~kolab2) unstable; urgency=low + + * Include fix for From: header display name off iOS devices + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 8 Apr 2014 15:13:40 +0200 + kolab-syncroton (2.2.5-0~kolab1) unstable; urgency=low * New upstream version
View file
debian.series
Changed
@@ -0,0 +1,1 @@ +kolab-syncroton-2.2.5-fix-from-header.patch -p1
View file
kolab-syncroton.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-syncroton Binary: kolab-syncroton Architecture: all -Version: 2.2.5-0~kolab1 +Version: 2.2.5-0~kolab2 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org/
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.