From 4b312a4f357b0ef1faa186c20503cc1f8660b238 Mon Sep 17 00:00:00 2001 From: Oxymoron Date: Sat, 22 Jul 2017 16:28:52 -0500 Subject: [PATCH 1/3] =?UTF-8?q?=C2=83Corrected=20mispelling=20of=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rainloop/v/0.0.0/app/libraries/PHP-OAuth2/Client.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainloop/v/0.0.0/app/libraries/PHP-OAuth2/Client.php b/rainloop/v/0.0.0/app/libraries/PHP-OAuth2/Client.php index 0b59cf6b7..6fae0925d 100644 --- a/rainloop/v/0.0.0/app/libraries/PHP-OAuth2/Client.php +++ b/rainloop/v/0.0.0/app/libraries/PHP-OAuth2/Client.php @@ -148,7 +148,7 @@ class Client public function __construct($client_id, $client_secret, $client_auth = self::AUTH_TYPE_URI, $certificate_file = null) { 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; From 3bc9c5403935dc37d2202df0316e8a14bb4b6934 Mon Sep 17 00:00:00 2001 From: Oxymoron Date: Sat, 22 Jul 2017 16:29:33 -0500 Subject: [PATCH 2/3] Corrected more mispellings of the word --- plugins/hmailserver-change-password/index.php | 2 +- plugins/ispconfig-change-password/index.php | 4 ++-- plugins/ispmail-change-password/index.php | 4 ++-- plugins/ldap-change-password/index.php | 2 +- plugins/ldap-contacts-suggestions/index.php | 2 +- plugins/mailcow-change-password/index.php | 4 ++-- plugins/postfixadmin-change-password/index.php | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/hmailserver-change-password/index.php b/plugins/hmailserver-change-password/index.php index 4bd153135..c499450e2 100644 --- a/plugins/hmailserver-change-password/index.php +++ b/plugins/hmailserver-change-password/index.php @@ -14,7 +14,7 @@ class HmailserverChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin { 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 ''; diff --git a/plugins/ispconfig-change-password/index.php b/plugins/ispconfig-change-password/index.php index 1c45e37fc..34906074f 100644 --- a/plugins/ispconfig-change-password/index.php +++ b/plugins/ispconfig-change-password/index.php @@ -14,13 +14,13 @@ class IspconfigChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin { 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(); 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 ''; diff --git a/plugins/ispmail-change-password/index.php b/plugins/ispmail-change-password/index.php index 5a924622c..5dceae56e 100755 --- a/plugins/ispmail-change-password/index.php +++ b/plugins/ispmail-change-password/index.php @@ -14,13 +14,13 @@ class IspmailChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin { 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(); 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 ''; diff --git a/plugins/ldap-change-password/index.php b/plugins/ldap-change-password/index.php index af201cedf..546249e2d 100644 --- a/plugins/ldap-change-password/index.php +++ b/plugins/ldap-change-password/index.php @@ -14,7 +14,7 @@ class LdapChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin { 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 ''; diff --git a/plugins/ldap-contacts-suggestions/index.php b/plugins/ldap-contacts-suggestions/index.php index 7e77f2790..b02fc1c37 100644 --- a/plugins/ldap-contacts-suggestions/index.php +++ b/plugins/ldap-contacts-suggestions/index.php @@ -14,7 +14,7 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin { 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 ''; diff --git a/plugins/mailcow-change-password/index.php b/plugins/mailcow-change-password/index.php index fdd58cf09..ae6c0443f 100644 --- a/plugins/mailcow-change-password/index.php +++ b/plugins/mailcow-change-password/index.php @@ -14,13 +14,13 @@ class MailcowChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin { 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(); 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 ''; diff --git a/plugins/postfixadmin-change-password/index.php b/plugins/postfixadmin-change-password/index.php index 1068d4ee2..3e1223d4b 100755 --- a/plugins/postfixadmin-change-password/index.php +++ b/plugins/postfixadmin-change-password/index.php @@ -14,13 +14,13 @@ class PostfixadminChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin { 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(); 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 ''; From 070e4ee0fb6d8503356a08237377b34f936787e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stenr=C3=B6se?= Date: Mon, 14 Aug 2017 14:51:10 +0200 Subject: [PATCH 3/3] Allow sieve filter to "fileinto" INBOX --- dev/Stores/User/Folder.js | 6 +++++- rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php | 1 + .../v/0.0.0/app/libraries/RainLoop/Config/Application.php | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js index db4bf257e..1ed15acc9 100644 --- a/dev/Stores/User/Folder.js +++ b/dev/Stores/User/Folder.js @@ -2,6 +2,8 @@ import ko from 'ko'; import _ from '_'; +import {settingsGet} from 'Storage/Settings'; + import {FolderType} from 'Common/Enums'; import {UNUSED_OPTION_VALUE} from 'Common/Consts'; import {isArray, folderListOptionsBuilder} from 'Common/Utils'; @@ -35,6 +37,8 @@ class FolderUserStore this.currentFolder = ko.observable(null).extend({toggleSubscribeProperty: [this, 'selected']}); + this.sieveAllowFileintoInbox = !!settingsGet('SieveAllowFileintoInbox'); + this.computers(); this.subscribers(); } @@ -117,7 +121,7 @@ class FolderUserStore this.folderMenuForFilters = ko.computed( () => folderListOptionsBuilder( this.folderListSystem(), this.folderList(), - ['INBOX'], [['', '']], null, null, null, (item) => (item ? item.localName() : '')) + [(this.sieveAllowFileintoInbox ? '' : 'INBOX')], [['', '']], null, null, null, (item) => (item ? item.localName() : '')) ); } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 7e3823125..4951703dd 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1531,6 +1531,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack 'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false), 'UseLoginWelcomePage' => (bool) $oConfig->Get('login', 'welcome_page', false), 'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')), + 'SieveAllowFileintoInbox' => (bool) $oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false), 'ContactsIsAllowed' => false, 'ChangePasswordIsAllowed' => false, 'RequireTwoFactor' => false, diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php index efbd86179..715c8a03e 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -422,6 +422,7 @@ Enables caching in the system'), 'sieve_allow_raw_script' => array(false), 'sieve_utf8_folder_name' => array(true), 'sieve_auth_plain_initial' => array(true), + 'sieve_allow_fileinto_inbox' => array(false), 'imap_timeout' => array(300), 'smtp_timeout' => array(60), 'sieve_timeout' => array(10),