Page MenuHomePhorge
Files F9121970

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/plugins/password/drivers/miab.php b/plugins/password/drivers/miab.php
index da62e9f67..c5625352a 100644
--- a/plugins/password/drivers/miab.php
+++ b/plugins/password/drivers/miab.php
@@ -1,75 +1,76 @@
<?php
/**
* Mail-in-a-Box Driver
*
* Driver that adds functionality to change the user password via the
* API endpoint of Mail-in-a-Box (https://mailinabox.email/).
*
* For installation instructions please read the README file. It requires
* following parameters in configuration:
*
* - password_miab_username - name of the admin user used to access api
* - password_miab_password - password of the admin user used to access api
* - password_miab_url - the url to the control panel of Mail-in-a-Box
*
* @version 1.0
* @author Alexey Shtokalo <alexey@shtokalo.net>
*
* Copyright (C) The Roundcube Dev Team
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
+use GuzzleHttp\Client;
+
class rcube_miab_password
{
public function save($currpass, $newpass, $username)
{
$config = rcmail::get_instance()->config;
$host = rtrim($config->get('password_miab_url'), '/') . '/mail/users/password';
- $result = 'Can not initialize curl.';
- if (is_resource($ch = curl_init($host)))
- {
- curl_setopt($ch, CURLOPT_HTTPHEADER,
- array('Content-Type: application/x-www-form-urlencoded'));
- curl_setopt($ch, CURLOPT_HEADER, false);
- curl_setopt($ch, CURLOPT_USERPWD, ($config->get('password_miab_username') ?: $username)
- . ':' . ($config->get('password_miab_password') ?: $currpass));
- curl_setopt($ch, CURLOPT_TIMEOUT, 30);
- curl_setopt($ch, CURLOPT_POST, true);
- curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
- curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array(
- 'email' => $username,
- 'password' => $newpass,
- )));
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
- $result = curl_exec($ch);
- curl_close($ch);
- if (trim($result) === 'OK') {
+ try {
+ $client = new Client();
+
+ $response = $client->post($host, array(
+ 'form_params' => array(
+ 'email' => $username,
+ 'password' => $newpass,
+ ),
+ 'auth' => array(
+ $config->get('password_miab_username') ?: $username,
+ $config->get('password_miab_password') ?: $currpass,
+ ),
+ ));
+
+ if (trim($result = $response->getBody()) === 'OK') {
return PASSWORD_SUCCESS;
}
}
+ catch (Exception $e) {
+ $result = $e->getMessage();
+ }
rcube::raise_error(array(
'code' => 600,
'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
- 'message' => 'Password plugin: Unable to change password. '
+ 'message' => 'Password plugin: Unable to change password. '
. $result
), true, false);
return PASSWORD_ERROR;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 30, 6:20 AM (18 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1175240
Default Alt Text
(3 KB)

Event Timeline