Changes of Revision 30
debian.changelog
Changed
x
1
2
-roundcubemail (1.5.4-1~kolab7) unstable; urgency=low
3
+roundcubemail (1.5.4-1~kolab8) unstable; urgency=low
4
5
* New tarball
6
* Set tasklist.inc.php
7
roundcubemail-1.5.tar.gz/composer.json
Changed
12
1
2
"sabre/dav" : "~4.0",
3
"sabre/http" : "~5.0",
4
"smarty/smarty" : "~3.1.7",
5
- "monolog/monolog": "1.2.*",
6
- "desarrolla2/cache": "dev-master"
7
+ "monolog/monolog": "1.2.*",
8
+ "desarrolla2/cache": "dev-master"
9
},
10
"require-dev": {
11
"phpunit/phpunit": "^4.8.36 || ^5.7.21",
12
roundcubemail-1.5.tar.gz/composer.lock
Changed
19
1
2
"source": {
3
"type": "git",
4
"url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
5
- "reference": "5a319cf437d75aad564ce7fd076cc5423722868b"
6
+ "reference": "bc02cfe80148b88504627ea0163148f36f49b277"
7
},
8
"require": {
9
"pear/net_ldap2": ">=2.0.12",
10
11
"pear",
12
"vlv"
13
,
14
- "time": "2023-06-07T08:32:15+00:00"
15
+ "time": "2023-07-28T10:53:50+00:00"
16
},
17
{
18
"name": "kolab/nextcloud_link",
19
roundcubemail-1.5.tar.gz/plugins/calendar/calendar.php
Changed
21
1
2
private function write_preprocess(&$event, $action)
3
{
4
// Remove double timezone specification (T2313)
5
- $event'start' = preg_replace('/\s*\(.*\)/', '', $event'start');
6
- $event'end' = preg_replace('/\s*\(.*\)/', '', $event'end');
7
+ $event'start' = preg_replace('/\s*\(.*\)/', '', $event'start' ?? '');
8
+ $event'end' = preg_replace('/\s*\(.*\)/', '', $event'end' ?? '');
9
10
// convert dates into DateTime objects in user's current timezone
11
$event'start' = new DateTime($event'start', $this->timezone);
12
13
'uid' => $event'uid',
14
'_instance' => isset($event'_instance') ? $event'_instance' : null,
15
'changed' => is_object($event'changed') ? $event'changed'->format('U') : 0,
16
- 'sequence' => intval($event'sequence'),
17
+ 'sequence' => intval($event'sequence' ?? 0),
18
'fallback' => strtoupper((string) $status),
19
'method' => $event'_method',
20
'task' => 'calendar',
21
roundcubemail-1.5.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php
Changed
10
1
2
}
3
4
// add Sender: header with current user default identity
5
- if ($context) {
6
+ if (!empty($context)) {
7
$identity = $this->rc->user->get_identity();
8
$sender = format_email_recipient($identity'email', $identity'name');
9
10
roundcubemail-1.5.tar.gz/plugins/kolab_notes/kolab_notes.php
Changed
10
1
2
*/
3
public function mail_message_load($p)
4
{
5
- if (!$p'object'->headers->others'x-kolab-type') {
6
+ if (empty($p'object'->headers->others'x-kolab-type')) {
7
$this->message_notes = $this->get_message_notes($p'object'->headers, $p'object'->folder);
8
}
9
}
10
roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_itip.php
Changed
96
1
2
$emails = $this->lib->get_user_emails();
3
4
foreach ($existing'attendees' as $attendee) {
5
- if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
6
- $status = strtoupper($attendee'status');
7
+ if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
8
+ $status = !empty($attendee'status') ? strtoupper($attendee'status') : '';
9
break;
10
}
11
}
12
13
$rsvp_buttons = '';
14
15
// pass some metadata about the event and trigger the asynchronous status check
16
- $changed = is_object($event'changed') ? $event'changed' : $message_date;
17
+ $changed = !empty($event'changed') && is_object($event'changed') ? $event'changed' : $message_date;
18
$metadata = array(
19
'uid' => $event'uid',
20
'_instance' => isset($event'_instance') ? $event'_instance' : null,
21
'changed' => $changed ? $changed->format('U') : 0,
22
- 'sequence' => intval($event'sequence'),
23
+ 'sequence' => intval($event'sequence' ?? 0),
24
'method' => $method,
25
'task' => $task,
26
'mime_id' => $mime_id,
27
28
// when receiving iTip REQUEST messages:
29
else if ($method == 'REQUEST') {
30
$emails = $this->lib->get_user_emails();
31
- $title = $event'sequence' > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
32
+ $title = !empty($event'sequence') ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
33
$metadata'rsvp' = true;
34
35
if (is_object($event'start')) {
36
37
*/
38
public static function get_custom_property($event, $name)
39
{
40
- $ret = false;
41
+ $ret = false;
42
43
- if (is_array($event'x-custom')) {
44
- array_walk($event'x-custom', function($prop, $i) use ($name, &$ret) {
45
- if (strcasecmp($prop0, $name) === 0) {
46
- $ret = $prop1;
47
- }
48
- });
49
- }
50
+ if (is_array($event'x-custom')) {
51
+ array_walk($event'x-custom', function($prop, $i) use ($name, &$ret) {
52
+ if (strcasecmp($prop0, $name) === 0) {
53
+ $ret = $prop1;
54
+ }
55
+ });
56
+ }
57
58
- return $ret;
59
+ return $ret;
60
}
61
62
/**
63
64
/**
65
* Find an attendee that is not the organizer and has an email matching $email_field
66
*/
67
- public function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null) {
68
+ public function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null)
69
+ {
70
foreach ($attendees as $_attendee) {
71
if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
72
continue;
73
74
return $attendee;
75
}
76
}
77
+
78
return null;
79
}
80
81
/**
82
* Find the replying attendee in a REPLY
83
*/
84
- public static function find_reply_attendee($event) {
85
+ public static function find_reply_attendee($event)
86
+ {
87
// remove the organizer
88
- $itip_attendees = array_filter($event'attendees', function($item) { return $item'role' != 'ORGANIZER' && !empty($item'email'); });
89
- $attendee = null;
90
+ $itip_attendees = array_filter($event'attendees', function($item) {
91
+ return (empty($item'role') || $item'role' != 'ORGANIZER') && !empty($item'email');
92
+ });
93
94
// According to rfc there should only be one attendee for a REPLY
95
if (count($itip_attendees) == 1) {
96
roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php
Changed
20
1
2
}
3
else {
4
// action == DISPLAY
5
- $alarm = new Alarm(strval(!empty($valarm'summary') ? $valarm'summary' : $object'title'));
6
+ $title = !empty($valarm'summary') ? $valarm'summary' : ($object'title' ?? '');
7
+ $alarm = new Alarm($title);
8
}
9
10
if ($valarm'trigger' instanceof DateTimeInterface) {
11
12
*/
13
public function get_reference_date()
14
{
15
- if ($this->data'start' && $this->data'start' instanceof DateTimeInterface) {
16
+ if (!empty($this->data'start') && $this->data'start' instanceof DateTimeInterface) {
17
return $this->data'start';
18
}
19
20
roundcubemail-1.5.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip
Changed
roundcubemail-1.5.tar.gz/vendor/autoload.php
Changed
7
1
2
3
require_once __DIR__ . '/composer/autoload_real.php';
4
5
-return ComposerAutoloaderInit37865e036c35ba82229501ec90486b55::getLoader();
6
+return ComposerAutoloaderInitbc80a36cbb7593b7b7a2a71a8ad8f68b::getLoader();
7
roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php
Changed
54
1
2
3
// autoload_real.php @generated by Composer
4
5
-class ComposerAutoloaderInit37865e036c35ba82229501ec90486b55
6
+class ComposerAutoloaderInitbc80a36cbb7593b7b7a2a71a8ad8f68b
7
{
8
private static $loader;
9
10
11
12
require __DIR__ . '/platform_check.php';
13
14
- spl_autoload_register(array('ComposerAutoloaderInit37865e036c35ba82229501ec90486b55', 'loadClassLoader'), true, true);
15
+ spl_autoload_register(array('ComposerAutoloaderInitbc80a36cbb7593b7b7a2a71a8ad8f68b', 'loadClassLoader'), true, true);
16
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
17
- spl_autoload_unregister(array('ComposerAutoloaderInit37865e036c35ba82229501ec90486b55', 'loadClassLoader'));
18
+ spl_autoload_unregister(array('ComposerAutoloaderInitbc80a36cbb7593b7b7a2a71a8ad8f68b', 'loadClassLoader'));
19
20
$includePaths = require __DIR__ . '/include_paths.php';
21
$includePaths = get_include_path();
22
23
if ($useStaticLoader) {
24
require __DIR__ . '/autoload_static.php';
25
26
- call_user_func(\Composer\Autoload\ComposerStaticInit37865e036c35ba82229501ec90486b55::getInitializer($loader));
27
+ call_user_func(\Composer\Autoload\ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::getInitializer($loader));
28
} else {
29
$map = require __DIR__ . '/autoload_namespaces.php';
30
foreach ($map as $namespace => $path) {
31
32
$loader->register(true);
33
34
if ($useStaticLoader) {
35
- $includeFiles = Composer\Autoload\ComposerStaticInit37865e036c35ba82229501ec90486b55::$files;
36
+ $includeFiles = Composer\Autoload\ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::$files;
37
} else {
38
$includeFiles = require __DIR__ . '/autoload_files.php';
39
}
40
foreach ($includeFiles as $fileIdentifier => $file) {
41
- composerRequire37865e036c35ba82229501ec90486b55($fileIdentifier, $file);
42
+ composerRequirebc80a36cbb7593b7b7a2a71a8ad8f68b($fileIdentifier, $file);
43
}
44
45
return $loader;
46
}
47
}
48
49
-function composerRequire37865e036c35ba82229501ec90486b55($fileIdentifier, $file)
50
+function composerRequirebc80a36cbb7593b7b7a2a71a8ad8f68b($fileIdentifier, $file)
51
{
52
if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
53
require $file;
54
roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php
Changed
27
1
2
3
namespace Composer\Autoload;
4
5
-class ComposerStaticInit37865e036c35ba82229501ec90486b55
6
+class ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b
7
{
8
public static $files = array (
9
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
10
11
public static function getInitializer(ClassLoader $loader)
12
{
13
return \Closure::bind(function () use ($loader) {
14
- $loader->prefixLengthsPsr4 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixLengthsPsr4;
15
- $loader->prefixDirsPsr4 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixDirsPsr4;
16
- $loader->prefixesPsr0 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$prefixesPsr0;
17
- $loader->fallbackDirsPsr0 = ComposerStaticInit37865e036c35ba82229501ec90486b55::$fallbackDirsPsr0;
18
- $loader->classMap = ComposerStaticInit37865e036c35ba82229501ec90486b55::$classMap;
19
+ $loader->prefixLengthsPsr4 = ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::$prefixLengthsPsr4;
20
+ $loader->prefixDirsPsr4 = ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::$prefixDirsPsr4;
21
+ $loader->prefixesPsr0 = ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::$prefixesPsr0;
22
+ $loader->fallbackDirsPsr0 = ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::$fallbackDirsPsr0;
23
+ $loader->classMap = ComposerStaticInitbc80a36cbb7593b7b7a2a71a8ad8f68b::$classMap;
24
25
}, null, ClassLoader::class);
26
}
27
roundcubemail-1.5.tar.gz/vendor/composer/installed.json
Changed
17
1
2
"source": {
3
"type": "git",
4
"url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
5
- "reference": "5a319cf437d75aad564ce7fd076cc5423722868b"
6
+ "reference": "bc02cfe80148b88504627ea0163148f36f49b277"
7
},
8
"require": {
9
"pear/net_ldap2": ">=2.0.12",
10
"php": ">=5.3.3"
11
},
12
- "time": "2023-06-07T08:32:15+00:00",
13
+ "time": "2023-07-28T10:53:50+00:00",
14
"default-branch": true,
15
"type": "library",
16
"installation-source": "source",
17
roundcubemail-1.5.tar.gz/vendor/composer/installed.php
Changed
10
1
2
'aliases' => array(
3
0 => '9999999-dev',
4
),
5
- 'reference' => '5a319cf437d75aad564ce7fd076cc5423722868b',
6
+ 'reference' => 'bc02cfe80148b88504627ea0163148f36f49b277',
7
'dev_requirement' => false,
8
),
9
'kolab/nextcloud_link' => array(
10
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD
Changed
4
1
2
-5a319cf437d75aad564ce7fd076cc5423722868b
3
+bc02cfe80148b88504627ea0163148f36f49b277
4
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index
Changed
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/info/refs
Changed
11
1
2
-5a319cf437d75aad564ce7fd076cc5423722868b refs/heads/master
3
-5a319cf437d75aad564ce7fd076cc5423722868b refs/remotes/origin/HEAD
4
-5a319cf437d75aad564ce7fd076cc5423722868b refs/remotes/origin/master
5
+bc02cfe80148b88504627ea0163148f36f49b277 refs/heads/master
6
+bc02cfe80148b88504627ea0163148f36f49b277 refs/remotes/origin/HEAD
7
+bc02cfe80148b88504627ea0163148f36f49b277 refs/remotes/origin/master
8
b51b8121f82b9296565e93cc95788ddff1b06514 refs/tags/pear-Net-LDAP3-1.0.0
9
6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480 refs/tags/pear-Net-LDAP3-1.0.0^{}
10
3e7503645609fac9d54bc963afbbddc668bef16c refs/tags/pear-Net-LDAP3-1.0.1
11
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD
Changed
8
1
2
-0000000000000000000000000000000000000000 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200 clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
3
-5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200 checkout: moving from master to master
4
-5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200 reset: moving to 5a319cf437d75aad564ce7fd076cc5423722868b
5
+0000000000000000000000000000000000000000 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1690804392 +0200 clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
6
+bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1690804393 +0200 checkout: moving from master to master
7
+bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1690804393 +0200 reset: moving to bc02cfe80148b88504627ea0163148f36f49b277
8
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master
Changed
4
1
2
-0000000000000000000000000000000000000000 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200 clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
3
+0000000000000000000000000000000000000000 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1690804392 +0200 clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
4
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD
Changed
4
1
2
-0000000000000000000000000000000000000000 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1690451351 +0200 clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
3
+0000000000000000000000000000000000000000 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1690804392 +0200 clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
4
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs
Changed
5
1
2
-P pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.pack
3
+P pack-341d66f5c0b301581bdd4aa62efcf99542551550.pack
4
5
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-341d66f5c0b301581bdd4aa62efcf99542551550.idx
Added
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-341d66f5c0b301581bdd4aa62efcf99542551550.pack
Added
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-341d66f5c0b301581bdd4aa62efcf99542551550.rev
Added
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.idx
Deleted
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.pack
Deleted
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.rev
Deleted
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs
Changed
8
1
2
# pack-refs with: peeled fully-peeled sorted
3
-5a319cf437d75aad564ce7fd076cc5423722868b refs/remotes/origin/master
4
+bc02cfe80148b88504627ea0163148f36f49b277 refs/remotes/origin/master
5
b51b8121f82b9296565e93cc95788ddff1b06514 refs/tags/pear-Net-LDAP3-1.0.0
6
^6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480
7
3e7503645609fac9d54bc963afbbddc668bef16c refs/tags/pear-Net-LDAP3-1.0.1
8
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master
Changed
4
1
2
-5a319cf437d75aad564ce7fd076cc5423722868b
3
+bc02cfe80148b88504627ea0163148f36f49b277
4
roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3.php
Changed
49
1
2
}
3
4
$controls = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
5
- $this->_vlv_search($sort, $props'search'));
6
+ $this->_vlv_search($sort, $props'search' ?? null));
7
8
$this->vlv_active = (bool) $controls;
9
}
10
11
{
12
$this->_debug("Net_LDAP3::search_entries with search " . var_export($props, true));
13
14
- if (is_array($props'search') && array_key_exists('params', $props'search')) {
15
+ if (!empty($props'search') && is_array($props'search') && array_key_exists('params', $props'search')) {
16
$_search = $this->search_filter($props'search');
17
$this->_debug("C: Search filter: $_search");
18
19
20
21
// use cache
22
$domain_dn = $this->get_cache_data($ckey);
23
+ $result = false;
24
25
if ($domain_dn) {
26
$result = $this->get_entry_attributes($domain_dn, $attributes);
27
28
if (!empty($result)) {
29
$result'dn' = $domain_dn;
30
}
31
- else {
32
- $result = false;
33
- }
34
}
35
else if ($domain_base_dn = $this->config_get('domain_base_dn')) {
36
$domain_filter = $this->config_get('domain_filter');
37
38
$result = $result->entries(true);
39
$domain_dn = key($result);
40
41
- if (empty($domain_dn)) {
42
- $result = false;
43
- }
44
- else {
45
+ if (!empty($domain_dn)) {
46
$result = $result$domain_dn;
47
$result'dn' = $domain_dn;
48
49
roundcubemail.dsc
Changed
10
1
2
Source: roundcubemail
3
Binary: roundcubemail
4
Architecture: all
5
-Version: 1:1.5.4-1~kolab7
6
+Version: 1:1.5.4-1~kolab8
7
Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
8
Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
9
Homepage: http://www.roundcube.net/
10