From 45691906910f6ec3232c310de7551d89ec386f2b Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Tue, 12 Aug 2014 19:19:39 +0400 Subject: [PATCH] Added "hide_dangerous_actions" setting --- dev/ViewModels/MailBoxMessageListViewModel.js | 2 ++ rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php | 1 + .../v/0.0.0/app/libraries/RainLoop/Config/Application.php | 1 + .../v/0.0.0/app/templates/Views/App/MailMessageList.html | 6 +++--- rainloop/v/0.0.0/static/js/app.js | 2 ++ rainloop/v/0.0.0/static/js/app.min.js | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev/ViewModels/MailBoxMessageListViewModel.js b/dev/ViewModels/MailBoxMessageListViewModel.js index 392480f67..e0f7c75ef 100644 --- a/dev/ViewModels/MailBoxMessageListViewModel.js +++ b/dev/ViewModels/MailBoxMessageListViewModel.js @@ -12,6 +12,8 @@ function MailBoxMessageListViewModel() this.bPrefetch = false; this.emptySubjectValue = ''; + this.hideDangerousActions = !!RL.settingsGet('HideDangerousActions'); + var oData = RL.data(); this.popupVisibility = RL.popupVisibility; 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 3c3ee4dde..4ad9ff31e 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -953,6 +953,7 @@ class Actions 'AllowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true), 'AllowHtmlEditorSourceButton' => (bool) $oConfig->Get('labs', 'allow_html_editor_source_button', false), 'UseRsaEncryption' => (bool) $oConfig->Get('security', 'use_rsa_encryption', false), + 'HideDangerousActions' => $oConfig->Get('labs', 'hide_dangerous_actions', false), 'CustomLoginLink' => $oConfig->Get('labs', 'custom_login_link', ''), 'CustomLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''), 'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''), 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 5dd6229b1..8d46a3b8d 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 @@ -227,6 +227,7 @@ Enables caching in the system'), 'login_fault_delay' => array(1), 'log_ajax_response_write_limit' => array(300), 'allow_html_editor_source_button' => array(false), + 'hide_dangerous_actions' => array(false), 'use_app_debug_js' => array(false), 'use_app_debug_css' => array(false), 'use_imap_sort' => array(true), diff --git a/rainloop/v/0.0.0/app/templates/Views/App/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/App/MailMessageList.html index b0e175d32..fa75775f3 100644 --- a/rainloop/v/0.0.0/app/templates/Views/App/MailMessageList.html +++ b/rainloop/v/0.0.0/app/templates/Views/App/MailMessageList.html @@ -92,15 +92,15 @@ - - + -