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 @@ -
-]*>/gim,"\n__bq__start__\n").replace(/<\/blockquote>/gim,"\n__bq__end__\n").replace(/]*>([\s\S\r\n]*?)<\/a>/gim,h).replace(/<\/div>/gi,"\n").replace(/ /gi," ").replace(/"/gi,'"').replace(/<[^>]*>/gm,""),r=Mt.$div.html(r).text(),r=r.replace(/\n[ \t]+/gm,"\n").replace(/[\n]{3,}/gm,"\n\n").replace(/>/gi,">").replace(/</gi,"<").replace(/&/gi,"&"),s=0,a=100;a>0&&(a--,i=r.indexOf("__bq__start__",s),i>-1);)o=r.indexOf("__bq__start__",i+5),n=r.indexOf("__bq__end__",i+5),(-1===o||o>n)&&n>i?(r=r.substring(0,i)+c(r.substring(i+13,n))+r.substring(n+11),s=0):s=o>-1&&n>o?o-1:0;return r=r.replace(/__bq__start__/gm,"").replace(/__bq__end__/gm,"")},Mt.plainToHtml=function(e,t){e=e.toString().replace(/\r/g,"");var s=!1,i=!0,o=!0,n=[],a="",r=0,l=e.split("\n");do{for(i=!1,n=[],r=0;r").replace(/[\-_~]{10,}/g,""===a.substr(0,1),o&&!s?(i=!0,s=!0,n.push("~~~blockquote~~~"),n.push(a.substr(1))):!o&&s?(s=!1,n.push("~~~/blockquote~~~"),n.push(a)):n.push(o&&s?a.substr(1):a);s&&(s=!1,n.push("~~~/blockquote~~~")),l=n}while(i);return e=l.join("\n"),e=e.replace(/&/g,"&").replace(/>/g,">").replace(/").replace(/[\s]*~~~\/blockquote~~~/g,"