Fix implode() wrong parameter order (#6866)

It has been deprecated in PHP 7.4. Such as PHP deprecated: implode(): Passing glue string after array is deprecated. Swap the parameters in /var/www/roundcubemail/program/lib/Roundcube/rcube_db.php on line 917 Signed-off-by: Jack Cherng <jfcherng@gmail.com>
5 years ago · 45e099b0be
parent 42c473aedd
commit 45e099b0be
6 changed files with 7 additions and 6 deletions
--- a/1
+++ b/1
@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where selection of columns on messages list wasn't working
 - Fix bug in converting multi-page Tiff images to Jpeg (#6824)
 - Fix wrong messages order after returning to a multi-folder search result (#6836)
+- Fix PHP 7.4 deprecation: implode() wrong parameter order (#6866)

 RELEASE 1.3.9
 -------------
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@ -732,7 +732,7 @@ class enigma_ui
        }

        $table->add('title', html::label('key-name', rcube::Q($this->enigma->gettext('newkeyident'))));
-        $table->add(null, implode($identities, "\n"));
+        $table->add(null, implode("\n", $identities));

        // Key size
        $select = new html_select(array('name' => 'size', 'id' => 'key-size'));
--- a/program/lib/Roundcube/rcube_contacts.php
+++ b/program/lib/Roundcube/rcube_contacts.php
@ -356,7 +356,7 @@ class rcube_contacts extends rcube_addressbook
        if (!empty($post_search) || !empty($required)) {
            $ids = array(0);
            // build key name regexp
-            $regexp = '/^(' . implode(array_keys($post_search), '|') . ')(?:.*)$/';
+            $regexp = '/^(' . implode('|', array_keys($post_search)) . ')(?:.*)$/';
            // use initial WHERE clause, to limit records number if possible
            if (!empty($where))
                $this->set_search_set($where);
--- a/program/lib/Roundcube/rcube_db.php
+++ b/program/lib/Roundcube/rcube_db.php
@ -914,7 +914,7 @@ class rcube_db
            $name[] = $start . $elem . $end;
        }

-        return implode($name, '.');
+        return implode('.', $name);
    }

    /**
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@ -209,8 +209,8 @@ function rcmail_contact_search()

    // search request ID
    $search_request = md5('addr'
-        .(is_array($fields) ? implode($fields, ',') : $fields)
-        .(is_array($search) ? implode($search, ',') : $search));
+        .(is_array($fields) ? implode(',', $fields) : $fields)
+        .(is_array($search) ? implode(',', $search) : $search));

    // save search settings in session
    $_SESSION['search'][$search_request] = $search_set;
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@ -276,7 +276,7 @@ if ($isHtml) {
    }

    // append doctype and html/body wrappers
-    $bstyle       = !empty($bstyle) ? (" style='" . implode($bstyle, '; ') . "'") : '';
+    $bstyle       = !empty($bstyle) ? (" style='" . implode('; ', $bstyle) . "'") : '';
    $message_body = '<html><head>'
        . '<meta http-equiv="Content-Type" content="text/html; charset=' . $message_charset . '" /></head>'
        . "<body" . $bstyle . ">\r\n" . $message_body;