Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PHP 7.4 deprecation warning on implode()

Browse source
This commit is contained in:
Aleksander Machniak 2020-08-11 12:55:49 +02:00
parent a99d2b6187
commit 112516794f
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -2375,7 +2375,7 @@ class kolab_driver extends calendar_driver
if (strlen($folder)) { if (strlen($folder)) {
$path_imap = explode($delim, $folder); $path_imap = explode($delim, $folder);
array_pop($path_imap); // pop off name part array_pop($path_imap); // pop off name part
$path_imap = implode($path_imap, $delim); $path_imap = implode($delim, $path_imap);
$options = $storage->folder_info($folder); $options = $storage->folder_info($folder);
} }

2
plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
View file

@ -183,7 +183,7 @@ class kolab_addressbook_ui
if ($action == 'edit') { if ($action == 'edit') {
$path_imap = explode($delim, $folder); $path_imap = explode($delim, $folder);
$name = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP'); $name = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
$path_imap = implode($path_imap, $delim); $path_imap = implode($delim, $path_imap);
} }
else { // create else { // create
$path_imap = $folder; $path_imap = $folder;

2
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -460,7 +460,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$scount = count($fields); $scount = count($fields);
// build key name regexp // build key name regexp
$regexp = '/^(' . implode($fields, '|') . ')(?:.*)$/'; $regexp = '/^(' . implode('|', $fields) . ')(?:.*)$/';
// pass query to storage if only indexed cols are involved // pass query to storage if only indexed cols are involved
// NOTE: this is only some rough pre-filtering but probably includes false positives // NOTE: this is only some rough pre-filtering but probably includes false positives

2
plugins/kolab_notes/kolab_notes_ui.php
View file

@ -306,7 +306,7 @@ class kolab_notes_ui
$path_imap = explode($delim, $folder_name); $path_imap = explode($delim, $folder_name);
array_pop($path_imap); // pop off name part array_pop($path_imap); // pop off name part
$path_imap = implode($path_imap, $delim); $path_imap = implode($delim, $path_imap);
} }
else { else {
$path_imap = ''; $path_imap = '';

10
plugins/libkolab/lib/kolab_storage.php
View file

@ -1371,8 +1371,8 @@ class kolab_storage
self::$subscriptions = self::$imap->list_folders_subscribed(); self::$subscriptions = self::$imap->list_folders_subscribed();
self::$with_tempsubs = true; self::$with_tempsubs = true;
} }
self::$states = self::$subscriptions; self::$states = (array) self::$subscriptions;
$folders = implode(self::$states, '**'); $folders = implode('**', self::$states);
$rcube->user->save_prefs(array('kolab_active_folders' => $folders)); $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
} }
@ -1396,9 +1396,9 @@ class kolab_storage
} }
// update user preferences // update user preferences
$folders = implode(self::$states, '**'); $folders = implode('**', self::$states);
$rcube = rcube::get_instance();
return $rcube->user->save_prefs(array('kolab_active_folders' => $folders)); return rcube::get_instance()->user->save_prefs(array('kolab_active_folders' => $folders));
} }
/** /**