'
@@ -1687,7 +1689,7 @@ function filter_form($attrib)
$label = $this->plugin->gettext($compact ? 'actions' : 'messagesactions');
$out .= '
' . rcube::Q($label) . " \n";
- $rows_num = isset($scr) ? count($scr['actions']) : 1;
+ $rows_num = isset($scr) ? count($scr['actions']) : 1;
$out .= '';
for ($x=0; $x<$rows_num; $x++) {
@@ -2113,13 +2115,13 @@ function rule_div($fid, $id, $div = true, $compact = false)
'class' => $this->error_class($id, 'test', 'index', 'rule_index'),
]);
$mout .= html::label('input-group-append',
- html::tag('input', [
- 'type' => 'checkbox',
- 'name' => "_rule_index_last[$id]",
- 'id' => 'rule_index_last' . $id,
- 'value' => 1,
- 'checked' => !empty($rule['last']),
- ]) . rcube::Q($this->plugin->gettext('indexlast')));
+ html::tag('input', [
+ 'type' => 'checkbox',
+ 'name' => "_rule_index_last[$id]",
+ 'id' => 'rule_index_last' . $id,
+ 'value' => 1,
+ 'checked' => !empty($rule['last']),
+ ]) . rcube::Q($this->plugin->gettext('indexlast')));
$mout .= '
';
}
@@ -2210,12 +2212,24 @@ private static function rule_test(&$rule)
$rule['not'] = false;
switch ($m[2]) {
- case 'gt': $rule['type'] = $m[1] . '-le'; break;
- case 'ge': $rule['type'] = $m[1] . '-lt'; break;
- case 'lt': $rule['type'] = $m[1] . '-ge'; break;
- case 'le': $rule['type'] = $m[1] . '-gt'; break;
- case 'eq': $rule['type'] = $m[1] . '-ne'; break;
- case 'ne': $rule['type'] = $m[1] . '-eq'; break;
+ case 'gt':
+ $rule['type'] = $m[1] . '-le';
+ break;
+ case 'ge':
+ $rule['type'] = $m[1] . '-lt';
+ break;
+ case 'lt':
+ $rule['type'] = $m[1] . '-ge';
+ break;
+ case 'le':
+ $rule['type'] = $m[1] . '-gt';
+ break;
+ case 'eq':
+ $rule['type'] = $m[1] . '-ne';
+ break;
+ case 'ne':
+ $rule['type'] = $m[1] . '-eq';
+ break;
}
}
else if (!empty($rule['not']) && !empty($rule['test']) && $rule['test'] == 'size') {
@@ -2433,8 +2447,8 @@ function action_div($fid, $id, $div = true)
]);
$out .= '' .rcube::Q($this->plugin->gettext('vacationaddr')) . ' ' . rcube::Q($this->plugin->gettext('vacationinterval')) . ' ".$response." ");
$id = $resp && !empty($resp->response[0]['id']) ? $resp->response[0]['id'] : null;
diff --git a/plugins/password/drivers/xmail.php b/plugins/password/drivers/xmail.php
index 64078394ce5..34dd2a55e3f 100644
--- a/plugins/password/drivers/xmail.php
+++ b/plugins/password/drivers/xmail.php
@@ -75,7 +75,8 @@ function save($currpass, $newpass)
}
}
-class XMail {
+class XMail
+{
var $socket;
var $hostname = 'localhost';
var $username = 'xmail';
@@ -94,8 +95,9 @@ function send($msg)
function connect()
{
$this->socket = socket_create(AF_INET, SOCK_STREAM, 0);
- if ($this->socket < 0)
+ if ($this->socket < 0) {
return false;
+ }
$result = socket_connect($this->socket, $this->hostname, $this->port);
if ($result < 0) {
diff --git a/plugins/password/password.php b/plugins/password/password.php
index a29dc8510d8..a543a982659 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -1,6 +1,6 @@
@@ -332,14 +332,14 @@ private function _compare($curpwd, $newpwd, $type)
}
else {
switch ($type) {
- case PASSWORD_COMPARE_CURRENT:
- $result = $curpwd != $newpwd ? $this->gettext('passwordincorrect') : null;
- break;
- case PASSWORD_COMPARE_NEW:
- $result = $curpwd == $newpwd ? $this->gettext('samepasswd') : null;
- break;
- default:
- $result = $this->gettext('internalerror');
+ case PASSWORD_COMPARE_CURRENT:
+ $result = $curpwd != $newpwd ? $this->gettext('passwordincorrect') : null;
+ break;
+ case PASSWORD_COMPARE_NEW:
+ $result = $curpwd == $newpwd ? $this->gettext('samepasswd') : null;
+ break;
+ default:
+ $result = $this->gettext('internalerror');
}
}
@@ -537,257 +537,257 @@ public static function hash_password($password, $method = '', $prefixed = true)
}
switch ($method) {
- case 'des':
- case 'des-crypt':
- $crypted = crypt($password, rcube_utils::random_bytes(2));
- $prefix = '{CRYPT}';
- break;
-
- case 'ext_des': // for BC
- case 'ext-des-crypt':
- $crypted = crypt($password, '_' . rcube_utils::random_bytes(8));
- $prefix = '{CRYPT}';
- break;
-
- case 'md5crypt': // for BC
- case 'md5-crypt':
- $crypted = crypt($password, '$1$' . rcube_utils::random_bytes(9));
- $prefix = '{MD5-CRYPT}';
- break;
-
- case 'sha256-crypt':
- $rounds = (int) $rcmail->config->get('password_crypt_rounds');
- $prefix = '$5$';
-
- if ($rounds > 1000) {
- $prefix .= 'rounds=' . $rounds . '$';
- }
+ case 'des':
+ case 'des-crypt':
+ $crypted = crypt($password, rcube_utils::random_bytes(2));
+ $prefix = '{CRYPT}';
+ break;
- $crypted = crypt($password, $prefix . rcube_utils::random_bytes(16));
- $prefix = '{SHA256-CRYPT}';
- break;
+ case 'ext_des': // for BC
+ case 'ext-des-crypt':
+ $crypted = crypt($password, '_' . rcube_utils::random_bytes(8));
+ $prefix = '{CRYPT}';
+ break;
- case 'sha512-crypt':
- $rounds = (int) $rcmail->config->get('password_crypt_rounds');
- $prefix = '$6$';
+ case 'md5crypt': // for BC
+ case 'md5-crypt':
+ $crypted = crypt($password, '$1$' . rcube_utils::random_bytes(9));
+ $prefix = '{MD5-CRYPT}';
+ break;
- if ($rounds > 1000) {
- $prefix .= 'rounds=' . $rounds . '$';
- }
+ case 'sha256-crypt':
+ $rounds = (int) $rcmail->config->get('password_crypt_rounds');
+ $prefix = '$5$';
- $crypted = crypt($password, $prefix . rcube_utils::random_bytes(16));
- $prefix = '{SHA512-CRYPT}';
- break;
+ if ($rounds > 1000) {
+ $prefix .= 'rounds=' . $rounds . '$';
+ }
- case 'blowfish': // for BC
- case 'blowfish-crypt':
- $cost = (int) ($options['cost'] ?? $rcmail->config->get('password_blowfish_cost'));
- $cost = $cost < 4 || $cost > 31 ? 12 : $cost;
- $prefix = sprintf('$2y$%02d$', $cost);
+ $crypted = crypt($password, $prefix . rcube_utils::random_bytes(16));
+ $prefix = '{SHA256-CRYPT}';
+ break;
- $crypted = crypt($password, $prefix . rcube_utils::random_bytes(22));
- $prefix = '{BLF-CRYPT}';
- break;
+ case 'sha512-crypt':
+ $rounds = (int) $rcmail->config->get('password_crypt_rounds');
+ $prefix = '$6$';
- case 'md5':
- $crypted = base64_encode(pack('H*', md5($password)));
- $prefix = '{MD5}';
- break;
+ if ($rounds > 1000) {
+ $prefix .= 'rounds=' . $rounds . '$';
+ }
- case 'sha':
- if (function_exists('sha1')) {
- $crypted = pack('H*', sha1($password));
- }
- else if (function_exists('hash')) {
- $crypted = hash('sha1', $password, true);
- }
- else {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Your PHP installation does not have the hash() nor sha1() function"
- ], true, true
- );
- }
+ $crypted = crypt($password, $prefix . rcube_utils::random_bytes(16));
+ $prefix = '{SHA512-CRYPT}';
+ break;
- $crypted = base64_encode($crypted);
- $prefix = '{SHA}';
- break;
+ case 'blowfish': // for BC
+ case 'blowfish-crypt':
+ $cost = (int) ($options['cost'] ?? $rcmail->config->get('password_blowfish_cost'));
+ $cost = $cost < 4 || $cost > 31 ? 12 : $cost;
+ $prefix = sprintf('$2y$%02d$', $cost);
- case 'ssha':
- $salt = rcube_utils::random_bytes(8);
+ $crypted = crypt($password, $prefix . rcube_utils::random_bytes(22));
+ $prefix = '{BLF-CRYPT}';
+ break;
- if (function_exists('sha1')) {
- $salt = substr(pack("H*", sha1($salt . $password)), 0, 4);
- $crypted = sha1($password . $salt, true);
- }
- else if (function_exists('hash')) {
- $salt = substr(pack("H*", hash('sha1', $salt . $password)), 0, 4);
- $crypted = hash('sha1', $password . $salt, true);
- }
- else {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Your PHP installation does not have the hash() nor sha1() function"
- ], true, true
- );
- }
+ case 'md5':
+ $crypted = base64_encode(pack('H*', md5($password)));
+ $prefix = '{MD5}';
+ break;
- $crypted = base64_encode($crypted . $salt);
- $prefix = '{SSHA}';
- break;
+ case 'sha':
+ if (function_exists('sha1')) {
+ $crypted = pack('H*', sha1($password));
+ }
+ else if (function_exists('hash')) {
+ $crypted = hash('sha1', $password, true);
+ }
+ else {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Your PHP installation does not have the hash() nor sha1() function"
+ ], true, true
+ );
+ }
- // base64 encoded ssha256 for mailcow
- case 'ssha256':
- $salt = rcube_utils::random_bytes(8);
+ $crypted = base64_encode($crypted);
+ $prefix = '{SHA}';
+ break;
- if (function_exists('hash')) {
- $salt = substr(pack("H*", hash('sha256', $salt . $password)), 0, 4);
- $crypted = hash('sha256', $password . $salt, true);
- }
- else {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Your PHP installation does not have the hash() function"
- ], true, true
- );
- }
+ case 'ssha':
+ $salt = rcube_utils::random_bytes(8);
- $crypted = base64_encode($crypted . $salt);
- $prefix = '{SSHA256}';
- break;
+ if (function_exists('sha1')) {
+ $salt = substr(pack("H*", sha1($salt . $password)), 0, 4);
+ $crypted = sha1($password . $salt, true);
+ }
+ else if (function_exists('hash')) {
+ $salt = substr(pack("H*", hash('sha1', $salt . $password)), 0, 4);
+ $crypted = hash('sha1', $password . $salt, true);
+ }
+ else {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Your PHP installation does not have the hash() nor sha1() function"
+ ], true, true
+ );
+ }
- case 'ssha512':
- $salt = rcube_utils::random_bytes(8);
+ $crypted = base64_encode($crypted . $salt);
+ $prefix = '{SSHA}';
+ break;
- if (function_exists('hash')) {
- $salt = substr(pack("H*", hash('sha512', $salt . $password)), 0, 4);
- $crypted = hash('sha512', $password . $salt, true);
- }
- else {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Your PHP installation does not have the hash() function"
- ], true, true
- );
- }
+ // base64 encoded ssha256 for mailcow (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'ssha256':
+ $salt = rcube_utils::random_bytes(8);
- $crypted = base64_encode($crypted . $salt);
- $prefix = '{SSHA512}';
- break;
+ if (function_exists('hash')) {
+ $salt = substr(pack("H*", hash('sha256', $salt . $password)), 0, 4);
+ $crypted = hash('sha256', $password . $salt, true);
+ }
+ else {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Your PHP installation does not have the hash() function"
+ ], true, true
+ );
+ }
- case 'smd5':
- $salt = rcube_utils::random_bytes(8);
+ $crypted = base64_encode($crypted . $salt);
+ $prefix = '{SSHA256}';
+ break;
- if (function_exists('hash')) {
- $salt = substr(pack("H*", hash('md5', $salt . $password)), 0, 4);
- $crypted = hash('md5', $password . $salt, true);
- }
- else {
- $salt = substr(pack("H*", md5($salt . $password)), 0, 4);
- $crypted = md5($password . $salt, true);
- }
+ case 'ssha512':
+ $salt = rcube_utils::random_bytes(8);
- $crypted = base64_encode($crypted . $salt);
- $prefix = '{SMD5}';
- break;
+ if (function_exists('hash')) {
+ $salt = substr(pack("H*", hash('sha512', $salt . $password)), 0, 4);
+ $crypted = hash('sha512', $password . $salt, true);
+ }
+ else {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Your PHP installation does not have the hash() function"
+ ], true, true
+ );
+ }
- case 'samba':
- if (function_exists('hash')) {
- $crypted = hash('md4', rcube_charset::convert($password, RCUBE_CHARSET, 'UTF-16LE'));
- $crypted = strtoupper($crypted);
- }
- else {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Your PHP installation does not have hash() function"
- ], true, true
- );
- }
- break;
+ $crypted = base64_encode($crypted . $salt);
+ $prefix = '{SSHA512}';
+ break;
- case 'ad':
- $crypted = rcube_charset::convert('"' . $password . '"', RCUBE_CHARSET, 'UTF-16LE');
- break;
+ case 'smd5':
+ $salt = rcube_utils::random_bytes(8);
- case 'dovecot':
- if (!($dovecotpw = $rcmail->config->get('password_dovecotpw'))) {
- $dovecotpw = 'dovecotpw';
- }
- if (!($method = $rcmail->config->get('password_dovecotpw_method'))) {
- $method = 'CRAM-MD5';
- }
+ if (function_exists('hash')) {
+ $salt = substr(pack("H*", hash('md5', $salt . $password)), 0, 4);
+ $crypted = hash('md5', $password . $salt, true);
+ }
+ else {
+ $salt = substr(pack("H*", md5($salt . $password)), 0, 4);
+ $crypted = md5($password . $salt, true);
+ }
- $command = "$dovecotpw -s '$method'";
+ $crypted = base64_encode($crypted . $salt);
+ $prefix = '{SMD5}';
+ break;
- $spec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
- $pipe = proc_open($command, $spec, $pipes);
+ case 'samba':
+ if (function_exists('hash')) {
+ $crypted = hash('md4', rcube_charset::convert($password, RCUBE_CHARSET, 'UTF-16LE'));
+ $crypted = strtoupper($crypted);
+ }
+ else {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Your PHP installation does not have hash() function"
+ ], true, true
+ );
+ }
+ break;
- if (!$pipe) {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Failed to execute command: $command"
- ], true, false);
- return false;
- }
+ case 'ad':
+ $crypted = rcube_charset::convert('"' . $password . '"', RCUBE_CHARSET, 'UTF-16LE');
+ break;
- fwrite($pipes[0], $password . "\n", 1+strlen($password));
- usleep(1000);
- fwrite($pipes[0], $password . "\n", 1+strlen($password));
+ case 'dovecot':
+ if (!($dovecotpw = $rcmail->config->get('password_dovecotpw'))) {
+ $dovecotpw = 'dovecotpw';
+ }
+ if (!($method = $rcmail->config->get('password_dovecotpw_method'))) {
+ $method = 'CRAM-MD5';
+ }
- $crypted = trim(stream_get_contents($pipes[1]), "\n");
- $stderr = trim(stream_get_contents($pipes[2]));
+ $command = "$dovecotpw -s '$method'";
- fclose($pipes[0]);
- fclose($pipes[1]);
- fclose($pipes[2]);
- proc_close($pipe);
+ $spec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
+ $pipe = proc_open($command, $spec, $pipes);
- if (!preg_match('/^\{' . $method . '\}/', $crypted)) {
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Failed to execute command: $command. Error: $stderr"
- ], true, false);
+ if (!$pipe) {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Failed to execute command: $command"
+ ], true, false);
+ return false;
+ }
- return false;
- }
+ fwrite($pipes[0], $password . "\n", 1+strlen($password));
+ usleep(1000);
+ fwrite($pipes[0], $password . "\n", 1+strlen($password));
- if (!$prefixed) {
- $prefixed = (bool) $rcmail->config->get('password_dovecotpw_with_method');
- }
+ $crypted = trim(stream_get_contents($pipes[1]), "\n");
+ $stderr = trim(stream_get_contents($pipes[2]));
- if (!$prefixed) {
- $crypted = trim(str_replace('{' . $method . '}', '', $crypted));
- }
+ fclose($pipes[0]);
+ fclose($pipes[1]);
+ fclose($pipes[2]);
+ proc_close($pipe);
- $prefixed = false;
+ if (!preg_match('/^\{' . $method . '\}/', $crypted)) {
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Failed to execute command: $command. Error: $stderr"
+ ], true, false);
- break;
+ return false;
+ }
- case 'hash-bcrypt':
- $crypted = password_hash($password, PASSWORD_BCRYPT, $options);
- $prefix = '{BLF-CRYPT}';
- break;
+ if (!$prefixed) {
+ $prefixed = (bool) $rcmail->config->get('password_dovecotpw_with_method');
+ }
- case 'hash-argon2i':
- $crypted = password_hash($password, PASSWORD_ARGON2I, $options);
- $prefix = '{ARGON2I}';
- break;
+ if (!$prefixed) {
+ $crypted = trim(str_replace('{' . $method . '}', '', $crypted));
+ }
- case 'hash-argon2id':
- $crypted = password_hash($password, PASSWORD_ARGON2ID, $options);
- $prefix = '{ARGON2ID}';
- break;
+ $prefixed = false;
- case 'clear':
- $crypted = $password;
- break;
+ break;
- default:
- rcube::raise_error([
- 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: Hash method not supported."
- ], true, true
- );
+ case 'hash-bcrypt':
+ $crypted = password_hash($password, PASSWORD_BCRYPT, $options);
+ $prefix = '{BLF-CRYPT}';
+ break;
+
+ case 'hash-argon2i':
+ $crypted = password_hash($password, PASSWORD_ARGON2I, $options);
+ $prefix = '{ARGON2I}';
+ break;
+
+ case 'hash-argon2id':
+ $crypted = password_hash($password, PASSWORD_ARGON2ID, $options);
+ $prefix = '{ARGON2ID}';
+ break;
+
+ case 'clear':
+ $crypted = $password;
+ break;
+
+ default:
+ rcube::raise_error([
+ 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Hash method not supported."
+ ], true, true
+ );
}
if ($crypted === null || $crypted === false) {
diff --git a/plugins/reconnect/reconnect.php b/plugins/reconnect/reconnect.php
index 11050dd222a..7a5a9154804 100644
--- a/plugins/reconnect/reconnect.php
+++ b/plugins/reconnect/reconnect.php
@@ -38,11 +38,11 @@ function storage_connect($args)
$storage = rcmail::get_instance()->get_storage();
switch ($storage->get_error_code()) {
- case rcube_imap_generic::ERROR_NO:
- case rcube_imap_generic::ERROR_BAD:
- case rcube_imap_generic::ERROR_BYE:
- $args['retry'] = false;
- break;
+ case rcube_imap_generic::ERROR_NO:
+ case rcube_imap_generic::ERROR_BAD:
+ case rcube_imap_generic::ERROR_BYE:
+ $args['retry'] = false;
+ break;
}
if ($args['retry']) {
diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php
index ede540aad49..a196f91bda6 100644
--- a/plugins/redundant_attachments/redundant_attachments.php
+++ b/plugins/redundant_attachments/redundant_attachments.php
@@ -1,6 +1,6 @@
assertInstanceOf('rcube_plugin', $plugin);
}
}
-
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index 8dca2be9e7a..d5834fab11e 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -169,7 +169,7 @@ private function read_squirrel_prefs($uname)
{
$rcmail = rcmail::get_instance();
- /**** File based backend ****/
+ /* File based backend */
if ($rcmail->config->get('squirrelmail_driver') == 'file' && ($srcdir = $rcmail->config->get('squirrelmail_data_dir'))) {
if (($hash_level = $rcmail->config->get('squirrelmail_data_dir_hash_level')) > 0) {
$srcdir = slashify($srcdir).chunk_split(substr(base_convert(crc32($uname), 10, 16), 0, $hash_level), 1, '/');
@@ -246,7 +246,7 @@ private function read_squirrel_prefs($uname)
$sql_result = $db->query('SELECT * FROM ' . $db->quote_identifier($userprefs_table)
.' WHERE `user` = ?', $uname); // ? is replaced with emailaddress
- while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result
+ while ($sql_array = $db->fetch_assoc($sql_result)) { // fetch one row from result
$this->prefs[$sql_array['prefkey']] = rcube_charset::convert(rtrim($sql_array['prefval']), $db_charset);
}
@@ -255,7 +255,7 @@ private function read_squirrel_prefs($uname)
.' WHERE `owner` = ?', $uname); // ? is replaced with emailaddress
// parse address book
- while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result
+ while ($sql_array = $db->fetch_assoc($sql_result)) { // fetch one row from result
$rec['name'] = rcube_charset::convert(rtrim($sql_array['nickname']), $db_charset);
$rec['firstname'] = rcube_charset::convert(rtrim($sql_array['firstname']), $db_charset);
$rec['surname'] = rcube_charset::convert(rtrim($sql_array['lastname']), $db_charset);
diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
index 444d3cdd656..b3fb9f076df 100644
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ b/plugins/subscriptions_option/subscriptions_option.php
@@ -102,7 +102,7 @@ function mailboxes_list($args)
$storage = $rcmail->get_storage();
if ($folders = $storage->list_folders_direct($args['root'], $args['name'])) {
- $folders = array_filter($folders, function($folder) use ($storage) {
+ $folders = array_filter($folders, function ($folder) use ($storage) {
$attrs = $storage->folder_attributes($folder);
return !in_array_nocase('\\Noselect', $attrs);
});
diff --git a/plugins/userinfo/tests/Userinfo.php b/plugins/userinfo/tests/Userinfo.php
index 49d02019db5..bc39fa7f765 100644
--- a/plugins/userinfo/tests/Userinfo.php
+++ b/plugins/userinfo/tests/Userinfo.php
@@ -19,4 +19,3 @@ function test_constructor()
$this->assertInstanceOf('rcube_plugin', $plugin);
}
}
-
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index 5443f3765ea..1ba50f3cbb1 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -296,10 +296,10 @@ private static function is_vcard($part)
$part->mimetype == 'text/x-vcard' ||
// Content-Type: text/directory; profile=vCard;
($part->mimetype == 'text/directory' && (
- (!empty($part->ctype_parameters['profile']) && strtolower($part->ctype_parameters['profile']) == 'vcard')
+ (!empty($part->ctype_parameters['profile']) && strtolower($part->ctype_parameters['profile']) == 'vcard')
// Content-Type: text/directory; (with filename=*.vcf)
- || (!empty($part->filename) && preg_match('/\.vcf$/i', $part->filename))
- )
+ || (!empty($part->filename) && preg_match('/\.vcf$/i', $part->filename))
+ )
)
);
}
diff --git a/plugins/virtuser_file/tests/VirtuserFile.php b/plugins/virtuser_file/tests/VirtuserFile.php
index 7d575a5f7c1..1ed763ebb04 100644
--- a/plugins/virtuser_file/tests/VirtuserFile.php
+++ b/plugins/virtuser_file/tests/VirtuserFile.php
@@ -19,4 +19,3 @@ function test_constructor()
$this->assertInstanceOf('rcube_plugin', $plugin);
}
}
-
diff --git a/plugins/virtuser_query/tests/VirtuserQuery.php b/plugins/virtuser_query/tests/VirtuserQuery.php
index d8ccb7b4187..2a36d8eb309 100644
--- a/plugins/virtuser_query/tests/VirtuserQuery.php
+++ b/plugins/virtuser_query/tests/VirtuserQuery.php
@@ -19,4 +19,3 @@ function test_constructor()
$this->assertInstanceOf('rcube_plugin', $plugin);
}
}
-
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 11698c34aba..3812c33d846 100644
--- a/plugins/virtuser_query/virtuser_query.php
+++ b/plugins/virtuser_query/virtuser_query.php
@@ -151,7 +151,7 @@ function get_dbh()
if ($dsn = $this->app->config->get('virtuser_query_dsn')) {
// connect to the virtuser database
$this->db = rcube_db::factory($dsn);
- $this->db->set_debug((bool)$this->app->config->get('sql_debug'));
+ $this->db->set_debug((bool) $this->app->config->get('sql_debug'));
$this->db->db_connect('r'); // connect in read mode
}
else {
diff --git a/plugins/zipdownload/config.inc.php.dist b/plugins/zipdownload/config.inc.php.dist
index 019cc8de531..3b41bbc9a3c 100644
--- a/plugins/zipdownload/config.inc.php.dist
+++ b/plugins/zipdownload/config.inc.php.dist
@@ -1,6 +1,6 @@
click('.header-links a.zipdownload');
});
- $filename = 'Lines.zip';
- $files = $this->getFilesFromZip($filename);
- $browser->removeDownloadedFile($filename);
- $expected = ['lines.txt', 'lines_lf.txt'];
- $this->assertSame($expected, $files);
+ $filename = 'Lines.zip';
+ $files = $this->getFilesFromZip($filename);
+ $browser->removeDownloadedFile($filename);
+ $expected = ['lines.txt', 'lines_lf.txt'];
+ $this->assertSame($expected, $files);
});
}
diff --git a/program/actions/contacts/copy.php b/program/actions/contacts/copy.php
index c04d1f2ab27..93d506bac06 100644
--- a/program/actions/contacts/copy.php
+++ b/program/actions/contacts/copy.php
@@ -1,6 +1,6 @@
output->command($prefix . 'add_contact_row', $row['ID'], $a_row_cols, join(' ', $classes),
- array_intersect_key($row, ['ID' => 1,'readonly' => 1, '_type' => 1, 'email' => 1,'name' => 1])
+ array_intersect_key($row, ['ID' => 1, 'readonly' => 1, '_type' => 1, 'email' => 1, 'name' => 1])
);
}
}
@@ -787,7 +787,7 @@ public static function contact_form($form, $record, $attrib = null)
// group fields
$head_fields = [
'source' => ['source'],
- 'names' => ['prefix','firstname','middlename','surname','suffix'],
+ 'names' => ['prefix', 'firstname', 'middlename', 'surname', 'suffix'],
'displayname' => ['name'],
'nickname' => ['nickname'],
'organization' => ['organization'],
@@ -832,7 +832,7 @@ public static function contact_form($form, $record, $attrib = null)
if (!empty($prop['subtypes'])) {
// re-order subtypes, so 'work' is before 'home'
if ($business_mode) {
- $work_opts = array_filter($prop['subtypes'], function($var) { return strpos($var, 'work') !== false; });
+ $work_opts = array_filter($prop['subtypes'], function ($var) { return strpos($var, 'work') !== false; });
if (!empty($work_opts)) {
$coltypes[$col]['subtypes'] = $prop['subtypes'] = array_merge(
$work_opts,
diff --git a/program/actions/contacts/list.php b/program/actions/contacts/list.php
index 0a65f4605f9..99bf1082217 100644
--- a/program/actions/contacts/list.php
+++ b/program/actions/contacts/list.php
@@ -1,6 +1,6 @@
group_id)) {
$group_data = ['ID' => $contacts->group_id]
- + array_intersect_key((array) $contacts->get_group($contacts->group_id), ['name' => 1,'email' => 1]);
+ + array_intersect_key((array) $contacts->get_group($contacts->group_id), ['name' => 1, 'email' => 1]);
}
}
diff --git a/program/actions/contacts/mailto.php b/program/actions/contacts/mailto.php
index 7be89c66fe8..167ab075de3 100644
--- a/program/actions/contacts/mailto.php
+++ b/program/actions/contacts/mailto.php
@@ -1,6 +1,6 @@
1,'email' => 1,'name' => 1]);
+ $record = array_intersect_key($record, ['ID' => 1, 'email' => 1, 'name' => 1]);
$record['_type'] = 'person';
// update the changed col in list
diff --git a/program/actions/contacts/search.php b/program/actions/contacts/search.php
index 70ff418ba9d..636a8490909 100644
--- a/program/actions/contacts/search.php
+++ b/program/actions/contacts/search.php
@@ -1,6 +1,6 @@
rcmail_sendmail::MODE_FORWARD],
[
'sendmail' => true,
- 'error_handler' => function(...$args) use ($rcmail) {
+ 'error_handler' => function (...$args) use ($rcmail) {
call_user_func_array([$rcmail->output, 'show_message'], $args);
$rcmail->output->send('iframe');
}
diff --git a/program/actions/mail/check_recent.php b/program/actions/mail/check_recent.php
index 3b3609f356a..2c725d8e3da 100644
--- a/program/actions/mail/check_recent.php
+++ b/program/actions/mail/check_recent.php
@@ -1,6 +1,6 @@
get_parameters('MAILBOX'))
+ && in_array($mbox_name, (array) $_SESSION['search'][1]->get_parameters('MAILBOX'))
);
if ($is_current) {
diff --git a/program/actions/mail/compose.php b/program/actions/mail/compose.php
index eee09db10d2..ecca2cfe0b9 100644
--- a/program/actions/mail/compose.php
+++ b/program/actions/mail/compose.php
@@ -1,6 +1,6 @@
session->reload();
if ($_SESSION['compose_data_' . self::$COMPOSE_ID]) {
- self::$COMPOSE =& $_SESSION['compose_data_' . self::$COMPOSE_ID];
+ self::$COMPOSE =&$_SESSION['compose_data_' . self::$COMPOSE_ID];
}
}
@@ -78,7 +78,7 @@ public function run($args = [])
? $params['mbox'] : $rcmail->storage->get_folder(),
];
- self::$COMPOSE =& $_SESSION['compose_data_' . self::$COMPOSE_ID];
+ self::$COMPOSE =&$_SESSION['compose_data_' . self::$COMPOSE_ID];
self::process_compose_params(self::$COMPOSE);
// check if folder for saving sent messages exists and is subscribed (#1486802)
diff --git a/program/actions/mail/copy.php b/program/actions/mail/copy.php
index b4dd5a7198e..5fec9a737d8 100644
--- a/program/actions/mail/copy.php
+++ b/program/actions/mail/copy.php
@@ -1,6 +1,6 @@
gettext('loadingdata');
header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
- print "\n\n"
+ echo "\n\n"
. 'GNU General Public License '
. 'as published by the Free Software Foundation, either version 3 of the License, '
diff --git a/program/actions/settings/folder_create.php b/program/actions/settings/folder_create.php
index f765c24e136..d851b44dae4 100644
--- a/program/actions/settings/folder_create.php
+++ b/program/actions/settings/folder_create.php
@@ -1,6 +1,6 @@
add($rcmail->gettext('all'), '---');
foreach (array_keys($namespace) as $type) {
- foreach ((array)$namespace[$type] as $ns) {
+ foreach ((array) $namespace[$type] as $ns) {
$root = rtrim($ns[0], $ns[1]);
$label = $rcmail->gettext('namespace.' . $type);
diff --git a/program/actions/settings/identities.php b/program/actions/settings/identities.php
index d0b76584eb0..8c50cd49d5b 100644
--- a/program/actions/settings/identities.php
+++ b/program/actions/settings/identities.php
@@ -1,6 +1,6 @@
$value){
+ foreach ($form['addressing']['content'] as $formfield => $value) {
$form['addressing']['content'][$formfield]['disabled'] = true;
$form['addressing']['content'][$formfield]['class'] = 'disabled';
}
diff --git a/program/actions/settings/identity_save.php b/program/actions/settings/identity_save.php
index a7756f8c6eb..d48a6f53359 100644
--- a/program/actions/settings/identity_save.php
+++ b/program/actions/settings/identity_save.php
@@ -1,6 +1,6 @@
'general', 'section' => $rcmail->gettext('uisettings')];
$sections['mailbox'] = ['id' => 'mailbox', 'section' => $rcmail->gettext('mailboxview')];
- $sections['mailview'] = ['id' => 'mailview','section' => $rcmail->gettext('messagesdisplaying')];
+ $sections['mailview'] = ['id' => 'mailview', 'section' => $rcmail->gettext('messagesdisplaying')];
$sections['compose'] = ['id' => 'compose', 'section' => $rcmail->gettext('messagescomposition')];
- $sections['addressbook'] = ['id' => 'addressbook','section' => $rcmail->gettext('contacts')];
+ $sections['addressbook'] = ['id' => 'addressbook', 'section' => $rcmail->gettext('contacts')];
$sections['folders'] = ['id' => 'folders', 'section' => $rcmail->gettext('specialfolders')];
- $sections['server'] = ['id' => 'server', 'section' => $rcmail->gettext('serversettings')];
+ $sections['server'] = ['id' => 'server', 'section' => $rcmail->gettext('serversettings')];
$sections['encryption'] = ['id' => 'encryption', 'section' => $rcmail->gettext('encryption')];
// hook + define list cols
@@ -127,1390 +127,1390 @@ public static function user_prefs($current = null)
switch ($sect['id']) {
- // general
- case 'general':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'skin' => ['name' => rcube::Q($rcmail->gettext('skin'))],
- 'browser' => ['name' => rcube::Q($rcmail->gettext('browseroptions'))],
- 'advanced'=> ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
+ // general
+ case 'general':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'skin' => ['name' => rcube::Q($rcmail->gettext('skin'))],
+ 'browser' => ['name' => rcube::Q($rcmail->gettext('browseroptions'))],
+ 'advanced'=> ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
+ ];
- // language selection
- if (!isset($no_override['language'])) {
- if (!$current) {
- continue 2;
- }
+ // language selection
+ if (!isset($no_override['language'])) {
+ if (!$current) {
+ continue 2;
+ }
- $a_lang = $rcmail->list_languages();
- asort($a_lang);
+ $a_lang = $rcmail->list_languages();
+ asort($a_lang);
- $field_id = 'rcmfd_lang';
- $select = new html_select([
- 'name' => '_language',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ $field_id = 'rcmfd_lang';
+ $select = new html_select([
+ 'name' => '_language',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $select->add(array_values($a_lang), array_keys($a_lang));
+ $select->add(array_values($a_lang), array_keys($a_lang));
- $blocks['main']['options']['language'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('language'))),
- 'content' => $select->show($rcmail->user->language),
- ];
- }
-
- // timezone selection
- if (!isset($no_override['timezone'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['language'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('language'))),
+ 'content' => $select->show($rcmail->user->language),
+ ];
}
- $field_id = 'rcmfd_timezone';
- $select = new html_select([
- 'name' => '_timezone',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ // timezone selection
+ if (!isset($no_override['timezone'])) {
+ if (!$current) {
+ continue 2;
+ }
+
+ $field_id = 'rcmfd_timezone';
+ $select = new html_select([
+ 'name' => '_timezone',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $select->add($rcmail->gettext('autodetect'), 'auto');
+ $select->add($rcmail->gettext('autodetect'), 'auto');
- $zones = [];
- foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
- if ($data = self::timezone_standard_time_data($tzs)) {
- $zones[$data['key']] = [$tzs, $data['offset']];
+ $zones = [];
+ foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
+ if ($data = self::timezone_standard_time_data($tzs)) {
+ $zones[$data['key']] = [$tzs, $data['offset']];
+ }
}
- }
- ksort($zones);
+ ksort($zones);
+
+ foreach ($zones as $zone) {
+ list($tzs, $offset) = $zone;
+ $select->add('(GMT ' . $offset . ') ' . self::timezone_label($tzs), $tzs);
+ }
- foreach ($zones as $zone) {
- list($tzs, $offset) = $zone;
- $select->add('(GMT ' . $offset . ') ' . self::timezone_label($tzs), $tzs);
+ $blocks['main']['options']['timezone'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('timezone'))),
+ 'content' => $select->show((string) $config['timezone']),
+ ];
}
- $blocks['main']['options']['timezone'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('timezone'))),
- 'content' => $select->show((string)$config['timezone']),
- ];
- }
+ // date/time formatting
+ if (!isset($no_override['time_format'])) {
+ if (!$current) {
+ continue 2;
+ }
- // date/time formatting
- if (!isset($no_override['time_format'])) {
- if (!$current) {
- continue 2;
- }
+ $reftime = mktime(7,30,0);
+ $defaults = ['G:i', 'H:i', 'g:i a', 'h:i A'];
+ $formats = (array) $rcmail->config->get('time_formats', $defaults);
+ $field_id = 'rcmfd_time_format';
+ $select = new html_select([
+ 'name' => '_time_format',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $reftime = mktime(7,30,0);
- $defaults = ['G:i', 'H:i', 'g:i a', 'h:i A'];
- $formats = (array) $rcmail->config->get('time_formats', $defaults);
- $field_id = 'rcmfd_time_format';
- $select = new html_select([
- 'name' => '_time_format',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ foreach ($formats as $choice) {
+ $select->add(date($choice, $reftime), $choice);
+ }
- foreach ($formats as $choice) {
- $select->add(date($choice, $reftime), $choice);
+ $blocks['main']['options']['time_format'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('timeformat'))),
+ 'content' => $select->show($rcmail->config->get('time_format')),
+ ];
}
- $blocks['main']['options']['time_format'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('timeformat'))),
- 'content' => $select->show($rcmail->config->get('time_format')),
- ];
- }
+ if (!isset($no_override['date_format'])) {
+ if (!$current) {
+ continue 2;
+ }
- if (!isset($no_override['date_format'])) {
- if (!$current) {
- continue 2;
- }
+ $refdate = mktime(12,30,0,7,24);
+ $defaults = ['Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'];
+ $formats = (array) $rcmail->config->get('date_formats', $defaults);
+ $field_id = 'rcmfd_date_format';
+ $select = new html_select([
+ 'name' => '_date_format',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $refdate = mktime(12,30,0,7,24);
- $defaults = ['Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y'];
- $formats = (array) $rcmail->config->get('date_formats', $defaults);
- $field_id = 'rcmfd_date_format';
- $select = new html_select([
- 'name' => '_date_format',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ foreach ($formats as $choice) {
+ $select->add(date($choice, $refdate), $choice);
+ }
- foreach ($formats as $choice) {
- $select->add(date($choice, $refdate), $choice);
+ $blocks['main']['options']['date_format'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('dateformat'))),
+ 'content' => $select->show($config['date_format']),
+ ];
}
- $blocks['main']['options']['date_format'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('dateformat'))),
- 'content' => $select->show($config['date_format']),
- ];
- }
+ // Show checkbox for toggling 'pretty dates'
+ if (!isset($no_override['prettydate'])) {
+ if (!$current) {
+ continue 2;
+ }
- // Show checkbox for toggling 'pretty dates'
- if (!isset($no_override['prettydate'])) {
- if (!$current) {
- continue 2;
+ $field_id = 'rcmfd_prettydate';
+ $input = new html_checkbox([
+ 'name' => '_pretty_date',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
+
+ $blocks['main']['options']['prettydate'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('prettydate'))),
+ 'content' => $input->show($config['prettydate'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_prettydate';
- $input = new html_checkbox([
- 'name' => '_pretty_date',
- 'id' => $field_id,
- 'value' => 1
- ]);
+ // "display after delete" checkbox
+ if (!isset($no_override['display_next'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['prettydate'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('prettydate'))),
- 'content' => $input->show($config['prettydate']?1:0),
- ];
- }
+ $field_id = 'rcmfd_displaynext';
+ $input = new html_checkbox([
+ 'name' => '_display_next',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
- // "display after delete" checkbox
- if (!isset($no_override['display_next'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['display_next'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('displaynext'))),
+ 'content' => $input->show($config['display_next'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_displaynext';
- $input = new html_checkbox([
- 'name' => '_display_next',
- 'id' => $field_id,
- 'value' => 1
- ]);
+ if (!isset($no_override['refresh_interval'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['display_next'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('displaynext'))),
- 'content' => $input->show($config['display_next']?1:0),
- ];
- }
+ $field_id = 'rcmfd_refresh_interval';
+ $select = new html_select([
+ 'name' => '_refresh_interval',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
+
+ $select->add($rcmail->gettext('never'), 0);
+ foreach ([1, 3, 5, 10, 15, 30, 60] as $min) {
+ if (!$config['min_refresh_interval'] || $config['min_refresh_interval'] <= $min * 60) {
+ $label = $rcmail->gettext(['name' => 'everynminutes', 'vars' => ['n' => $min]]);
+ $select->add($label, $min);
+ }
+ }
- if (!isset($no_override['refresh_interval'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['refresh_interval'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('refreshinterval'))),
+ 'content' => $select->show($config['refresh_interval']/60),
+ ];
}
- $field_id = 'rcmfd_refresh_interval';
- $select = new html_select([
- 'name' => '_refresh_interval',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ // show drop-down for available skins
+ if (!isset($no_override['skin'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('never'), 0);
- foreach ([1, 3, 5, 10, 15, 30, 60] as $min) {
- if (!$config['min_refresh_interval'] || $config['min_refresh_interval'] <= $min * 60) {
- $label = $rcmail->gettext(['name' => 'everynminutes', 'vars' => ['n' => $min]]);
- $select->add($label, $min);
+ $skins = self::get_skins();
+
+ if (count($skins) > 1) {
+ sort($skins);
+
+ $field_id = 'rcmfd_skin';
+ $input = new html_radiobutton(['name' => '_skin']);
+
+ foreach ($skins as $skin) {
+ $skinname = ucfirst($skin);
+ $author_link = '';
+ $license_link = '';
+ $meta = @json_decode(@file_get_contents(INSTALL_PATH . "skins/$skin/meta.json"), true);
+
+ if (is_array($meta) && !empty($meta['name'])) {
+ $skinname = $meta['name'];
+ $author_link = !empty($meta['url']) ? html::a(['href' => $meta['url'], 'target' => '_blank'], rcube::Q($meta['author'])) : rcube::Q($meta['author']);
+ $license_link = !empty($meta['license-url']) ? html::a(['href' => $meta['license-url'], 'target' => '_blank', 'tabindex' => '-1'], rcube::Q($meta['license'])) : rcube::Q($meta['license']);
+ }
+
+ $img = html::img([
+ 'src' => $rcmail->output->asset_url("skins/$skin/thumbnail.png"),
+ 'class' => 'skinthumbnail',
+ 'alt' => $skin,
+ 'width' => 64,
+ 'height' => 64,
+ 'onerror' => "this.onerror = null; this.src = 'data:image/gif;base64," . rcmail_output::BLANK_GIF ."';",
+ ]);
+
+ $blocks['skin']['options'][$skin]['content'] = html::label(['class' => 'skinselection'],
+ html::span('skinitem', $input->show($config['skin'], ['value' => $skin, 'id' => $field_id.$skin])) .
+ html::span('skinitem', $img) .
+ html::span('skinitem', html::span('skinname', rcube::Q($skinname)) . html::br() .
+ html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
+ html::span('skinlicense', $license_link ? $rcmail->gettext('license').': ' . $license_link : ''))
+ );
+ }
}
}
- $blocks['main']['options']['refresh_interval'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('refreshinterval'))),
- 'content' => $select->show($config['refresh_interval']/60),
- ];
- }
+ // standard_windows option decides if new windows should be
+ // opened as popups or standard windows (which can be handled by browsers as tabs)
+ if (!isset($no_override['standard_windows'])) {
+ if (!$current) {
+ continue 2;
+ }
- // show drop-down for available skins
- if (!isset($no_override['skin'])) {
- if (!$current) {
- continue 2;
+ $field_id = 'rcmfd_standard_windows';
+ $checkbox = new html_checkbox([
+ 'name' => '_standard_windows',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
+
+ $blocks['browser']['options']['standard_windows'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('standardwindows'))),
+ 'content' => $checkbox->show($config['standard_windows'] ? 1 : 0),
+ ];
}
- $skins = self::get_skins();
+ if ($current) {
+ $product_name = $rcmail->config->get('product_name', 'Roundcube Webmail');
+ $rcmail->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
+ rcmail_output::JS_OBJECT_NAME, rcube::JQ($product_name)), 'docready');
+ }
- if (count($skins) > 1) {
- sort($skins);
+ $blocks['browser']['options']['mailtoprotohandler'] = [
+ 'content' => html::a(['href' => '#', 'id' => 'mailtoprotohandler'],
+ rcube::Q($rcmail->gettext('mailtoprotohandler'))) .
+ html::span('mailtoprotohandler-status', ''),
+ ];
- $field_id = 'rcmfd_skin';
- $input = new html_radiobutton(['name' => '_skin']);
+ break;
- foreach ($skins as $skin) {
- $skinname = ucfirst($skin);
- $author_link = '';
- $license_link = '';
- $meta = @json_decode(@file_get_contents(INSTALL_PATH . "skins/$skin/meta.json"), true);
+ // Mailbox view (mail screen) (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'mailbox':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'new_message' => ['name' => rcube::Q($rcmail->gettext('newmessage'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
+ ];
- if (is_array($meta) && !empty($meta['name'])) {
- $skinname = $meta['name'];
- $author_link = !empty($meta['url']) ? html::a(['href' => $meta['url'], 'target' => '_blank'], rcube::Q($meta['author'])) : rcube::Q($meta['author']);
- $license_link = !empty($meta['license-url']) ? html::a(['href' => $meta['license-url'], 'target' => '_blank', 'tabindex' => '-1'], rcube::Q($meta['license'])) : rcube::Q($meta['license']);
- }
+ if (!isset($no_override['layout']) && count($config['supported_layouts']) > 1) {
+ if (!$current) {
+ continue 2;
+ }
- $img = html::img([
- 'src' => $rcmail->output->asset_url("skins/$skin/thumbnail.png"),
- 'class' => 'skinthumbnail',
- 'alt' => $skin,
- 'width' => 64,
- 'height' => 64,
- 'onerror' => "this.onerror = null; this.src = 'data:image/gif;base64," . rcmail_output::BLANK_GIF ."';",
- ]);
+ $field_id = 'rcmfd_layout';
+ $select = new html_select([
+ 'name' => '_layout',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['skin']['options'][$skin]['content'] = html::label(['class' => 'skinselection'],
- html::span('skinitem', $input->show($config['skin'], ['value' => $skin, 'id' => $field_id.$skin])) .
- html::span('skinitem', $img) .
- html::span('skinitem', html::span('skinname', rcube::Q($skinname)) . html::br() .
- html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
- html::span('skinlicense', $license_link ? $rcmail->gettext('license').': ' . $license_link : ''))
- );
+ $layouts = [
+ 'widescreen' => 'layoutwidescreendesc',
+ 'desktop' => 'layoutdesktopdesc',
+ 'list' => 'layoutlistdesc'
+ ];
+
+ $available_layouts = array_intersect_key($layouts, array_flip($config['supported_layouts']));
+ foreach ($available_layouts as $val => $label) {
+ $select->add($rcmail->gettext($label), $val);
}
- }
- }
- // standard_windows option decides if new windows should be
- // opened as popups or standard windows (which can be handled by browsers as tabs)
- if (!isset($no_override['standard_windows'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['layout'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('layout'))),
+ 'content' => $select->show($config['layout'] ?: 'widescreen'),
+ ];
}
- $field_id = 'rcmfd_standard_windows';
- $checkbox = new html_checkbox([
- 'name' => '_standard_windows',
- 'id' => $field_id,
- 'value' => 1
- ]);
-
- $blocks['browser']['options']['standard_windows'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('standardwindows'))),
- 'content' => $checkbox->show($config['standard_windows']?1:0),
- ];
- }
+ // show config parameter for auto marking the previewed message as read
+ if (!isset($no_override['mail_read_time'])) {
+ if (!$current) {
+ continue 2;
+ }
- if ($current) {
- $product_name = $rcmail->config->get('product_name', 'Roundcube Webmail');
- $rcmail->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
- rcmail_output::JS_OBJECT_NAME, rcube::JQ($product_name)), 'docready');
- }
+ // apply default if config option is not set at all
+ $config['mail_read_time'] = intval($rcmail->config->get('mail_read_time'));
- $blocks['browser']['options']['mailtoprotohandler'] = [
- 'content' => html::a(['href' => '#', 'id' => 'mailtoprotohandler'],
- rcube::Q($rcmail->gettext('mailtoprotohandler'))) .
- html::span('mailtoprotohandler-status', ''),
- ];
-
- break;
-
- // Mailbox view (mail screen)
- case 'mailbox':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'new_message' => ['name' => rcube::Q($rcmail->gettext('newmessage'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
-
- if (!isset($no_override['layout']) && count($config['supported_layouts']) > 1) {
- if (!$current) {
- continue 2;
- }
-
- $field_id = 'rcmfd_layout';
- $select = new html_select([
- 'name' => '_layout',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
-
- $layouts = [
- 'widescreen' => 'layoutwidescreendesc',
- 'desktop' => 'layoutdesktopdesc',
- 'list' => 'layoutlistdesc'
- ];
+ $field_id = 'rcmfd_mail_read_time';
+ $select = new html_select([
+ 'name' => '_mail_read_time',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $available_layouts = array_intersect_key($layouts, array_flip($config['supported_layouts']));
- foreach ($available_layouts as $val => $label) {
- $select->add($rcmail->gettext($label), $val);
- }
+ $select->add($rcmail->gettext('never'), -1);
+ $select->add($rcmail->gettext('immediately'), 0);
- $blocks['main']['options']['layout'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('layout'))),
- 'content' => $select->show($config['layout'] ?: 'widescreen'),
- ];
- }
+ foreach ([5, 10, 20, 30] as $sec) {
+ $label = $rcmail->gettext(['name' => 'afternseconds', 'vars' => ['n' => $sec]]);
+ $select->add($label, $sec);
+ }
- // show config parameter for auto marking the previewed message as read
- if (!isset($no_override['mail_read_time'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['mail_read_time'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('automarkread'))),
+ 'content' => $select->show($config['mail_read_time']),
+ ];
}
- // apply default if config option is not set at all
- $config['mail_read_time'] = intval($rcmail->config->get('mail_read_time'));
-
- $field_id = 'rcmfd_mail_read_time';
- $select = new html_select([
- 'name' => '_mail_read_time',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ if (!isset($no_override['autoexpand_threads'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('never'), -1);
- $select->add($rcmail->gettext('immediately'), 0);
+ $storage = $rcmail->get_storage();
+ $supported = $storage->get_capability('THREAD');
- foreach ([5, 10, 20, 30] as $sec) {
- $label = $rcmail->gettext(['name' => 'afternseconds', 'vars' => ['n' => $sec]]);
- $select->add($label, $sec);
- }
+ if ($supported) {
+ $field_id = 'rcmfd_autoexpand_threads';
+ $select = new html_select([
+ 'name' => '_autoexpand_threads',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['main']['options']['mail_read_time'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('automarkread'))),
- 'content' => $select->show($config['mail_read_time']),
- ];
- }
+ $select->add($rcmail->gettext('never'), 0);
+ $select->add($rcmail->gettext('do_expand'), 1);
+ $select->add($rcmail->gettext('expand_only_unread'), 2);
- if (!isset($no_override['autoexpand_threads'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['autoexpand_threads'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autoexpand_threads'))),
+ 'content' => $select->show($config['autoexpand_threads']),
+ ];
+ }
}
- $storage = $rcmail->get_storage();
- $supported = $storage->get_capability('THREAD');
+ // show page size selection
+ if (!isset($no_override['mail_pagesize'])) {
+ if (!$current) {
+ continue 2;
+ }
- if ($supported) {
- $field_id = 'rcmfd_autoexpand_threads';
- $select = new html_select([
- 'name' => '_autoexpand_threads',
+ $size = intval($config['mail_pagesize'] ?: $config['pagesize']);
+ $field_id = 'rcmfd_mail_pagesize';
+ $input = new html_inputfield([
+ 'name' => '_mail_pagesize',
'id' => $field_id,
- 'class' => 'custom-select'
+ 'size' => 5,
+ 'class' => 'form-control'
]);
- $select->add($rcmail->gettext('never'), 0);
- $select->add($rcmail->gettext('do_expand'), 1);
- $select->add($rcmail->gettext('expand_only_unread'), 2);
-
- $blocks['main']['options']['autoexpand_threads'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autoexpand_threads'))),
- 'content' => $select->show($config['autoexpand_threads']),
+ $blocks['main']['options']['pagesize'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('pagesize'))),
+ 'content' => $input->show($size ?: 50),
];
}
- }
-
- // show page size selection
- if (!isset($no_override['mail_pagesize'])) {
- if (!$current) {
- continue 2;
- }
- $size = intval($config['mail_pagesize'] ?: $config['pagesize']);
- $field_id = 'rcmfd_mail_pagesize';
- $input = new html_inputfield([
- 'name' => '_mail_pagesize',
- 'id' => $field_id,
- 'size' => 5,
- 'class' => 'form-control'
- ]);
+ if (!isset($no_override['check_all_folders'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['pagesize'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('pagesize'))),
- 'content' => $input->show($size ?: 50),
- ];
- }
+ $field_id = 'rcmfd_check_all_folders';
+ $input = new html_checkbox([
+ 'name' => '_check_all_folders',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
- if (!isset($no_override['check_all_folders'])) {
- if (!$current) {
- continue 2;
+ $blocks['new_message']['options']['check_all_folders'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('checkallfolders'))),
+ 'content' => $input->show($config['check_all_folders'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_check_all_folders';
- $input = new html_checkbox([
- 'name' => '_check_all_folders',
- 'id' => $field_id,
- 'value' => 1
- ]);
+ break;
- $blocks['new_message']['options']['check_all_folders'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('checkallfolders'))),
- 'content' => $input->show($config['check_all_folders']?1:0),
+ // Message viewing (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'mailview':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
];
- }
- break;
+ // show checkbox to open message view in new window
+ if (!isset($no_override['message_extwin'])) {
+ if (!$current) {
+ continue 2;
+ }
- // Message viewing
- case 'mailview':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
+ $field_id = 'rcmfd_message_extwin';
+ $input = new html_checkbox(['name' => '_message_extwin', 'id' => $field_id, 'value' => 1]);
- // show checkbox to open message view in new window
- if (!isset($no_override['message_extwin'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['message_extwin'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('showinextwin'))),
+ 'content' => $input->show($config['message_extwin'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_message_extwin';
- $input = new html_checkbox(['name' => '_message_extwin', 'id' => $field_id, 'value' => 1]);
+ // show checkbox to show email instead of name
+ if (!isset($no_override['message_show_email'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['message_extwin'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('showinextwin'))),
- 'content' => $input->show($config['message_extwin']?1:0),
- ];
- }
+ $field_id = 'rcmfd_message_show_email';
+ $input = new html_checkbox(['name' => '_message_show_email', 'id' => $field_id, 'value' => 1]);
- // show checkbox to show email instead of name
- if (!isset($no_override['message_show_email'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['message_show_email'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('showemail'))),
+ 'content' => $input->show($config['message_show_email'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_message_show_email';
- $input = new html_checkbox(['name' => '_message_show_email', 'id' => $field_id, 'value' => 1]);
+ // show checkbox for HTML/plaintext messages
+ if (!isset($no_override['prefer_html'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['message_show_email'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('showemail'))),
- 'content' => $input->show($config['message_show_email']?1:0),
- ];
- }
+ $field_id = 'rcmfd_htmlmsg';
+ $input = new html_checkbox([
+ 'name' => '_prefer_html',
+ 'id' => $field_id,
+ 'value' => 1,
+ 'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"
+ ]);
- // show checkbox for HTML/plaintext messages
- if (!isset($no_override['prefer_html'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['prefer_html'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('preferhtml'))),
+ 'content' => $input->show($config['prefer_html'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_htmlmsg';
- $input = new html_checkbox([
- 'name' => '_prefer_html',
- 'id' => $field_id,
- 'value' => 1,
- 'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"
- ]);
+ if (!isset($no_override['default_charset'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['prefer_html'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('preferhtml'))),
- 'content' => $input->show($config['prefer_html']?1:0),
- ];
- }
+ $field_id = 'rcmfd_default_charset';
- if (!isset($no_override['default_charset'])) {
- if (!$current) {
- continue 2;
+ $blocks['advanced']['options']['default_charset'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('defaultcharset'))),
+ 'content' => $rcmail->output->charset_selector([
+ 'id' => $field_id,
+ 'name' => '_default_charset',
+ 'selected' => $config['default_charset'],
+ 'class' => 'custom-select',
+ ])
+ ];
}
- $field_id = 'rcmfd_default_charset';
+ if (!isset($no_override['show_images'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['advanced']['options']['default_charset'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('defaultcharset'))),
- 'content' => $rcmail->output->charset_selector([
+ $field_id = 'rcmfd_show_images';
+ $input = new html_select([
+ 'name' => '_show_images',
'id' => $field_id,
- 'name' => '_default_charset',
- 'selected' => $config['default_charset'],
'class' => 'custom-select',
- ])
- ];
- }
+ 'disabled' => empty($config['prefer_html'])
+ ]);
+
+ $input->add($rcmail->gettext('never'), 0);
+ $input->add($rcmail->gettext('frommycontacts'), 1);
+ $input->add($rcmail->gettext('fromtrustedsenders'), 3);
+ $input->add($rcmail->gettext('always'), 2);
- if (!isset($no_override['show_images'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['show_images'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('allowremoteresources'))),
+ 'content' => $input->show(!empty($config['prefer_html']) ? $config['show_images'] : 0),
+ ];
}
- $field_id = 'rcmfd_show_images';
- $input = new html_select([
- 'name' => '_show_images',
- 'id' => $field_id,
- 'class' => 'custom-select',
- 'disabled' => empty($config['prefer_html'])
- ]);
+ if (!isset($no_override['mdn_requests'])) {
+ if (!$current) {
+ continue 2;
+ }
- $input->add($rcmail->gettext('never'), 0);
- $input->add($rcmail->gettext('frommycontacts'), 1);
- $input->add($rcmail->gettext('fromtrustedsenders'), 3);
- $input->add($rcmail->gettext('always'), 2);
+ $field_id = 'rcmfd_mdn_requests';
+ $select = new html_select([
+ 'name' => '_mdn_requests',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['main']['options']['show_images'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('allowremoteresources'))),
- 'content' => $input->show(!empty($config['prefer_html']) ? $config['show_images'] : 0),
- ];
- }
+ $select->add($rcmail->gettext('askuser'), 0);
+ $select->add($rcmail->gettext('autosend'), 1);
+ $select->add($rcmail->gettext('autosendknown'), 3);
+ $select->add($rcmail->gettext('autosendknownignore'), 4);
+ $select->add($rcmail->gettext('autosendtrusted'), 5);
+ $select->add($rcmail->gettext('autosendtrustedignore'), 6);
+ $select->add($rcmail->gettext('ignorerequest'), 2);
+
+ $blocks['main']['options']['mdn_requests'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('mdnrequests'))),
+ 'content' => $select->show($config['mdn_requests']),
+ ];
+ }
- if (!isset($no_override['mdn_requests'])) {
- if (!$current) {
- continue 2;
- }
-
- $field_id = 'rcmfd_mdn_requests';
- $select = new html_select([
- 'name' => '_mdn_requests',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
-
- $select->add($rcmail->gettext('askuser'), 0);
- $select->add($rcmail->gettext('autosend'), 1);
- $select->add($rcmail->gettext('autosendknown'), 3);
- $select->add($rcmail->gettext('autosendknownignore'), 4);
- $select->add($rcmail->gettext('autosendtrusted'), 5);
- $select->add($rcmail->gettext('autosendtrustedignore'), 6);
- $select->add($rcmail->gettext('ignorerequest'), 2);
-
- $blocks['main']['options']['mdn_requests'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('mdnrequests'))),
- 'content' => $select->show($config['mdn_requests']),
- ];
- }
+ if (!isset($no_override['inline_images'])) {
+ if (!$current) {
+ continue 2;
+ }
+
+ $field_id = 'rcmfd_inline_images';
+ $input = new html_checkbox(['name' => '_inline_images', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['inline_images'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['inline_images'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('showinlineimages'))),
+ 'content' => $input->show($config['inline_images'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_inline_images';
- $input = new html_checkbox(['name' => '_inline_images', 'id' => $field_id, 'value' => 1]);
+ break;
- $blocks['main']['options']['inline_images'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('showinlineimages'))),
- 'content' => $input->show($config['inline_images']?1:0),
+ // Mail composition (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'compose':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'sig' => ['name' => rcube::Q($rcmail->gettext('signatureoptions'))],
+ 'spellcheck' => ['name' => rcube::Q($rcmail->gettext('spellcheckoptions'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
];
- }
- break;
+ // show checkbox to compose messages in a new window
+ if (!isset($no_override['compose_extwin'])) {
+ if (!$current) {
+ continue 2;
+ }
- // Mail composition
- case 'compose':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'sig' => ['name' => rcube::Q($rcmail->gettext('signatureoptions'))],
- 'spellcheck' => ['name' => rcube::Q($rcmail->gettext('spellcheckoptions'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
+ $field_id = 'rcmfdcompose_extwin';
+ $input = new html_checkbox(['name' => '_compose_extwin', 'id' => $field_id, 'value' => 1]);
- // show checkbox to compose messages in a new window
- if (!isset($no_override['compose_extwin'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['compose_extwin'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('composeextwin'))),
+ 'content' => $input->show($config['compose_extwin'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfdcompose_extwin';
- $input = new html_checkbox(['name' => '_compose_extwin', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['htmleditor'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['compose_extwin'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('composeextwin'))),
- 'content' => $input->show($config['compose_extwin']?1:0),
- ];
- }
+ $field_id = 'rcmfd_htmleditor';
+ $select = new html_select([
+ 'name' => '_htmleditor',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- if (!isset($no_override['htmleditor'])) {
- if (!$current) {
- continue 2;
+ $select->add($rcmail->gettext('never'), 0);
+ $select->add($rcmail->gettext('htmlonreply'), 2);
+ $select->add($rcmail->gettext('htmlonreplyandforward'), 3);
+ $select->add($rcmail->gettext('always'), 1);
+ $select->add($rcmail->gettext('alwaysbutplain'), 4);
+
+ $blocks['main']['options']['htmleditor'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('htmleditor'))),
+ 'content' => $select->show(intval($config['htmleditor'])),
+ ];
}
- $field_id = 'rcmfd_htmleditor';
- $select = new html_select([
- 'name' => '_htmleditor',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ if (!isset($no_override['draft_autosave'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('never'), 0);
- $select->add($rcmail->gettext('htmlonreply'), 2);
- $select->add($rcmail->gettext('htmlonreplyandforward'), 3);
- $select->add($rcmail->gettext('always'), 1);
- $select->add($rcmail->gettext('alwaysbutplain'), 4);
+ $field_id = 'rcmfd_autosave';
+ $select = new html_select([
+ 'name' => '_draft_autosave',
+ 'id' => $field_id,
+ 'class' => 'custom-select',
+ 'disabled' => empty($config['drafts_mbox'])
+ ]);
- $blocks['main']['options']['htmleditor'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('htmleditor'))),
- 'content' => $select->show(intval($config['htmleditor'])),
- ];
- }
+ $select->add($rcmail->gettext('never'), 0);
+ foreach ([1, 3, 5, 10] as $i => $min) {
+ $label = $rcmail->gettext(['name' => 'everynminutes', 'vars' => ['n' => $min]]);
+ $select->add($label, $min * 60);
+ }
- if (!isset($no_override['draft_autosave'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['draft_autosave'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autosavedraft'))),
+ 'content' => $select->show($config['draft_autosave']),
+ ];
}
- $field_id = 'rcmfd_autosave';
- $select = new html_select([
- 'name' => '_draft_autosave',
- 'id' => $field_id,
- 'class' => 'custom-select',
- 'disabled' => empty($config['drafts_mbox'])
- ]);
+ if (!isset($no_override['mime_param_folding'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('never'), 0);
- foreach ([1, 3, 5, 10] as $i => $min) {
- $label = $rcmail->gettext(['name' => 'everynminutes', 'vars' => ['n' => $min]]);
- $select->add($label, $min * 60);
- }
+ $field_id = 'rcmfd_param_folding';
+ $select = new html_select([
+ 'name' => '_mime_param_folding',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['main']['options']['draft_autosave'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autosavedraft'))),
- 'content' => $select->show($config['draft_autosave']),
- ];
- }
+ $select->add($rcmail->gettext('2231folding'), 0);
+ $select->add($rcmail->gettext('miscfolding'), 1);
+ $select->add($rcmail->gettext('2047folding'), 2);
- if (!isset($no_override['mime_param_folding'])) {
- if (!$current) {
- continue 2;
+ $blocks['advanced']['options']['mime_param_folding'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('mimeparamfolding'))),
+ 'content' => $select->show($config['mime_param_folding']),
+ ];
}
- $field_id = 'rcmfd_param_folding';
- $select = new html_select([
- 'name' => '_mime_param_folding',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
-
- $select->add($rcmail->gettext('2231folding'), 0);
- $select->add($rcmail->gettext('miscfolding'), 1);
- $select->add($rcmail->gettext('2047folding'), 2);
+ if (!isset($no_override['force_7bit'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['advanced']['options']['mime_param_folding'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('mimeparamfolding'))),
- 'content' => $select->show($config['mime_param_folding']),
- ];
- }
+ $field_id = 'rcmfd_force_7bit';
+ $input = new html_checkbox(['name' => '_force_7bit', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['force_7bit'])) {
- if (!$current) {
- continue 2;
+ $blocks['advanced']['options']['force_7bit'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('force7bit'))),
+ 'content' => $input->show($config['force_7bit'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_force_7bit';
- $input = new html_checkbox(['name' => '_force_7bit', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['mdn_default'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['advanced']['options']['force_7bit'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('force7bit'))),
- 'content' => $input->show($config['force_7bit']?1:0),
- ];
- }
+ $field_id = 'rcmfd_mdn_default';
+ $input = new html_checkbox(['name' => '_mdn_default', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['mdn_default'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['mdn_default'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('reqmdn'))),
+ 'content' => $input->show($config['mdn_default'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_mdn_default';
- $input = new html_checkbox(['name' => '_mdn_default', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['dsn_default'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['mdn_default'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('reqmdn'))),
- 'content' => $input->show($config['mdn_default']?1:0),
- ];
- }
+ $field_id = 'rcmfd_dsn_default';
+ $input = new html_checkbox(['name' => '_dsn_default', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['dsn_default'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['dsn_default'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('reqdsn'))),
+ 'content' => $input->show($config['dsn_default'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_dsn_default';
- $input = new html_checkbox(['name' => '_dsn_default', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['reply_same_folder'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['dsn_default'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('reqdsn'))),
- 'content' => $input->show($config['dsn_default']?1:0),
- ];
- }
+ $field_id = 'rcmfd_reply_same_folder';
+ $input = new html_checkbox(['name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['reply_same_folder'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['reply_same_folder'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('replysamefolder'))),
+ 'content' => $input->show($config['reply_same_folder'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_reply_same_folder';
- $input = new html_checkbox(['name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['reply_mode'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['reply_same_folder'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('replysamefolder'))),
- 'content' => $input->show($config['reply_same_folder']?1:0),
- ];
- }
+ $field_id = 'rcmfd_reply_mode';
+ $select = new html_select(['name' => '_reply_mode', 'id' => $field_id, 'class' => 'custom-select']);
- if (!isset($no_override['reply_mode'])) {
- if (!$current) {
- continue 2;
- }
+ $select->add($rcmail->gettext('replyempty'), -1);
+ $select->add($rcmail->gettext('replybottomposting'), 0);
+ $select->add($rcmail->gettext('replytopposting'), 1);
+ $select->add($rcmail->gettext('replytoppostingnoindent'), 2);
- $field_id = 'rcmfd_reply_mode';
- $select = new html_select(['name' => '_reply_mode', 'id' => $field_id, 'class' => 'custom-select']);
+ $blocks['main']['options']['reply_mode'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('whenreplying'))),
+ 'content' => $select->show(intval($config['reply_mode'])),
+ ];
+ }
- $select->add($rcmail->gettext('replyempty'), -1);
- $select->add($rcmail->gettext('replybottomposting'), 0);
- $select->add($rcmail->gettext('replytopposting'), 1);
- $select->add($rcmail->gettext('replytoppostingnoindent'), 2);
+ if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['reply_mode'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('whenreplying'))),
- 'content' => $select->show(intval($config['reply_mode'])),
- ];
- }
+ $field_id = 'rcmfd_spellcheck_before_send';
+ $input = new html_checkbox([
+ 'name' => '_spellcheck_before_send',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
- if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
- if (!$current) {
- continue 2;
+ $blocks['spellcheck']['options']['spellcheck_before_send'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('spellcheckbeforesend'))),
+ 'content' => $input->show($config['spellcheck_before_send'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_spellcheck_before_send';
- $input = new html_checkbox([
- 'name' => '_spellcheck_before_send',
- 'id' => $field_id,
- 'value' => 1
- ]);
+ if ($config['enable_spellcheck']) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['spellcheck']['options']['spellcheck_before_send'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('spellcheckbeforesend'))),
- 'content' => $input->show($config['spellcheck_before_send']?1:0),
- ];
- }
+ foreach (['syms', 'nums', 'caps'] as $key) {
+ $key = 'spellcheck_ignore_' . $key;
+ if (!isset($no_override[$key])) {
+ $input = new html_checkbox(['name' => '_' . $key, 'id' => 'rcmfd_' . $key, 'value' => 1]);
- if ($config['enable_spellcheck']) {
- if (!$current) {
- continue 2;
+ $blocks['spellcheck']['options'][$key] = [
+ 'title' => html::label('rcmfd_' . $key, rcube::Q($rcmail->gettext(str_replace('_', '', $key)))),
+ 'content' => $input->show($config[$key] ? 1 : 0),
+ ];
+ }
+ }
}
- foreach (['syms', 'nums', 'caps'] as $key) {
- $key = 'spellcheck_ignore_' . $key;
- if (!isset($no_override[$key])) {
- $input = new html_checkbox(['name' => '_' . $key, 'id' => 'rcmfd_' . $key, 'value' => 1]);
-
- $blocks['spellcheck']['options'][$key] = [
- 'title' => html::label('rcmfd_' . $key, rcube::Q($rcmail->gettext(str_replace('_', '', $key)))),
- 'content' => $input->show($config[$key]?1:0),
- ];
+ if (!isset($no_override['show_sig'])) {
+ if (!$current) {
+ continue 2;
}
- }
- }
- if (!isset($no_override['show_sig'])) {
- if (!$current) {
- continue 2;
- }
+ $field_id = 'rcmfd_show_sig';
+ $select = new html_select([
+ 'name' => '_show_sig',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $field_id = 'rcmfd_show_sig';
- $select = new html_select([
- 'name' => '_show_sig',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ $select->add($rcmail->gettext('never'), 0);
+ $select->add($rcmail->gettext('always'), 1);
+ $select->add($rcmail->gettext('newmessageonly'), 2);
+ $select->add($rcmail->gettext('replyandforwardonly'), 3);
- $select->add($rcmail->gettext('never'), 0);
- $select->add($rcmail->gettext('always'), 1);
- $select->add($rcmail->gettext('newmessageonly'), 2);
- $select->add($rcmail->gettext('replyandforwardonly'), 3);
+ $blocks['sig']['options']['show_sig'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autoaddsignature'))),
+ 'content' => $select->show($rcmail->config->get('show_sig', 1)),
+ ];
+ }
- $blocks['sig']['options']['show_sig'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autoaddsignature'))),
- 'content' => $select->show($rcmail->config->get('show_sig', 1)),
- ];
- }
+ if (!isset($no_override['sig_below'])) {
+ if (!$current) {
+ continue 2;
+ }
+
+ $field_id = 'rcmfd_sig_below';
+ $input = new html_checkbox(['name' => '_sig_below', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['sig_below'])) {
- if (!$current) {
- continue 2;
+ $blocks['sig']['options']['sig_below'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('sigbelow'))),
+ 'content' => $input->show($rcmail->config->get('sig_below') ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_sig_below';
- $input = new html_checkbox(['name' => '_sig_below', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['strip_existing_sig'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['sig']['options']['sig_below'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('sigbelow'))),
- 'content' => $input->show($rcmail->config->get('sig_below') ? 1 : 0),
- ];
- }
+ $field_id = 'rcmfd_strip_existing_sig';
+ $input = new html_checkbox([
+ 'name' => '_strip_existing_sig',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
- if (!isset($no_override['strip_existing_sig'])) {
- if (!$current) {
- continue 2;
+ $blocks['sig']['options']['strip_existing_sig'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('replyremovesignature'))),
+ 'content' => $input->show($config['strip_existing_sig'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_strip_existing_sig';
- $input = new html_checkbox([
- 'name' => '_strip_existing_sig',
- 'id' => $field_id,
- 'value' => 1
- ]);
+ if (!isset($no_override['sig_separator'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['sig']['options']['strip_existing_sig'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('replyremovesignature'))),
- 'content' => $input->show($config['strip_existing_sig']?1:0),
- ];
- }
+ $field_id = 'rcmfd_sig_separator';
+ $input = new html_checkbox(['name' => '_sig_separator', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['sig_separator'])) {
- if (!$current) {
- continue 2;
+ $blocks['sig']['options']['sig_separator'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('sigseparator'))),
+ 'content' => $input->show($rcmail->config->get('sig_separator') ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_sig_separator';
- $input = new html_checkbox(['name' => '_sig_separator', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['forward_attachment'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['sig']['options']['sig_separator'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('sigseparator'))),
- 'content' => $input->show($rcmail->config->get('sig_separator') ? 1 : 0),
- ];
- }
+ $field_id = 'rcmfd_forward_attachment';
+ $select = new html_select([
+ 'name' => '_forward_attachment',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- if (!isset($no_override['forward_attachment'])) {
- if (!$current) {
- continue 2;
+ $select->add($rcmail->gettext('inline'), 0);
+ $select->add($rcmail->gettext('asattachment'), 1);
+
+ $blocks['main']['options']['forward_attachment'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('forwardmode'))),
+ 'content' => $select->show(intval($config['forward_attachment'])),
+ ];
}
- $field_id = 'rcmfd_forward_attachment';
- $select = new html_select([
- 'name' => '_forward_attachment',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ // Font settings are made up of 2 parts, font name and font size
+ // Compute the settings first to discover is anything to display to the user
+ $font_settings = '';
- $select->add($rcmail->gettext('inline'), 0);
- $select->add($rcmail->gettext('asattachment'), 1);
+ // Default font
+ if (!isset($no_override['default_font'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['forward_attachment'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('forwardmode'))),
- 'content' => $select->show(intval($config['forward_attachment'])),
- ];
- }
+ $fonts = self::font_defs();
+ if (count($fonts) > 1) {
+ $field_id = 'rcmfd_default_font';
+ $select_font = new html_select([
+ 'name' => '_default_font',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
+
+ $select_font->add('', '');
- // Font settings are made up of 2 parts, font name and font size
- // Compute the settings first to discover is anything to display to the user
- $font_settings = '';
+ foreach (array_keys($fonts) as $fname) {
+ $select_font->add($fname, $fname);
+ }
- // Default font
- if (!isset($no_override['default_font'])) {
- if (!$current) {
- continue 2;
+ $font_settings .= $select_font->show($rcmail->config->get('default_font', 1));
+ }
}
- $fonts = self::font_defs();
- if (count($fonts) > 1) {
- $field_id = 'rcmfd_default_font';
- $select_font = new html_select([
- 'name' => '_default_font',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ // Default font size
+ if (!isset($no_override['default_font_size'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select_font->add('', '');
+ $fontsizes = self::fontsize_defs();
+ if (count($fontsizes) > 1) {
+ $field_id = 'rcmfd_default_font_size';
+ $select_size = new html_select([
+ 'name' => '_default_font_size',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- foreach (array_keys($fonts) as $fname) {
- $select_font->add($fname, $fname);
- }
+ $select_size->add('', '');
- $font_settings .= $select_font->show($rcmail->config->get('default_font', 1));
+ foreach ($fontsizes as $size) {
+ $select_size->add($size, $size);
+ }
+
+ $font_settings .= $select_size->show($rcmail->config->get('default_font_size', 1));
+ }
}
- }
- // Default font size
- if (!isset($no_override['default_font_size'])) {
- if (!$current) {
- continue 2;
+ // Include font settings in the display only if at least one setting exists
+ if (!empty($font_settings)) {
+ $blocks['main']['options']['default_font'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('defaultfont'))),
+ 'content' => html::div('input-group', $font_settings)
+ ];
}
- $fontsizes = self::fontsize_defs();
- if (count($fontsizes) > 1) {
- $field_id = 'rcmfd_default_font_size';
- $select_size = new html_select([
- 'name' => '_default_font_size',
+ if (!isset($no_override['reply_all_mode'])) {
+ if (!$current) {
+ continue 2;
+ }
+
+ $field_id = 'rcmfd_reply_all_mode';
+ $select = new html_select([
+ 'name' => '_reply_all_mode',
'id' => $field_id,
'class' => 'custom-select'
]);
- $select_size->add('', '');
-
- foreach ($fontsizes as $size) {
- $select_size->add($size, $size);
- }
-
- $font_settings .= $select_size->show($rcmail->config->get('default_font_size', 1));
- }
- }
-
- // Include font settings in the display only if at least one setting exists
- if (!empty($font_settings)) {
- $blocks['main']['options']['default_font'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('defaultfont'))),
- 'content' => html::div('input-group', $font_settings)
- ];
- }
+ $select->add($rcmail->gettext('replyalldefault'), 0);
+ $select->add($rcmail->gettext('replyalllist'), 1);
- if (!isset($no_override['reply_all_mode'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['reply_all_mode'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('replyallmode'))),
+ 'content' => $select->show(intval($config['reply_all_mode'])),
+ ];
}
- $field_id = 'rcmfd_reply_all_mode';
- $select = new html_select([
- 'name' => '_reply_all_mode',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
-
- $select->add($rcmail->gettext('replyalldefault'), 0);
- $select->add($rcmail->gettext('replyalllist'), 1);
+ if (!isset($no_override['compose_save_localstorage'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['reply_all_mode'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('replyallmode'))),
- 'content' => $select->show(intval($config['reply_all_mode'])),
- ];
- }
+ $field_id = 'rcmfd_compose_save_localstorage';
+ $input = new html_checkbox([
+ 'name' => '_compose_save_localstorage',
+ 'id' => $field_id,
+ 'value' => 1
+ ]);
- if (!isset($no_override['compose_save_localstorage'])) {
- if (!$current) {
- continue 2;
+ $blocks['advanced']['options']['compose_save_localstorage'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('savelocalstorage'))),
+ 'content' => $input->show($config['compose_save_localstorage'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_compose_save_localstorage';
- $input = new html_checkbox([
- 'name' => '_compose_save_localstorage',
- 'id' => $field_id,
- 'value' => 1
- ]);
+ break;
- $blocks['advanced']['options']['compose_save_localstorage'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('savelocalstorage'))),
- 'content' => $input->show($config['compose_save_localstorage']?1:0),
+ // Addressbook config (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'addressbook':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'collected' => ['name' => rcube::Q($rcmail->gettext('collectedaddresses'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
];
- }
- break;
-
- // Addressbook config
- case 'addressbook':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'collected' => ['name' => rcube::Q($rcmail->gettext('collectedaddresses'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
-
- if (!isset($no_override['default_addressbook'])
- && (!$current || ($books = $rcmail->get_address_sources(true, true)))
- ) {
- if (!$current) {
- continue 2;
- }
+ if (!isset($no_override['default_addressbook'])
+ && (!$current || ($books = $rcmail->get_address_sources(true, true)))
+ ) {
+ if (!$current) {
+ continue 2;
+ }
- $field_id = 'rcmfd_default_addressbook';
- $select = new html_select([
- 'name' => '_default_addressbook',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ $field_id = 'rcmfd_default_addressbook';
+ $select = new html_select([
+ 'name' => '_default_addressbook',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- if (!empty($books)) {
- foreach ($books as $book) {
- $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
+ if (!empty($books)) {
+ foreach ($books as $book) {
+ $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
+ }
}
- }
- $blocks['main']['options']['default_addressbook'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('defaultabook'))),
- 'content' => $select->show($config['default_addressbook']),
- ];
- }
-
- // show addressbook listing mode selection
- if (!isset($no_override['addressbook_name_listing'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['default_addressbook'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('defaultabook'))),
+ 'content' => $select->show($config['default_addressbook']),
+ ];
}
- $field_id = 'rcmfd_addressbook_name_listing';
- $select = new html_select([
- 'name' => '_addressbook_name_listing',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ // show addressbook listing mode selection
+ if (!isset($no_override['addressbook_name_listing'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('name'), 0);
- $select->add($rcmail->gettext('firstname') . ' ' . $rcmail->gettext('surname'), 1);
- $select->add($rcmail->gettext('surname') . ' ' . $rcmail->gettext('firstname'), 2);
- $select->add($rcmail->gettext('surname') . ', ' . $rcmail->gettext('firstname'), 3);
+ $field_id = 'rcmfd_addressbook_name_listing';
+ $select = new html_select([
+ 'name' => '_addressbook_name_listing',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['main']['options']['list_name_listing'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('listnamedisplay'))),
- 'content' => $select->show($config['addressbook_name_listing']),
- ];
- }
+ $select->add($rcmail->gettext('name'), 0);
+ $select->add($rcmail->gettext('firstname') . ' ' . $rcmail->gettext('surname'), 1);
+ $select->add($rcmail->gettext('surname') . ' ' . $rcmail->gettext('firstname'), 2);
+ $select->add($rcmail->gettext('surname') . ', ' . $rcmail->gettext('firstname'), 3);
- // show addressbook sort column
- if (!isset($no_override['addressbook_sort_col'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['list_name_listing'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('listnamedisplay'))),
+ 'content' => $select->show($config['addressbook_name_listing']),
+ ];
}
- $field_id = 'rcmfd_addressbook_sort_col';
- $select = new html_select([
- 'name' => '_addressbook_sort_col',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ // show addressbook sort column
+ if (!isset($no_override['addressbook_sort_col'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('name'), 'name');
- $select->add($rcmail->gettext('firstname'), 'firstname');
- $select->add($rcmail->gettext('surname'), 'surname');
+ $field_id = 'rcmfd_addressbook_sort_col';
+ $select = new html_select([
+ 'name' => '_addressbook_sort_col',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['main']['options']['sort_col'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('listsorting'))),
- 'content' => $select->show($config['addressbook_sort_col']),
- ];
- }
+ $select->add($rcmail->gettext('name'), 'name');
+ $select->add($rcmail->gettext('firstname'), 'firstname');
+ $select->add($rcmail->gettext('surname'), 'surname');
- // show addressbook page size selection
- if (!isset($no_override['addressbook_pagesize'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['sort_col'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('listsorting'))),
+ 'content' => $select->show($config['addressbook_sort_col']),
+ ];
}
- $size = intval($config['addressbook_pagesize'] ?: $config['pagesize']);
- $field_id = 'rcmfd_addressbook_pagesize';
- $input = new html_inputfield([
- 'name' => '_addressbook_pagesize',
- 'id' => $field_id,
- 'size' => 5,
- 'class' => 'form-control'
- ]);
+ // show addressbook page size selection
+ if (!isset($no_override['addressbook_pagesize'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['pagesize'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('pagesize'))),
- 'content' => $input->show($size ?: 50),
- ];
- }
+ $size = intval($config['addressbook_pagesize'] ?: $config['pagesize']);
+ $field_id = 'rcmfd_addressbook_pagesize';
+ $input = new html_inputfield([
+ 'name' => '_addressbook_pagesize',
+ 'id' => $field_id,
+ 'size' => 5,
+ 'class' => 'form-control'
+ ]);
- if (!isset($no_override['contact_form_mode'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['pagesize'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('pagesize'))),
+ 'content' => $input->show($size ?: 50),
+ ];
}
- $mode = $config['contact_form_mode'] == 'business' ? 'business' : 'private';
- $field_id = 'rcmfd_contact_form_mode';
- $select = new html_select([
- 'name' => '_contact_form_mode',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ if (!isset($no_override['contact_form_mode'])) {
+ if (!$current) {
+ continue 2;
+ }
- $select->add($rcmail->gettext('privatemode'), 'private');
- $select->add($rcmail->gettext('businessmode'), 'business');
+ $mode = $config['contact_form_mode'] == 'business' ? 'business' : 'private';
+ $field_id = 'rcmfd_contact_form_mode';
+ $select = new html_select([
+ 'name' => '_contact_form_mode',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- $blocks['main']['options']['contact_form_mode'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('contactformmode'))),
- 'content' => $select->show($mode),
- ];
- }
+ $select->add($rcmail->gettext('privatemode'), 'private');
+ $select->add($rcmail->gettext('businessmode'), 'business');
- if (!isset($no_override['autocomplete_single'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['contact_form_mode'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('contactformmode'))),
+ 'content' => $select->show($mode),
+ ];
}
- $field_id = 'rcmfd_autocomplete_single';
- $checkbox = new html_checkbox(['name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['autocomplete_single'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['autocomplete_single'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autocompletesingle'))),
- 'content' => $checkbox->show($config['autocomplete_single']?1:0),
- ];
- }
+ $field_id = 'rcmfd_autocomplete_single';
+ $checkbox = new html_checkbox(['name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['collected_recipients'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['autocomplete_single'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('autocompletesingle'))),
+ 'content' => $checkbox->show($config['autocomplete_single'] ? 1 : 0),
+ ];
}
- if (!isset($books)) {
- $books = $rcmail->get_address_sources(true, true);
- }
+ if (!isset($no_override['collected_recipients'])) {
+ if (!$current) {
+ continue 2;
+ }
- $field_id = 'rcmfd_collected_recipients';
- $select = new html_select([
- 'name' => '_collected_recipients',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ if (!isset($books)) {
+ $books = $rcmail->get_address_sources(true, true);
+ }
- $select->add('---', '');
- $select->add($rcmail->gettext('collectedrecipients'), (string) rcube_addressbook::TYPE_RECIPIENT);
+ $field_id = 'rcmfd_collected_recipients';
+ $select = new html_select([
+ 'name' => '_collected_recipients',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- foreach ($books as $book) {
- $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
- }
+ $select->add('---', '');
+ $select->add($rcmail->gettext('collectedrecipients'), (string) rcube_addressbook::TYPE_RECIPIENT);
- $selected = $config['collected_recipients'];
- if (is_bool($selected)) {
- $selected = $selected ? rcube_addressbook::TYPE_RECIPIENT : '';
- }
+ foreach ($books as $book) {
+ $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
+ }
- $blocks['collected']['options']['collected_recipients'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('collectedrecipientsopt'))),
- 'content' => $select->show((string) $selected),
- ];
- }
+ $selected = $config['collected_recipients'];
+ if (is_bool($selected)) {
+ $selected = $selected ? rcube_addressbook::TYPE_RECIPIENT : '';
+ }
- if (!isset($no_override['collected_senders'])) {
- if (!$current) {
- continue 2;
+ $blocks['collected']['options']['collected_recipients'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('collectedrecipientsopt'))),
+ 'content' => $select->show((string) $selected),
+ ];
}
- if (!isset($books)) {
- $books = $rcmail->get_address_sources(true, true);
- }
+ if (!isset($no_override['collected_senders'])) {
+ if (!$current) {
+ continue 2;
+ }
- $field_id = 'rcmfd_collected_senders';
- $select = new html_select([
- 'name' => '_collected_senders',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ if (!isset($books)) {
+ $books = $rcmail->get_address_sources(true, true);
+ }
- $select->add($rcmail->gettext('trustedsenders'), (string) rcube_addressbook::TYPE_TRUSTED_SENDER);
+ $field_id = 'rcmfd_collected_senders';
+ $select = new html_select([
+ 'name' => '_collected_senders',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- foreach ($books as $book) {
- $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
- }
+ $select->add($rcmail->gettext('trustedsenders'), (string) rcube_addressbook::TYPE_TRUSTED_SENDER);
- $selected = $config['collected_senders'];
- if (is_bool($selected)) {
- $selected = $selected ? rcube_addressbook::TYPE_TRUSTED_SENDER : '';
+ foreach ($books as $book) {
+ $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
+ }
+
+ $selected = $config['collected_senders'];
+ if (is_bool($selected)) {
+ $selected = $selected ? rcube_addressbook::TYPE_TRUSTED_SENDER : '';
+ }
+
+ $blocks['collected']['options']['collected_senders'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('collectedsendersopt'))),
+ 'content' => $select->show((string) $selected),
+ ];
}
- $blocks['collected']['options']['collected_senders'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('collectedsendersopt'))),
- 'content' => $select->show((string) $selected),
+ break;
+
+ // Special IMAP folders (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'folders':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
];
- }
- break;
+ if (!isset($no_override['show_real_foldernames'])) {
+ if (!$current) {
+ continue 2;
+ }
- // Special IMAP folders
- case 'folders':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
+ $field_id = 'show_real_foldernames';
+ $input = new html_checkbox(['name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['show_real_foldernames'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['show_real_foldernames'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('show_real_foldernames'))),
+ 'content' => $input->show($config['show_real_foldernames'] ? 1 : 0),
+ ];
}
- $field_id = 'show_real_foldernames';
- $input = new html_checkbox(['name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1]);
+ // Configure special folders
+ $set = ['drafts_mbox', 'sent_mbox', 'junk_mbox', 'trash_mbox'];
- $blocks['main']['options']['show_real_foldernames'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('show_real_foldernames'))),
- 'content' => $input->show($config['show_real_foldernames']?1:0),
- ];
- }
+ if ($current && count(array_intersect($no_override, $set)) < 4) {
+ $select = self::folder_selector([
+ 'noselection' => '---',
+ 'realnames' => true,
+ 'maxlength' => 30,
+ 'folder_filter' => 'mail',
+ 'folder_rights' => 'w',
+ 'class' => 'custom-select',
+ ]);
- // Configure special folders
- $set = ['drafts_mbox', 'sent_mbox', 'junk_mbox', 'trash_mbox'];
-
- if ($current && count(array_intersect($no_override, $set)) < 4) {
- $select = self::folder_selector([
- 'noselection' => '---',
- 'realnames' => true,
- 'maxlength' => 30,
- 'folder_filter' => 'mail',
- 'folder_rights' => 'w',
- 'class' => 'custom-select',
- ]);
-
- // #1486114, #1488279, #1489219
- $onchange = "if ($(this).val() == 'INBOX') $(this).val('')";
- }
- else {
- $onchange = null;
- $select = new html_select();
- }
+ // #1486114, #1488279, #1489219
+ $onchange = "if ($(this).val() == 'INBOX') $(this).val('')";
+ }
+ else {
+ $onchange = null;
+ $select = new html_select();
+ }
- if (!isset($no_override['drafts_mbox'])) {
- if (!$current) {
- continue 2;
+ if (!isset($no_override['drafts_mbox'])) {
+ if (!$current) {
+ continue 2;
+ }
+
+ $attrs = ['id' => '_drafts_mbox', 'name' => '_drafts_mbox', 'onchange' => $onchange];
+ $blocks['main']['options']['drafts_mbox'] = [
+ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('drafts'))),
+ 'content' => $select->show($config['drafts_mbox'], $attrs),
+ ];
}
- $attrs = ['id' => '_drafts_mbox', 'name' => '_drafts_mbox', 'onchange' => $onchange];
- $blocks['main']['options']['drafts_mbox'] = [
- 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('drafts'))),
- 'content' => $select->show($config['drafts_mbox'], $attrs),
- ];
- }
+ if (!isset($no_override['sent_mbox'])) {
+ if (!$current) {
+ continue 2;
+ }
- if (!isset($no_override['sent_mbox'])) {
- if (!$current) {
- continue 2;
+ $attrs = ['id' => '_sent_mbox', 'name' => '_sent_mbox', 'onchange' => ''];
+ $blocks['main']['options']['sent_mbox'] = [
+ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('sent'))),
+ 'content' => $select->show($config['sent_mbox'], $attrs),
+ ];
}
- $attrs = ['id' => '_sent_mbox', 'name' => '_sent_mbox', 'onchange' => ''];
- $blocks['main']['options']['sent_mbox'] = [
- 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('sent'))),
- 'content' => $select->show($config['sent_mbox'], $attrs),
- ];
- }
+ if (!isset($no_override['junk_mbox'])) {
+ if (!$current) {
+ continue 2;
+ }
- if (!isset($no_override['junk_mbox'])) {
- if (!$current) {
- continue 2;
+ $attrs = ['id' => '_junk_mbox', 'name' => '_junk_mbox', 'onchange' => $onchange];
+ $blocks['main']['options']['junk_mbox'] = [
+ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('junk'))),
+ 'content' => $select->show($config['junk_mbox'], $attrs),
+ ];
}
- $attrs = ['id' => '_junk_mbox', 'name' => '_junk_mbox', 'onchange' => $onchange];
- $blocks['main']['options']['junk_mbox'] = [
- 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('junk'))),
- 'content' => $select->show($config['junk_mbox'], $attrs),
- ];
- }
+ if (!isset($no_override['trash_mbox'])) {
+ if (!$current) {
+ continue 2;
+ }
- if (!isset($no_override['trash_mbox'])) {
- if (!$current) {
- continue 2;
+ $attrs = ['id' => '_trash_mbox', 'name' => '_trash_mbox', 'onchange' => $onchange];
+ $blocks['main']['options']['trash_mbox'] = [
+ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('trash'))),
+ 'content' => $select->show($config['trash_mbox'], $attrs),
+ ];
}
- $attrs = ['id' => '_trash_mbox', 'name' => '_trash_mbox', 'onchange' => $onchange];
- $blocks['main']['options']['trash_mbox'] = [
- 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('trash'))),
- 'content' => $select->show($config['trash_mbox'], $attrs),
+ break;
+
+ // Server settings (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'server':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'maintenance' => ['name' => rcube::Q($rcmail->gettext('maintenance'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
];
- }
- break;
+ if (!isset($no_override['read_when_deleted'])) {
+ if (!$current) {
+ continue 2;
+ }
- // Server settings
- case 'server':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'maintenance' => ['name' => rcube::Q($rcmail->gettext('maintenance'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
+ $field_id = 'rcmfd_read_deleted';
+ $input = new html_checkbox(['name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['read_when_deleted'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['read_when_deleted'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('readwhendeleted'))),
+ 'content' => $input->show($config['read_when_deleted'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_read_deleted';
- $input = new html_checkbox(['name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['flag_for_deletion'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['read_when_deleted'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('readwhendeleted'))),
- 'content' => $input->show($config['read_when_deleted']?1:0),
- ];
- }
+ $field_id = 'rcmfd_flag_for_deletion';
+ $input = new html_checkbox(['name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['flag_for_deletion'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['flag_for_deletion'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('flagfordeletion'))),
+ 'content' => $input->show($config['flag_for_deletion'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_flag_for_deletion';
- $input = new html_checkbox(['name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1]);
+ // don't show deleted messages
+ if (!isset($no_override['skip_deleted'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['flag_for_deletion'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('flagfordeletion'))),
- 'content' => $input->show($config['flag_for_deletion']?1:0),
- ];
- }
+ $field_id = 'rcmfd_skip_deleted';
+ $input = new html_checkbox(['name' => '_skip_deleted', 'id' => $field_id, 'value' => 1]);
- // don't show deleted messages
- if (!isset($no_override['skip_deleted'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['skip_deleted'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('skipdeleted'))),
+ 'content' => $input->show($config['skip_deleted'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_skip_deleted';
- $input = new html_checkbox(['name' => '_skip_deleted', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['delete_junk'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['skip_deleted'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('skipdeleted'))),
- 'content' => $input->show($config['skip_deleted']?1:0),
- ];
- }
+ $field_id = 'rcmfd_delete_junk';
+ $input = new html_checkbox(['name' => '_delete_junk', 'id' => $field_id, 'value' => 1]);
- if (!isset($no_override['delete_junk'])) {
- if (!$current) {
- continue 2;
+ $blocks['main']['options']['delete_junk'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('deletejunk'))),
+ 'content' => $input->show($config['delete_junk'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_delete_junk';
- $input = new html_checkbox(['name' => '_delete_junk', 'id' => $field_id, 'value' => 1]);
+ // Trash purging on logout
+ if (!isset($no_override['logout_purge'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['main']['options']['delete_junk'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('deletejunk'))),
- 'content' => $input->show($config['delete_junk']?1:0),
- ];
- }
+ $field_id = 'rcmfd_logout_purge';
+ $select = new html_select([
+ 'name' => '_logout_purge',
+ 'id' => $field_id,
+ 'class' => 'custom-select'
+ ]);
- // Trash purging on logout
- if (!isset($no_override['logout_purge'])) {
- if (!$current) {
- continue 2;
- }
+ $select->add($rcmail->gettext('never'), 'never');
+ $select->add($rcmail->gettext('allmessages'), 'all');
- $field_id = 'rcmfd_logout_purge';
- $select = new html_select([
- 'name' => '_logout_purge',
- 'id' => $field_id,
- 'class' => 'custom-select'
- ]);
+ foreach ([30, 60, 90] as $days) {
+ $select->add($rcmail->gettext(['name' => 'olderxdays', 'vars' => ['x' => $days]]), (string) $days);
+ }
- $select->add($rcmail->gettext('never'), 'never');
- $select->add($rcmail->gettext('allmessages'), 'all');
+ $purge = $config['logout_purge'];
+ if (!is_numeric($purge)) {
+ $purge = empty($purge) ? 'never' : 'all';
+ }
- foreach ([30, 60, 90] as $days) {
- $select->add($rcmail->gettext(['name' => 'olderxdays', 'vars' => ['x' => $days]]), (string) $days);
+ $blocks['maintenance']['options']['logout_purge'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('logoutclear'))),
+ 'content' => $select->show((string) $purge),
+ ];
}
- $purge = $config['logout_purge'];
- if (!is_numeric($purge)) {
- $purge = empty($purge) ? 'never' : 'all';
- }
+ // INBOX compacting on logout
+ if (!isset($no_override['logout_expunge'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['maintenance']['options']['logout_purge'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('logoutclear'))),
- 'content' => $select->show((string) $purge),
- ];
- }
+ $field_id = 'rcmfd_logout_expunge';
+ $input = new html_checkbox(['name' => '_logout_expunge', 'id' => $field_id, 'value' => 1]);
- // INBOX compacting on logout
- if (!isset($no_override['logout_expunge'])) {
- if (!$current) {
- continue 2;
+ $blocks['maintenance']['options']['logout_expunge'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('logoutcompact'))),
+ 'content' => $input->show($config['logout_expunge'] ? 1 : 0),
+ ];
}
- $field_id = 'rcmfd_logout_expunge';
- $input = new html_checkbox(['name' => '_logout_expunge', 'id' => $field_id, 'value' => 1]);
+ break;
- $blocks['maintenance']['options']['logout_expunge'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('logoutcompact'))),
- 'content' => $input->show($config['logout_expunge']?1:0),
+ // Server settings (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case 'encryption':
+ $blocks = [
+ 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
+ 'mailvelope' => ['name' => rcube::Q($rcmail->gettext('mailvelopeoptions'))],
+ 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
];
- }
-
- break;
-
- // Server settings
- case 'encryption':
- $blocks = [
- 'main' => ['name' => rcube::Q($rcmail->gettext('mainoptions'))],
- 'mailvelope' => ['name' => rcube::Q($rcmail->gettext('mailvelopeoptions'))],
- 'advanced' => ['name' => rcube::Q($rcmail->gettext('advancedoptions'))],
- ];
-
- if (!isset($no_override['mailvelope_main_keyring'])) {
- if (!$current) {
- continue 2;
- }
- $field_id = 'rcmfd_mailvelope_main_keyring';
- $input = new html_checkbox(['name' => '_mailvelope_main_keyring', 'id' => $field_id, 'value' => 1]);
+ if (!isset($no_override['mailvelope_main_keyring'])) {
+ if (!$current) {
+ continue 2;
+ }
- $blocks['mailvelope']['options']['mailvelope_status'] = [
- 'content' => html::div(
- ['style' => 'display:none', 'class' => 'boxwarning', 'id' => 'mailvelope-warning'],
- str_replace(
- 'Mailvelope', 'Mailvelope ',
- rcube::Q($rcmail->gettext('mailvelopenotfound'))
+ $field_id = 'rcmfd_mailvelope_main_keyring';
+ $input = new html_checkbox(['name' => '_mailvelope_main_keyring', 'id' => $field_id, 'value' => 1]);
+
+ $blocks['mailvelope']['options']['mailvelope_status'] = [
+ 'content' => html::div(
+ ['style' => 'display:none', 'class' => 'boxwarning', 'id' => 'mailvelope-warning'],
+ str_replace(
+ 'Mailvelope', 'Mailvelope ',
+ rcube::Q($rcmail->gettext('mailvelopenotfound'))
+ )
+ . html::script([], "if (!parent.mailvelope) \$('#mailvelope-warning').show()")
)
- . html::script([], "if (!parent.mailvelope) \$('#mailvelope-warning').show()")
- )
- ];
+ ];
- $blocks['mailvelope']['options']['mailvelope_main_keyring'] = [
- 'title' => html::label($field_id, rcube::Q($rcmail->gettext('mailvelopemainkeyring'))),
- 'content' => $input->show(!empty($config['mailvelope_main_keyring']) ? 1 : 0),
- ];
- }
+ $blocks['mailvelope']['options']['mailvelope_main_keyring'] = [
+ 'title' => html::label($field_id, rcube::Q($rcmail->gettext('mailvelopemainkeyring'))),
+ 'content' => $input->show(!empty($config['mailvelope_main_keyring']) ? 1 : 0),
+ ];
+ }
- break;
+ break;
}
$found = false;
@@ -1612,9 +1612,9 @@ public static function settings_tabs($attrib)
$default_actions = [
['action' => 'preferences', 'type' => 'link', 'label' => 'preferences', 'title' => 'editpreferences'],
- ['action' => 'folders', 'type' => 'link', 'label' => 'folders', 'title' => 'managefolders'],
- ['action' => 'identities', 'type' => 'link', 'label' => 'identities', 'title' => 'manageidentities'],
- ['action' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'manageresponses'],
+ ['action' => 'folders', 'type' => 'link', 'label' => 'folders', 'title' => 'managefolders'],
+ ['action' => 'identities', 'type' => 'link', 'label' => 'identities', 'title' => 'manageidentities'],
+ ['action' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'manageresponses'],
];
$disabled_actions = (array) $rcmail->config->get('disabled_actions');
diff --git a/program/actions/settings/prefs_edit.php b/program/actions/settings/prefs_edit.php
index 7417885ae47..bf5efa47602 100644
--- a/program/actions/settings/prefs_edit.php
+++ b/program/actions/settings/prefs_edit.php
@@ -1,6 +1,6 @@
output->set_pagetitle($rcmail->gettext('preferences'));
self::$section = rcube_utils::get_input_string('_section', rcube_utils::INPUT_GPC);
- list(self::$sections,) = self::user_prefs(self::$section);
+ list(self::$sections) = self::user_prefs(self::$section);
// register UI objects
$rcmail->output->add_handlers([
diff --git a/program/actions/settings/prefs_save.php b/program/actions/settings/prefs_save.php
index b65a2777116..bdc27306c4e 100644
--- a/program/actions/settings/prefs_save.php
+++ b/program/actions/settings/prefs_save.php
@@ -1,6 +1,6 @@
self::prefs_input('language', '/^[a-zA-Z0-9_-]+$/'),
- 'timezone' => self::prefs_input('timezone', '/^[a-zA-Z_\/-]+$/'),
- 'date_format' => self::prefs_input('date_format', '/^[a-zA-Z_.\/ -]+$/'),
- 'time_format' => self::prefs_input('time_format', '/^[a-zA-Z0-9: ]+$/'),
- 'prettydate' => isset($_POST['_pretty_date']),
- 'display_next' => isset($_POST['_display_next']),
- 'refresh_interval' => self::prefs_input_int('refresh_interval') * 60,
- 'standard_windows' => isset($_POST['_standard_windows']),
- 'skin' => self::prefs_input('skin', '/^[a-zA-Z0-9_.-]+$/'),
- ];
-
- // compose derived date/time format strings
- if (
- (isset($_POST['_date_format']) || isset($_POST['_time_format']))
- && !empty($a_user_prefs['date_format'])
- && !empty($a_user_prefs['time_format'])
- ) {
- $a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format'];
- $a_user_prefs['date_long'] = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format'];
- }
-
- break;
-
- case 'mailbox':
- $a_user_prefs = [
- 'layout' => self::prefs_input('layout', '/^[a-z]+$/'),
- 'mail_read_time' => self::prefs_input_int('mail_read_time'),
- 'autoexpand_threads' => self::prefs_input_int('autoexpand_threads'),
- 'check_all_folders' => isset($_POST['_check_all_folders']),
- 'mail_pagesize' => max(2, self::prefs_input_int('mail_pagesize')),
- ];
-
- break;
-
- case 'mailview':
- $a_user_prefs = [
- 'message_extwin' => self::prefs_input_int('message_extwin'),
- 'message_show_email' => isset($_POST['_message_show_email']),
- 'prefer_html' => isset($_POST['_prefer_html']),
- 'inline_images' => isset($_POST['_inline_images']),
- 'show_images' => self::prefs_input_int('show_images'),
- 'mdn_requests' => self::prefs_input_int('mdn_requests'),
- 'default_charset' => self::prefs_input('default_charset', '/^[a-zA-Z0-9-]+$/'),
- ];
-
- break;
-
- case 'compose':
- $a_user_prefs = [
- 'compose_extwin' => self::prefs_input_int('compose_extwin'),
- 'htmleditor' => self::prefs_input_int('htmleditor'),
- 'draft_autosave' => self::prefs_input_int('draft_autosave'),
- 'mime_param_folding' => self::prefs_input_int('mime_param_folding'),
- 'force_7bit' => isset($_POST['_force_7bit']),
- 'mdn_default' => isset($_POST['_mdn_default']),
- 'dsn_default' => isset($_POST['_dsn_default']),
- 'reply_same_folder' => isset($_POST['_reply_same_folder']),
- 'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']),
- 'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']),
- 'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']),
- 'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']),
- 'show_sig' => self::prefs_input_int('show_sig'),
- 'reply_mode' => self::prefs_input_int('reply_mode'),
- 'sig_below' => isset($_POST['_sig_below']),
- 'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
- 'sig_separator' => isset($_POST['_sig_separator']),
- 'default_font' => self::prefs_input('default_font', '/^[a-zA-Z ]+$/'),
- 'default_font_size' => self::prefs_input('default_font_size', '/^[0-9]+pt$/'),
- 'reply_all_mode' => self::prefs_input_int('reply_all_mode'),
- 'forward_attachment' => !empty($_POST['_forward_attachment']),
- 'compose_save_localstorage' => self::prefs_input_int('compose_save_localstorage'),
- ];
-
- break;
-
- case 'addressbook':
- $a_user_prefs = [
- 'default_addressbook' => rcube_utils::get_input_string('_default_addressbook', rcube_utils::INPUT_POST, true),
- 'collected_recipients' => rcube_utils::get_input_string('_collected_recipients', rcube_utils::INPUT_POST, true),
- 'collected_senders' => rcube_utils::get_input_string('_collected_senders', rcube_utils::INPUT_POST, true),
- 'autocomplete_single' => isset($_POST['_autocomplete_single']),
- 'addressbook_sort_col' => self::prefs_input('addressbook_sort_col', '/^[a-z_]+$/'),
- 'addressbook_name_listing' => self::prefs_input_int('addressbook_name_listing'),
- 'addressbook_pagesize' => max(2, self::prefs_input_int('addressbook_pagesize')),
- 'contact_form_mode' => self::prefs_input('contact_form_mode', '/^(private|business)$/'),
- ];
-
- break;
-
- case 'server':
- $a_user_prefs = [
- 'read_when_deleted' => isset($_POST['_read_when_deleted']),
- 'skip_deleted' => isset($_POST['_skip_deleted']),
- 'flag_for_deletion' => isset($_POST['_flag_for_deletion']),
- 'delete_junk' => isset($_POST['_delete_junk']),
- 'logout_purge' => self::prefs_input('logout_purge', '/^(all|never|30|60|90)$/'),
- 'logout_expunge' => isset($_POST['_logout_expunge']),
- ];
-
- break;
-
- case 'folders':
- $a_user_prefs = [
- 'show_real_foldernames' => isset($_POST['_show_real_foldernames']),
- // stop using SPECIAL-USE (#4782)
- 'lock_special_folders' => !in_array('lock_special_folders', $dont_override),
- ];
-
- foreach (rcube_storage::$folder_types as $type) {
- $a_user_prefs[$type . '_mbox'] = rcube_utils::get_input_string('_' . $type . '_mbox', rcube_utils::INPUT_POST, true);
- };
-
- break;
-
- case 'encryption':
- $a_user_prefs = [
- 'mailvelope_main_keyring' => isset($_POST['_mailvelope_main_keyring']),
- ];
-
- break;
+ case 'general':
+ $a_user_prefs = [
+ 'language' => self::prefs_input('language', '/^[a-zA-Z0-9_-]+$/'),
+ 'timezone' => self::prefs_input('timezone', '/^[a-zA-Z_\/-]+$/'),
+ 'date_format' => self::prefs_input('date_format', '/^[a-zA-Z_.\/ -]+$/'),
+ 'time_format' => self::prefs_input('time_format', '/^[a-zA-Z0-9: ]+$/'),
+ 'prettydate' => isset($_POST['_pretty_date']),
+ 'display_next' => isset($_POST['_display_next']),
+ 'refresh_interval' => self::prefs_input_int('refresh_interval') * 60,
+ 'standard_windows' => isset($_POST['_standard_windows']),
+ 'skin' => self::prefs_input('skin', '/^[a-zA-Z0-9_.-]+$/'),
+ ];
+
+ // compose derived date/time format strings
+ if (
+ (isset($_POST['_date_format']) || isset($_POST['_time_format']))
+ && !empty($a_user_prefs['date_format'])
+ && !empty($a_user_prefs['time_format'])
+ ) {
+ $a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format'];
+ $a_user_prefs['date_long'] = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format'];
+ }
+
+ break;
+
+ case 'mailbox':
+ $a_user_prefs = [
+ 'layout' => self::prefs_input('layout', '/^[a-z]+$/'),
+ 'mail_read_time' => self::prefs_input_int('mail_read_time'),
+ 'autoexpand_threads' => self::prefs_input_int('autoexpand_threads'),
+ 'check_all_folders' => isset($_POST['_check_all_folders']),
+ 'mail_pagesize' => max(2, self::prefs_input_int('mail_pagesize')),
+ ];
+
+ break;
+
+ case 'mailview':
+ $a_user_prefs = [
+ 'message_extwin' => self::prefs_input_int('message_extwin'),
+ 'message_show_email' => isset($_POST['_message_show_email']),
+ 'prefer_html' => isset($_POST['_prefer_html']),
+ 'inline_images' => isset($_POST['_inline_images']),
+ 'show_images' => self::prefs_input_int('show_images'),
+ 'mdn_requests' => self::prefs_input_int('mdn_requests'),
+ 'default_charset' => self::prefs_input('default_charset', '/^[a-zA-Z0-9-]+$/'),
+ ];
+
+ break;
+
+ case 'compose':
+ $a_user_prefs = [
+ 'compose_extwin' => self::prefs_input_int('compose_extwin'),
+ 'htmleditor' => self::prefs_input_int('htmleditor'),
+ 'draft_autosave' => self::prefs_input_int('draft_autosave'),
+ 'mime_param_folding' => self::prefs_input_int('mime_param_folding'),
+ 'force_7bit' => isset($_POST['_force_7bit']),
+ 'mdn_default' => isset($_POST['_mdn_default']),
+ 'dsn_default' => isset($_POST['_dsn_default']),
+ 'reply_same_folder' => isset($_POST['_reply_same_folder']),
+ 'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']),
+ 'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']),
+ 'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']),
+ 'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']),
+ 'show_sig' => self::prefs_input_int('show_sig'),
+ 'reply_mode' => self::prefs_input_int('reply_mode'),
+ 'sig_below' => isset($_POST['_sig_below']),
+ 'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
+ 'sig_separator' => isset($_POST['_sig_separator']),
+ 'default_font' => self::prefs_input('default_font', '/^[a-zA-Z ]+$/'),
+ 'default_font_size' => self::prefs_input('default_font_size', '/^[0-9]+pt$/'),
+ 'reply_all_mode' => self::prefs_input_int('reply_all_mode'),
+ 'forward_attachment' => !empty($_POST['_forward_attachment']),
+ 'compose_save_localstorage' => self::prefs_input_int('compose_save_localstorage'),
+ ];
+
+ break;
+
+ case 'addressbook':
+ $a_user_prefs = [
+ 'default_addressbook' => rcube_utils::get_input_string('_default_addressbook', rcube_utils::INPUT_POST, true),
+ 'collected_recipients' => rcube_utils::get_input_string('_collected_recipients', rcube_utils::INPUT_POST, true),
+ 'collected_senders' => rcube_utils::get_input_string('_collected_senders', rcube_utils::INPUT_POST, true),
+ 'autocomplete_single' => isset($_POST['_autocomplete_single']),
+ 'addressbook_sort_col' => self::prefs_input('addressbook_sort_col', '/^[a-z_]+$/'),
+ 'addressbook_name_listing' => self::prefs_input_int('addressbook_name_listing'),
+ 'addressbook_pagesize' => max(2, self::prefs_input_int('addressbook_pagesize')),
+ 'contact_form_mode' => self::prefs_input('contact_form_mode', '/^(private|business)$/'),
+ ];
+
+ break;
+
+ case 'server':
+ $a_user_prefs = [
+ 'read_when_deleted' => isset($_POST['_read_when_deleted']),
+ 'skip_deleted' => isset($_POST['_skip_deleted']),
+ 'flag_for_deletion' => isset($_POST['_flag_for_deletion']),
+ 'delete_junk' => isset($_POST['_delete_junk']),
+ 'logout_purge' => self::prefs_input('logout_purge', '/^(all|never|30|60|90)$/'),
+ 'logout_expunge' => isset($_POST['_logout_expunge']),
+ ];
+
+ break;
+
+ case 'folders':
+ $a_user_prefs = [
+ 'show_real_foldernames' => isset($_POST['_show_real_foldernames']),
+ // stop using SPECIAL-USE (#4782)
+ 'lock_special_folders' => !in_array('lock_special_folders', $dont_override),
+ ];
+
+ foreach (rcube_storage::$folder_types as $type) {
+ $a_user_prefs[$type . '_mbox'] = rcube_utils::get_input_string('_' . $type . '_mbox', rcube_utils::INPUT_POST, true);
+ };
+
+ break;
+
+ case 'encryption':
+ $a_user_prefs = [
+ 'mailvelope_main_keyring' => isset($_POST['_mailvelope_main_keyring']),
+ ];
+
+ break;
}
$plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save',
@@ -173,78 +173,78 @@ public function run($args = [])
// verify some options
switch ($CURR_SECTION) {
- case 'general':
- // switch UI language
- if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
- $rcmail->load_language($a_user_prefs['language']);
- $rcmail->output->command('reload', 500);
- }
-
- // switch skin (if valid, otherwise unset the pref and fall back to default)
- if (!empty($a_user_prefs['skin'])) {
- if (!$rcmail->output->check_skin($a_user_prefs['skin'])) {
- unset($a_user_prefs['skin']);
- }
- else if ($rcmail->config->get('skin') != $a_user_prefs['skin']) {
+ case 'general':
+ // switch UI language
+ if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
+ $rcmail->load_language($a_user_prefs['language']);
$rcmail->output->command('reload', 500);
}
- }
- $a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];
+ // switch skin (if valid, otherwise unset the pref and fall back to default)
+ if (!empty($a_user_prefs['skin'])) {
+ if (!$rcmail->output->check_skin($a_user_prefs['skin'])) {
+ unset($a_user_prefs['skin']);
+ }
+ else if ($rcmail->config->get('skin') != $a_user_prefs['skin']) {
+ $rcmail->output->command('reload', 500);
+ }
+ }
+
+ $a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];
- $min_refresh_interval = (int) $rcmail->config->get('min_refresh_interval');
- if (!empty($a_user_prefs['refresh_interval']) && $min_refresh_interval) {
- if ($a_user_prefs['refresh_interval'] < $min_refresh_interval) {
- $a_user_prefs['refresh_interval'] = $min_refresh_interval;
+ $min_refresh_interval = (int) $rcmail->config->get('min_refresh_interval');
+ if (!empty($a_user_prefs['refresh_interval']) && $min_refresh_interval) {
+ if ($a_user_prefs['refresh_interval'] < $min_refresh_interval) {
+ $a_user_prefs['refresh_interval'] = $min_refresh_interval;
+ }
}
- }
- break;
+ break;
- case 'mailbox':
- // force min size
- if ($a_user_prefs['mail_pagesize'] < 1) {
- $a_user_prefs['mail_pagesize'] = 10;
- }
+ case 'mailbox':
+ // force min size
+ if ($a_user_prefs['mail_pagesize'] < 1) {
+ $a_user_prefs['mail_pagesize'] = 10;
+ }
- $max_pagesize = (int) $rcmail->config->get('max_pagesize');
- if ($max_pagesize && ($a_user_prefs['mail_pagesize'] > $max_pagesize)) {
- $a_user_prefs['mail_pagesize'] = $max_pagesize;
- }
+ $max_pagesize = (int) $rcmail->config->get('max_pagesize');
+ if ($max_pagesize && ($a_user_prefs['mail_pagesize'] > $max_pagesize)) {
+ $a_user_prefs['mail_pagesize'] = $max_pagesize;
+ }
- break;
+ break;
- case 'addressbook':
- // force min size
- if ($a_user_prefs['addressbook_pagesize'] < 1) {
- $a_user_prefs['addressbook_pagesize'] = 10;
- }
+ case 'addressbook':
+ // force min size
+ if ($a_user_prefs['addressbook_pagesize'] < 1) {
+ $a_user_prefs['addressbook_pagesize'] = 10;
+ }
- $max_pagesize = (int) $rcmail->config->get('max_pagesize');
- if ($max_pagesize && ($a_user_prefs['addressbook_pagesize'] > $max_pagesize)) {
- $a_user_prefs['addressbook_pagesize'] = $max_pagesize;
- }
+ $max_pagesize = (int) $rcmail->config->get('max_pagesize');
+ if ($max_pagesize && ($a_user_prefs['addressbook_pagesize'] > $max_pagesize)) {
+ $a_user_prefs['addressbook_pagesize'] = $max_pagesize;
+ }
- break;
+ break;
- case 'folders':
- $storage = $rcmail->get_storage();
- $specials = [];
+ case 'folders':
+ $storage = $rcmail->get_storage();
+ $specials = [];
- foreach (rcube_storage::$folder_types as $type) {
- $specials[$type] = $a_user_prefs[$type . '_mbox'];
- }
+ foreach (rcube_storage::$folder_types as $type) {
+ $specials[$type] = $a_user_prefs[$type . '_mbox'];
+ }
- $storage->set_special_folders($specials);
+ $storage->set_special_folders($specials);
- break;
+ break;
- case 'server':
- if (isset($a_user_prefs['logout_purge']) && !is_numeric($a_user_prefs['logout_purge'])) {
- $a_user_prefs['logout_purge'] = $a_user_prefs['logout_purge'] !== 'never';
- }
+ case 'server':
+ if (isset($a_user_prefs['logout_purge']) && !is_numeric($a_user_prefs['logout_purge'])) {
+ $a_user_prefs['logout_purge'] = $a_user_prefs['logout_purge'] !== 'never';
+ }
- break;
+ break;
}
// Save preferences
diff --git a/program/actions/settings/response_create.php b/program/actions/settings/response_create.php
index 7440d332af3..38003f230ad 100644
--- a/program/actions/settings/response_create.php
+++ b/program/actions/settings/response_create.php
@@ -1,6 +1,6 @@
plugins->is_plugin_task($task)) {
- if (!$this->action) $this->action = 'index';
+ if (!$this->action) {
+ $this->action = 'index';
+ }
$this->plugins->exec_action("{$task}.{$this->action}");
break;
}
diff --git a/program/include/rcmail_action.php b/program/include/rcmail_action.php
index 4544512cd2a..78a9dd528f1 100644
--- a/program/include/rcmail_action.php
+++ b/program/include/rcmail_action.php
@@ -1,6 +1,6 @@
storage->get_error_code();
switch ($err_code) {
- // Not all are really fatal, but these should catch
- // connection/authentication errors the best we can
- case rcube_imap_generic::ERROR_NO:
- case rcube_imap_generic::ERROR_BAD:
- case rcube_imap_generic::ERROR_BYE:
- self::display_server_error();
+ // Not all are really fatal, but these should catch
+ // connection/authentication errors the best we can
+ case rcube_imap_generic::ERROR_NO:
+ case rcube_imap_generic::ERROR_BAD:
+ case rcube_imap_generic::ERROR_BYE:
+ self::display_server_error();
}
}
diff --git a/program/include/rcmail_attachment_handler.php b/program/include/rcmail_attachment_handler.php
index 8f34781fbc6..1e6228ed815 100644
--- a/program/include/rcmail_attachment_handler.php
+++ b/program/include/rcmail_attachment_handler.php
@@ -1,6 +1,6 @@
'LOG_AUTH', 80 => 'LOG_AUTHPRIV', 72 => ' LOG_CRON',
- 24 => 'LOG_DAEMON', 0 => 'LOG_KERN', 128 => 'LOG_LOCAL0',
- 136 => 'LOG_LOCAL1', 144 => 'LOG_LOCAL2', 152 => 'LOG_LOCAL3',
- 160 => 'LOG_LOCAL4', 168 => 'LOG_LOCAL5', 176 => 'LOG_LOCAL6',
- 184 => 'LOG_LOCAL7', 48 => 'LOG_LPR', 16 => 'LOG_MAIL',
- 56 => 'LOG_NEWS', 40 => 'LOG_SYSLOG', 8 => 'LOG_USER', 64 => 'LOG_UUCP'
- ];
+ case 'syslog_facility':
+ $list = [
+ 32 => 'LOG_AUTH', 80 => 'LOG_AUTHPRIV', 72 => ' LOG_CRON',
+ 24 => 'LOG_DAEMON', 0 => 'LOG_KERN', 128 => 'LOG_LOCAL0',
+ 136 => 'LOG_LOCAL1', 144 => 'LOG_LOCAL2', 152 => 'LOG_LOCAL3',
+ 160 => 'LOG_LOCAL4', 168 => 'LOG_LOCAL5', 176 => 'LOG_LOCAL6',
+ 184 => 'LOG_LOCAL7', 48 => 'LOG_LPR', 16 => 'LOG_MAIL',
+ 56 => 'LOG_NEWS', 40 => 'LOG_SYSLOG', 8 => 'LOG_USER', 64 => 'LOG_UUCP'
+ ];
- if (!empty($list[$var])) {
- return $list[$var];
- }
+ if (!empty($list[$var])) {
+ return $list[$var];
+ }
- break;
+ break;
}
if (is_array($var)) {
diff --git a/program/include/rcmail_oauth.php b/program/include/rcmail_oauth.php
index bcce3f25633..47dd9f8b083 100644
--- a/program/include/rcmail_oauth.php
+++ b/program/include/rcmail_oauth.php
@@ -1,6 +1,6 @@
message) {
if ($this->app->text_exists($message)) {
if (!empty($vars)) {
- $vars = array_map(['rcube','Q'], $vars);
+ $vars = array_map(['rcube', 'Q'], $vars);
}
$msgtext = $this->app->gettext(['name' => $message, 'vars' => $vars]);
@@ -975,7 +975,7 @@ public function asset_url($path, $abs_url = false)
}
- /***** Template parsing methods *****/
+ /* Template parsing methods */
/**
* Replace all strings ($varname)
@@ -1128,51 +1128,51 @@ protected function parse_conditions($input)
$tag_name = strtolower($matches[1][0]);
switch ($tag_name) {
- case 'if':
- $level++;
- break;
-
- case 'endif':
- if (!$level--) {
- $endif = $tag_end;
- if ($content_end === null) {
- $content_end = $tag_start;
- }
- break 2;
- }
- break;
+ case 'if':
+ $level++;
+ break;
- case 'elseif':
- if (!$level) {
- if ($condmet) {
+ case 'endif':
+ if (!$level--) {
+ $endif = $tag_end;
if ($content_end === null) {
$content_end = $tag_start;
}
+ break 2;
}
- else {
- // Process the 'condition' attribute
- $attrib = html::parse_attrib_string($matches[2][0]);
- $condmet = isset($attrib['condition']) && $this->check_condition($attrib['condition']);
+ break;
+ case 'elseif':
+ if (!$level) {
if ($condmet) {
- $content_start = $tag_end;
+ if ($content_end === null) {
+ $content_end = $tag_start;
+ }
}
- }
- }
- break;
+ else {
+ // Process the 'condition' attribute
+ $attrib = html::parse_attrib_string($matches[2][0]);
+ $condmet = isset($attrib['condition']) && $this->check_condition($attrib['condition']);
- case 'else':
- if (!$level) {
- if ($condmet) {
- if ($content_end === null) {
- $content_end = $tag_start;
+ if ($condmet) {
+ $content_start = $tag_end;
+ }
}
}
- else {
- $content_start = $tag_end;
+ break;
+
+ case 'else':
+ if (!$level) {
+ if ($condmet) {
+ if ($content_end === null) {
+ $content_end = $tag_start;
+ }
+ }
+ else {
+ $content_start = $tag_end;
+ }
}
- }
- break;
+ break;
}
$n = $tag_end;
@@ -1357,12 +1357,12 @@ protected function xml_command($matches)
}
break;
- // frame
+ // frame (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
case 'frame':
return $this->frame($attrib);
break;
- // show a label
+ // show a label (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
case 'label':
if (!empty($attrib['expression'])) {
$attrib['name'] = $this->eval_expression($attrib['expression']);
@@ -1408,7 +1408,7 @@ protected function xml_command($matches)
$this->add_label($attrib['name']);
break;
- // include a file
+ // include a file (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
case 'include':
if (!empty($attrib['condition']) && !$this->check_condition($attrib['condition'])) {
break;
@@ -1448,7 +1448,7 @@ protected function xml_command($matches)
$hook = $this->app->plugins->exec_hook("template_plugin_include", $attrib + ['content' => '']);
return $hook['content'];
- // define a container block
+ // define a container block (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
case 'container':
if (!empty($attrib['name']) && !empty($attrib['id'])) {
$this->command('gui_container', $attrib['name'], $attrib['id']);
@@ -1458,7 +1458,7 @@ protected function xml_command($matches)
}
break;
- // return code for a specific application object
+ // return code for a specific application object (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
case 'object':
$object = strtolower($attrib['name']);
$content = '';
@@ -1534,15 +1534,16 @@ protected function xml_command($matches)
$ver = (string) RCMAIL_VERSION;
if (is_file(RCUBE_INSTALL_PATH . '.svn/entries')) {
if (function_exists('shell_exec')) {
- if (preg_match('/Revision:\s(\d+)/', (string)@shell_exec('svn info'), $regs))
+ if (preg_match('/Revision:\s(\d+)/', (string) @shell_exec('svn info'), $regs)) {
$ver .= ' [SVN r' . $regs[1] . ']';
+ }
} else {
$ver .= ' [SVN]';
}
}
else if (is_file(RCUBE_INSTALL_PATH . '.git/index')) {
if (function_exists('shell_exec')) {
- if (preg_match('/Date:\s+([^\n]+)/', (string)@shell_exec('git log -1'), $regs)) {
+ if (preg_match('/Date:\s+([^\n]+)/', (string) @shell_exec('git log -1'), $regs)) {
if ($date = date('Ymd.Hi', strtotime($regs[1]))) {
$ver .= ' [GIT ' . $date . ']';
}
@@ -1630,7 +1631,7 @@ protected function xml_command($matches)
return $hook['content'];
- // return ', '' => ' ',
- '' => '', ' ' => '',
- '' => '', ' ' => '',
+ '' => '', ' ' => '',
+ '' => '', ' ' => '',
+ '' => '', ' ' => '',
'' => '', ' '=> '',
'' => '', ' ' => '',
'' => '', ' ' => '',
- '' => '', ' ' => '',
- '' => '', ' ' => '',
- '' => '', ' ' => '',
- '' => '', ' ' => '',
- '' => '', ' ' => '',
+ '' => '', ' ' => '',
+ '' => '', ' ' => '',
+ '' => '', ' ' => '',
+ '' => '', ' ' => '',
+ '' => '', ' ' => '',
];
return str_ireplace(array_keys($replace), array_values($replace), $body);
diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 7b964a985fd..a2efb9143f1 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -1,6 +1,6 @@
get_text();
+ echo $this->get_text();
}
/**
@@ -704,7 +704,9 @@ protected function _convert_blockquotes(&$text)
// adjust text wrapping width
$p_width = $this->width;
- if ($this->width > 0) $this->width -= 2;
+ if ($this->width > 0) {
+ $this->width -= 2;
+ }
// replace content with inner blockquotes
$this->_converter($body);
@@ -751,14 +753,14 @@ public function blockquote_citation_callback($m)
public function tags_preg_callback($matches)
{
switch (strtolower($matches[1])) {
- case 'th':
- return $this->_toupper("\t\t". $matches[3] ."\n");
- case 'h':
- return $this->_toupper("\n\n". $matches[3] ."\n\n");
- case 'a':
- // Remove spaces in URL (#1487805)
- $url = str_replace(' ', '', $matches[3]);
- return $this->_handle_link($url, $matches[4]);
+ case 'th':
+ return $this->_toupper("\t\t". $matches[3] ."\n");
+ case 'h':
+ return $this->_toupper("\n\n". $matches[3] ."\n\n");
+ case 'a':
+ // Remove spaces in URL (#1487805)
+ $url = str_replace(' ', '', $matches[3]);
+ return $this->_handle_link($url, $matches[4]);
}
}
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index 94e75764359..079504a4954 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -1,6 +1,6 @@
conn->connect($data['host'], $data['user'], $pass, $data);
- } while(!$this->conn->connected() && $data['retry']);
+ } while (!$this->conn->connected() && $data['retry']);
$config = [
'host' => $data['host'],
@@ -1139,7 +1139,7 @@ protected function list_search_messages($folder, $page, $slice = 0)
}
// Re-sort the result according to the original search set order
- usort($a_msg_headers, function($a, $b) use ($index) {
+ usort($a_msg_headers, function ($a, $b) use ($index) {
return array_search($a->uid . '-' . $a->folder, $index) - array_search($b->uid . '-' . $b->folder, $index);
});
}
@@ -1438,7 +1438,7 @@ public function index($folder = '', $sort_field = null, $sort_order = null,
if ($this->search_set instanceof rcube_result_multifolder) {
$index = $this->search_set;
$index->folder = $folder;
- // TODO: handle changed sorting
+ // TODO: handle changed sorting (>> reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7497 is fixed)
}
// search result is an index with the same sorting?
else if (($this->search_set instanceof rcube_result_index)
@@ -2042,13 +2042,13 @@ public function get_message($uid, $folder = null)
protected function structure_part($part, $count = 0, $parent = '', $mime_headers = null)
{
$struct = new rcube_message_part;
- $struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";
+ $struct->mime_id = empty($parent) ? (string) $count : "$parent.$count";
// multipart
if (is_array($part[0])) {
$struct->ctype_primary = 'multipart';
- /* RFC3501: BODYSTRUCTURE fields of multipart part
+ /* RFC3501: BODYSTRUCTURE fields of multipart part
part1 array
part2 array
part3 array
@@ -2058,7 +2058,7 @@ protected function structure_part($part, $count = 0, $parent = '', $mime_headers
3. description (optional)
4. language (optional)
5. location (optional)
- */
+ */
// find first non-array entry
for ($i=1; $ifolder;
}
- list($uids, ) = $this->parse_uids($uids);
+ list($uids) = $this->parse_uids($uids);
// exit if no message uids are specified
if (empty($uids)) {
@@ -3135,12 +3135,12 @@ protected function list_folders_filter(&$result, $root, $update_type = null)
// Remove hidden folders
if ($config->get('imap_skip_hidden_folders')) {
- $result = array_filter($result, function($v) { return $v[0] != '.'; });
+ $result = array_filter($result, function ($v) { return $v[0] != '.'; });
}
// Remove folders in shared namespaces (if configured, see self::set_env())
if ($root === '*' && !empty($this->list_excludes)) {
- $result = array_filter($result, function($v) {
+ $result = array_filter($result, function ($v) {
foreach ($this->list_excludes as $prefix) {
if (strpos($v, $prefix) === 0) {
return false;
@@ -3165,7 +3165,7 @@ protected function list_folders_update(&$result, $type = null)
$search = [];
// build list of namespace prefixes
- foreach ((array)$namespace as $ns) {
+ foreach ((array) $namespace as $ns) {
if (is_array($ns)) {
foreach ($ns as $ns_data) {
if (strlen($ns_data[0])) {
@@ -3222,7 +3222,7 @@ protected function filter_rights($a_folders, $rights)
continue;
}
- $myrights = implode('', (array)$this->my_rights($folder));
+ $myrights = implode('', (array) $this->my_rights($folder));
if ($myrights !== null && !preg_match($regex, $myrights)) {
unset($a_folders[$idx]);
@@ -3491,7 +3491,7 @@ public function get_special_folders($forced = false)
return $result;
}
- $types = array_map(function($value) { return "\\" . ucfirst($value); }, rcube_storage::$folder_types);
+ $types = array_map(function ($value) { return "\\" . ucfirst($value); }, rcube_storage::$folder_types);
$special = [];
// request \Subscribed flag in LIST response as performance improvement for folder_exists()
@@ -4068,7 +4068,7 @@ public function set_metadata($folder, $entries)
}
if ($this->get_capability('ANNOTATEMORE') || $this->get_capability('ANNOTATEMORE2')) {
- foreach ((array)$entries as $entry => $value) {
+ foreach ((array) $entries as $entry => $value) {
list($ent, $attr) = $this->md2annotate($entry);
$entries[$entry] = [$ent, $attr, $value];
}
@@ -4103,7 +4103,7 @@ public function delete_metadata($folder, $entries)
}
if ($this->get_capability('ANNOTATEMORE') || $this->get_capability('ANNOTATEMORE2')) {
- foreach ((array)$entries as $idx => $entry) {
+ foreach ((array) $entries as $idx => $entry) {
list($ent, $attr) = $this->md2annotate($entry);
$entries[$idx] = [$ent, $attr, null];
}
diff --git a/program/lib/Roundcube/rcube_imap_cache.php b/program/lib/Roundcube/rcube_imap_cache.php
index 5bb3e213db9..407d8abb5fa 100644
--- a/program/lib/Roundcube/rcube_imap_cache.php
+++ b/program/lib/Roundcube/rcube_imap_cache.php
@@ -1,6 +1,6 @@
2592000) $ttl = 2592000;
+ if ($ttl > 2592000) {
+ $ttl = 2592000;
+ }
$this->db = $db;
$this->imap = $imap;
@@ -423,7 +425,7 @@ function get_message($mailbox, $uid, $update = true, $cache = true)
." WHERE `user_id` = ?"
." AND `mailbox` = ?"
." AND `uid` = ?",
- $this->userid, $mailbox, (int)$uid);
+ $this->userid, $mailbox, (int) $uid);
if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
$message = $this->build_message($sql_arr);
@@ -590,7 +592,7 @@ function remove_message($mailbox = null, $uids = null)
"DELETE FROM {$this->messages_table}"
." WHERE `user_id` = ?"
." AND `mailbox` = ?"
- .($uids !== null ? " AND `uid` IN (".$this->db->array2list((array)$uids, 'integer').")" : ""),
+ .($uids !== null ? " AND `uid` IN (".$this->db->array2list((array) $uids, 'integer').")" : ""),
$this->userid, $mailbox
);
}
@@ -1018,7 +1020,7 @@ function synchronize($mailbox)
$mbox_data = $this->imap->folder_data($mailbox);
if (empty($mbox_data)) {
- return;
+ return;
}
// Check UIDVALIDITY
@@ -1155,7 +1157,7 @@ private function build_message($sql_arr)
if (($sql_arr['flags'] & $idx) == $idx) {
$message->flags[$flag] = true;
}
- }
+ }
}
return $message;
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index bfb2a55c74e..90812f678cd 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -1,6 +1,6 @@
fp, $proxy_protocol_header);
}
}
-
+
if ($this->prefs['timeout'] > 0) {
stream_set_timeout($this->fp, $this->prefs['timeout']);
}
@@ -1162,7 +1162,7 @@ protected function set_prefs($prefs)
// disabled capabilities
if (!empty($this->prefs['disabled_caps'])) {
- $this->prefs['disabled_caps'] = array_map('strtoupper', (array)$this->prefs['disabled_caps']);
+ $this->prefs['disabled_caps'] = array_map('strtoupper', (array) $this->prefs['disabled_caps']);
}
// additional message flags
@@ -1241,54 +1241,54 @@ public function select($mailbox, $qresync_data = null)
$pos += 7;
switch ($token) {
- case 'UIDNEXT':
- case 'UIDVALIDITY':
- case 'UNSEEN':
- if ($len = strspn($line, '0123456789', $pos)) {
- $this->data[$token] = (int) substr($line, $pos, $len);
- }
- break;
+ case 'UIDNEXT':
+ case 'UIDVALIDITY':
+ case 'UNSEEN':
+ if ($len = strspn($line, '0123456789', $pos)) {
+ $this->data[$token] = (int) substr($line, $pos, $len);
+ }
+ break;
- case 'HIGHESTMODSEQ':
- if ($len = strspn($line, '0123456789', $pos)) {
- $this->data[$token] = (string) substr($line, $pos, $len);
- }
- break;
+ case 'HIGHESTMODSEQ':
+ if ($len = strspn($line, '0123456789', $pos)) {
+ $this->data[$token] = (string) substr($line, $pos, $len);
+ }
+ break;
- case 'NOMODSEQ':
- $this->data[$token] = true;
- break;
+ case 'NOMODSEQ':
+ $this->data[$token] = true;
+ break;
- case 'PERMANENTFLAGS':
- $start = strpos($line, '(', $pos);
- $end = strrpos($line, ')');
- if ($start && $end) {
- $flags = substr($line, $start + 1, $end - $start - 1);
- $this->data[$token] = explode(' ', $flags);
- }
- break;
+ case 'PERMANENTFLAGS':
+ $start = strpos($line, '(', $pos);
+ $end = strrpos($line, ')');
+ if ($start && $end) {
+ $flags = substr($line, $start + 1, $end - $start - 1);
+ $this->data[$token] = explode(' ', $flags);
+ }
+ break;
}
}
else if (preg_match('/^\* ([0-9]+) (EXISTS|RECENT|FETCH)/i', $line, $match)) {
$token = strtoupper($match[2]);
switch ($token) {
- case 'EXISTS':
- case 'RECENT':
- $this->data[$token] = (int) $match[1];
- break;
+ case 'EXISTS':
+ case 'RECENT':
+ $this->data[$token] = (int) $match[1];
+ break;
- case 'FETCH':
- // QRESYNC FETCH response (RFC5162)
- $line = substr($line, strlen($match[0]));
- $fetch_data = $this->tokenizeResponse($line, 1);
- $data = ['id' => $match[1]];
+ case 'FETCH':
+ // QRESYNC FETCH response (RFC5162)
+ $line = substr($line, strlen($match[0]));
+ $fetch_data = $this->tokenizeResponse($line, 1);
+ $data = ['id' => $match[1]];
- for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
- $data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
- }
+ for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
+ $data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
+ }
- $this->data['QRESYNC'][$data['uid']] = $data;
- break;
+ $this->data['QRESYNC'][$data['uid']] = $data;
+ break;
}
}
// QRESYNC VANISHED response (RFC5162)
@@ -1886,7 +1886,7 @@ public function enable($extension)
$response = substr($response, 10); // remove prefix "* ENABLED "
$result = (array) $this->tokenizeResponse($response);
- $this->extensions_enabled = array_unique(array_merge((array)$this->extensions_enabled, $result));
+ $this->extensions_enabled = array_unique(array_merge((array) $this->extensions_enabled, $result));
return $this->extensions_enabled;
}
@@ -2550,7 +2550,7 @@ public function fetch($mailbox, $message_set, $is_uid = false, $query_items = []
}
else if ($name == 'FLAGS') {
if (!empty($value)) {
- foreach ((array)$value as $flag) {
+ foreach ((array) $value as $flag) {
$flag = str_replace(['$', "\\"], '', $flag);
$flag = strtoupper($flag);
@@ -2616,58 +2616,58 @@ public function fetch($mailbox, $message_set, $is_uid = false, $query_items = []
$string = preg_replace('/\n[\t\s]*/', ' ', trim($string));
switch ($field) {
- case 'date';
- $string = substr($string, 0, 128);
- $result[$id]->date = $string;
- $result[$id]->timestamp = rcube_utils::strtotime($string);
- break;
- case 'to':
- $result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string);
- break;
- case 'from':
- case 'subject':
- $string = substr($string, 0, 2048);
- case 'cc':
- case 'bcc':
- case 'references':
- $result[$id]->{$field} = $string;
- break;
- case 'reply-to':
- $result[$id]->replyto = $string;
- break;
- case 'content-transfer-encoding':
- $result[$id]->encoding = substr($string, 0, 32);
- break;
- case 'content-type':
- $ctype_parts = preg_split('/[; ]+/', $string);
- $result[$id]->ctype = strtolower(array_first($ctype_parts));
- if (preg_match('/charset\s*=\s*"?([a-z0-9\-\.\_]+)"?/i', $string, $regs)) {
- $result[$id]->charset = $regs[1];
- }
- break;
- case 'in-reply-to':
- $result[$id]->in_reply_to = str_replace(["\n", '<', '>'], '', $string);
- break;
- case 'disposition-notification-to':
- case 'x-confirm-reading-to':
- $result[$id]->mdn_to = substr($string, 0, 2048);
- break;
- case 'message-id':
- $result[$id]->messageID = substr($string, 0, 2048);
- break;
- case 'x-priority':
- if (preg_match('/^(\d+)/', $string, $matches)) {
- $result[$id]->priority = intval($matches[1]);
- }
- break;
- default:
- if (strlen($field) < 3) {
+ case 'date':
+ $string = substr($string, 0, 128);
+ $result[$id]->date = $string;
+ $result[$id]->timestamp = rcube_utils::strtotime($string);
break;
- }
- if (!empty($result[$id]->others[$field])) {
- $string = array_merge((array) $result[$id]->others[$field], (array) $string);
- }
- $result[$id]->others[$field] = $string;
+ case 'to':
+ $result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string);
+ break;
+ case 'from':
+ case 'subject':
+ $string = substr($string, 0, 2048);
+ case 'cc':
+ case 'bcc':
+ case 'references':
+ $result[$id]->{$field} = $string;
+ break;
+ case 'reply-to':
+ $result[$id]->replyto = $string;
+ break;
+ case 'content-transfer-encoding':
+ $result[$id]->encoding = substr($string, 0, 32);
+ break;
+ case 'content-type':
+ $ctype_parts = preg_split('/[; ]+/', $string);
+ $result[$id]->ctype = strtolower(array_first($ctype_parts));
+ if (preg_match('/charset\s*=\s*"?([a-z0-9\-\.\_]+)"?/i', $string, $regs)) {
+ $result[$id]->charset = $regs[1];
+ }
+ break;
+ case 'in-reply-to':
+ $result[$id]->in_reply_to = str_replace(["\n", '<', '>'], '', $string);
+ break;
+ case 'disposition-notification-to':
+ case 'x-confirm-reading-to':
+ $result[$id]->mdn_to = substr($string, 0, 2048);
+ break;
+ case 'message-id':
+ $result[$id]->messageID = substr($string, 0, 2048);
+ break;
+ case 'x-priority':
+ if (preg_match('/^(\d+)/', $string, $matches)) {
+ $result[$id]->priority = intval($matches[1]);
+ }
+ break;
+ default:
+ if (strlen($field) < 3) {
+ break;
+ }
+ if (!empty($result[$id]->others[$field])) {
+ $string = array_merge((array) $result[$id]->others[$field], (array) $string);
+ }
+ $result[$id]->others[$field] = $string;
}
}
}
@@ -2759,29 +2759,29 @@ public static function sortHeaders($messages, $field, $order = 'ASC')
// Create an index
foreach ($messages as $key => $headers) {
switch ($field) {
- case 'arrival':
- $field = 'internaldate';
- // no-break
- case 'date':
- case 'internaldate':
- case 'timestamp':
- $value = rcube_utils::strtotime($headers->$field);
- if (!$value && $field != 'timestamp') {
- $value = $headers->timestamp;
- }
+ case 'arrival':
+ $field = 'internaldate';
+ // no-break
+ case 'date':
+ case 'internaldate':
+ case 'timestamp':
+ $value = rcube_utils::strtotime($headers->$field);
+ if (!$value && $field != 'timestamp') {
+ $value = $headers->timestamp;
+ }
- break;
+ break;
- default:
- // @TODO: decode header value, convert to UTF-8
- $value = $headers->$field;
- if (is_string($value)) {
- $value = str_replace('"', '', $value);
+ default:
+ // @TODO: decode header value, convert to UTF-8
+ $value = $headers->$field;
+ if (is_string($value)) {
+ $value = str_replace('"', '', $value);
- if ($field == 'subject') {
- $value = rcube_utils::remove_subject_prefix($value);
+ if ($field == 'subject') {
+ $value = rcube_utils::remove_subject_prefix($value);
+ }
}
- }
}
$index[$key] = $value;
@@ -2878,20 +2878,20 @@ public function handlePartBody($mailbox, $id, $is_uid = false, $part = '', $enco
do {
if (!$initiated) {
switch ($encoding) {
- case 'base64':
- $mode = 1;
- break;
- case 'quoted-printable':
- $mode = 2;
- break;
- case 'x-uuencode':
- case 'x-uue':
- case 'uue':
- case 'uuencode':
- $mode = 3;
- break;
- default:
- $mode = $formatted ? 4 : 0;
+ case 'base64':
+ $mode = 1;
+ break;
+ case 'quoted-printable':
+ $mode = 2;
+ break;
+ case 'x-uuencode':
+ case 'x-uue':
+ case 'uue':
+ case 'uuencode':
+ $mode = 3;
+ break;
+ default:
+ $mode = $formatted ? 4 : 0;
}
// Use BINARY extension when possible (and safe)
@@ -2980,33 +2980,35 @@ public function handlePartBody($mailbox, $id, $is_uid = false, $part = '', $enco
else if (!$mode && !$file && !$print) {
$result = $this->readBytes($bytes);
}
- else while ($bytes > 0) {
- $chunk = $this->readBytes($bytes > $chunkSize ? $chunkSize : $bytes);
-
- if ($chunk === '') {
- break;
- }
+ else {
+ while ($bytes > 0) {
+ $chunk = $this->readBytes($bytes > $chunkSize ? $chunkSize : $bytes);
- $len = strlen($chunk);
+ if ($chunk === '') {
+ break;
+ }
- if ($len > $bytes) {
- $chunk = substr($chunk, 0, $bytes);
$len = strlen($chunk);
- }
- $bytes -= $len;
- $chunk = $this->decodeContent($chunk, $mode, $bytes <= 0, $prev);
+ if ($len > $bytes) {
+ $chunk = substr($chunk, 0, $bytes);
+ $len = strlen($chunk);
+ }
+ $bytes -= $len;
- if ($file) {
- if (fwrite($file, $chunk) === false) {
- break;
+ $chunk = $this->decodeContent($chunk, $mode, $bytes <= 0, $prev);
+
+ if ($file) {
+ if (fwrite($file, $chunk) === false) {
+ break;
+ }
+ }
+ else if ($print) {
+ echo $chunk;
+ }
+ else {
+ $result .= $chunk;
}
- }
- else if ($print) {
- echo $chunk;
- }
- else {
- $result .= $chunk;
}
}
}
@@ -3827,7 +3829,7 @@ public static function getStructurePartData($structure, $part)
// charset
if (is_array($part_a[2])) {
- foreach ($part_a[2] as $key => $val) {
+ foreach ($part_a[2] as $key => $val) {
if (strcasecmp($val, 'charset') == 0) {
$data['charset'] = $part_a[2][$key+1];
break;
@@ -3988,59 +3990,59 @@ public static function tokenizeResponse(&$str, $num=0)
switch ($str[0]) {
- // String literal
- case '{':
- if (($epos = strpos($str, "}\r\n", 1)) == false) {
- // error
- }
- if (!is_numeric(($bytes = substr($str, 1, $epos - 1)))) {
- // error
- }
+ // String literal
+ case '{':
+ if (($epos = strpos($str, "}\r\n", 1)) == false) {
+ // error
+ }
+ if (!is_numeric(($bytes = substr($str, 1, $epos - 1)))) {
+ // error
+ }
- $result[] = $bytes ? substr($str, $epos + 3, $bytes) : '';
- $str = substr($str, $epos + 3 + $bytes);
- break;
+ $result[] = $bytes ? substr($str, $epos + 3, $bytes) : '';
+ $str = substr($str, $epos + 3 + $bytes);
+ break;
- // Quoted string
- case '"':
- $len = strlen($str);
+ // Quoted string (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case '"':
+ $len = strlen($str);
- for ($pos=1; $pos<$len; $pos++) {
- if ($str[$pos] == '"') {
- break;
- }
- if ($str[$pos] == "\\") {
- if ($str[$pos + 1] == '"' || $str[$pos + 1] == "\\") {
- $pos++;
+ for ($pos=1; $pos<$len; $pos++) {
+ if ($str[$pos] == '"') {
+ break;
+ }
+ if ($str[$pos] == "\\") {
+ if ($str[$pos + 1] == '"' || $str[$pos + 1] == "\\") {
+ $pos++;
+ }
}
}
- }
- // we need to strip slashes for a quoted string
- $result[] = stripslashes(substr($str, 1, $pos - 1));
- $str = substr($str, $pos + 1);
- break;
+ // we need to strip slashes for a quoted string
+ $result[] = stripslashes(substr($str, 1, $pos - 1));
+ $str = substr($str, $pos + 1);
+ break;
- // Parenthesized list
- case '(':
- $str = substr($str, 1);
- $result[] = self::tokenizeResponse($str);
- break;
+ // Parenthesized list (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ case '(':
+ $str = substr($str, 1);
+ $result[] = self::tokenizeResponse($str);
+ break;
- case ')':
- $str = substr($str, 1);
- return $result;
+ case ')':
+ $str = substr($str, 1);
+ return $result;
- // String atom, number, astring, NIL, *, %
- default:
- // excluded chars: SP, CTL, ), DEL
- // we do not exclude [ and ] (#1489223)
- if (preg_match('/^([^\x00-\x20\x29\x7F]+)/', $str, $m)) {
- $result[] = $m[1] == 'NIL' ? null : $m[1];
- $str = substr($str, strlen($m[1]));
- }
+ // String atom, number, astring, NIL, *, % (<< reindent once https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7179 is fixed)
+ default:
+ // excluded chars: SP, CTL, ), DEL
+ // we do not exclude [ and ] (#1489223)
+ if (preg_match('/^([^\x00-\x20\x29\x7F]+)/', $str, $m)) {
+ $result[] = $m[1] == 'NIL' ? null : $m[1];
+ $str = substr($str, strlen($m[1]));
+ }
- break;
+ break;
}
}
diff --git a/program/lib/Roundcube/rcube_imap_search.php b/program/lib/Roundcube/rcube_imap_search.php
index 32a1c00ac2c..3a117346590 100644
--- a/program/lib/Roundcube/rcube_imap_search.php
+++ b/program/lib/Roundcube/rcube_imap_search.php
@@ -1,6 +1,6 @@
prop = $p;
@@ -160,8 +160,12 @@ function __construct($p, $debug = false, $mail_domain = null)
}
// first argument is a limit
else if ($idx === 0) {
- if ($param == '*') $limit = null;
- else $limit = max(1, intval($param));
+ if ($param == '*') {
+ $limit = null;
+ }
+ else {
+ $limit = max(1, intval($param));
+ }
}
// second is a composite field separator
else if ($idx === 1 && $param) {
@@ -194,7 +198,7 @@ function __construct($p, $debug = false, $mail_domain = null)
),
] + (array) ($this->coltypes['address'] ?? []);
- foreach (['street','locality','zipcode','region','country'] as $childcol) {
+ foreach (['street', 'locality', 'zipcode', 'region', 'country'] as $childcol) {
if (!empty($this->coltypes[$childcol])) {
$this->coltypes['address']['childs'][$childcol] = ['type' => 'text'];
$this->coltypes['address']['attributes'] = array_merge(
@@ -843,7 +847,7 @@ function search($fields, $value, $mode = 0, $select = true, $nocount = false, $r
// use VLV pseudo-search for autocompletion
if (!empty($this->prop['vlv_search']) && $this->ready
- && implode(',', (array)$fields) == implode(',', $list_fields)
+ && implode(',', (array) $fields) == implode(',', $list_fields)
) {
$this->result = new rcube_result_set(0);
@@ -862,7 +866,7 @@ function search($fields, $value, $mode = 0, $select = true, $nocount = false, $r
$rec = $this->_ldap2result($entry);
foreach ($fields as $f) {
if (!empty($rec[$f])) {
- foreach ((array)$rec[$f] as $val) {
+ foreach ((array) $rec[$f] as $val) {
if ($this->compare_search_value($f, $val, $search, $mode)) {
$this->result->add($rec);
$this->result->count++;
@@ -1636,7 +1640,7 @@ private function _ldap2result($rec)
// assign object type from object class mapping
if (!empty($this->prop['class_type_map'])) {
- foreach (array_map('strtolower', (array)$rec['objectclass']) as $objcls) {
+ foreach (array_map('strtolower', (array) $rec['objectclass']) as $objcls) {
if (!empty($this->prop['class_type_map'][$objcls])) {
$out['_type'] = $this->prop['class_type_map'][$objcls];
break;
@@ -1715,7 +1719,7 @@ private function _map_data($save_cols)
foreach ($this->get_col_values($col, $save_cols, false) as $subtype => $childs) {
$subtype = $subtype ? ':'.$subtype : '';
foreach ($childs as $i => $child_values) {
- foreach ((array)$child_values as $childcol => $value) {
+ foreach ((array) $child_values as $childcol => $value) {
$save_cols[$childcol.$subtype][$i] = $value;
}
}
@@ -1724,13 +1728,13 @@ private function _map_data($save_cols)
// if addresses are to be saved as serialized string, do so
if (!empty($colprop['serialized']) && is_array($colprop['serialized'])) {
- foreach ($colprop['serialized'] as $subtype => $delim) {
- $key = $col.':'.$subtype;
- foreach ((array)$save_cols[$key] as $i => $val) {
- $values = [$val['street'], $val['locality'], $val['zipcode'], $val['country']];
- $save_cols[$key][$i] = count(array_filter($values)) ? implode($delim, $values) : null;
- }
- }
+ foreach ($colprop['serialized'] as $subtype => $delim) {
+ $key = $col.':'.$subtype;
+ foreach ((array) $save_cols[$key] as $i => $val) {
+ $values = [$val['street'], $val['locality'], $val['zipcode'], $val['country']];
+ $save_cols[$key][$i] = count(array_filter($values)) ? implode($delim, $values) : null;
+ }
+ }
}
}
@@ -1765,11 +1769,11 @@ private function _map_data($save_cols)
}
switch ($format['type']) {
- case 'date':
- if ($dt = rcube_utils::anytodatetime($ldap_data[$fld])) {
- $ldap_data[$fld] = $dt->format($format['format']);
- }
- break;
+ case 'date':
+ if ($dt = rcube_utils::anytodatetime($ldap_data[$fld])) {
+ $ldap_data[$fld] = $dt->format($format['format']);
+ }
+ break;
}
}
@@ -1811,7 +1815,7 @@ private function is_group_entry($entry)
return false;
}
- $classes = array_map('strtolower', (array)$entry['objectclass']);
+ $classes = array_map('strtolower', (array) $entry['objectclass']);
return count(array_intersect(array_keys($this->group_types), $classes)) > 0;
}
@@ -1979,8 +1983,9 @@ private function _fetch_groups($search = null, $mode = 0, $vlv_page = null)
// list email attributes of a group
for ($j=0; $entry[$email_attr] && $j < $entry[$email_attr]['count']; $j++) {
- if (strpos($entry[$email_attr][$j], '@') > 0)
+ if (strpos($entry[$email_attr][$j], '@') > 0) {
$groups[$group_id]['email'][] = $entry[$email_attr][$j];
+ }
}
$group_sortnames[] = mb_strtolower($entry[$sort_attr][0]);
@@ -2026,7 +2031,7 @@ private function get_group_entry($group_id)
if (!isset($group_cache[$group_id])) {
$name_attr = $this->prop['groups']['name_attr'];
$dn = self::dn_decode($group_id);
- $attrs = ['dn','objectClass','member','uniqueMember','memberURL',$name_attr,$this->fieldmap['email']];
+ $attrs = ['dn', 'objectClass', 'member', 'uniqueMember', 'memberURL', $name_attr, $this->fieldmap['email']];
if ($list = $this->ldap->read_entries($dn, '(objectClass=*)', $attrs)) {
$entry = $list[0];
diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php
index a603229fd46..c411727f250 100644
--- a/program/lib/Roundcube/rcube_ldap_generic.php
+++ b/program/lib/Roundcube/rcube_ldap_generic.php
@@ -1,6 +1,6 @@
config['debug'])) {
- rcube::write_log('ldap', $msg);
- }
- break;
-
- case LOG_EMERG:
- case LOG_ALERT:
- case LOG_CRIT:
- rcube::raise_error($msg, true, true);
- break;
-
- case LOG_ERR:
- case LOG_WARNING:
- $this->error = $msg;
- rcube::raise_error($msg, true, false);
- break;
+ case LOG_DEBUG:
+ case LOG_INFO:
+ case LOG_NOTICE:
+ if (!empty($this->config['debug'])) {
+ rcube::write_log('ldap', $msg);
+ }
+ break;
+
+ case LOG_EMERG:
+ case LOG_ALERT:
+ case LOG_CRIT:
+ rcube::raise_error($msg, true, true);
+ break;
+
+ case LOG_ERR:
+ case LOG_WARNING:
+ $this->error = $msg;
+ rcube::raise_error($msg, true, false);
+ break;
}
}
@@ -260,7 +260,7 @@ public function read_entries($dn, $filter, $attributes = null)
$this->_debug("C: Read $dn [{$filter}]");
if ($this->conn && $dn) {
- $result = @ldap_read($this->conn, $dn, $filter, $attributes, 0, (int)$this->config['sizelimit'], (int)$this->config['timelimit']);
+ $result = @ldap_read($this->conn, $dn, $filter, $attributes, 0, (int) $this->config['sizelimit'], (int) $this->config['timelimit']);
if ($result === false) {
$this->_error("ldap_read() failed with " . ldap_error($this->conn));
return false;
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index e61d1d74720..18aa758ab94 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -1,6 +1,6 @@
mimetype == 'message/rfc822') {
- if (in_array($part, (array)$att_part->parts)) {
+ if (in_array($part, (array) $att_part->parts)) {
return true;
}
}
@@ -593,7 +593,7 @@ private function parse_structure($structure, $recursive = false)
// parse headers from message/rfc822 part
if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) {
$part_body = $this->get_part_body($structure->mime_id, false, 32768);
- list($headers, ) = rcube_utils::explode("\r\n\r\n", $part_body, 2);
+ list($headers) = rcube_utils::explode("\r\n\r\n", $part_body, 2);
$structure->headers = rcube_mime::parse_headers($headers);
if ($this->context === $structure->mime_id) {
@@ -671,7 +671,7 @@ private function parse_structure($structure, $recursive = false)
// Parse simple (plain text) message body
if ($message_ctype_secondary == 'plain') {
- foreach ((array)$this->uu_decode($structure) as $uupart) {
+ foreach ((array) $this->uu_decode($structure) as $uupart) {
$this->mime_parts[$uupart->mime_id] = $uupart;
$this->add_part($uupart, 'attachment');
}
@@ -1060,9 +1060,15 @@ private function add_part($part, $type = null)
// It may happen that we add the same part to the array many times
// use part ID index to prevent from duplicates
switch ($type) {
- case 'inline': $this->inline_parts[(string) $part->mime_id] = $part; break;
- case 'attachment': $this->attachments[(string) $part->mime_id] = $part; break;
- default: $this->parts[] = $part; break;
+ case 'inline':
+ $this->inline_parts[(string) $part->mime_id] = $part;
+ break;
+ case 'attachment':
+ $this->attachments[(string) $part->mime_id] = $part;
+ break;
+ default:
+ $this->parts[] = $part;
+ break;
}
}
}
diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php
index 28b95fa69b3..fb9030e4995 100644
--- a/program/lib/Roundcube/rcube_message_header.php
+++ b/program/lib/Roundcube/rcube_message_header.php
@@ -1,6 +1,6 @@
config->resolve_paths('mimetypes.php') as $fpath) {
- $mime_ext = array_merge($mime_ext, (array) @include($fpath));
+ $mime_ext = array_merge($mime_ext, (array) @include ($fpath));
}
}
@@ -859,7 +859,7 @@ public static function get_mime_extensions($mimetype = null)
}
foreach ($lines as $line) {
- // skip comments or mime types w/o any extensions
+ // skip comments or mime types w/o any extensions
if ($line[0] == '#' || !preg_match($regex, $line, $matches)) {
continue;
}
@@ -876,7 +876,7 @@ public static function get_mime_extensions($mimetype = null)
// fallback to some well-known types most important for daily emails
if (empty($mime_types)) {
foreach (rcube::get_instance()->config->resolve_paths('mimetypes.php') as $fpath) {
- $mime_extensions = array_merge($mime_extensions, (array) @include($fpath));
+ $mime_extensions = array_merge($mime_extensions, (array) @include ($fpath));
}
foreach ($mime_extensions as $ext => $mime) {
@@ -932,10 +932,18 @@ public static function get_mime_extensions($mimetype = null)
public static function image_content_type($data)
{
$type = 'jpeg';
- if (preg_match('/^\x89\x50\x4E\x47/', $data)) $type = 'png';
- else if (preg_match('/^\x47\x49\x46\x38/', $data)) $type = 'gif';
- else if (preg_match('/^\x00\x00\x01\x00/', $data)) $type = 'ico';
- // else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data)) $type = 'jpeg';
+ if (preg_match('/^\x89\x50\x4E\x47/', $data)) {
+ $type = 'png';
+ }
+ else if (preg_match('/^\x47\x49\x46\x38/', $data)) {
+ $type = 'gif';
+ }
+ else if (preg_match('/^\x00\x00\x01\x00/', $data)) {
+ $type = 'ico';
+ }
+ // else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data)) {
+ // $type = 'jpeg';
+ // }
return 'image/' . $type;
}
diff --git a/program/lib/Roundcube/rcube_mime_decode.php b/program/lib/Roundcube/rcube_mime_decode.php
index 662962c7463..69f076d38a0 100644
--- a/program/lib/Roundcube/rcube_mime_decode.php
+++ b/program/lib/Roundcube/rcube_mime_decode.php
@@ -1,6 +1,6 @@
parseHeaderValue($value['value']);
+ case 'content-type':
+ $content_type = $this->parseHeaderValue($value['value']);
- if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
- $return->ctype_primary = $regs[1];
- $return->ctype_secondary = $regs[2];
- }
+ if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
+ $return->ctype_primary = $regs[1];
+ $return->ctype_secondary = $regs[2];
+ }
- if (!empty($content_type['other'])) {
- $return->ctype_parameters = array_merge((array) $return->ctype_parameters, (array) $content_type['other']);
- }
+ if (!empty($content_type['other'])) {
+ $return->ctype_parameters = array_merge((array) $return->ctype_parameters, (array) $content_type['other']);
+ }
- break;
+ break;
- case 'content-disposition';
- $content_disposition = $this->parseHeaderValue($value['value']);
- $return->disposition = $content_disposition['value'];
+ case 'content-disposition':
+ $content_disposition = $this->parseHeaderValue($value['value']);
+ $return->disposition = $content_disposition['value'];
- if (!empty($content_disposition['other'])) {
- $return->d_parameters = array_merge((array) $return->d_parameters, (array) $content_disposition['other']);
- }
+ if (!empty($content_disposition['other'])) {
+ $return->d_parameters = array_merge((array) $return->d_parameters, (array) $content_disposition['other']);
+ }
- break;
+ break;
- case 'content-transfer-encoding':
- $content_transfer_encoding = $this->parseHeaderValue($value['value']);
- break;
+ case 'content-transfer-encoding':
+ $content_transfer_encoding = $this->parseHeaderValue($value['value']);
+ break;
}
}
@@ -154,62 +154,62 @@ protected function do_decode($headers, $body, $default_ctype = 'text/plain')
$ctype = strtolower($content_type['value']);
switch ($ctype) {
- case 'text/plain':
- $encoding = $content_transfer_encoding['value'] ?? '7bit';
+ case 'text/plain':
+ $encoding = $content_transfer_encoding['value'] ?? '7bit';
- if ($this->params['include_bodies']) {
- $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
- }
+ if ($this->params['include_bodies']) {
+ $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
+ }
- break;
+ break;
- case 'text/html':
- $encoding = $content_transfer_encoding['value'] ?? '7bit';
+ case 'text/html':
+ $encoding = $content_transfer_encoding['value'] ?? '7bit';
- if ($this->params['include_bodies']) {
- $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
- }
+ if ($this->params['include_bodies']) {
+ $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
+ }
- break;
+ break;
- case 'multipart/digest':
- case 'multipart/alternative':
- case 'multipart/related':
- case 'multipart/mixed':
- case 'multipart/signed':
- case 'multipart/encrypted':
- if (!isset($content_type['other']['boundary'])) {
- return false;
- }
+ case 'multipart/digest':
+ case 'multipart/alternative':
+ case 'multipart/related':
+ case 'multipart/mixed':
+ case 'multipart/signed':
+ case 'multipart/encrypted':
+ if (!isset($content_type['other']['boundary'])) {
+ return false;
+ }
- $default_ctype = $ctype === 'multipart/digest' ? 'message/rfc822' : 'text/plain';
- $parts = $this->boundarySplit($body, $content_type['other']['boundary']);
+ $default_ctype = $ctype === 'multipart/digest' ? 'message/rfc822' : 'text/plain';
+ $parts = $this->boundarySplit($body, $content_type['other']['boundary']);
- for ($i = 0; $i < count($parts); $i++) {
- list($part_header, $part_body) = $this->splitBodyHeader($parts[$i]);
- $return->parts[] = $this->do_decode($part_header, $part_body, $default_ctype);
- }
+ for ($i = 0; $i < count($parts); $i++) {
+ list($part_header, $part_body) = $this->splitBodyHeader($parts[$i]);
+ $return->parts[] = $this->do_decode($part_header, $part_body, $default_ctype);
+ }
- break;
+ break;
- case 'message/rfc822':
- $obj = new rcube_mime_decode($this->params);
- $return->parts[] = $obj->decode($body, false);
- unset($obj);
+ case 'message/rfc822':
+ $obj = new rcube_mime_decode($this->params);
+ $return->parts[] = $obj->decode($body, false);
+ unset($obj);
- if ($this->params['include_bodies']) {
- $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body) : $body;
- }
+ if ($this->params['include_bodies']) {
+ $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body) : $body;
+ }
- break;
+ break;
- default:
- if ($this->params['include_bodies']) {
- $encoding = !empty($content_transfer_encoding['value']) ? $content_transfer_encoding['value'] : '7bit';
- $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
- }
+ default:
+ if ($this->params['include_bodies']) {
+ $encoding = !empty($content_transfer_encoding['value']) ? $content_transfer_encoding['value'] : '7bit';
+ $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
+ }
- break;
+ break;
}
}
else {
@@ -380,7 +380,7 @@ protected function decodeHeader($input)
protected function structure_part($part, $count = 0, $parent = '')
{
$struct = new rcube_message_part;
- $struct->mime_id = $part->mime_id ?: (empty($parent) ? (string)$count : "$parent.$count");
+ $struct->mime_id = $part->mime_id ?: (empty($parent) ? (string) $count : "$parent.$count");
$struct->headers = $part->headers;
$struct->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
$struct->ctype_primary = $part->ctype_primary;
diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php
index 46e8ff76041..cee403fde30 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -1,6 +1,6 @@
output->skins);
+ $skins = array_keys((array) $rcube->output->skins);
$skin_path = '';
if (empty($skins)) {
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 19e6ae2b41b..f5f6be22160 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -1,6 +1,6 @@
meta = [];
- $data = explode('*', (string)$data);
+ $data = explode('*', (string) $data);
// ...skip unilateral untagged server responses
for ($i=0, $len=count($data); $i<$len; $i++) {
@@ -100,8 +100,8 @@ public function init($data = null)
}
}
-// @TODO: Implement compression using compressMessageSet() in __sleep() and __wakeup() ?
-// @TODO: work with compressed result?!
+ // @TODO: Implement compression using compressMessageSet() in __sleep() and __wakeup() ?
+ // @TODO: work with compressed result?!
if (isset($this->params['ALL'])) {
$data_item = implode(self::SEPARATOR_ELEMENT,
rcube_imap_generic::uncompressMessageSet($this->params['ALL']));
@@ -304,7 +304,7 @@ public function exists($msgid, $get_index = false)
$idx = 1 + substr_count($this->raw_data, self::SEPARATOR_ELEMENT, 0, $m[0][1]);
}
// cache position of this element, so we can use it in get_element()
- $this->meta['pos'][$idx] = (int)$m[0][1];
+ $this->meta['pos'][$idx] = (int) $m[0][1];
return $idx;
}
diff --git a/program/lib/Roundcube/rcube_result_multifolder.php b/program/lib/Roundcube/rcube_result_multifolder.php
index aa26b81b608..3581e68584a 100644
--- a/program/lib/Roundcube/rcube_result_multifolder.php
+++ b/program/lib/Roundcube/rcube_result_multifolder.php
@@ -1,6 +1,6 @@
get_parameters('MAILBOX');
- $index = array_map(function($uid) use ($folder) { return $uid . '-' . $folder; }, $result->get());
+ $index = array_map(function ($uid) use ($folder) { return $uid . '-' . $folder; }, $result->get());
$this->index = array_merge($this->index, $index);
}
diff --git a/program/lib/Roundcube/rcube_result_set.php b/program/lib/Roundcube/rcube_result_set.php
index 633a85f7f3c..192267a48ec 100644
--- a/program/lib/Roundcube/rcube_result_set.php
+++ b/program/lib/Roundcube/rcube_result_set.php
@@ -1,6 +1,6 @@
current = $i;
}
- /*** Implement PHP ArrayAccess interface ***/
+ /* Implement PHP ArrayAccess interface */
public function offsetSet($offset, $value): void
{
@@ -114,7 +114,7 @@ public function offsetGet($offset)
return $this->records[$offset];
}
- /*** PHP 5 Iterator interface ***/
+ /* PHP 5 Iterator interface */
public function rewind(): void
{
diff --git a/program/lib/Roundcube/rcube_result_thread.php b/program/lib/Roundcube/rcube_result_thread.php
index 05e33474ac8..a2d10476816 100644
--- a/program/lib/Roundcube/rcube_result_thread.php
+++ b/program/lib/Roundcube/rcube_result_thread.php
@@ -1,6 +1,6 @@
raw_data, self::SEPARATOR_ITEM, 0, $m[0][1]+1);
}
// cache position of this element, so we can use it in get_element()
- $this->meta['pos'][$idx] = (int)$m[0][1];
+ $this->meta['pos'][$idx] = (int) $m[0][1];
return $idx;
}
@@ -549,7 +549,7 @@ public function get_thread_data()
*/
protected function build_thread_data($data, &$depth, &$children, $level = 0)
{
- foreach ((array)$data as $key => $val) {
+ foreach ((array) $data as $key => $val) {
$empty = empty($val) || !is_array($val);
$children[$key] = !$empty;
$depth[$key] = $level;
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index afe5fd46809..93d0bed5a53 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -1,6 +1,6 @@
unsets as $var) {
+ foreach ((array) $this->unsets as $var) {
if (isset($a_oldvars[$var])) {
unset($a_oldvars[$var]);
}
@@ -250,7 +250,7 @@ protected function fixvars($vars, $oldvars)
}
$newvars = $this->serialize(array_merge(
- (array)$a_oldvars, (array)$this->unserialize($vars)));
+ (array) $a_oldvars, (array) $this->unserialize($vars)));
}
else {
$newvars = $vars;
@@ -485,8 +485,9 @@ protected function serialize($vars)
$data = '';
if (is_array($vars)) {
- foreach ($vars as $var => $value)
+ foreach ($vars as $var => $value) {
$data .= $var.'|'.serialize($value);
+ }
}
else {
$data = 'b:0;';
@@ -515,9 +516,11 @@ public static function unserialize($str)
while ($p < $endptr) {
$q = $p;
- while ($str[$q] != '|')
- if (++$q >= $endptr)
+ while ($str[$q] != '|') {
+ if (++$q >= $endptr) {
break 2;
+ }
+ }
if ($str[$p] == '!') {
$p++;
@@ -536,59 +539,63 @@ public static function unserialize($str)
for (;;) {
$p = $q;
switch (strtolower($str[$q])) {
- case 'n': // null
- case 'b': // boolean
- case 'i': // integer
- case 'd': // decimal
- do $q++;
- while (($q < $endptr) && ($str[$q] != ';'));
- $q++;
- $serialized .= substr($str, $p, $q - $p);
- if ($level == 0) {
- break 2;
- }
- break;
- case 'r': // reference
- $q+= 2;
- for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++) {
- $id .= $str[$q];
- }
- $q++;
- // increment pointer because of outer array
- $serialized .= 'R:' . ($id + 1) . ';';
- if ($level == 0) {
- break 2;
- }
- break;
- case 's': // string
- $q+=2;
- for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++) {
- $length .= $str[$q];
- }
- $q+=2;
- $q+= (int)$length + 2;
- $serialized .= substr($str, $p, $q - $p);
- if ($level == 0) {
- break 2;
- }
- break;
- case 'a': // array
- case 'o': // object
- do $q++;
- while ($q < $endptr && $str[$q] != '{');
- $q++;
- $level++;
- $serialized .= substr($str, $p, $q - $p);
- break;
- case '}': // end of array|object
- $q++;
- $serialized .= substr($str, $p, $q - $p);
- if (--$level == 0) {
- break 2;
- }
- break;
- default:
- return false;
+ case 'n': // null
+ case 'b': // boolean
+ case 'i': // integer
+ case 'd': // decimal
+ do {
+ $q++;
+ }
+ while (($q < $endptr) && ($str[$q] != ';'));
+ $q++;
+ $serialized .= substr($str, $p, $q - $p);
+ if ($level == 0) {
+ break 2;
+ }
+ break;
+ case 'r': // reference
+ $q+= 2;
+ for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++) {
+ $id .= $str[$q];
+ }
+ $q++;
+ // increment pointer because of outer array
+ $serialized .= 'R:' . ($id + 1) . ';';
+ if ($level == 0) {
+ break 2;
+ }
+ break;
+ case 's': // string
+ $q+=2;
+ for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++) {
+ $length .= $str[$q];
+ }
+ $q+=2;
+ $q+= (int) $length + 2;
+ $serialized .= substr($str, $p, $q - $p);
+ if ($level == 0) {
+ break 2;
+ }
+ break;
+ case 'a': // array
+ case 'o': // object
+ do {
+ $q++;
+ }
+ while ($q < $endptr && $str[$q] != '{');
+ $q++;
+ $level++;
+ $serialized .= substr($str, $p, $q - $p);
+ break;
+ case '}': // end of array|object
+ $q++;
+ $serialized .= substr($str, $p, $q - $p);
+ if (--$level == 0) {
+ break 2;
+ }
+ break;
+ default:
+ return false;
}
}
}
diff --git a/program/lib/Roundcube/rcube_smtp.php b/program/lib/Roundcube/rcube_smtp.php
index ea1bd8cd0ec..834cbc0beb4 100644
--- a/program/lib/Roundcube/rcube_smtp.php
+++ b/program/lib/Roundcube/rcube_smtp.php
@@ -1,6 +1,6 @@
response;
+ return $this->response;
}
/**
diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php
index 62061aad5a4..ca113b41b46 100644
--- a/program/lib/Roundcube/rcube_spellchecker.php
+++ b/program/lib/Roundcube/rcube_spellchecker.php
@@ -1,6 +1,6 @@
mailto_pattern, [$this, 'mailto_callback'], $str);
// resolve link references
-/*
+ /*
This code requires PHP 7.4 and could be used instead of the two if() statements below,
when we get there.
@@ -240,7 +240,7 @@ public function replace($str)
$str = preg_replace_callback($this->linkref_pattern,
[$this, 'linkref_callback'], $str, -1, $count, PREG_OFFSET_CAPTURE
);
-*/
+ */
if (preg_match_all($this->linkref_index, $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
$diff = 0;
foreach ($matches as $m) {
diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php
index 86cfc14057d..c913e3543a8 100644
--- a/program/lib/Roundcube/rcube_text2html.php
+++ b/program/lib/Roundcube/rcube_text2html.php
@@ -1,6 +1,6 @@
get_html();
+ echo $this->get_html();
}
/**
diff --git a/program/lib/Roundcube/rcube_tnef_decoder.php b/program/lib/Roundcube/rcube_tnef_decoder.php
index 822f2e67948..5e131b3580f 100644
--- a/program/lib/Roundcube/rcube_tnef_decoder.php
+++ b/program/lib/Roundcube/rcube_tnef_decoder.php
@@ -1,6 +1,6 @@
0) {
switch ($this->_geti($data, 8)) {
- case self::LVL_MESSAGE:
- $this->_decodeMessage($data, $message);
- break;
+ case self::LVL_MESSAGE:
+ $this->_decodeMessage($data, $message);
+ break;
- case self::LVL_ATTACHMENT:
- $this->_decodeAttachment($data, $attachments);
- break;
+ case self::LVL_ATTACHMENT:
+ $this->_decodeAttachment($data, $attachments);
+ break;
}
}
}
@@ -293,20 +293,20 @@ protected function _extractMapiAttributes($data, &$result)
$named_type = $this->_geti($data, 32);
switch ($named_type) {
- case self::MAPI_NAMED_TYPE_ID:
- $attr_name = $this->_geti($data, 32);
- break;
+ case self::MAPI_NAMED_TYPE_ID:
+ $attr_name = $this->_geti($data, 32);
+ break;
- case self::MAPI_NAMED_TYPE_STRING:
- $attr_name = 0x9999;
- $idlen = $this->_geti($data, 32);
- $name = $this->_getx($data, $idlen + ((4 - ($idlen % 4)) % 4));
- // $name = $this->convertString(substr($name, 0, $idlen));
- break;
+ case self::MAPI_NAMED_TYPE_STRING:
+ $attr_name = 0x9999;
+ $idlen = $this->_geti($data, 32);
+ $name = $this->_getx($data, $idlen + ((4 - ($idlen % 4)) % 4));
+ // $name = $this->convertString(substr($name, 0, $idlen));
+ break;
- case self::MAPI_NAMED_TYPE_NONE:
- default:
- continue 2;
+ case self::MAPI_NAMED_TYPE_NONE:
+ default:
+ continue 2;
}
}
@@ -315,99 +315,99 @@ protected function _extractMapiAttributes($data, &$result)
}
switch ($attr_type) {
- case self::MAPI_NULL:
- case self::MAPI_TYPE_UNSET:
- break;
+ case self::MAPI_NULL:
+ case self::MAPI_TYPE_UNSET:
+ break;
- case self::MAPI_SHORT:
- $value = $this->_geti($data, 16);
- $this->_geti($data, 16);
- break;
+ case self::MAPI_SHORT:
+ $value = $this->_geti($data, 16);
+ $this->_geti($data, 16);
+ break;
- case self::MAPI_INT:
- case self::MAPI_BOOLEAN:
- for ($i = 0; $i < $num_mval; $i++) {
- $value = $this->_geti($data, 32);
- }
- break;
+ case self::MAPI_INT:
+ case self::MAPI_BOOLEAN:
+ for ($i = 0; $i < $num_mval; $i++) {
+ $value = $this->_geti($data, 32);
+ }
+ break;
- case self::MAPI_FLOAT:
- case self::MAPI_ERROR:
- $value = $this->_getx($data, 4);
- break;
+ case self::MAPI_FLOAT:
+ case self::MAPI_ERROR:
+ $value = $this->_getx($data, 4);
+ break;
- case self::MAPI_DOUBLE:
- case self::MAPI_APPTIME:
- case self::MAPI_CURRENCY:
- case self::MAPI_INT8BYTE:
- case self::MAPI_SYSTIME:
- $value = $this->_getx($data, 8);
- break;
+ case self::MAPI_DOUBLE:
+ case self::MAPI_APPTIME:
+ case self::MAPI_CURRENCY:
+ case self::MAPI_INT8BYTE:
+ case self::MAPI_SYSTIME:
+ $value = $this->_getx($data, 8);
+ break;
- case self::MAPI_STRING:
- case self::MAPI_UNICODE_STRING:
- case self::MAPI_BINARY:
- case self::MAPI_OBJECT:
- $num_vals = $have_mval ? $num_mval : $this->_geti($data, 32);
- for ($i = 0; $i < $num_vals; $i++) {
- $length = $this->_geti($data, 32);
+ case self::MAPI_STRING:
+ case self::MAPI_UNICODE_STRING:
+ case self::MAPI_BINARY:
+ case self::MAPI_OBJECT:
+ $num_vals = $have_mval ? $num_mval : $this->_geti($data, 32);
+ for ($i = 0; $i < $num_vals; $i++) {
+ $length = $this->_geti($data, 32);
- // Pad to next 4 byte boundary.
- $datalen = $length + ((4 - ($length % 4)) % 4);
+ // Pad to next 4 byte boundary.
+ $datalen = $length + ((4 - ($length % 4)) % 4);
- // Read and truncate to length.
- $value = $this->_getx($data, $datalen);
- }
+ // Read and truncate to length.
+ $value = $this->_getx($data, $datalen);
+ }
- if ($attr_type == self::MAPI_UNICODE_STRING) {
- $value = $this->convertString($value);
- }
+ if ($attr_type == self::MAPI_UNICODE_STRING) {
+ $value = $this->convertString($value);
+ }
- break;
+ break;
}
// Store any interesting attributes.
switch ($attr_name) {
- case self::MAPI_RTF_COMPRESSED:
- $result['type'] = 'application';
- $result['subtype'] = 'rtf';
- $result['name'] = (!empty($result['name']) ? $result['name'] : 'Untitled') . '.rtf';
- $result['stream'] = $this->_decodeRTF($value);
- $result['size'] = strlen($result['stream']);
- break;
+ case self::MAPI_RTF_COMPRESSED:
+ $result['type'] = 'application';
+ $result['subtype'] = 'rtf';
+ $result['name'] = (!empty($result['name']) ? $result['name'] : 'Untitled') . '.rtf';
+ $result['stream'] = $this->_decodeRTF($value);
+ $result['size'] = strlen($result['stream']);
+ break;
- case self::MAPI_BODY:
- case self::MAPI_BODY_HTML:
- $result['type'] = 'text';
- $result['subtype'] = $attr_name == self::MAPI_BODY ? 'plain' : 'html';
- $result['name'] = (!empty($result['name']) ? $result['name'] : 'Untitled')
- . ($attr_name == self::MAPI_BODY ? '.txt' : '.html');
- $result['stream'] = $value;
- $result['size'] = strlen($value);
- break;
+ case self::MAPI_BODY:
+ case self::MAPI_BODY_HTML:
+ $result['type'] = 'text';
+ $result['subtype'] = $attr_name == self::MAPI_BODY ? 'plain' : 'html';
+ $result['name'] = (!empty($result['name']) ? $result['name'] : 'Untitled')
+ . ($attr_name == self::MAPI_BODY ? '.txt' : '.html');
+ $result['stream'] = $value;
+ $result['size'] = strlen($value);
+ break;
- case self::MAPI_ATTACH_LONG_FILENAME:
- // Used in preference to AFILENAME value.
- $result['name'] = trim(preg_replace('/.*[\/](.*)$/', '\1', $value));
- break;
+ case self::MAPI_ATTACH_LONG_FILENAME:
+ // Used in preference to AFILENAME value.
+ $result['name'] = trim(preg_replace('/.*[\/](.*)$/', '\1', $value));
+ break;
- case self::MAPI_ATTACH_MIME_TAG:
- // Is this ever set, and what is format?
- $value = explode('/', trim($value));
- $result['type'] = $value[0];
- $result['subtype'] = $value[1];
- break;
+ case self::MAPI_ATTACH_MIME_TAG:
+ // Is this ever set, and what is format?
+ $value = explode('/', trim($value));
+ $result['type'] = $value[0];
+ $result['subtype'] = $value[1];
+ break;
- case self::MAPI_ATTACH_CONTENT_ID:
- $result['content-id'] = $value;
- break;
+ case self::MAPI_ATTACH_CONTENT_ID:
+ $result['content-id'] = $value;
+ break;
- case self::MAPI_ATTACH_DATA:
- $this->_getx($value, 16);
- $att = new rcube_tnef_decoder;
- $res = $att->decompress($value);
- $result = array_merge($result, $res['message']);
- break;
+ case self::MAPI_ATTACH_DATA:
+ $this->_getx($value, 16);
+ $att = new rcube_tnef_decoder;
+ $res = $att->decompress($value);
+ $result = array_merge($result, $res['message']);
+ break;
}
}
}
@@ -424,24 +424,24 @@ protected function _decodeMessage(&$data, &$message)
$value = $this->_decodeAttribute($data);
switch ($attribute) {
- case self::AOEMCODEPAGE:
- // Find codepage of the message
- $value = unpack('V', $value);
- $this->codepage = $value[1];
- break;
-
- case self::AMCLASS:
- $value = trim(str_replace('Microsoft Mail v3.0 ', '', $value));
- // Normal message will be that with prefix 'IPM.Microsoft Mail.
- break;
-
- case self::ASUBJECT:
- $message['name'] = $value;
- break;
-
- case self::AMAPIPROPS:
- $this->_extractMapiAttributes($value, $message);
- break;
+ case self::AOEMCODEPAGE:
+ // Find codepage of the message
+ $value = unpack('V', $value);
+ $this->codepage = $value[1];
+ break;
+
+ case self::AMCLASS:
+ $value = trim(str_replace('Microsoft Mail v3.0 ', '', $value));
+ // Normal message will be that with prefix 'IPM.Microsoft Mail.
+ break;
+
+ case self::ASUBJECT:
+ $message['name'] = $value;
+ break;
+
+ case self::AMAPIPROPS:
+ $this->_extractMapiAttributes($value, $message);
+ break;
}
}
@@ -460,33 +460,33 @@ protected function _decodeAttachment(&$data, &$attachment)
$this->_geti($data, 16); // checksum
switch ($attribute) {
- case self::ARENDDATA:
- // Add a new default data block to hold details of this
- // attachment. Reverse order is easier to handle later!
- array_unshift($attachment, [
- 'type' => 'application',
- 'subtype' => 'octet-stream',
- 'name' => 'unknown',
- 'stream' => ''
- ]);
-
- break;
-
- case self::AFILENAME:
- $value = $this->convertString($value, true);
- // Strip path
- $attachment[0]['name'] = trim(preg_replace('/.*[\/](.*)$/', '\1', $value));
- break;
-
- case self::ATTACHDATA:
- // The attachment itself
- $attachment[0]['size'] = $size;
- $attachment[0]['stream'] = $value;
- break;
-
- case self::AMAPIATTRS:
- $this->_extractMapiAttributes($value, $attachment[0]);
- break;
+ case self::ARENDDATA:
+ // Add a new default data block to hold details of this
+ // attachment. Reverse order is easier to handle later!
+ array_unshift($attachment, [
+ 'type' => 'application',
+ 'subtype' => 'octet-stream',
+ 'name' => 'unknown',
+ 'stream' => ''
+ ]);
+
+ break;
+
+ case self::AFILENAME:
+ $value = $this->convertString($value, true);
+ // Strip path
+ $attachment[0]['name'] = trim(preg_replace('/.*[\/](.*)$/', '\1', $value));
+ break;
+
+ case self::ATTACHDATA:
+ // The attachment itself
+ $attachment[0]['size'] = $size;
+ $attachment[0]['stream'] = $value;
+ break;
+
+ case self::AMAPIATTRS:
+ $this->_extractMapiAttributes($value, $attachment[0]);
+ break;
}
}
@@ -552,7 +552,7 @@ protected function _decompressRTF($data, $size)
$length = ord($data[$in++]);
$offset = ($offset << 4) | ($length >> 4);
$length = ($length & 0xF) + 2;
- $offset = ((int)($out / 4096)) * 4096 + $offset;
+ $offset = ((int) ($out / 4096)) * 4096 + $offset;
if ($offset >= $out) {
$offset -= 4096;
@@ -592,187 +592,187 @@ public static function rtf2text($text)
for ($i = 0, $len = strlen($text); $i < $len; $i++) {
$c = $text[$i];
switch ($c) {
- case "\\":
- // Key Word
- $nextChar = $text[$i + 1];
- // If it is another backslash or nonbreaking space or hyphen,
- // then the character is plain text and add it to the output stream.
- if ($nextChar == "\\" && self::_rtfIsPlain($stack[$j])) {
- $document .= "\\";
- }
- elseif ($nextChar == '~' && self::_rtfIsPlain($stack[$j])) {
- $document .= ' ';
- }
- elseif ($nextChar == '_' && self::_rtfIsPlain($stack[$j])) {
- $document .= '-';
- }
- elseif ($nextChar == '*') {
- // Add to the stack.
- $stack[$j]['*'] = true;
- }
- elseif ($nextChar == "'") {
- // If it is a single quote, read next two characters that
- // are the hexadecimal notation of a character we should add
- // to the output stream.
- $hex = substr($text, $i + 2, 2);
-
- if (self::_rtfIsPlain($stack[$j])) {
- $document .= html_entity_decode('&#' . hexdec($hex) .';');
+ case "\\":
+ // Key Word
+ $nextChar = $text[$i + 1];
+ // If it is another backslash or nonbreaking space or hyphen,
+ // then the character is plain text and add it to the output stream.
+ if ($nextChar == "\\" && self::_rtfIsPlain($stack[$j])) {
+ $document .= "\\";
+ }
+ elseif ($nextChar == '~' && self::_rtfIsPlain($stack[$j])) {
+ $document .= ' ';
+ }
+ elseif ($nextChar == '_' && self::_rtfIsPlain($stack[$j])) {
+ $document .= '-';
+ }
+ elseif ($nextChar == '*') {
+ // Add to the stack.
+ $stack[$j]['*'] = true;
}
+ elseif ($nextChar == "'") {
+ // If it is a single quote, read next two characters that
+ // are the hexadecimal notation of a character we should add
+ // to the output stream.
+ $hex = substr($text, $i + 2, 2);
+
+ if (self::_rtfIsPlain($stack[$j])) {
+ $document .= html_entity_decode('&#' . hexdec($hex) .';');
+ }
- //Shift the pointer.
- $i += 2;
- }
- elseif ($nextChar >= 'a' && $nextChar <= 'z' || $nextChar >= 'A' && $nextChar <= 'Z') {
- // Since, we’ve found the alphabetic character, the next
- // characters are control words and, possibly, some digit
- // parameter.
- $word = '';
- $param = null;
-
- // Start reading characters after the backslash.
- for ($k = $i + 1, $m = 0; $k < strlen($text); $k++, $m++) {
- $nextChar = $text[$k];
- // If the current character is a letter and there were
- // no digits before it, then we’re still reading the
- // control word. If there were digits, we should stop
- // since we reach the end of the control word.
- if ($nextChar >= 'a' && $nextChar <= 'z'
- || $nextChar >= 'A' && $nextChar <= 'Z') {
- if (!empty($param)) {
- break;
+ //Shift the pointer.
+ $i += 2;
+ }
+ elseif ($nextChar >= 'a' && $nextChar <= 'z' || $nextChar >= 'A' && $nextChar <= 'Z') {
+ // Since, we’ve found the alphabetic character, the next
+ // characters are control words and, possibly, some digit
+ // parameter.
+ $word = '';
+ $param = null;
+
+ // Start reading characters after the backslash.
+ for ($k = $i + 1, $m = 0; $k < strlen($text); $k++, $m++) {
+ $nextChar = $text[$k];
+ // If the current character is a letter and there were
+ // no digits before it, then we’re still reading the
+ // control word. If there were digits, we should stop
+ // since we reach the end of the control word.
+ if ($nextChar >= 'a' && $nextChar <= 'z'
+ || $nextChar >= 'A' && $nextChar <= 'Z') {
+ if (!empty($param)) {
+ break;
+ }
+ $word .= $nextChar;
}
- $word .= $nextChar;
- }
- elseif ($nextChar >= '0' && $nextChar <= '9') {
- // If it is a digit, store the parameter.
- $param .= $nextChar;
- }
- elseif ($nextChar == '-') {
- // Since minus sign may occur only before a digit
- // parameter, check whether $param is empty.
- // Otherwise, we reach the end of the control word.
- if (!empty($param)) {
+ elseif ($nextChar >= '0' && $nextChar <= '9') {
+ // If it is a digit, store the parameter.
+ $param .= $nextChar;
+ }
+ elseif ($nextChar == '-') {
+ // Since minus sign may occur only before a digit
+ // parameter, check whether $param is empty.
+ // Otherwise, we reach the end of the control word.
+ if (!empty($param)) {
+ break;
+ }
+ $param .= $nextChar;
+ }
+ else {
break;
}
- $param .= $nextChar;
}
- else {
- break;
- }
- }
- // Shift the pointer on the number of read characters.
- $i += $m - 1;
-
- // Start analyzing.We are interested mostly in control words
- $toText = '';
-
- switch (strtolower($word)) {
- // If the control word is "u", then its parameter is
- // the decimal notation of the Unicode character that
- // should be added to the output stream. We need to
- // check whether the stack contains \ucN control word.
- // If it does, we should remove the N characters from
- // the output stream.
- case 'u':
- $toText .= html_entity_decode('&#x' . dechex($param) .';');
- $ucDelta = @$stack[$j]['uc'];
- if ($ucDelta > 0) {
- $i += $ucDelta;
+ // Shift the pointer on the number of read characters.
+ $i += $m - 1;
+
+ // Start analyzing.We are interested mostly in control words
+ $toText = '';
+
+ switch (strtolower($word)) {
+ // If the control word is "u", then its parameter is
+ // the decimal notation of the Unicode character that
+ // should be added to the output stream. We need to
+ // check whether the stack contains \ucN control word.
+ // If it does, we should remove the N characters from
+ // the output stream.
+ case 'u':
+ $toText .= html_entity_decode('&#x' . dechex($param) .';');
+ $ucDelta = @$stack[$j]['uc'];
+ if ($ucDelta > 0) {
+ $i += $ucDelta;
+ }
+ break;
+ case 'par':
+ case 'page':
+ case 'column':
+ case 'line':
+ case 'lbr':
+ $toText .= "\n";
+ break;
+ case 'emspace':
+ case 'enspace':
+ case 'qmspace':
+ $toText .= ' ';
+ break;
+ case 'tab':
+ $toText .= "\t";
+ break;
+ case 'chdate':
+ $toText .= date('m.d.Y');
+ break;
+ case 'chdpl':
+ $toText .= date('l, j F Y');
+ break;
+ case 'chdpa':
+ $toText .= date('D, j M Y');
+ break;
+ case 'chtime':
+ $toText .= date('H:i:s');
+ break;
+ case 'emdash':
+ $toText .= html_entity_decode('—');
+ break;
+ case 'endash':
+ $toText .= html_entity_decode('–');
+ break;
+ case 'bullet':
+ $toText .= html_entity_decode('•');
+ break;
+ case 'lquote':
+ $toText .= html_entity_decode('‘');
+ break;
+ case 'rquote':
+ $toText .= html_entity_decode('’');
+ break;
+ case 'ldblquote':
+ $toText .= html_entity_decode('«');
+ break;
+ case 'rdblquote':
+ $toText .= html_entity_decode('»');
+ break;
+ default:
+ $stack[$j][strtolower($word)] = empty($param) ? true : $param;
+ break;
}
- break;
- case 'par':
- case 'page':
- case 'column':
- case 'line':
- case 'lbr':
- $toText .= "\n";
- break;
- case 'emspace':
- case 'enspace':
- case 'qmspace':
- $toText .= ' ';
- break;
- case 'tab':
- $toText .= "\t";
- break;
- case 'chdate':
- $toText .= date('m.d.Y');
- break;
- case 'chdpl':
- $toText .= date('l, j F Y');
- break;
- case 'chdpa':
- $toText .= date('D, j M Y');
- break;
- case 'chtime':
- $toText .= date('H:i:s');
- break;
- case 'emdash':
- $toText .= html_entity_decode('—');
- break;
- case 'endash':
- $toText .= html_entity_decode('–');
- break;
- case 'bullet':
- $toText .= html_entity_decode('•');
- break;
- case 'lquote':
- $toText .= html_entity_decode('‘');
- break;
- case 'rquote':
- $toText .= html_entity_decode('’');
- break;
- case 'ldblquote':
- $toText .= html_entity_decode('«');
- break;
- case 'rdblquote':
- $toText .= html_entity_decode('»');
- break;
- default:
- $stack[$j][strtolower($word)] = empty($param) ? true : $param;
- break;
- }
- // Add data to the output stream if required.
- if (self::_rtfIsPlain($stack[$j])) {
- $document .= $toText;
+ // Add data to the output stream if required.
+ if (self::_rtfIsPlain($stack[$j])) {
+ $document .= $toText;
+ }
}
- }
- $i++;
- break;
+ $i++;
+ break;
- case '{':
- // New subgroup starts, add new stack element and write the data
- // from previous stack element to it.
- if (!empty($stack[$j])) {
- array_push($stack, $stack[$j++]);
- }
- else {
- $j++;
- }
- break;
+ case '{':
+ // New subgroup starts, add new stack element and write the data
+ // from previous stack element to it.
+ if (!empty($stack[$j])) {
+ array_push($stack, $stack[$j++]);
+ }
+ else {
+ $j++;
+ }
+ break;
- case '}':
- array_pop($stack);
- $j--;
- break;
+ case '}':
+ array_pop($stack);
+ $j--;
+ break;
- case '\0':
- case '\r':
- case '\f':
- case '\n':
- // Junk
- break;
+ case '\0':
+ case '\r':
+ case '\f':
+ case '\n':
+ // Junk
+ break;
- default:
- // Add other data to the output stream if required.
- if (!empty($stack[$j]) && self::_rtfIsPlain($stack[$j])) {
- $document .= $c;
- }
- break;
+ default:
+ // Add other data to the output stream if required.
+ if (!empty($stack[$j]) && self::_rtfIsPlain($stack[$j])) {
+ $document .= $c;
+ }
+ break;
}
}
diff --git a/program/lib/Roundcube/rcube_uploads.php b/program/lib/Roundcube/rcube_uploads.php
index 4f913328071..af067eb7de6 100644
--- a/program/lib/Roundcube/rcube_uploads.php
+++ b/program/lib/Roundcube/rcube_uploads.php
@@ -1,6 +1,6 @@
rc->plugins->exec_hook('preferences_update', [
'userid' => $this->ID,
'prefs' => $a_user_prefs,
- 'old' => (array)$this->get_prefs()
+ 'old' => (array) $this->get_prefs()
]);
if (!empty($plugin['abort'])) {
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index 15519f9f933..09bd0d7b65a 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -1,6 +1,6 @@
pattern, 1, -1) . ')';
$regexp = '/(^\s*|,\s*|\}\s*|\{\s*)(' . $excl . ':?[a-z0-9\._#\*\[][a-z0-9\._:\(\)#=~ \[\]"\|\>\+\$\^-]*)/im';
- $callback = function($matches) use ($container_id, $prefix) {
+ $callback = function ($matches) use ($container_id, $prefix) {
$replace = $matches[2];
if (stripos($replace, ':root') === 0) {
@@ -630,7 +630,7 @@ public static function file2class($mimetype, $filename)
*/
public static function xss_entity_decode($content)
{
- $callback = function($matches) { return chr(hexdec($matches[1])); };
+ $callback = function ($matches) { return chr(hexdec($matches[1])); };
$out = html_entity_decode(html_entity_decode($content));
$out = trim(preg_replace('/(^$)/', '', trim($out)));
@@ -692,7 +692,8 @@ public static function https_check($port = null, $use_https = true)
/**
* Check if the reported REMOTE_ADDR is in the 'proxy_whitelist' config option
*/
- public static function check_proxy_whitelist_ip() {
+ public static function check_proxy_whitelist_ip()
+ {
return in_array($_SERVER['REMOTE_ADDR'], (array) rcube::get_instance()->config->get('proxy_whitelist', []));
}
@@ -1236,7 +1237,7 @@ public static function normalize_string($str, $as_array = false, $minlen = 2)
$arr = self::tokenize_string($str, $minlen);
// detect character set
- if (rcube_charset::convert(rcube_charset::convert($str, 'UTF-8', 'ISO-8859-1'), 'ISO-8859-1', 'UTF-8') == $str) {
+ if (rcube_charset::convert(rcube_charset::convert($str, 'UTF-8', 'ISO-8859-1'), 'ISO-8859-1', 'UTF-8') == $str) {
// ISO-8859-1 (or ASCII)
preg_match_all('/./u', 'äâàåáãæçéêëèïîìíñöôòøõóüûùúýÿ', $keys);
preg_match_all('/./', 'aaaaaaaceeeeiiiinoooooouuuuyy', $values);
@@ -1655,10 +1656,10 @@ public static function temp_filename($file_name, $unique = true, $create = true)
/**
* Clean the subject from reply and forward prefix
- *
+ *
* @param string $subject Subject to clean
* @param string $mode Mode of cleaning : reply, forward or both
- *
+ *
* @return string Cleaned subject
*/
public static function remove_subject_prefix($subject, $mode = 'both')
@@ -1681,7 +1682,7 @@ public static function remove_subject_prefix($subject, $mode = 'both')
}
// replace Re:, Re[x]:, Re-x (#1490497)
- $pieces = array_map(function($prefix) {
+ $pieces = array_map(function ($prefix) {
$prefix = strtolower(str_replace(':', '', $prefix));
return "$prefix:|$prefix\[\d\]:|$prefix-\d:";
}, $prefixes);
@@ -1699,7 +1700,7 @@ public static function remove_subject_prefix($subject, $mode = 'both')
* into the TCP stream, if configured.
*
* http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
- *
+ *
* PROXY protocol headers must be sent before any other data is sent on the TCP socket.
*
* @param array $options Preferences array which may contain proxy_protocol (generally {driver}_conn_options)
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index dce8afe32c1..fce068cbb50 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -1,6 +1,6 @@
[],
- 'N' => [['','','','','']],
+ 'N' => [['', '', '', '', '']],
];
private static $fieldmap = [
'phone' => 'TEL',
@@ -332,7 +332,7 @@ public function reset($fields = [])
}
if (empty($this->raw['N'])) {
- $this->raw['N'] = [['','','','','']];
+ $this->raw['N'] = [['', '', '', '', '']];
}
if (empty($this->raw['FN'])) {
@@ -355,116 +355,116 @@ public function set($field, $value, $type = 'HOME')
$type_uc = strtoupper((string) $type);
switch ($field) {
- case 'name':
- case 'displayname':
- $this->raw['FN'][0][0] = $this->displayname = $value;
- break;
-
- case 'surname':
- $this->raw['N'][0][0] = $this->surname = $value;
- break;
-
- case 'firstname':
- $this->raw['N'][0][1] = $this->firstname = $value;
- break;
-
- case 'middlename':
- $this->raw['N'][0][2] = $this->middlename = $value;
- break;
-
- case 'prefix':
- $this->raw['N'][0][3] = $value;
- break;
-
- case 'suffix':
- $this->raw['N'][0][4] = $value;
- break;
-
- case 'nickname':
- $this->raw['NICKNAME'][0][0] = $this->nickname = $value;
- break;
-
- case 'organization':
- $this->raw['ORG'][0][0] = $this->organization = $value;
- break;
-
- case 'photo':
- if (strpos($value, 'http:') === 0) {
- // TODO: fetch file from URL and save it locally?
- $this->raw['PHOTO'][0] = [0 => $value, 'url' => true];
- }
- else {
- $this->raw['PHOTO'][0] = [0 => $value, 'base64' => (bool) preg_match('![^a-z0-9/=+-]!i', $value)];
- }
- break;
-
- case 'email':
- $this->raw['EMAIL'][] = [0 => $value, 'type' => array_filter(['INTERNET', $type_uc])];
- $this->email[] = $value;
- break;
-
- case 'im':
- // save IM subtypes into extension fields
- $typemap = array_flip($this->immap);
- if (!empty($typemap[strtolower($type)])) {
- $field = $typemap[strtolower($type)];
- $this->raw[$field][] = [$value];
- }
- break;
+ case 'name':
+ case 'displayname':
+ $this->raw['FN'][0][0] = $this->displayname = $value;
+ break;
- case 'birthday':
- case 'anniversary':
- if (($val = rcube_utils::anytodatetime($value)) && !empty(self::$fieldmap[$field])) {
- $fn = self::$fieldmap[$field];
- $this->raw[$fn][] = [0 => $val->format('Y-m-d'), 'value' => ['date']];
- }
- break;
+ case 'surname':
+ $this->raw['N'][0][0] = $this->surname = $value;
+ break;
- case 'address':
- if (!empty($this->addresstypemap[$type_uc])) {
- $type = $this->addresstypemap[$type_uc];
- }
+ case 'firstname':
+ $this->raw['N'][0][1] = $this->firstname = $value;
+ break;
- if (empty($value[0])) {
- $value = [
- '',
- '',
- $value['street'] ?? '',
- $value['locality'] ?? '',
- $value['region'] ?? '',
- $value['zipcode'] ?? '',
- $value['country'] ?? '',
- ];
- }
+ case 'middlename':
+ $this->raw['N'][0][2] = $this->middlename = $value;
+ break;
- // fall through if not empty
- if (!strlen(@implode('', $value))) {
+ case 'prefix':
+ $this->raw['N'][0][3] = $value;
break;
- }
- default:
- if ($field == 'phone' && !empty($this->phonetypemap[$type_uc])) {
- $type = $this->phonetypemap[$type_uc];
- }
+ case 'suffix':
+ $this->raw['N'][0][4] = $value;
+ break;
- if (!empty(self::$fieldmap[$field])) {
- $tag = self::$fieldmap[$field];
+ case 'nickname':
+ $this->raw['NICKNAME'][0][0] = $this->nickname = $value;
+ break;
- if (is_array($value) || (is_string($value) && strlen($value))) {
- $this->raw[$tag][] = (array) $value;
- if ($type) {
- $index = count($this->raw[$tag]) - 1;
- $typemap = array_flip($this->typemap);
- $type_val = !empty($typemap[$type_uc]) ? $typemap[$type_uc] : $type;
- $this->raw[$tag][$index]['type'] = explode(',', $type_val);
- }
+ case 'organization':
+ $this->raw['ORG'][0][0] = $this->organization = $value;
+ break;
+
+ case 'photo':
+ if (strpos($value, 'http:') === 0) {
+ // TODO: fetch file from URL and save it locally?
+ $this->raw['PHOTO'][0] = [0 => $value, 'url' => true];
}
else {
- unset($this->raw[$tag]);
+ $this->raw['PHOTO'][0] = [0 => $value, 'base64' => (bool) preg_match('![^a-z0-9/=+-]!i', $value)];
}
- }
+ break;
+
+ case 'email':
+ $this->raw['EMAIL'][] = [0 => $value, 'type' => array_filter(['INTERNET', $type_uc])];
+ $this->email[] = $value;
+ break;
- break;
+ case 'im':
+ // save IM subtypes into extension fields
+ $typemap = array_flip($this->immap);
+ if (!empty($typemap[strtolower($type)])) {
+ $field = $typemap[strtolower($type)];
+ $this->raw[$field][] = [$value];
+ }
+ break;
+
+ case 'birthday':
+ case 'anniversary':
+ if (($val = rcube_utils::anytodatetime($value)) && !empty(self::$fieldmap[$field])) {
+ $fn = self::$fieldmap[$field];
+ $this->raw[$fn][] = [0 => $val->format('Y-m-d'), 'value' => ['date']];
+ }
+ break;
+
+ case 'address':
+ if (!empty($this->addresstypemap[$type_uc])) {
+ $type = $this->addresstypemap[$type_uc];
+ }
+
+ if (empty($value[0])) {
+ $value = [
+ '',
+ '',
+ $value['street'] ?? '',
+ $value['locality'] ?? '',
+ $value['region'] ?? '',
+ $value['zipcode'] ?? '',
+ $value['country'] ?? '',
+ ];
+ }
+
+ // fall through if not empty
+ if (!strlen(@implode('', $value))) {
+ break;
+ }
+
+ default:
+ if ($field == 'phone' && !empty($this->phonetypemap[$type_uc])) {
+ $type = $this->phonetypemap[$type_uc];
+ }
+
+ if (!empty(self::$fieldmap[$field])) {
+ $tag = self::$fieldmap[$field];
+
+ if (is_array($value) || (is_string($value) && strlen($value))) {
+ $this->raw[$tag][] = (array) $value;
+ if ($type) {
+ $index = count($this->raw[$tag]) - 1;
+ $typemap = array_flip($this->typemap);
+ $type_val = !empty($typemap[$type_uc]) ? $typemap[$type_uc] : $type;
+ $this->raw[$tag][$index]['type'] = explode(',', $type_val);
+ }
+ }
+ else {
+ unset($this->raw[$tag]);
+ }
+ }
+
+ break;
}
}
@@ -811,17 +811,17 @@ private static function vcard_decode($vcard)
private static function decode_value($value, $encoding)
{
switch (strtolower($encoding)) {
- case 'quoted-printable':
- self::$values_decoded = true;
- return quoted_printable_decode($value);
+ case 'quoted-printable':
+ self::$values_decoded = true;
+ return quoted_printable_decode($value);
- case 'base64':
- case 'b':
- self::$values_decoded = true;
- return base64_decode($value);
+ case 'base64':
+ case 'b':
+ self::$values_decoded = true;
+ return base64_decode($value);
- default:
- return $value;
+ default:
+ return $value;
}
}
@@ -851,8 +851,8 @@ static function vcard_encode($data)
$data['N'][0][] = '';
}
- foreach ((array)$data as $type => $entries) {
- foreach ((array)$entries as $entry) {
+ foreach ((array) $data as $type => $entries) {
+ foreach ((array) $entries as $entry) {
$attr = '';
if (is_array($entry)) {
$value = [];
@@ -876,7 +876,7 @@ static function vcard_encode($data)
}
}
else {
- foreach ((array)$attrvalues as $attrvalue) {
+ foreach ((array) $attrvalues as $attrvalue) {
$attrname = strtoupper($attrname);
// TYPE=OTHER is non-standard, TYPE=INTERNET is redundant, remove these
if ($attrname == 'TYPE') {
@@ -925,7 +925,7 @@ public static function vcard_quote($str, $sep = ';')
$r[] = self::vcard_quote($part, $sep);
}
- return(implode($sep, $r));
+ return (implode($sep, $r));
}
return strtr($str, ["\\" => "\\\\", "\r" => '', "\n" => '\n', $sep => "\\$sep"]);
diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
index 542174588fa..a7f543d42cb 100644
--- a/program/lib/Roundcube/rcube_washtml.php
+++ b/program/lib/Roundcube/rcube_washtml.php
@@ -1,6 +1,6 @@
_css_prefix . '\1', $value);
}
else if ($key) {
- $out = $value;
+ $out = $value;
}
if ($out !== null && $out !== '') {
@@ -587,79 +587,79 @@ private function dumpHtml($node, $level = 20)
do {
switch ($node->nodeType) {
- case XML_ELEMENT_NODE: //Check element
- $tagName = strtolower($node->nodeName);
+ case XML_ELEMENT_NODE: //Check element
+ $tagName = strtolower($node->nodeName);
+
+ if ($tagName == 'link') {
+ $uri = $this->wash_uri($node->getAttribute('href'), false, false);
+ if (!$uri) {
+ $dump .= '';
+ break;
+ }
- if ($tagName == 'link') {
- $uri = $this->wash_uri($node->getAttribute('href'), false, false);
- if (!$uri) {
- $dump .= '';
+ $node->setAttribute('href', (string) $uri);
+ }
+ else if (in_array($tagName, ['animate', 'animatecolor', 'set', 'animatetransform'])
+ && self::attribute_value($node, 'attributename', 'href')
+ ) {
+ // Insecure svg tags
+ $dump .= "";
break;
}
- $node->setAttribute('href', (string) $uri);
- }
- else if (in_array($tagName, ['animate', 'animatecolor', 'set', 'animatetransform'])
- && self::attribute_value($node, 'attributename', 'href')
- ) {
- // Insecure svg tags
- $dump .= "";
- break;
- }
-
- if (!empty($this->handlers[$tagName])) {
- $callback = $this->handlers[$tagName];
- $dump .= call_user_func($callback, $tagName,
- $this->wash_attribs($node), $this->dumpHtml($node, $level), $this);
- }
- else if (isset($this->_html_elements[$tagName])) {
- $content = $this->dumpHtml($node, $level);
- $dump .= '<' . $node->nodeName;
-
- if ($tagName == 'svg') {
- $xpath = new DOMXPath($node->ownerDocument);
- foreach ($xpath->query('namespace::*') as $ns) {
- if ($ns->nodeName != 'xmlns:xml') {
- $dump .= sprintf(' %s="%s"',
- $ns->nodeName,
- htmlspecialchars($ns->nodeValue, ENT_QUOTES, $this->config['charset'])
- );
+ if (!empty($this->handlers[$tagName])) {
+ $callback = $this->handlers[$tagName];
+ $dump .= call_user_func($callback, $tagName,
+ $this->wash_attribs($node), $this->dumpHtml($node, $level), $this);
+ }
+ else if (isset($this->_html_elements[$tagName])) {
+ $content = $this->dumpHtml($node, $level);
+ $dump .= '<' . $node->nodeName;
+
+ if ($tagName == 'svg') {
+ $xpath = new DOMXPath($node->ownerDocument);
+ foreach ($xpath->query('namespace::*') as $ns) {
+ if ($ns->nodeName != 'xmlns:xml') {
+ $dump .= sprintf(' %s="%s"',
+ $ns->nodeName,
+ htmlspecialchars($ns->nodeValue, ENT_QUOTES, $this->config['charset'])
+ );
+ }
}
}
- }
- else if ($tagName == 'textarea' && strpos($content, '<') !== false) {
- $content = htmlspecialchars($content, ENT_QUOTES | ENT_SUBSTITUTE, $this->config['charset']);
- }
+ else if ($tagName == 'textarea' && strpos($content, '<') !== false) {
+ $content = htmlspecialchars($content, ENT_QUOTES | ENT_SUBSTITUTE, $this->config['charset']);
+ }
- $dump .= $this->wash_attribs($node);
+ $dump .= $this->wash_attribs($node);
- if ($content === '' && ($this->is_xml || isset($this->_void_elements[$tagName]))) {
- $dump .= ' />';
+ if ($content === '' && ($this->is_xml || isset($this->_void_elements[$tagName]))) {
+ $dump .= ' />';
+ }
+ else {
+ $dump .= '>' . $content . 'nodeName . '>';
+ }
+ }
+ else if (isset($this->_ignore_elements[$tagName])) {
+ $dump .= '';
}
else {
- $dump .= '>' . $content . 'nodeName . '>';
+ $dump .= '';
+ $dump .= $this->dumpHtml($node, $level); // ignore tags not its content
}
- }
- else if (isset($this->_ignore_elements[$tagName])) {
- $dump .= '';
- }
- else {
- $dump .= '';
- $dump .= $this->dumpHtml($node, $level); // ignore tags not its content
- }
- break;
+ break;
- case XML_CDATA_SECTION_NODE:
- case XML_TEXT_NODE:
- $dump .= htmlspecialchars($node->nodeValue, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE, $this->config['charset']);
- break;
+ case XML_CDATA_SECTION_NODE:
+ case XML_TEXT_NODE:
+ $dump .= htmlspecialchars($node->nodeValue, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE, $this->config['charset']);
+ break;
- case XML_HTML_DOCUMENT_NODE:
- $dump .= $this->dumpHtml($node, $level);
- break;
+ case XML_HTML_DOCUMENT_NODE:
+ $dump .= $this->dumpHtml($node, $level);
+ break;
}
}
- while($node = $node->nextSibling);
+ while ($node = $node->nextSibling);
return $dump;
}
diff --git a/program/lib/Roundcube/session/db.php b/program/lib/Roundcube/session/db.php
index df0e16387e6..dc1f4c3994d 100644
--- a/program/lib/Roundcube/session/db.php
+++ b/program/lib/Roundcube/session/db.php
@@ -1,6 +1,6 @@
db->query("INSERT INTO {$this->table_name}"
. " (`sess_id`, `vars`, `ip`, `changed`)"
. " VALUES (?, ?, ?, $now)",
- $key, base64_encode($vars), (string)$this->ip
+ $key, base64_encode($vars), (string) $this->ip
);
return true;
diff --git a/program/lib/Roundcube/session/memcache.php b/program/lib/Roundcube/session/memcache.php
index b6fe20cbdaf..092db3f75b6 100644
--- a/program/lib/Roundcube/session/memcache.php
+++ b/program/lib/Roundcube/session/memcache.php
@@ -1,6 +1,6 @@
plugins->register_hook('attachment_upload', function($att) use ($file) {
+ $rcmail->plugins->register_hook('attachment_upload', function ($att) use ($file) {
$att['status'] = true;
$att['id'] = $file['id'];
return $att;
@@ -229,7 +229,7 @@ protected function fileUpload($group)
// Attachments handling plugins use move_uploaded_file() which does not work
// here. We'll add a fake hook handler for our purposes.
$rcmail = rcmail::get_instance();
- $rcmail->plugins->register_hook('attachment_upload', function($att) use ($file) {
+ $rcmail->plugins->register_hook('attachment_upload', function ($att) use ($file) {
$att['status'] = true;
$att['id'] = $file['id'];
return $att;
diff --git a/tests/Actions/Contacts/Edit.php b/tests/Actions/Contacts/Edit.php
index 96ff745524a..880efa25d27 100644
--- a/tests/Actions/Contacts/Edit.php
+++ b/tests/Actions/Contacts/Edit.php
@@ -100,6 +100,6 @@ function test_photo_drop_area()
$this->assertSame('upload-photo', $filedrop['action']);
$this->assertSame('_photo', $filedrop['fieldname']);
$this->assertSame(1, $filedrop['single']);
- $this->assertSame( '^image/.+', $filedrop['filter']);
+ $this->assertSame('^image/.+', $filedrop['filter']);
}
}
diff --git a/tests/Actions/Mail/AttachmentDelete.php b/tests/Actions/Mail/AttachmentDelete.php
index c75a604c223..70858d8c6a1 100644
--- a/tests/Actions/Mail/AttachmentDelete.php
+++ b/tests/Actions/Mail/AttachmentDelete.php
@@ -30,7 +30,7 @@ function test_run()
// This is needed so upload deletion works
$rcmail = rcmail::get_instance();
unset($rcmail->plugins->handlers['attachment_delete']);
- $rcmail->plugins->register_hook('attachment_delete', function($att) {
+ $rcmail->plugins->register_hook('attachment_delete', function ($att) {
$att['status'] = true;
$att['break'] = true;
return $att;
diff --git a/tests/Actions/Mail/Index.php b/tests/Actions/Mail/Index.php
index f7197932a69..7f8736e8612 100644
--- a/tests/Actions/Mail/Index.php
+++ b/tests/Actions/Mail/Index.php
@@ -341,7 +341,7 @@ function test_html()
$this->assertMatchesRegularExpression('/Subscription form/', $html, "Include