Skip to content

Commit b87939f

Browse files
ScIT-RaphaelScIT-Raphael
committed
Remove unsupported OS configs and add new roundcube files.
1 parent 579baa7 commit b87939f

File tree

865 files changed

+147
-47002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

865 files changed

+147
-47002
lines changed

‎install/debian/8/roundcube/config.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// -----------------------
55
// A driver to use for password change. Default: "sql".
66
// See README file for list of supported driver names.
7-
$rcmail_config['password_driver'] = 'vesta';
7+
$rcmail_config['password_driver'] = 'hestia';
88

99
// Require the new password to be a certain length.
1010
// set to blank to allow passwords of any length
@@ -29,5 +29,5 @@
2929
// Vesta Driver options
3030
// -----------------------
3131
// Control Panel host
32-
$rcmail_config['password_vesta_host'] = 'localhost';
33-
$rcmail_config['password_vesta_port'] = '8083';
32+
$rcmail_config['password_hestia_host'] = 'localhost';
33+
$rcmail_config['password_hestia_port'] = '8083';

install/debian/8/roundcube/vesta.php renamed to install/debian/8/roundcube/hestia.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<?php
22

33
/**
4-
* Vesta Control Panel Password Driver
4+
* Hestia Control Panel Password Driver
55
*
66
* @version 1.0
7-
* @author Serghey Rodin <skid@vestacp.com>
7+
* @author HestiaCP <info@hestiacp.com>
88
*/
9-
class rcube_vesta_password {
9+
class rcube_hestia_password {
1010
function save($curpass, $passwd)
1111
{
1212
$rcmail = rcmail::get_instance();
13-
$vesta_host = $rcmail->config->get('password_vesta_host');
13+
$hestia_host = $rcmail->config->get('password_hestia_host');
1414

15-
if (empty($vesta_host))
15+
if (empty($hestia_host))
1616
{
17-
$vesta_host = 'localhost';
17+
$hestia_host = 'localhost';
1818
}
1919

20-
$vesta_port = $rcmail->config->get('password_vesta_port');
21-
if (empty($vesta_port))
20+
$hestia_port = $rcmail->config->get('password_hestia_port');
21+
if (empty($hestia_port))
2222
{
23-
$vesta_port = '8083';
23+
$hestia_port = '8083';
2424
}
2525

2626
$postvars = array(
@@ -32,15 +32,15 @@ function save($curpass, $passwd)
3232
$postdata = http_build_query($postvars);
3333

3434
$send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL;
35-
$send .= 'Host: ' . $vesta_host . PHP_EOL;
35+
$send .= 'Host: ' . $hestia_host . PHP_EOL;
3636
$send .= 'User-Agent: PHP Script' . PHP_EOL;
3737
$send .= 'Content-length: ' . strlen($postdata) . PHP_EOL;
3838
$send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL;
3939
$send .= 'Connection: close' . PHP_EOL;
4040
$send .= PHP_EOL;
4141
$send .= $postdata . PHP_EOL . PHP_EOL;
4242

43-
//$fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
43+
//$fp = fsockopen('ssl://' . $hestia_host, $hestia_port);
4444
$errno = "";
4545
$errstr = "";
4646
$context = stream_context_create();
@@ -50,7 +50,7 @@ function save($curpass, $passwd)
5050
$result = stream_context_set_option($context, 'ssl', 'verify_host', false);
5151
$result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
5252

53-
$fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
53+
$fp = stream_socket_client('ssl://' . $hestia_host . ':'.$hestia_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
5454
fputs($fp, $send);
5555
$result = fread($fp, 2048);
5656
fclose($fp);

‎install/debian/9/roundcube/config.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// -----------------------
55
// A driver to use for password change. Default: "sql".
66
// See README file for list of supported driver names.
7-
$rcmail_config['password_driver'] = 'vesta';
7+
$rcmail_config['password_driver'] = 'hestia';
88

99
// Require the new password to be a certain length.
1010
// set to blank to allow passwords of any length
@@ -29,5 +29,5 @@
2929
// Vesta Driver options
3030
// -----------------------
3131
// Control Panel host
32-
$rcmail_config['password_vesta_host'] = 'localhost';
33-
$rcmail_config['password_vesta_port'] = '8083';
32+
$rcmail_config['password_hestia_host'] = 'localhost';
33+
$rcmail_config['password_hestia_port'] = '8083';

install/debian/9/roundcube/vesta.php renamed to install/debian/9/roundcube/hestia.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<?php
22

33
/**
4-
* Vesta Control Panel Password Driver
4+
* Hestia Control Panel Password Driver
55
*
66
* @version 1.0
7-
* @author Serghey Rodin <skid@vestacp.com>
7+
* @author HestiaCP <info@hestiacp.com>
88
*/
9-
class rcube_vesta_password {
9+
class rcube_hestia_password {
1010
function save($curpass, $passwd)
1111
{
1212
$rcmail = rcmail::get_instance();
13-
$vesta_host = $rcmail->config->get('password_vesta_host');
13+
$hestia_host = $rcmail->config->get('password_hestia_host');
1414

15-
if (empty($vesta_host))
15+
if (empty($hestia_host))
1616
{
17-
$vesta_host = 'localhost';
17+
$hestia_host = 'localhost';
1818
}
1919

20-
$vesta_port = $rcmail->config->get('password_vesta_port');
21-
if (empty($vesta_port))
20+
$hestia_port = $rcmail->config->get('password_hestia_port');
21+
if (empty($hestia_port))
2222
{
23-
$vesta_port = '8083';
23+
$hestia_port = '8083';
2424
}
2525

2626
$postvars = array(
@@ -32,15 +32,15 @@ function save($curpass, $passwd)
3232
$postdata = http_build_query($postvars);
3333

3434
$send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL;
35-
$send .= 'Host: ' . $vesta_host . PHP_EOL;
35+
$send .= 'Host: ' . $hestia_host . PHP_EOL;
3636
$send .= 'User-Agent: PHP Script' . PHP_EOL;
3737
$send .= 'Content-length: ' . strlen($postdata) . PHP_EOL;
3838
$send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL;
3939
$send .= 'Connection: close' . PHP_EOL;
4040
$send .= PHP_EOL;
4141
$send .= $postdata . PHP_EOL . PHP_EOL;
4242

43-
//$fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
43+
//$fp = fsockopen('ssl://' . $hestia_host, $hestia_port);
4444
$errno = "";
4545
$errstr = "";
4646
$context = stream_context_create();
@@ -50,7 +50,7 @@ function save($curpass, $passwd)
5050
$result = stream_context_set_option($context, 'ssl', 'verify_host', false);
5151
$result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
5252

53-
$fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
53+
$fp = stream_socket_client('ssl://' . $hestia_host . ':'.$hestia_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
5454
fputs($fp, $send);
5555
$result = fread($fp, 2048);
5656
fclose($fp);

‎install/ubuntu/14.04/roundcube/config.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// -----------------------
55
// A driver to use for password change. Default: "sql".
66
// See README file for list of supported driver names.
7-
$rcmail_config['password_driver'] = 'vesta';
7+
$rcmail_config['password_driver'] = 'hestia';
88

99
// Require the new password to be a certain length.
1010
// set to blank to allow passwords of any length
@@ -29,5 +29,5 @@
2929
// Vesta Driver options
3030
// -----------------------
3131
// Control Panel host
32-
$rcmail_config['password_vesta_host'] = 'localhost';
33-
$rcmail_config['password_vesta_port'] = '8083';
32+
$rcmail_config['password_hestia_host'] = 'localhost';
33+
$rcmail_config['password_hestia_port'] = '8083';

install/ubuntu/17.10/roundcube/vesta.php renamed to install/ubuntu/14.04/roundcube/hestia.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<?php
22

33
/**
4-
* Vesta Control Panel Password Driver
4+
* Hestia Control Panel Password Driver
55
*
66
* @version 1.0
7-
* @author Serghey Rodin <skid@vestacp.com>
7+
* @author HestiaCP <info@hestiacp.com>
88
*/
9-
class rcube_vesta_password {
9+
class rcube_hestia_password {
1010
function save($curpass, $passwd)
1111
{
1212
$rcmail = rcmail::get_instance();
13-
$vesta_host = $rcmail->config->get('password_vesta_host');
13+
$hestia_host = $rcmail->config->get('password_hestia_host');
1414

15-
if (empty($vesta_host))
15+
if (empty($hestia_host))
1616
{
17-
$vesta_host = 'localhost';
17+
$hestia_host = 'localhost';
1818
}
1919

20-
$vesta_port = $rcmail->config->get('password_vesta_port');
21-
if (empty($vesta_port))
20+
$hestia_port = $rcmail->config->get('password_hestia_port');
21+
if (empty($hestia_port))
2222
{
23-
$vesta_port = '8083';
23+
$hestia_port = '8083';
2424
}
2525

2626
$postvars = array(
@@ -32,24 +32,25 @@ function save($curpass, $passwd)
3232
$postdata = http_build_query($postvars);
3333

3434
$send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL;
35-
$send .= 'Host: ' . $vesta_host . PHP_EOL;
35+
$send .= 'Host: ' . $hestia_host . PHP_EOL;
3636
$send .= 'User-Agent: PHP Script' . PHP_EOL;
3737
$send .= 'Content-length: ' . strlen($postdata) . PHP_EOL;
3838
$send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL;
3939
$send .= 'Connection: close' . PHP_EOL;
4040
$send .= PHP_EOL;
4141
$send .= $postdata . PHP_EOL . PHP_EOL;
4242

43-
//$fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
43+
//$fp = fsockopen('ssl://' . $hestia_host, $hestia_port);
4444
$errno = "";
4545
$errstr = "";
4646
$context = stream_context_create();
47+
4748
$result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
4849
$result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
4950
$result = stream_context_set_option($context, 'ssl', 'verify_host', false);
5051
$result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
5152

52-
$fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
53+
$fp = stream_socket_client('ssl://' . $hestia_host . ':'.$hestia_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
5354
fputs($fp, $send);
5455
$result = fread($fp, 2048);
5556
fclose($fp);

‎install/ubuntu/14.04/roundcube/vesta.php‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎install/ubuntu/14.10/apache2/apache2.conf‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)