the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-11-08 06:11:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
RainLoop Team 2017-09-15 19:51:58 +03:00
commit 6daeb28279
11 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dev/Stores/User/Folder.js
View file

@ -2,6 +2,8 @@
import ko from 'ko'; import ko from 'ko';
import _ from '_'; import _ from '_';
import {settingsGet} from 'Storage/Settings';
import {FolderType} from 'Common/Enums'; import {FolderType} from 'Common/Enums';
import {UNUSED_OPTION_VALUE} from 'Common/Consts'; import {UNUSED_OPTION_VALUE} from 'Common/Consts';
import {isArray, folderListOptionsBuilder} from 'Common/Utils'; import {isArray, folderListOptionsBuilder} from 'Common/Utils';
@ -35,6 +37,8 @@ class FolderUserStore
this.currentFolder = ko.observable(null).extend({toggleSubscribeProperty: [this, 'selected']}); this.currentFolder = ko.observable(null).extend({toggleSubscribeProperty: [this, 'selected']});
this.sieveAllowFileintoInbox = !!settingsGet('SieveAllowFileintoInbox');
this.computers(); this.computers();
this.subscribers(); this.subscribers();
} }
@ -117,7 +121,7 @@ class FolderUserStore
this.folderMenuForFilters = ko.computed( this.folderMenuForFilters = ko.computed(
() => folderListOptionsBuilder( () => folderListOptionsBuilder(
this.folderListSystem(), this.folderList(), this.folderListSystem(), this.folderList(),
['INBOX'], [['', '']], null, null, null, (item) => (item ? item.localName() : '')) [(this.sieveAllowFileintoInbox ? '' : 'INBOX')], [['', '']], null, null, null, (item) => (item ? item.localName() : ''))
); );
} }

2
plugins/hmailserver-change-password/index.php
View file

@ -14,7 +14,7 @@ class HmailserverChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!class_exists('COM')) if (!class_exists('COM'))
{ {
return 'The PHP exention COM must be installed to use this plugin'; return 'The PHP extension COM must be installed to use this plugin';
} }
return ''; return '';

4
plugins/ispconfig-change-password/index.php
View file

@ -14,13 +14,13 @@ class IspconfigChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!extension_loaded('pdo') || !class_exists('PDO')) if (!extension_loaded('pdo') || !class_exists('PDO'))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
$aDrivers = \PDO::getAvailableDrivers(); $aDrivers = \PDO::getAvailableDrivers();
if (!is_array($aDrivers) || !in_array('mysql', $aDrivers)) if (!is_array($aDrivers) || !in_array('mysql', $aDrivers))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
return ''; return '';

4
plugins/ispmail-change-password/index.php
View file

@ -14,13 +14,13 @@ class IspmailChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!extension_loaded('pdo') || !class_exists('PDO')) if (!extension_loaded('pdo') || !class_exists('PDO'))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
$aDrivers = \PDO::getAvailableDrivers(); $aDrivers = \PDO::getAvailableDrivers();
if (!is_array($aDrivers) || !in_array('mysql', $aDrivers)) if (!is_array($aDrivers) || !in_array('mysql', $aDrivers))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
return ''; return '';

2
plugins/ldap-change-password/index.php
View file

@ -14,7 +14,7 @@ class LdapChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!\function_exists('ldap_connect')) if (!\function_exists('ldap_connect'))
{ {
return 'The LDAP PHP exention must be installed to use this plugin'; return 'The LDAP PHP extension must be installed to use this plugin';
} }
return ''; return '';

2
plugins/ldap-contacts-suggestions/index.php
View file

@ -14,7 +14,7 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!\function_exists('ldap_connect')) if (!\function_exists('ldap_connect'))
{ {
return 'The LDAP PHP exention must be installed to use this plugin'; return 'The LDAP PHP extension must be installed to use this plugin';
} }
return ''; return '';

4
plugins/mailcow-change-password/index.php
View file

@ -14,13 +14,13 @@ class MailcowChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!extension_loaded('pdo') || !class_exists('PDO')) if (!extension_loaded('pdo') || !class_exists('PDO'))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
$aDrivers = \PDO::getAvailableDrivers(); $aDrivers = \PDO::getAvailableDrivers();
if (!is_array($aDrivers) || !in_array('mysql', $aDrivers)) if (!is_array($aDrivers) || !in_array('mysql', $aDrivers))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
return ''; return '';

4
plugins/postfixadmin-change-password/index.php
View file

@ -14,13 +14,13 @@ class PostfixadminChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
if (!extension_loaded('pdo') || !class_exists('PDO')) if (!extension_loaded('pdo') || !class_exists('PDO'))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
$aDrivers = \PDO::getAvailableDrivers(); $aDrivers = \PDO::getAvailableDrivers();
if (!is_array($aDrivers) || !in_array('mysql', $aDrivers)) if (!is_array($aDrivers) || !in_array('mysql', $aDrivers))
{ {
return 'The PHP exention PDO (mysql) must be installed to use this plugin'; return 'The PHP extension PDO (mysql) must be installed to use this plugin';
} }
return ''; return '';

2
rainloop/v/0.0.0/app/libraries/PHP-OAuth2/Client.php
View file

@ -148,7 +148,7 @@ class Client
public function __construct($client_id, $client_secret, $client_auth = self::AUTH_TYPE_URI, $certificate_file = null) public function __construct($client_id, $client_secret, $client_auth = self::AUTH_TYPE_URI, $certificate_file = null)
{ {
if (!extension_loaded('curl')) { if (!extension_loaded('curl')) {
throw new Exception('The PHP exention curl must be installed to use this library.', Exception::CURL_NOT_FOUND); throw new Exception('The PHP extension curl must be installed to use this library.', Exception::CURL_NOT_FOUND);
} }
$this->client_id = $client_id; $this->client_id = $client_id;

1
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1531,6 +1531,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false), 'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false),
'UseLoginWelcomePage' => (bool) $oConfig->Get('login', 'welcome_page', false), 'UseLoginWelcomePage' => (bool) $oConfig->Get('login', 'welcome_page', false),
'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')), 'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')),
'SieveAllowFileintoInbox' => (bool) $oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
'ContactsIsAllowed' => false, 'ContactsIsAllowed' => false,
'ChangePasswordIsAllowed' => false, 'ChangePasswordIsAllowed' => false,
'RequireTwoFactor' => false, 'RequireTwoFactor' => false,

1
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -422,6 +422,7 @@ Enables caching in the system'),
'sieve_allow_raw_script' => array(false), 'sieve_allow_raw_script' => array(false),
'sieve_utf8_folder_name' => array(true), 'sieve_utf8_folder_name' => array(true),
'sieve_auth_plain_initial' => array(true), 'sieve_auth_plain_initial' => array(true),
'sieve_allow_fileinto_inbox' => array(false),
'imap_timeout' => array(300), 'imap_timeout' => array(300),
'smtp_timeout' => array(60), 'smtp_timeout' => array(60),
'sieve_timeout' => array(10), 'sieve_timeout' => array(10),