Merge branch 'master' into dev/elastic
Aleksander Machniak
6 years ago
commit
2dcf50019c
@ -0,0 +1,36 @@
|
||||
require ["editheader"];
|
||||
# rule:[test-addheader1]
|
||||
if true
|
||||
{
|
||||
addheader "X-Sieve-Filtered" "<test@test.com>";
|
||||
}
|
||||
# rule:[test-addheader2]
|
||||
if not header :contains "X-Sieve-Filtered" "<test@test.com>"
|
||||
{
|
||||
addheader :last "X-Sieve-Filtered" "<test@test.com>";
|
||||
}
|
||||
# rule:[test-deleteheader1]
|
||||
if true
|
||||
{
|
||||
deleteheader :index 1 :contains "Delivered-To" ["bob@example.com","test@test.com"];
|
||||
}
|
||||
# rule:[test-deleteheader2]
|
||||
if true
|
||||
{
|
||||
deleteheader :index 2 :last :contains :comparator "i;octet" "Delivered-To" "test@test.com";
|
||||
}
|
||||
# rule:[test-deleteheader3]
|
||||
if true
|
||||
{
|
||||
deleteheader "Delivered-To";
|
||||
}
|
||||
# rule:[test-deleteheader4]
|
||||
if true
|
||||
{
|
||||
deleteheader :index 3 :last :contains "Delivered-To";
|
||||
}
|
||||
# rule:[test-deleteheader5]
|
||||
if true
|
||||
{
|
||||
deleteheader "Delivered-To" "test";
|
||||
}
|
||||
@ -0,0 +1,119 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Modoboa Password Driver
|
||||
*
|
||||
* Payload is json string containing username, oldPassword and newPassword
|
||||
* Return value is a json string saying result: true if success.
|
||||
*
|
||||
* @version 1.0.1
|
||||
* @author stephane @actionweb.fr
|
||||
*
|
||||
* Copyright (C) 2018, 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/.
|
||||
*
|
||||
* The driver need modoboa core 1.10.6 or later
|
||||
*
|
||||
* You need to define theses variables in plugin/password/config.inc.php
|
||||
*
|
||||
* $config['password_driver'] = 'modoboa'; // use modoboa as driver
|
||||
* $config['password_modoboa_api_token'] = ''; // put token number from Modoboa server
|
||||
* $config['password_minimum_length'] = 8; // select same number as in Modoboa server
|
||||
*/
|
||||
|
||||
class rcube_modoboa_password
|
||||
{
|
||||
function save($curpass, $passwd)
|
||||
{
|
||||
// Init config access
|
||||
$rcmail = rcmail::get_instance();
|
||||
$ModoboaToken = $rcmail->config->get('password_modoboa_api_token');
|
||||
$RoudCubeUsername = $_SESSION['username'];
|
||||
$IMAPhost = $_SESSION['imap_host'];
|
||||
|
||||
// Call GET to fetch values from modoboa server
|
||||
$curl = curl_init();
|
||||
|
||||
curl_setopt_array($curl, array(
|
||||
CURLOPT_URL => "https://" . $IMAPhost . "/api/v1/accounts/?search=" . urlencode($RoudCubeUsername),
|
||||
CURLOPT_RETURNTRANSFER => true,
|
||||
CURLOPT_ENCODING => "",
|
||||
CURLOPT_MAXREDIRS => 10,
|
||||
CURLOPT_TIMEOUT => 30,
|
||||
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
|
||||
CURLOPT_CUSTOMREQUEST => "GET",
|
||||
CURLOPT_HTTPHEADER => array(
|
||||
"Authorization: Token " . $ModoboaToken,
|
||||
"Cache-Control: no-cache",
|
||||
"Content-Type: application/json"
|
||||
),
|
||||
));
|
||||
|
||||
$response = curl_exec($curl);
|
||||
$err = curl_error($curl);
|
||||
|
||||
curl_close($curl);
|
||||
|
||||
if ($err) {
|
||||
return PASSWORD_CONNECT_ERROR;
|
||||
}
|
||||
|
||||
// Decode json string
|
||||
$decoded = json_decode($response);
|
||||
|
||||
if (!is_array($decoded)) {
|
||||
return PASSWORD_CONNECT_ERROR;
|
||||
}
|
||||
|
||||
// Get user ID (pk)
|
||||
$userid = $decoded[0]->pk;
|
||||
|
||||
// Encode json with new password
|
||||
$ret['username'] = $decoded[0]->username;
|
||||
$ret['role'] = $decoded[0]->role;
|
||||
$ret['password'] = $passwd; // new password
|
||||
$encoded = json_encode($ret);
|
||||
|
||||
// Call HTTP API Modoboa
|
||||
$curl = curl_init();
|
||||
|
||||
curl_setopt_array($curl, array(
|
||||
CURLOPT_URL => "https://" . $IMAPhost . "/api/v1/accounts/" . $userid . "/",
|
||||
CURLOPT_RETURNTRANSFER => true,
|
||||
CURLOPT_ENCODING => "",
|
||||
CURLOPT_MAXREDIRS => 10,
|
||||
CURLOPT_TIMEOUT => 30,
|
||||
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
|
||||
CURLOPT_CUSTOMREQUEST => "PUT",
|
||||
CURLOPT_POSTFIELDS => "" . $encoded . "",
|
||||
CURLOPT_HTTPHEADER => array(
|
||||
"Authorization: Token " . $ModoboaToken,
|
||||
"Cache-Control: no-cache",
|
||||
"Content-Type: application/json"
|
||||
),
|
||||
));
|
||||
|
||||
$response = curl_exec($curl);
|
||||
$err = curl_error($curl);
|
||||
|
||||
curl_close($curl);
|
||||
|
||||
if ($err) {
|
||||
return PASSWORD_CONNECT_ERROR;
|
||||
}
|
||||
|
||||
return PASSWORD_SUCCESS;
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="9.14 141.8 573.65 573.65">
|
||||
<style type="text/css">
|
||||
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#404F54;}
|
||||
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#E5E5E5;}
|
||||
.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#CCCCCC;}
|
||||
.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#37BEFF;}
|
||||
</style>
|
||||
<polygon class="st3" points="582.79,549.77 295.96,384.1 295.96,207.27 582.79,372.95 "/>
|
||||
<polygon class="st0" points="9.14,549.77 295.96,384.1 295.96,207.27 9.14,372.95 "/>
|
||||
<path class="st2" d="M295.96,141.8c109.56,0,198.41,88.85,198.41,198.41c0,109.56-88.85,198.41-198.41,198.41 c-109.56,0-198.41-88.85-198.41-198.41C97.55,230.65,186.4,141.8,295.96,141.8"/>
|
||||
<path class="st1" d="M295.96,141.8c109.6,0,198.48,88.85,198.48,198.41c0,109.56-88.88,198.41-198.48,198.41 c-62.91-42.34-88.94-127.64-88.94-198.3S233.05,184.22,295.96,141.8"/>
|
||||
<polygon class="st3" points="582.79,372.95 295.96,538.62 295.96,715.45 582.79,549.77 "/>
|
||||
<polygon class="st0" points="9.14,372.95 295.96,538.62 295.96,715.45 9.14,549.77 "/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB |
@ -1,16 +0,0 @@
|
||||
<roundcube:include file="includes/layout.html" />
|
||||
<roundcube:include file="includes/menu.html" condition="!env:framed && !env:extwin" />
|
||||
|
||||
<h1 class="voice"><roundcube:label name="messageopenerror" /></h1>
|
||||
|
||||
<div class="content selected">
|
||||
<roundcube:if condition="env:action == 'show'" />
|
||||
<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
|
||||
<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
|
||||
<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
|
||||
</div>
|
||||
<roundcube:endif />
|
||||
<div class="watermark"></div>
|
||||
</div>
|
||||
|
||||
<roundcube:include file="includes/footer.html" />
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.8 KiB |
Loading…
Reference in New Issue