diff --git a/.gitignore b/.gitignore index c88cfb29614..dbdbc28ef74 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ program/js/jquery.min.js program/js/jstz.min.js program/js/publickey.js program/js/tinymce/ +**/*.min.js # eslint dependencies /node_modules diff --git a/index.php b/index.php index 83d9be2f9e9..5cb04c169fe 100644 --- a/index.php +++ b/index.php @@ -226,7 +226,7 @@ } if ($RCMAIL->output->ajax_call || $RCMAIL->output->get_env('framed')) { - $RCMAIL->output->command('session_error', $RCMAIL->url(['_err' => 'session'])); + $RCMAIL->output->add_js_call('session_error', $RCMAIL->url(['_err' => 'session'])); $RCMAIL->output->send('iframe'); } diff --git a/installer/client.js b/installer/client.js index 7bfb7c1e1a4..1d8e7b30d1c 100644 --- a/installer/client.js +++ b/installer/client.js @@ -45,3 +45,35 @@ function removehostfield(row) { var container = document.getElementById('defaulthostlist'); container.removeChild(row); } + +function addOnclickCallback(id, callback) { + var elem = document.getElementById(id); + if (!elem) { + console.error('No element found with ID "' + id + '", cannot add callback!'); + return false; + } + elem.addEventListener('click', callback); +} + +document.addEventListener('DOMContentLoaded', function () { + addOnclickCallback('button-save-config', function () { + document.getElementById('getconfig_form').submit(); + }); + + addOnclickCallback('button-download-config', function () { + location.href = 'index.php?_getconfig=1'; + }); + + addOnclickCallback('button-continue-step-3', function () { + location.href = './index.php?_step=3'; + }); + + addOnclickCallback('remove-host-field', function (event) { + removehostfield(event.target.parentNode); + return false; + }); + + addOnclickCallback('add-host-field', function () { + addhostfield(); + }); +}); diff --git a/installer/config.php b/installer/config.php index 02e6498686f..8f2c3d5dfe9 100644 --- a/installer/config.php +++ b/installer/config.php @@ -42,13 +42,13 @@ echo ''; $button_txt = html::quote('Save in ' . $dir); - $save_button = ' '; + $save_button = ' '; } echo '

Copy or download the following configuration and save it'; echo ' as config.inc.php within the ' . RCUBE_CONFIG_DIR . ' directory of your Roundcube installation.
'; echo ' Make sure that there are no characters before the <?php bracket when saving the file.'; - echo ' '; + echo ' '; echo $save_button; if ($RCI->legacy_config) { @@ -65,7 +65,7 @@ echo '

Of course there are more options to configure. Have a look at the defaults.inc.php file or visit Howto_Config to find out.

'; - echo '

'; + echo '

'; // echo ''; echo "\n
\n"; @@ -327,14 +327,14 @@ foreach ($default_hosts as $host) { echo '
' . $text_imaphost->show($host); if ($i++ > 0) { - echo 'remove'; + echo 'remove'; } echo '
'; } ?> -
add
+
add
The IMAP host(s) chosen to perform the log-in

Leave blank to show a textbox at login. To use SSL/STARTTLS connection add ssl:// or tls:// prefix. It can also contain the port number, e.g. tls://imap.domain.tld:143. diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 20aff988d1f..d86f750b222 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -135,7 +135,7 @@ public function acl_autocomplete() $users = array_values($keys); } - $this->rc->output->command('ksearch_query_results', $users, $search, $reqid); + $this->rc->output->add_js_call('ksearch_query_results', $users, $search, $reqid); $this->rc->output->send(); } @@ -533,7 +533,7 @@ private function action_save() if ($user != $self && $username != $self) { if ($this->rc->storage->set_acl($mbox, $user, $acl)) { $display = $this->resolve_acl_identifier($username, $title); - $this->rc->output->command('acl_update', [ + $this->rc->output->add_js_call('acl_update', [ 'id' => rcube_utils::html_identifier($user), 'username' => $username, 'title' => $title, @@ -566,7 +566,7 @@ private function action_delete() foreach ($user as $u) { $u = trim($u); if ($this->rc->storage->delete_acl($mbox, $u)) { - $this->rc->output->command('acl_remove_row', rcube_utils::html_identifier($u)); + $this->rc->output->add_js_call('acl_remove_row', rcube_utils::html_identifier($u)); } else { $error = true; } @@ -599,7 +599,7 @@ private function action_list() $out = preg_replace(['/^]+>/', '/<\/table>$/'], '', $out); - $this->rc->output->command('acl_list_update', $out); + $this->rc->output->add_js_call('acl_list_update', $out); } /** diff --git a/plugins/acl/skins/elastic/templates/table.html b/plugins/acl/skins/elastic/templates/table.html index 0a4b581337e..84032704036 100644 --- a/plugins/acl/skins/elastic/templates/table.html +++ b/plugins/acl/skins/elastic/templates/table.html @@ -18,7 +18,7 @@

- + diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php index e9178b97ada..1034a2c4c99 100644 --- a/plugins/archive/archive.php +++ b/plugins/archive/archive.php @@ -227,7 +227,7 @@ public function move_messages() // @phpstan-ignore-next-line if ($this->result['error']) { if (!$from_show_action) { - $rcmail->output->command('list_mailbox'); + $rcmail->output->add_js_call('list_mailbox'); } $rcmail->output->show_message($this->gettext('archiveerror'), 'warning'); @@ -236,7 +236,7 @@ public function move_messages() if (!empty($_POST['_refresh'])) { // FIXME: send updated message rows instead of reloading the entire list - $rcmail->output->command('refresh_list'); + $rcmail->output->add_js_call('refresh_list'); $addrows = false; } else { $addrows = true; @@ -249,9 +249,9 @@ public function move_messages() if ($from_show_action) { if ($next = rcube_utils::get_input_string('_next_uid', rcube_utils::INPUT_GPC)) { - $rcmail->output->command('show_message', $next); + $rcmail->output->add_js_call('show_message', $next); } else { - $rcmail->output->command('command', 'list'); + $rcmail->output->add_js_call('command', 'list'); } $rcmail->output->send(); @@ -287,8 +287,8 @@ public function move_messages() $rcmail->output->set_env('current_page', $page); $rcmail->output->set_env('pagecount', $pages); $rcmail->output->set_env('exists', $exists); - $rcmail->output->command('set_quota', rcmail_action::quota_content(null, $quota_root)); - $rcmail->output->command('set_rowcount', rcmail_action_mail_index::get_messagecount_text($msg_count), $mbox); + $rcmail->output->add_js_call('set_quota', rcmail_action::quota_content(null, $quota_root)); + $rcmail->output->add_js_call('set_rowcount', rcmail_action_mail_index::get_messagecount_text($msg_count), $mbox); if ($threading) { $count = rcube_utils::get_input_string('_count', rcube_utils::INPUT_POST); @@ -403,7 +403,7 @@ public function prefs_table($args) 'maxlength' => 30, 'folder_filter' => 'mail', 'folder_rights' => 'w', - 'onchange' => "if ($(this).val() == 'INBOX') $(this).val('')", + 'data-onchange' => ['reset_value_if_inbox', '__THIS__'], 'class' => 'custom-select', ]); } else { diff --git a/plugins/enigma/enigma.js b/plugins/enigma/enigma.js index 865380d8cd7..fc745fe709c 100644 --- a/plugins/enigma/enigma.js +++ b/plugins/enigma/enigma.js @@ -567,14 +567,15 @@ rcube_webmail.prototype.enigma_compose_handler = function (props) { }; // Import attached keys/certs file -rcube_webmail.prototype.enigma_import_attachment = function (mime_id) { +$('[data-event-handle="enigma_import_attachment"]').on('click', function (event) { + var mime_id = event.target.dataset.part; var lock = this.set_busy(true, 'loading'), post = { _uid: this.env.uid, _mbox: this.env.mailbox, _part: mime_id }; this.http_post('plugin.enigmaimport', post, lock); return false; -}; +}); // password request popup rcube_webmail.prototype.enigma_password_request = function (data) { @@ -745,3 +746,16 @@ rcube_webmail.prototype.enigma_find_publickey = function (email) { } ); }; + +// Some event handlers. +$('[data-event-handle="enigma_import_upload"]').on('click', function (event) { + return window.rcmail.command('plugin.enigma-import', '', event.target, event); +}); + +$('[data-event-handle="enigma_import_search"]').on('click', function (event) { + return window.rcmail.command('plugin.enigma-import-search', '', event.target, event); +}); + +$('[data-event-handle="enigma_import_search"]').on('click', function (event) { + window.rcmail.command('menu-open', 'enigmamenu', event.target, event); +}); diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php index 1eea580cace..723f6b0f014 100644 --- a/plugins/enigma/lib/enigma_ui.php +++ b/plugins/enigma/lib/enigma_ui.php @@ -174,7 +174,7 @@ public function password_prompt($status, $params = []) } if (preg_match('/^(send|plugin.enigmaimport|plugin.enigmakeys)$/', $this->rc->action)) { - $this->rc->output->command('enigma_password_request', $data); + $this->rc->output->add_js_call('enigma_password_request', $data); } else { $this->rc->output->set_env('enigma_password_request', $data); } @@ -254,7 +254,7 @@ private function key_list() // Add rows foreach ($list as $key) { - $this->rc->output->command('enigma_add_list_row', [ + $this->rc->output->add_js_call('enigma_add_list_row', [ 'name' => rcube::Q($key->name), 'id' => $key->id, 'flags' => $key->is_private() ? 'p' : '', @@ -266,7 +266,7 @@ private function key_list() $this->rc->output->set_env('search_request', $search); $this->rc->output->set_env('pagecount', ceil($listsize / $pagesize)); $this->rc->output->set_env('current_page', $page); - $this->rc->output->command('set_rowcount', $this->get_rowcount_text($listsize, $size, $page)); + $this->rc->output->add_js_call('set_rowcount', $this->get_rowcount_text($listsize, $size, $page)); $this->rc->output->send(); } @@ -323,7 +323,7 @@ private function key_info() $this->data = $res; } else { // error $this->rc->output->show_message('enigma.keyopenerror', 'error'); - $this->rc->output->command('parent.enigma_loadframe'); + $this->rc->output->add_js_call('parent.enigma_loadframe'); $this->rc->output->send('iframe'); } @@ -528,14 +528,14 @@ private function key_import() if (is_array($result)) { if (rcube_utils::get_input_value('_generated', rcube_utils::INPUT_POST)) { - $this->rc->output->command('enigma_key_create_success'); + $this->rc->output->add_js_call('enigma_key_create_success'); $this->rc->output->show_message('enigma.keygeneratesuccess', 'confirmation'); } else { $this->rc->output->show_message('enigma.keysimportsuccess', 'confirmation', ['new' => $result['imported'], 'old' => $result['unchanged']]); if ($result['imported'] && !empty($_POST['_refresh'])) { - $this->rc->output->command('enigma_list', 1, false); + $this->rc->output->add_js_call('enigma_list', 1, false); } } } else { @@ -550,13 +550,13 @@ private function key_import() if (is_array($result)) { // reload list if any keys has been added if ($result['imported']) { - $this->rc->output->command('parent.enigma_list', 1); + $this->rc->output->add_js_call('parent.enigma_list', 1); } $this->rc->output->show_message('enigma.keysimportsuccess', 'confirmation', ['new' => $result['imported'], 'old' => $result['unchanged']]); - $this->rc->output->command('parent.enigma_import_success'); + $this->rc->output->add_js_call('parent.enigma_import_success'); } elseif ($result instanceof enigma_error && $result->getCode() == enigma_error::BADPASS) { $this->password_prompt($result); } else { @@ -611,7 +611,7 @@ public function tpl_key_import_form($attrib) $max_filesize = rcmail_action::upload_init(); $upload_button = new html_button([ 'class' => 'button import', - 'onclick' => "return rcmail.command('plugin.enigma-import','',this,event)", + 'data-event-handle' => 'enigma_import_upload', ]); $form = html::div(null, html::p(null, rcube::Q($this->enigma->gettext('keyimporttext'), 'show')) @@ -639,7 +639,7 @@ public function tpl_key_import_form($attrib) $search_button = new html_button([ 'class' => 'button search', - 'onclick' => "return rcmail.command('plugin.enigma-import-search','',this,event)", + 'data-event-handle' => 'enigma_import_search', ]); $form = html::div(null, @@ -710,7 +710,7 @@ private function key_generate() ]); if ($result instanceof enigma_key) { - $this->rc->output->command('enigma_key_create_success'); + $this->rc->output->add_js_call('enigma_key_create_success'); $this->rc->output->show_message('enigma.keygeneratesuccess', 'confirmation'); } else { $this->rc->output->show_message('enigma.keygenerateerror', 'error'); @@ -820,12 +820,12 @@ private function key_delete() if ($res !== true) { $this->rc->output->show_message('enigma.keyremoveerror', 'error'); - $this->rc->output->command('enigma_list'); + $this->rc->output->add_js_call('enigma_list'); $this->rc->output->send(); } } - $this->rc->output->command('enigma_list'); + $this->rc->output->add_js_call('enigma_list'); $this->rc->output->show_message('enigma.keyremovesuccess', 'confirmation'); $this->rc->output->send(); } @@ -848,7 +848,7 @@ private function compose_ui() $this->enigma->add_button([ 'type' => 'link', 'command' => 'plugin.enigma', - 'onclick' => "rcmail.command('menu-open', 'enigmamenu', event.target, event)", + 'data-event-handle' => 'enigma_menu_open', 'class' => 'button enigma', 'title' => 'encryptionoptions', 'label' => 'encryption', @@ -1107,7 +1107,8 @@ public function message_output($p) $p['content'] = html::p(['class' => 'enigmaattachment boxinformation aligned-buttons'], html::span(null, rcube::Q($this->enigma->gettext('keyattfound'))) . html::tag('button', [ - 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".enigma_import_attachment('" . rcube::JQ($part) . "')", + 'data-event-handle' => 'enigma_import_attachment', + 'data-part' => $part, 'title' => $this->enigma->gettext('keyattimport'), 'class' => 'import btn-sm', ], rcube::Q($this->rc->gettext('import')) @@ -1190,7 +1191,7 @@ public function message_ready($p) if (!empty($msg)) { if (!empty($vars['email'])) { - $this->rc->output->command('enigma_key_not_found', [ + $this->rc->output->add_js_call('enigma_key_not_found', [ 'email' => $vars['email'], 'text' => $this->rc->gettext(['name' => $msg, 'vars' => $vars]), 'title' => $this->enigma->gettext('keynotfound'), diff --git a/plugins/help/help.php b/plugins/help/help.php index d3d1e5a0a61..3a6d3bc74ab 100644 --- a/plugins/help/help.php +++ b/plugins/help/help.php @@ -108,7 +108,8 @@ public function tablink($attrib) // so button() will translate it correctly $attrib['title'] = $attrib['label']; - $attrib['onclick'] = sprintf("return show_help_content('%s', event)", $attrib['action']); + $attrib['data-action'] = $attrib['action']; + $attrib['data-event-handle'] = 'call_show_help_content'; return $rcmail->output->button($attrib); } diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index c971bd133f2..0a3982f2e54 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -120,7 +120,8 @@ public static function miniColors() $rcube->output->include_css('plugins/jqueryui/' . $css); $rcube->output->include_script($script, 'head', false); - $rcube->output->add_script('$.fn.miniColors = $.fn.minicolors; $("input.colors").minicolors(' . $config_str . ')', 'docready'); + $rcube->output->include_script('plugins/jqueryui/js/jqueryui-minicolors-init.js'); + $rcube->output->add_js_call('jqueryui_minicolors_init', $config_str); $rcube->output->set_env('minicolors_config', $config); } diff --git a/plugins/jqueryui/js/jqueryui-minicolors-init.js b/plugins/jqueryui/js/jqueryui-minicolors-init.js new file mode 100644 index 00000000000..e5ba4c2feb5 --- /dev/null +++ b/plugins/jqueryui/js/jqueryui-minicolors-init.js @@ -0,0 +1,4 @@ +rcube_webmail.prototype.jqueryui_minicolors_init = function (config) { + $.fn.miniColors = $.fn.minicolors; + $("input.colors").minicolors(config); +} diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php index 15b468bac34..8fb92b21547 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php @@ -133,7 +133,7 @@ public function start($mode = null) // reload interface in case of possible error when specified script wasn't found (#1489412) if ($script_name !== null && !empty($list) && !in_array($script_name, $list)) { - $this->rc->output->command('reload', 500); + $this->rc->output->add_js_call('reload', 500); } // to disable 'Add filter' button set env variable @@ -306,7 +306,7 @@ public function actions() if ($result === true) { $this->rc->output->show_message('managesieve.filterdeleted', 'confirmation'); - $this->rc->output->command('managesieve_updatelist', 'del', ['id' => $fid]); + $this->rc->output->add_js_call('managesieve_updatelist', 'del', ['id' => $fid]); } else { $this->rc->output->show_message('managesieve.filterdeleteerror', 'error'); } @@ -344,7 +344,7 @@ public function actions() $result = $this->list_rules(); $this->rc->output->show_message('managesieve.moved', 'confirmation'); - $this->rc->output->command('managesieve_updatelist', 'list', + $this->rc->output->add_js_call('managesieve_updatelist', 'list', ['list' => $result, 'clear' => true, 'set' => $to]); } else { $this->rc->output->show_message('managesieve.moveerror', 'error'); @@ -367,7 +367,7 @@ public function actions() } else { $this->rc->output->show_message('managesieve.activated', 'confirmation'); } - $this->rc->output->command('managesieve_updatelist', 'update', + $this->rc->output->add_js_call('managesieve_updatelist', 'update', ['id' => $fid, 'disabled' => $rule['disabled']]); } else { if ($rule['disabled']) { @@ -386,7 +386,7 @@ public function actions() if ($result === true) { $this->rc->output->set_env('active_sets', $this->active); $this->rc->output->show_message('managesieve.setactivated', 'confirmation'); - $this->rc->output->command('managesieve_updatelist', 'setact', + $this->rc->output->add_js_call('managesieve_updatelist', 'setact', ['name' => $script_name, 'active' => true, 'all' => !$kep14]); } else { $this->rc->output->show_message('managesieve.setactivateerror', 'error'); @@ -402,7 +402,7 @@ public function actions() if ($result === true) { $this->rc->output->set_env('active_sets', $this->active); $this->rc->output->show_message('managesieve.setdeactivated', 'confirmation'); - $this->rc->output->command('managesieve_updatelist', 'setact', + $this->rc->output->add_js_call('managesieve_updatelist', 'setact', ['name' => $script_name, 'active' => false]); } else { $this->rc->output->show_message('managesieve.setdeactivateerror', 'error'); @@ -417,7 +417,7 @@ public function actions() if ($result === true) { $this->rc->output->show_message('managesieve.setdeleted', 'confirmation'); - $this->rc->output->command('managesieve_updatelist', 'setdel', ['name' => $script_name]); + $this->rc->output->add_js_call('managesieve_updatelist', 'setdel', ['name' => $script_name]); $this->rc->session->remove('managesieve_current'); } else { $this->rc->output->show_message('managesieve.setdeleteerror', 'error'); @@ -447,23 +447,23 @@ public function actions() } elseif ($action == 'list') { $result = $this->list_rules(); - $this->rc->output->command('managesieve_updatelist', 'list', ['list' => $result]); + $this->rc->output->add_js_call('managesieve_updatelist', 'list', ['list' => $result]); } elseif ($action == 'ruleadd') { $rid = rcube_utils::get_input_string('_rid', rcube_utils::INPUT_POST); $id = $this->genid(); $content = $this->rule_div($fid, $id, false, !empty($_SESSION['managesieve-compact-form'])); - $this->rc->output->command('managesieve_rulefill', $content, $id, $rid); + $this->rc->output->add_js_call('managesieve_rulefill', $content, $id, $rid); } elseif ($action == 'actionadd') { $aid = rcube_utils::get_input_string('_aid', rcube_utils::INPUT_POST); $id = $this->genid(); $content = $this->action_div($fid, $id, false); - $this->rc->output->command('managesieve_actionfill', $content, $id, $aid); + $this->rc->output->add_js_call('managesieve_actionfill', $content, $id, $aid); } elseif ($action == 'addresses') { $aid = rcube_utils::get_input_string('_aid', rcube_utils::INPUT_POST); - $this->rc->output->command('managesieve_vacation_addresses_update', $aid, $this->user_emails()); + $this->rc->output->add_js_call('managesieve_vacation_addresses_update', $aid, $this->user_emails()); } $this->rc->output->send(); @@ -515,7 +515,7 @@ public function saveraw() } } else { $this->rc->output->show_message('managesieve.setupdated', 'confirmation'); - $this->rc->output->command('parent.managesieve_updatelist', 'refresh'); + $this->rc->output->add_js_call('parent.managesieve_updatelist', 'refresh'); } $this->send(); @@ -602,7 +602,7 @@ public function save() $index = array_search($name, $list); $this->rc->output->show_message('managesieve.setcreated', 'confirmation'); - $this->rc->output->command('parent.managesieve_updatelist', 'setadd', + $this->rc->output->add_js_call('parent.managesieve_updatelist', 'setadd', ['name' => $name, 'index' => $index]); } elseif ($error) { $this->rc->output->show_message($error, 'error'); @@ -1217,9 +1217,9 @@ public function save() 'id' => $fid, 'disabled' => $this->form['disabled'], ]; - $this->rc->output->command('parent.managesieve_updatelist', isset($new) ? 'add' : 'update', $args); + $this->rc->output->add_js_call('parent.managesieve_updatelist', isset($new) ? 'add' : 'update', $args); } else { - $this->rc->output->command('managesieve_dialog_close'); + $this->rc->output->add_js_call('managesieve_dialog_close'); $this->rc->output->send('iframe'); } } else { @@ -1321,7 +1321,7 @@ public function filtersets_list($attrib, $no_env = false) 'name' => '_set', 'id' => $attrib['id'], 'class' => 'custom-select', - 'onchange' => $this->rc->task != 'mail' ? 'rcmail.managesieve_set()' : '', + 'data-onchange' => $this->rc->task != 'mail' ? ['managesieve_set'] : '', ]); if ($list) { @@ -1567,7 +1567,7 @@ public function filter_form($attrib) if ($compact) { $select = new html_select(['name' => '_join', 'id' => '_join', 'class' => 'custom-select', - 'onchange' => 'rule_join_radio(this.value)']); + 'data-onchange' => ['managesieve_rule_join_radio_with_this_value']]); foreach (['allof', 'anyof', 'any'] as $val) { $select->add($this->plugin->gettext('filter' . $val), $val); @@ -1592,7 +1592,7 @@ public function filter_form($attrib) // any, allof, anyof radio buttons $field_id = '_allof'; $input_join = new html_radiobutton(['name' => '_join', 'id' => $field_id, 'value' => 'allof', - 'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio']); + 'data-event-handle' => 'managesieve_rule_join_radio', 'data-value' => 'allof', 'class' => 'radio']); if (isset($scr) && !$any) { $input_join = $input_join->show($scr['join'] ? 'allof' : ''); @@ -1604,7 +1604,7 @@ public function filter_form($attrib) $field_id = '_anyof'; $input_join = new html_radiobutton(['name' => '_join', 'id' => $field_id, 'value' => 'anyof', - 'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio']); + 'data-event-handle' => 'managesieve_rule_join_radio', 'data-value' => 'anyof', 'class' => 'radio']); if (isset($scr) && !$any) { $input_join = $input_join->show($scr['join'] ? '' : 'anyof'); @@ -1616,7 +1616,7 @@ public function filter_form($attrib) $field_id = '_any'; $input_join = new html_radiobutton(['name' => '_join', 'id' => $field_id, 'value' => 'any', - 'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio']); + 'data-event-handle' => 'managesieve_rule_join_radio', 'data-value' => 'any', 'class' => 'radio']); $input_join = $input_join->show($any ? 'any' : ''); @@ -1687,7 +1687,7 @@ public function rule_div($fid, $id, $div = true, $compact = false) // headers select $select_header = new html_select(['name' => "_header[{$id}]", 'id' => 'header' . $id, - 'onchange' => 'rule_header_select(' . $id . ')', 'class' => 'custom-select']); + 'data-onchange' => ['rule_header_select', $id]), 'class' => 'custom-select']; foreach ($this->headers as $index => $header) { $header = $this->rc->text_exists($index) ? $this->plugin->gettext($index) : $header; @@ -1872,7 +1872,7 @@ public function rule_div($fid, $id, $div = true, $compact = false) 'name' => "_rule_spamtest_op[{$id}]", 'id' => 'rule_spamtest_op' . $id, 'class' => 'input-group-prepend custom-select', - 'onchange' => 'rule_spamtest_select(' . $id . ')', + 'data-onchange' => ['rule_spamtest_select', $id], ]); $select_spamtest_op->add(rcube::Q($this->plugin->gettext('spamtestisunknown')), ''); $select_spamtest_op->add(rcube::Q($this->plugin->gettext('spamtestisgreaterthan')), 'value-gt'); @@ -1909,7 +1909,7 @@ public function rule_div($fid, $id, $div = true, $compact = false) 'name' => "_rule_mod[{$id}]", 'id' => 'rule_mod_op' . $id, 'class' => 'custom-select', - 'onchange' => 'rule_mod_select(' . $id . ')', + 'data-onchange' => ['rule_mod_select', $id], ]); $select_mod->add(rcube::Q($this->plugin->gettext('none')), ''); $select_mod->add(rcube::Q($this->plugin->gettext('address')), 'address'); @@ -1955,7 +1955,7 @@ public function rule_div($fid, $id, $div = true, $compact = false) $select_mime = new html_select([ 'name' => "_rule_mime_type[{$id}]", 'id' => 'rule_mime_type' . $id, - 'style' => 'min-width:8em', 'onchange' => 'rule_mime_select(' . $id . ')', + 'style' => 'min-width:8em', 'data-onchange' => ['rule_mime_select', $id], 'class' => 'custom-select', ]); $select_mime->add('-', ''); @@ -1994,7 +1994,7 @@ public function rule_div($fid, $id, $div = true, $compact = false) 'name' => "_rule_trans[{$id}]", 'id' => 'rule_trans_op' . $id, 'class' => 'custom-select', - 'onchange' => 'rule_trans_select(' . $id . ')', + 'data-onchange' => ['rule_trans_select', $id], ]); $select_mod->add(rcube::Q($this->plugin->gettext('text')), 'text'); $select_mod->add(rcube::Q($this->plugin->gettext('undecoded')), 'raw'); @@ -2108,25 +2108,66 @@ public function rule_div($fid, $id, $div = true, $compact = false) $out .= ''; if (!$compact) { - $out .= ''; + $out .= html::tag('td', ['class' => 'advbutton'], + html::a([ + 'href' => '#', + 'id' => "ruleadv{$id}", + 'title' => $adv_title, + 'data-id' => $id, + 'data-event-handle' => 'managesieve_rule_adv_switch', + 'class' => 'show', + ], + html::span(['class' => 'inner'], $adv_title) + ) + ); } - $out .= ''; - $out .= ''; + $out .= html::tag('td', ['class' => 'rowactions'], + html::div(['class' => 'flexbox'], $aout) + ); + $out .= html::tag('td', ['class' => 'rowtargets'], [ + $tout, + html::div([ + 'id' => "rule_advanced{$id}", + 'style' => 'display:none', + 'class' => 'advanced', + ], + $mout), + ]); + $out .= ''; $out .= '
'; - $out .= sprintf('' - . '%s', $id, $adv_title, $id, $adv_title); - $out .= '
' . $aout . '
' . $tout . "\n"; - $out .= ''; - $out .= ''; if ($compact) { - $out .= sprintf('' - . '%s', $id, $adv_title, $id, $adv_title); + $out .= html::a([ + 'href' => '#', + 'id' => "ruleadv{$id}", + 'title' => $adv_title, + 'data-id' => $id, + 'data-event-handle' => 'managesieve_rule_adv_switch', + 'class' => 'advanced show', + ], + html::span(['class' => 'inner'], $adv_title) + ); } - $out .= sprintf('' - . '%s', $id, $add_title, $id, $add_title); - $out .= sprintf('' - . '%s', $id, $del_title, $id, $rows_num < 2 ? ' disabled' : '', $del_title); + $out .= html::a([ + 'href' => '#', + 'id' => "ruleadd{$id}", + 'title' => $add_title, + 'data-id' => $id, + 'data-event-handle' => 'managesieve_ruleadd', + 'class' => 'button create add', + ], + html::span(['class' => 'inner'], $add_title) + ); + $out .= html::a([ + 'href' => '#', + 'id' => "ruledel{$id}", + 'title' => $del_title, + 'data-id' => $id, + 'data-event-handle' => 'managesieve_ruledel', + 'class' => 'button delete del ' . $rows_num < 2 ? 'disabled' : '', + ], + html::span(['class' => 'inner'], $del_title) + ); $out .= '
'; @@ -2211,7 +2252,7 @@ public function action_div($fid, $id, $div = true) 'name' => "_action_type[{$id}]", 'id' => 'action_type' . $id, 'class' => 'custom-select', - 'onchange' => "action_type_select({$id})", + 'data-onchange' => ['managesieve_action_type_select', $id], ]); if (in_array('fileinto', $this->exts)) { $select_action->add($this->plugin->gettext('messagemoveto'), 'fileinto'); @@ -2373,7 +2414,7 @@ public function action_div($fid, $id, $div = true) $out .= $this->list_input($id, 'action_addresses', $action['addresses'] ?? null, 30, false, ['class' => $this->error_class($id, 'action', 'addresses', 'action_addresses')] ) - . html::a(['href' => '#', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".managesieve_vacation_addresses({$id})"], + . html::a(['href' => '#', 'data-event-handle' => 'managesieve_vacation_addresses', 'data-id' => $id], rcube::Q($this->plugin->gettext('filladdresses'))); $out .= '
' . rcube::Q($this->plugin->gettext('vacationinterval')) . '
'; $out .= '
' . html::tag('input', [ @@ -2671,12 +2712,30 @@ public function action_div($fid, $id, $div = true) // add/del buttons $add_label = rcube::Q($this->plugin->gettext('add')); $del_label = rcube::Q($this->plugin->gettext('del')); - $out .= ''; - $out .= sprintf('' - . '%s', $id, $add_label, $id, $add_label); - $out .= sprintf('' - . '%s', $id, $del_label, $id, $rows_num < 2 ? ' disabled' : '', $del_label); - $out .= ''; + $out .= html::tag('td', ['class' => 'rowbuttons'], + html::a( + [ + 'href' => '#', + 'id' => "actionadd{$id}", + 'title' => $add_label, + 'data-id' => $id, + 'data-event-handle' => 'managesieve_actionadd', + 'class' => 'button create add', + ], + html::span(['class' => 'inner'], $add_label), + ), + html::a( + [ + 'href' => '#', + 'id' => "actiondel{$id}", + 'title' => $del_label, + 'data-id' => $id, + 'data-event-handle' => ['managesieve_actiondel', + 'class' => 'button delete del ' . ($rows_num < 2 ? 'disabled' : ''), + ], + html::span(['class' => 'inner'], $del_label), + ) + ); $out .= ''; @@ -2757,8 +2816,7 @@ protected function print_tips() return; } - $script = rcmail_output::JS_OBJECT_NAME . '.managesieve_tip_register(' . json_encode($this->tips) . ');'; - $this->rc->output->add_script($script, 'docready'); + $this->rc->output->add_js_call('managesieve_tip_register', $this->tips); } protected function list_input($id, $name, $value, $size = null, $hidden = false, $attrib = []) @@ -3255,7 +3313,7 @@ protected function match_type_selector($name, $id, $test, $rule = null, $mode = 'id' => "{$name}{$id}", 'style' => 'display:' . (!in_array($rule, ['size', 'duplicate', 'spamtest']) ? 'inline' : 'none'), 'class' => 'operator_selector col-6 custom-select', - 'onchange' => "{$name}_select(this, '{$id}')", + 'data-onchange' => ["managesieve_{$name}_select", '__THIS__', $id], ]); $select_op->add(rcube::Q($this->plugin->gettext('filtercontains')), 'contains'); diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php index ac7abe7e6a8..6afb627f2ff 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php @@ -393,12 +393,12 @@ public function vacation_form($attrib) . (!empty($this->vacation['addresses']) ? rcube::Q(implode("\n", (array) $this->vacation['addresses']), 'strict', false) : '') . ''; $status = new html_select(['name' => 'vacation_status', 'id' => 'vacation_status', 'class' => 'custom-select']); - $action = new html_select(['name' => 'vacation_action', 'id' => 'vacation_action', 'class' => 'custom-select', 'onchange' => 'vacation_action_select()']); + $action = new html_select(['name' => 'vacation_action', 'id' => 'vacation_action', 'class' => 'custom-select', 'data-onchange' => ['vacation_action_select']]); $addresses_link = new html_inputfield([ 'type' => 'button', 'href' => '#', 'class' => 'button', - 'onclick' => rcmail_output::JS_OBJECT_NAME . '.managesieve_vacation_addresses()', + 'data-event-handle' => 'managesieve_vacation_addresses', ]); $redirect = !empty($this->vacation['action']) diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js index c9b43fa6227..f9769fc1ee0 100644 --- a/plugins/managesieve/managesieve.js +++ b/plugins/managesieve/managesieve.js @@ -537,10 +537,6 @@ rcube_webmail.prototype.managesieve_save = function () { }; // Operations on filters form -rcube_webmail.prototype.managesieve_ruleadd = function (id) { - this.http_post('plugin.managesieve-action', '_act=ruleadd&_rid=' + id); -}; - rcube_webmail.prototype.managesieve_rulefill = function (content, id, after) { if (content != '') { // create new element @@ -559,22 +555,6 @@ rcube_webmail.prototype.managesieve_rulefill = function (content, id, after) { } }; -rcube_webmail.prototype.managesieve_ruledel = function (id) { - if ($('#ruledel' + id).hasClass('disabled')) { - return; - } - - this.confirm_dialog(this.get_label('managesieve.ruledeleteconfirm'), 'delete', function (e, ref) { - var row = document.getElementById('rulerow' + id); - row.parentNode.removeChild(row); - ref.managesieve_formbuttons(document.getElementById('rules')); - }); -}; - -rcube_webmail.prototype.managesieve_actionadd = function (id) { - this.http_post('plugin.managesieve-action', '_act=actionadd&_aid=' + id); -}; - rcube_webmail.prototype.managesieve_actionfill = function (content, id, after) { if (content != '') { var div = $('#actions')[0], @@ -592,18 +572,6 @@ rcube_webmail.prototype.managesieve_actionfill = function (content, id, after) { } }; -rcube_webmail.prototype.managesieve_actiondel = function (id) { - if ($('#actiondel' + id).hasClass('disabled')) { - return; - } - - this.confirm_dialog(this.get_label('managesieve.actiondeleteconfirm'), 'delete', function (e, ref) { - var row = document.getElementById('actionrow' + id); - row.parentNode.removeChild(row); - ref.managesieve_formbuttons(document.getElementById('actions')); - }); -}; - // insert rule/action row in specified place on the list rcube_webmail.prototype.managesieve_insertrow = function (div, row, after) { var node = $('#' + ($(div).attr('id') == 'rules' ? 'rulerow' : 'actionrow') + after)[0]; @@ -627,12 +595,6 @@ rcube_webmail.prototype.managesieve_formbuttons = function (div) { } }; -// update vacation addresses field with user identities -rcube_webmail.prototype.managesieve_vacation_addresses = function (id) { - var lock = this.set_busy(true, 'loading'); - this.http_post('plugin.managesieve-action', { _act: 'addresses', _aid: id }, lock); -}; - // update vacation addresses field with user identities rcube_webmail.prototype.managesieve_vacation_addresses_update = function (id, addresses) { var field = $('#vacation_addresses,#action_addresses' + (id || '')); @@ -747,6 +709,8 @@ function rule_op_select(obj, id, header) { target.style.display = obj.value.match(/^(exists|notexists)$/) || header.match(/^(size|spamtest|message)$/) ? 'none' : ''; } +rcube_webmail.prototype.managesieve_rule_op_select = rule_op_select; + function rule_trans_select(id) { var obj = document.getElementById('rule_trans_op' + id), target = document.getElementById('rule_trans_type' + id); @@ -787,22 +751,6 @@ function rule_spamtest_select(id) { $(obj)[obj.value ? 'removeClass' : 'addClass']('rounded-right'); } -function rule_join_radio(value) { - $('#rules').css('display', value == 'any' ? 'none' : 'block'); -} - -function rule_adv_switch(id, elem) { - var elem = $(elem), enabled = elem.hasClass('hide'), adv = $('#rule_advanced' + id); - - if (enabled) { - adv.get(0).style.display = 'none'; - elem.removeClass('hide').addClass('show'); - } else { - adv.get(0).style.display = ''; - elem.removeClass('show').addClass('hide'); - } -} - function rule_mime_select(id) { var elem = $('#rule_mime_type' + id), param_elem = $('#rule_mime_param' + id + '_list'); @@ -847,6 +795,8 @@ function action_type_select(id) { } } +rcube_webmail.prototype.managesieve_action_type_select = action_type_select; + function vacation_action_select() { var selected = $('#vacation_action').val(); @@ -1140,7 +1090,7 @@ var cmeditor; function cmCreateErrorElem(msg) { var marker = document.createElement('div'); marker.style.color = '#822'; - marker.innerHTML = '●'; + marker.innerText = '●'; marker.title = msg; return marker; @@ -1283,3 +1233,77 @@ rcube_webmail.prototype.managesieve_dialog_resize = function (o) { dialog.dialog('option', { height: Math.min(h - 20, height + 120), width: Math.min(w - 20, width + 65) }); }; + +// Some event handlers. +window.rcmail.addEventListener('init', function () { + + $('[data-event-handle="managesieve_switch_nav_list"]').on('click', function (event) { + UI.switch_nav_list(event.target); + }); + + $('[data-event-handle="managesieve_ruleadd"]').on('click', function (event) { + const id = event.target.dataset.id; + this.http_post('plugin.managesieve-action', '_act=ruleadd&_rid=' + id); + return false; + }); + + $('[data-event-handle="managesieve_ruledel"]').on('click', function (event) { + const id = event.target.dataset.id; + if ($('#ruledel' + id).hasClass('disabled')) { + return; + } + + this.confirm_dialog(this.get_label('managesieve.ruledeleteconfirm'), 'delete', function (e, ref) { + var row = document.getElementById('rulerow' + id); + row.parentNode.removeChild(row); + ref.managesieve_formbuttons(document.getElementById('rules')); + }); + }); + + $('[data-event-handle="managesieve_actionadd"]').on('click', function (event) { + const id = event.target.dataset.id; + this.http_post('plugin.managesieve-action', '_act=actionadd&_aid=' + id); + }); + + $('[data-event-handle="managesieve_actiondel"]').on('click', function (event) { + const id = event.target.dataset.id; + if ($('#actiondel' + id).hasClass('disabled')) { + return; + } + + this.confirm_dialog(this.get_label('managesieve.actiondeleteconfirm'), 'delete', function (e, ref) { + var row = document.getElementById('actionrow' + id); + row.parentNode.removeChild(row); + ref.managesieve_formbuttons(document.getElementById('actions')); + }); + }); + + // update vacation addresses field with user identities + $('[data-event-handle="managesieve_vacation_addresses"]').on('click', function (event) { + const id = event.target.dataset.id; + var lock = window.rcmail.set_busy(true, 'loading'); + window.rcmail.http_post('plugin.managesieve-action', { _act: 'addresses', _aid: id }, lock); + }); + + $('data-event-handle="managesieve_rule_join_radio"]').on('click', function (event) { + const value = event.target.dataset.value; + $('#rules').css('display', value == 'any' ? 'none' : 'block'); + }); + + $('data-event-handle="managesieve_rule_adv_switch"]').on('click', function (event) { + var elem = event.target; + var id = elem.dataset.id; + var elem = $(elem), enabled = elem.hasClass('hide'), adv = $('#rule_advanced' + id); + + if (enabled) { + adv.get(0).style.display = 'none'; + elem.removeClass('hide').addClass('show'); + } else { + adv.get(0).style.display = ''; + elem.removeClass('show').addClass('hide'); + } + + return false; + }); + +}); diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index 1e160b60f83..da38fff2d72 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -206,7 +206,7 @@ public function mail_headers($args) $headers = $this->parse_headers($args['headers']); if ($this->rc->action == 'preview') { - $this->rc->output->command('parent.set_env', ['sieve_headers' => $headers]); + $this->rc->output->add_js_call('parent.set_env', ['sieve_headers' => $headers]); } else { $this->rc->output->set_env('sieve_headers', $headers); } @@ -228,7 +228,7 @@ public function managesieve_actions() $headers = $this->parse_headers($message->headers); $this->rc->output->set_env('sieve_headers', $headers); - $this->rc->output->command('managesieve_create', true); + $this->rc->output->add_js_call('managesieve_create', true); $this->rc->output->send(); } diff --git a/plugins/managesieve/skins/elastic/templates/managesieve.html b/plugins/managesieve/skins/elastic/templates/managesieve.html index e3201f89326..7ecfeb874e3 100644 --- a/plugins/managesieve/skins/elastic/templates/managesieve.html +++ b/plugins/managesieve/skins/elastic/templates/managesieve.html @@ -18,7 +18,7 @@

:

-
+

diff --git a/plugins/markasjunk/drivers/edit_headers.php b/plugins/markasjunk/drivers/edit_headers.php index f3c11baad6d..83980fcc719 100644 --- a/plugins/markasjunk/drivers/edit_headers.php +++ b/plugins/markasjunk/drivers/edit_headers.php @@ -57,7 +57,7 @@ private function _edit_headers(&$uids, $spam, $dst_mbox) $saved = $rcube->storage->save_message($dst_mbox, $raw_message); if ($saved !== false) { - $rcube->output->command('markasjunk_move', null, [$uid]); + $rcube->output->add_js_call('markasjunk_move', null, [$uid]); $new_uids[] = $saved; } } diff --git a/plugins/markasjunk/drivers/jsevent.php b/plugins/markasjunk/drivers/jsevent.php index 56e0e340b53..dc9b2734764 100644 --- a/plugins/markasjunk/drivers/jsevent.php +++ b/plugins/markasjunk/drivers/jsevent.php @@ -42,38 +42,7 @@ public function init() return; } - $js_addition_spam_folders = json_encode($this->addition_spam_folders); - $js_suspicious_folders = json_encode($this->suspicious_folders); - - $script = << -1) { - props.disp.spam = false; - props.disp.ham = true; - } - else if ($.inArray(rcmail.env.mailbox, suspicious_folders) > -1) { - props.disp.spam = true; - props.disp.ham = true; - - // from here it is also possible to alter the buttons themselves... - props.objs.spamobj.find('a > span').text('As possibly spam'); - } - else { - props.objs.spamobj.find('a > span').text(rcmail.get_label('markasjunk.markasjunk')); - } - - return props; - }); - EOL; - - $rcmail->output->add_script($script, 'docready'); + $rcmail->output->add_js_call('markasjunk_init', $this->addition_spam_folders, $this->suspicious_folders); } public function spam(&$uids, $mbox) diff --git a/plugins/markasjunk/drivers/sa_detach.php b/plugins/markasjunk/drivers/sa_detach.php index b9d41de3804..b0753d692ef 100644 --- a/plugins/markasjunk/drivers/sa_detach.php +++ b/plugins/markasjunk/drivers/sa_detach.php @@ -51,7 +51,7 @@ public function ham(&$uids, $src_mbox, $dst_mbox) $orig_message_raw = $message->get_part_body($part->mime_id); if ($saved = $storage->save_message($dst_mbox, $orig_message_raw)) { - $rcube->output->command('markasjunk_move', null, [$uid]); + $rcube->output->add_js_call('markasjunk_move', null, [$uid]); $new_uids[] = $saved; } } diff --git a/plugins/markasjunk/markasjunk.js b/plugins/markasjunk/markasjunk.js index f295bbc12c7..a72aa7c0623 100644 --- a/plugins/markasjunk/markasjunk.js +++ b/plugins/markasjunk/markasjunk.js @@ -95,6 +95,32 @@ rcube_webmail.prototype.markasjunk_is_spam_mbox = function () { return !this.is_multifolder_listing() && this.env.mailbox == this.env.markasjunk_spam_mailbox; }; +rcube_webmail.prototype.markasjunk_init = function (addition_spam_folders, suspicious_folders) { + rcmail.addEventListener('markasjunk-update', function (props) { + // ignore this special code when in a multifolder listing + if (rcmail.is_multifolder_listing()) { + return; + } + + if ($.inArray(rcmail.env.mailbox, addition_spam_folders) > -1) { + props.disp.spam = false; + props.disp.ham = true; + } + else if ($.inArray(rcmail.env.mailbox, suspicious_folders) > -1) { + props.disp.spam = true; + props.disp.ham = true; + + // from here it is also possible to alter the buttons themselves... + props.objs.spamobj.find('a > span').text('As possibly spam'); + } + else { + props.objs.spamobj.find('a > span').text(rcmail.get_label('markasjunk.markasjunk')); + } + + return props; + }); +}; + if (window.rcmail) { rcmail.addEventListener('init', function () { // register command (directly enable in message view mode) diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php index 7b2fde06dea..7fc27bcc268 100644 --- a/plugins/markasjunk/markasjunk.php +++ b/plugins/markasjunk/markasjunk.php @@ -153,12 +153,12 @@ public function mark_message() $result = $is_spam ? $this->_spam($messageset, $dest_mbox) : $this->_ham($messageset, $dest_mbox); if ($result) { if ($dest_mbox && ($mbox_name !== $dest_mbox || $multifolder)) { - $this->rcube->output->command('markasjunk_move', $dest_mbox, $this->_messageset_to_uids($messageset, $multifolder)); + $this->rcube->output->add_js_call('markasjunk_move', $dest_mbox, $this->_messageset_to_uids($messageset, $multifolder)); } else { - $this->rcube->output->command('command', 'list', $mbox_name); + $this->rcube->output->add_js_call('command', 'list', $mbox_name); } - $this->rcube->output->command('display_message', $this->gettext($is_spam ? 'reportedasjunk' : 'reportedasnotjunk'), 'confirmation'); + $this->rcube->output->add_js_call('display_message', $this->gettext($is_spam ? 'reportedasjunk' : 'reportedasnotjunk'), 'confirmation'); } $this->rcube->output->send(); diff --git a/plugins/new_user_dialog/new_user_dialog.js b/plugins/new_user_dialog/new_user_dialog.js new file mode 100644 index 00000000000..2df1e6eb8fa --- /dev/null +++ b/plugins/new_user_dialog/new_user_dialog.js @@ -0,0 +1,31 @@ +rcube_webmail.prototype.new_user_dialog_open = function (title) { + window.newuserdialog = rcmail.show_popup_dialog($('#newuserdialog'), title, [{ + text: rcmail.get_label('save'), + class: 'mainaction save', + click: function () { + var request = {}; + $.each($('form', this).serializeArray(), function () { + request[this.name] = this.value; + }); + + rcmail.http_post('plugin.newusersave', request, true); + return false; + }, + }], + { + resizable: false, + closeOnEscape: false, + width: 500, + open: function () { $('#newuserdialog').show(); $('#newuserdialog-name').focus(); }, + beforeClose: function () { + return false; + }, + } + ); +}; + +rcube_webmail.prototype.new_user_dialog_close = function (title) { + if (window.newuserdialog) { + window.newuserdialog.dialog('destroy'); + } +}; diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php index 512ea617dc3..9f591d29df0 100644 --- a/plugins/new_user_dialog/new_user_dialog.php +++ b/plugins/new_user_dialog/new_user_dialog.php @@ -104,34 +104,8 @@ public function render_page($p) )); $title = rcube::JQ($this->gettext('identitydialogtitle')); - $script = " -var newuserdialog = rcmail.show_popup_dialog($('#newuserdialog'), '{$title}', [{ - text: rcmail.get_label('save'), - 'class': 'mainaction save', - click: function() { - var request = {}; - $.each($('form', this).serializeArray(), function() { - request[this.name] = this.value; - }); - - rcmail.http_post('plugin.newusersave', request, true); - return false; - } - }], - { - resizable: false, - closeOnEscape: false, - width: 500, - open: function() { $('#newuserdialog').show(); $('#newuserdialog-name').focus(); }, - beforeClose: function() { - return false; - } - } -); -rcube_webmail.prototype.new_user_dialog_close = function() { newuserdialog.dialog('destroy'); }; -"; - // disable keyboard events for messages list (#1486726) - $rcmail->output->add_script($script, 'docready'); + $rcmail->output->add_js_call('new_user_dialog_open', $title); + $this->include_script('new_user_dialog.js'); } } @@ -187,7 +161,7 @@ public function save_data() // save prefs to not show dialog again $rcmail->user->save_prefs(['newuserdialog' => null]); // hide dialog - $rcmail->output->command('new_user_dialog_close'); + $rcmail->output->add_js_call('new_user_dialog_close'); $rcmail->output->show_message('successfullysaved', 'confirmation'); } else { // show error diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index f8e1edd52c0..f22f40d7399 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -18,8 +18,7 @@ */ if (window.rcmail && rcmail.env.task == 'mail') { - rcmail.addEventListener('plugin.newmail_notifier', newmail_notifier_run) - .addEventListener('actionbefore', newmail_notifier_stop) + rcmail.addEventListener('actionbefore', newmail_notifier_stop) .addEventListener('init', function () { // bind to messages list select event, so favicon will be reverted on message preview too if (rcmail.message_list) { @@ -29,7 +28,7 @@ if (window.rcmail && rcmail.env.task == 'mail') { } // Executes notification methods -function newmail_notifier_run(prop) { +rcube_webmail.prototype.newmail_notifier_run = function (prop) { if (prop.basic) { newmail_notifier_basic(); } @@ -39,7 +38,7 @@ function newmail_notifier_run(prop) { if (prop.desktop) { newmail_notifier_desktop(rcmail.get_label('body', 'newmail_notifier')); } -} +}; // Stops notification function newmail_notifier_stop(prop) { @@ -133,7 +132,7 @@ function newmail_notifier_desktop(body, disabled_callback) { } } -function newmail_notifier_test_desktop() { +rcube_webmail.prototype.newmail_notifier_test_desktop = function () { var status = newmail_notifier_desktop(rcmail.get_label('testbody', 'newmail_notifier'), function () { rcmail.display_message(rcmail.get_label('desktopdisabled', 'newmail_notifier'), 'error'); }); @@ -141,12 +140,8 @@ function newmail_notifier_test_desktop() { if (!status) { rcmail.display_message(rcmail.get_label('desktopunsupported', 'newmail_notifier'), 'error'); } -} +}; -function newmail_notifier_test_basic() { - newmail_notifier_basic(); -} +rcube_webmail.prototype.newmail_notifier_test_basic = newmail_notifier_basic; -function newmail_notifier_test_sound() { - newmail_notifier_sound(); -} +rcube_webmail.prototype.newmail_notifier_test_sound = newmail_notifier_sound; diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php index cccf0fe207f..a51457e0df6 100644 --- a/plugins/newmail_notifier/newmail_notifier.php +++ b/plugins/newmail_notifier/newmail_notifier.php @@ -111,7 +111,7 @@ public function prefs_list($args) $field_id = '_' . $key; $input = new html_checkbox(['name' => $field_id, 'id' => $field_id, 'value' => 1]); $content = $input->show($this->rc->config->get($key)) - . ' ' . html::a(['href' => '#', 'onclick' => 'newmail_notifier_test_' . $type . '(); return false'], + . ' ' . html::a(['href' => '#', 'data-onclick' => ['newmail_notifier_test_' . $type, ['preventDefault' => true]]], $this->gettext('test')); $args['blocks']['new_message']['options'][$key] = [ @@ -204,7 +204,7 @@ public function notify($args) $this->notified = true; $this->rc->output->set_env('newmail_notifier_timeout', $this->rc->config->get('newmail_notifier_desktop_timeout')); - $this->rc->output->command('plugin.newmail_notifier', + $this->rc->output->add_js_call('newmail_notifier_run', [ 'basic' => $this->opt['basic'], 'sound' => $this->opt['sound'], diff --git a/plugins/password/password.php b/plugins/password/password.php index 288430f9751..e370fb434a4 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -81,7 +81,7 @@ public function init() if ($this->rc->config->get('password_force_new_user')) { if ($this->rc->config->get('newuserpassword') && $this->check_host_login_exceptions()) { if (!($this->rc->task == 'settings' && strpos($this->rc->action, 'plugin.password') === 0)) { - $this->rc->output->command('redirect', '?_task=settings&_action=plugin.password&_first=1', false); + $this->rc->output->add_js_call('redirect', '?_task=settings&_action=plugin.password&_first=1', false); } } @@ -111,12 +111,12 @@ public function password_init() $this->rc->output->set_pagetitle($this->gettext('changepasswd')); if (rcube_utils::get_input_value('_first', rcube_utils::INPUT_GET)) { - $this->rc->output->command('display_message', $this->gettext('firstloginchange'), 'notice'); + $this->rc->output->add_js_call('display_message', $this->gettext('firstloginchange'), 'notice'); } elseif (!empty($_SESSION['password_expires'])) { if ($_SESSION['password_expires'] == 1) { - $this->rc->output->command('display_message', $this->gettext('passwdexpired'), 'error'); + $this->rc->output->add_js_call('display_message', $this->gettext('passwdexpired'), 'error'); } else { - $this->rc->output->command('display_message', $this->gettext([ + $this->rc->output->add_js_call('display_message', $this->gettext([ 'name' => 'passwdexpirewarning', 'vars' => ['expirationdatetime' => $_SESSION['password_expires']], ]), 'warning'); @@ -137,7 +137,7 @@ public function password_save() $force_save = $this->rc->config->get('password_force_save'); if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']) || !strlen($_POST['_newpasswd'])) { - $this->rc->output->command('display_message', $this->gettext('nopassword'), 'error'); + $this->rc->output->add_js_call('display_message', $this->gettext('nopassword'), 'error'); } else { $charset = strtoupper($this->rc->config->get('password_charset', 'UTF-8')); $rc_charset = strtoupper($this->rc->output->get_charset()); @@ -158,26 +158,26 @@ public function password_save() $conpwd = rcube_charset::convert($conpwd, $rc_charset, $charset); if ($chk_pwd != $orig_pwd || preg_match('/[\x00-\x1F\x7F]/', $newpwd)) { - $this->rc->output->command('display_message', $this->gettext('passwordforbidden'), 'error'); + $this->rc->output->add_js_call('display_message', $this->gettext('passwordforbidden'), 'error'); } // other passwords validity checks elseif ($conpwd != $newpwd) { - $this->rc->output->command('display_message', $this->gettext('passwordinconsistency'), 'error'); + $this->rc->output->add_js_call('display_message', $this->gettext('passwordinconsistency'), 'error'); } elseif ($confirm && ($res = $this->_compare($sesspwd, $curpwd, PASSWORD_COMPARE_CURRENT))) { - $this->rc->output->command('display_message', $res, 'error'); + $this->rc->output->add_js_call('display_message', $res, 'error'); } elseif ($required_length && strlen($newpwd) < $required_length) { - $this->rc->output->command('display_message', $this->gettext( + $this->rc->output->add_js_call('display_message', $this->gettext( ['name' => 'passwordshort', 'vars' => ['length' => $required_length]]), 'error'); } elseif ($res = $this->_check_strength($newpwd)) { - $this->rc->output->command('display_message', $res, 'error'); + $this->rc->output->add_js_call('display_message', $res, 'error'); } // password is the same as the old one, warn user, return error elseif (!$force_save && ($res = $this->_compare($sesspwd, $newpwd, PASSWORD_COMPARE_NEW))) { - $this->rc->output->command('display_message', $res, 'error'); + $this->rc->output->add_js_call('display_message', $res, 'error'); } // try to save the password elseif (!($res = $this->_save($curpwd, $newpwd))) { - $this->rc->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation'); + $this->rc->output->add_js_call('display_message', $this->gettext('successfullysaved'), 'confirmation'); // allow additional actions after password change (e.g. reset some backends) $plugin = $this->rc->plugins->exec_hook('password_change', [ @@ -201,7 +201,7 @@ public function password_save() // Remove expiration date/time $this->rc->session->remove('password_expires'); } else { - $this->rc->output->command('display_message', $res, 'error'); + $this->rc->output->add_js_call('display_message', $res, 'error'); } } diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php index 973868d4b91..61e76e35925 100644 --- a/plugins/vcard_attachments/vcard_attachments.php +++ b/plugins/vcard_attachments/vcard_attachments.php @@ -127,10 +127,10 @@ public function message_objects($p) if (count($contacts) == 1) { $display = array_first($contacts); - $attr['onclick'] = "return plugin_vcard_import('" . rcube::JQ(key($contacts)) . "')"; + $attr['data-onclick'] = ['vcard_attachments_plugin_vcard_import', key($contacts), ['returnResult' => true]]; } else { $display = $this->gettext(['name' => 'contactsattached', 'vars' => ['num' => count($contacts)]]); - $attr['onclick'] = 'return plugin_vcard_import()'; + $attr['data-onclick'] = ['vcard_attachments_plugin_vcard_import', ['returnResult' => true]]; $rcmail->output->set_env('vcards', $contacts); $rcmail->output->add_label('vcard_attachments.addvcardmsg', 'import'); @@ -244,7 +244,7 @@ public function save_vcard() } if ($existing->count) { - // $rcmail->output->command('display_message', $this->gettext('contactexists'), 'warning'); + // $rcmail->output->add_js_call('display_message', $this->gettext('contactexists'), 'warning'); $valid = false; } } @@ -262,9 +262,9 @@ public function save_vcard() } if ($errors || empty($vcards)) { - $rcmail->output->command('display_message', $this->gettext('vcardsavefailed'), 'error'); + $rcmail->output->add_js_call('display_message', $this->gettext('vcardsavefailed'), 'error'); } else { - $rcmail->output->command('display_message', $this->gettext('importedsuccessfully'), 'confirmation'); + $rcmail->output->add_js_call('display_message', $this->gettext('importedsuccessfully'), 'confirmation'); } $rcmail->output->send(); diff --git a/plugins/vcard_attachments/vcardattach.js b/plugins/vcard_attachments/vcardattach.js index 58a5eba3372..8dff377038f 100644 --- a/plugins/vcard_attachments/vcardattach.js +++ b/plugins/vcard_attachments/vcardattach.js @@ -148,3 +148,5 @@ window.rcmail && rcmail.addEventListener('init', function (evt) { }); } }); + +rcube_webmail.prototype.vcard_attachments_plugin_vcard_import = plugin_vcard_import; diff --git a/program/actions/contacts/delete.php b/program/actions/contacts/delete.php index 3933e17555d..945e0af6574 100644 --- a/program/actions/contacts/delete.php +++ b/program/actions/contacts/delete.php @@ -46,7 +46,7 @@ public function run($args = []) // more than one source, some of these sources can be readonly if (count($cids) == 1) { $rcmail->output->show_message('contactdelerror', 'error'); - $rcmail->output->command('list_contacts'); + $rcmail->output->add_js_call('list_contacts'); $rcmail->output->send(); } @@ -73,7 +73,7 @@ public function run($args = []) $group = rcube_utils::get_input_string('_gid', rcube_utils::INPUT_GP); $rcmail->output->show_message($error, 'error'); - $rcmail->output->command('list_contacts', $source, $group); + $rcmail->output->add_js_call('list_contacts', $source, $group); $rcmail->output->send(); } else { $delcnt += $deleted; @@ -89,7 +89,7 @@ public function run($args = []) $_SESSION['contact_undo']['ts'] = time(); $msg = html::span(null, $rcmail->gettext('contactdeleted')) . ' ' . html::a( - ['onclick' => rcmail_output::JS_OBJECT_NAME . ".command('undo', '', this)"], + ['data-event-handle' => 'contacts_delete_undo'], $rcmail->gettext('undo') ); @@ -111,7 +111,7 @@ public function run($args = []) // last page and it's empty, display previous one if ($result->count && $result->count <= ($page_size * ($page - 1))) { - $rcmail->output->command('list_page', 'prev'); + $rcmail->output->add_js_call('list_page', 'prev'); $rowcount = $rcmail->gettext('loading'); } // get records from the next page to add to the list @@ -139,7 +139,7 @@ public function run($args = []) // last page and it's empty, display previous one if ($result->count && $result->count <= ($page_size * ($page - 1))) { - $rcmail->output->command('list_page', 'prev'); + $rcmail->output->add_js_call('list_page', 'prev'); $rowcount = $rcmail->gettext('loading'); } // get records from the next page to add to the list @@ -155,7 +155,7 @@ public function run($args = []) // update message count display $rcmail->output->set_env('pagecount', isset($result) ? ceil($result->count / $page_size) : 0); - $rcmail->output->command('set_rowcount', $rowcount); + $rcmail->output->add_js_call('set_rowcount', $rowcount); // add new rows from next page (if any) if (!empty($records)) { diff --git a/program/actions/contacts/group_create.php b/program/actions/contacts/group_create.php index 8a9ce5c9504..9bd9e7b7ba0 100644 --- a/program/actions/contacts/group_create.php +++ b/program/actions/contacts/group_create.php @@ -54,7 +54,7 @@ public function run($args = []) if (!empty($created)) { $rcmail->output->show_message('groupcreated', 'confirmation'); - $rcmail->output->command('insert_contact_group', ['source' => $source] + $created); + $rcmail->output->add_js_call('insert_contact_group', ['source' => $source] + $created); } elseif (empty($created)) { $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; $rcmail->output->show_message($error, 'error'); diff --git a/program/actions/contacts/group_delete.php b/program/actions/contacts/group_delete.php index 3c13d78cf6e..c6e8dadfa52 100644 --- a/program/actions/contacts/group_delete.php +++ b/program/actions/contacts/group_delete.php @@ -54,7 +54,7 @@ public function run($args = []) if (!empty($deleted)) { $rcmail->output->show_message('groupdeleted', 'confirmation'); - $rcmail->output->command('remove_group_item', ['source' => $source, 'id' => $gid]); + $rcmail->output->add_js_call('remove_group_item', ['source' => $source, 'id' => $gid]); } else { $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; $rcmail->output->show_message($error, 'error'); diff --git a/program/actions/contacts/group_delmembers.php b/program/actions/contacts/group_delmembers.php index cdfe8502338..bf84fa2b96d 100644 --- a/program/actions/contacts/group_delmembers.php +++ b/program/actions/contacts/group_delmembers.php @@ -58,7 +58,7 @@ public function run($args = []) if (!empty($result)) { $rcmail->output->show_message('contactremovedfromgroup', 'confirmation'); - $rcmail->output->command('remove_group_contacts', ['source' => $source, 'gid' => $gid]); + $rcmail->output->add_js_call('remove_group_contacts', ['source' => $source, 'gid' => $gid]); } else { $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; $rcmail->output->show_message($error, 'error'); diff --git a/program/actions/contacts/group_rename.php b/program/actions/contacts/group_rename.php index e26e173a612..4a6cc7956df 100644 --- a/program/actions/contacts/group_rename.php +++ b/program/actions/contacts/group_rename.php @@ -59,7 +59,7 @@ public function run($args = []) if (!empty($newname)) { $rcmail->output->show_message('grouprenamed', 'confirmation'); - $rcmail->output->command('update_contact_group', [ + $rcmail->output->add_js_call('update_contact_group', [ 'source' => $source, 'id' => $gid, 'name' => $newname, diff --git a/program/actions/contacts/import.php b/program/actions/contacts/import.php index 42de7046598..89149f25665 100644 --- a/program/actions/contacts/import.php +++ b/program/actions/contacts/import.php @@ -152,7 +152,7 @@ public function run($args = []) $_SESSION['contactcsvimport']['map'] = $map; // Re-enable the import button - $rcmail->output->command('parent.import_state_set', 'error'); + $rcmail->output->add_js_call('parent.import_state_set', 'error'); } elseif (count($vcards) > 0) { // import vcards self::$stats = new stdClass(); @@ -246,7 +246,7 @@ public function run($args = []) $importstep = 'import_confirm'; $_SESSION['contactcsvimport'] = null; - $rcmail->output->command('parent.import_state_set', self::$stats->inserted ? 'reload' : 'ok'); + $rcmail->output->add_js_call('parent.import_state_set', self::$stats->inserted ? 'reload' : 'ok'); } else { if ($upload_error == self::UPLOAD_ERR_CSV_FIELDS) { $rcmail->output->show_message('csvfilemismatch', 'error'); @@ -254,7 +254,7 @@ public function run($args = []) self::upload_error($upload_error); } - $rcmail->output->command('parent.import_state_set', 'error'); + $rcmail->output->add_js_call('parent.import_state_set', 'error'); } } diff --git a/program/actions/contacts/index.php b/program/actions/contacts/index.php index d3851194591..3ce6583b283 100644 --- a/program/actions/contacts/index.php +++ b/program/actions/contacts/index.php @@ -453,7 +453,8 @@ public static function directory_list($attrib) [ 'href' => '%s', 'rel' => '%s', - 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('list','%s',this)", + 'data-event-handle' => 'contacts_directory_list', + 'data-arg' => '%s', ], '%s' ) @@ -527,7 +528,8 @@ public static function savedsearch_list($attrib) html::a([ 'href' => '#', 'rel' => 'S%s', - 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('listsearch', '%s', this)", + 'data-event-handle' => 'contacts_listsearch', + 'data-arg' => '%s', ], '%s' ) @@ -571,7 +573,8 @@ public static function contact_groups($args) html::a([ 'href' => '#', 'rel' => '%s:%s', - 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('listgroup',{'source':'%s','id':'%s'},this)", + 'data-event-handle' => 'contacts_listgroup', + 'data-arg' => '%s', ], '%s' ) @@ -673,12 +676,9 @@ public static function js_contacts_list($result, $prefix = '') 'href' => '#list', 'rel' => $row['ID'], 'title' => $rcmail->gettext('listgroup'), - 'onclick' => sprintf( - "return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", - rcmail_output::JS_OBJECT_NAME, - $source_id, - $row['CID'] - ), + 'data-source' => $source_id, + 'data-id' => $row['CID'], + 'data-event-handle' => 'contacts_pushgroup', 'class' => 'pushgroup', 'data-action-link' => true, ], @@ -703,7 +703,7 @@ public static function js_contacts_list($result, $prefix = '') $classes[] = 'readonly'; } - $rcmail->output->command($prefix . 'add_contact_row', $row['ID'], $a_row_cols, implode(' ', $classes), + $rcmail->output->add_js_call($prefix . 'add_contact_row', $row['ID'], $a_row_cols, implode(' ', $classes), array_intersect_key($row, ['ID' => 1, 'readonly' => 1, '_type' => 1, 'email' => 1, 'name' => 1]) ); } @@ -1335,7 +1335,7 @@ public static function contact_photo($attrib) $content = html::div($attrib, html::img([ 'src' => $photo_img, - 'onerror' => 'this.onerror = null; this.src = rcmail.env.photo_placeholder;', + 'data-onerror' => ['onerror_set_placeholder_src', '__EVENT__'], ])); if (!empty(self::$CONTACT_COLTYPES['photo']) && ($rcmail->action == 'edit' || $rcmail->action == 'add')) { @@ -1482,7 +1482,7 @@ public static function source_selector($attrib) $attrib['name'] = '_source'; $attrib['is_escaped'] = true; - $attrib['onchange'] = rcmail_output::JS_OBJECT_NAME . ".command('save', 'reload', this.form)"; + $attrib['data-onchange'] = ['reloadForm', '__THIS__']; $select = new html_select($attrib); diff --git a/program/actions/contacts/list.php b/program/actions/contacts/list.php index fbf91985be3..62f078306e5 100644 --- a/program/actions/contacts/list.php +++ b/program/actions/contacts/list.php @@ -79,11 +79,11 @@ public function run($args = []) } } - $rcmail->output->command('set_group_prop', $group_data); + $rcmail->output->add_js_call('set_group_prop', $group_data); // update message count display $rcmail->output->set_env('pagecount', ceil($result->count / $page_size)); - $rcmail->output->command('set_rowcount', self::get_rowcount_text($result)); + $rcmail->output->add_js_call('set_rowcount', self::get_rowcount_text($result)); // create javascript list self::js_contacts_list($result); diff --git a/program/actions/contacts/mailto.php b/program/actions/contacts/mailto.php index fab4b024703..9d3d2840aeb 100644 --- a/program/actions/contacts/mailto.php +++ b/program/actions/contacts/mailto.php @@ -79,7 +79,7 @@ public function run($args = []) $mailto_str = implode(', ', $mailto); $mailto_id = substr(md5($mailto_str), 0, 16); $_SESSION['mailto'][$mailto_id] = urlencode($mailto_str); - $rcmail->output->command('open_compose_step', ['_mailto' => $mailto_id]); + $rcmail->output->add_js_call('open_compose_step', ['_mailto' => $mailto_id]); } else { $rcmail->output->show_message('nocontactsfound', 'warning'); } diff --git a/program/actions/contacts/move.php b/program/actions/contacts/move.php index 0649d94b409..7a96c692099 100644 --- a/program/actions/contacts/move.php +++ b/program/actions/contacts/move.php @@ -159,7 +159,7 @@ public function run($args = []) } if (!$deleted || $deleted != $all) { - $rcmail->output->command('list_contacts'); + $rcmail->output->add_js_call('list_contacts'); } else { // update saved search after data changed if (($records = self::search_update(true)) !== false) { @@ -171,7 +171,7 @@ public function run($args = []) // last page and it's empty, display previous one if ($result->count && $result->count <= ($page_size * ($page - 1))) { - $rcmail->output->command('list_page', 'prev'); + $rcmail->output->add_js_call('list_page', 'prev'); $rowcount = $rcmail->gettext('loading'); } // get records from the next page to add to the list @@ -199,7 +199,7 @@ public function run($args = []) // last page and it's empty, display previous one if ($result->count && $result->count <= ($page_size * ($page - 1))) { - $rcmail->output->command('list_page', 'prev'); + $rcmail->output->add_js_call('list_page', 'prev'); $rowcount = $rcmail->gettext('loading'); } // get records from the next page to add to the list @@ -215,7 +215,7 @@ public function run($args = []) // update message count display $rcmail->output->set_env('pagecount', isset($result) ? ceil($result->count / $page_size) : 0); - $rcmail->output->command('set_rowcount', $rowcount); + $rcmail->output->add_js_call('set_rowcount', $rowcount); // add new rows from next page (if any) if (!empty($records)) { diff --git a/program/actions/contacts/save.php b/program/actions/contacts/save.php index cf4bd237780..dcd5f31a85c 100644 --- a/program/actions/contacts/save.php +++ b/program/actions/contacts/save.php @@ -95,7 +95,7 @@ public function run($args = []) // in search mode, just reload the list (#1490015) if (!empty($_REQUEST['_search'])) { - $rcmail->output->command('parent.command', 'list'); + $rcmail->output->add_js_call('parent.command', 'list'); $rcmail->output->send('iframe'); } @@ -114,7 +114,7 @@ public function run($args = []) // Plugins can decide to remove the contact on edit, e.g. automatic_addressbook // Best we can do is to refresh the list (#5522) if (empty($contact)) { - $rcmail->output->command('parent.command', 'list'); + $rcmail->output->add_js_call('parent.command', 'list'); $rcmail->output->send('iframe'); } @@ -133,7 +133,7 @@ public function run($args = []) $record['_type'] = 'person'; // update the changed col in list - $rcmail->output->command('parent.update_contact_row', $cid, $a_js_cols, $newcid, $source, $record); + $rcmail->output->add_js_call('parent.update_contact_row', $cid, $a_js_cols, $newcid, $source, $record); $rcmail->overwrite_action('show', ['contact' => $contact]); } else { @@ -193,7 +193,7 @@ public function run($args = []) if (($maxnum = $rcmail->config->get('max_group_members', 0)) && ($contacts->count()->count + 1 > $maxnum)) { // @FIXME: should we remove the contact? $msgtext = $rcmail->gettext(['name' => 'maxgroupmembersreached', 'vars' => ['max' => $maxnum]]); - $rcmail->output->command('parent.display_message', $msgtext, 'warning'); + $rcmail->output->add_js_call('parent.display_message', $msgtext, 'warning'); } else { $contacts->add_to_group($plugin['group_id'], $plugin['ids']); } @@ -203,8 +203,8 @@ public function run($args = []) // show confirmation $rcmail->output->show_message('successfullysaved', 'confirmation', null, false); - $rcmail->output->command('parent.set_rowcount', $rcmail->gettext('loading')); - $rcmail->output->command('parent.list_contacts'); + $rcmail->output->add_js_call('parent.set_rowcount', $rcmail->gettext('loading')); + $rcmail->output->add_js_call('parent.list_contacts'); $rcmail->output->send('iframe'); } else { diff --git a/program/actions/contacts/search.php b/program/actions/contacts/search.php index 92be7acd4ad..d35b7b1cdb9 100644 --- a/program/actions/contacts/search.php +++ b/program/actions/contacts/search.php @@ -171,7 +171,7 @@ public static function contact_search() $_SESSION['page'] = 1; if ($adv) { - $rcmail->output->command('list_contacts_clear'); + $rcmail->output->add_js_call('list_contacts_clear'); } if ($result->count > 0) { @@ -185,22 +185,22 @@ public static function contact_search() // update message count display $rcmail->output->set_env('search_request', $search_request); $rcmail->output->set_env('pagecount', ceil($result->count / $page_size)); - $rcmail->output->command('set_rowcount', self::get_rowcount_text($result)); + $rcmail->output->add_js_call('set_rowcount', self::get_rowcount_text($result)); // Re-set current source $rcmail->output->set_env('search_id', $sid); $rcmail->output->set_env('source', ''); $rcmail->output->set_env('group', ''); // Re-set list header - $rcmail->output->command('set_group_prop', null); + $rcmail->output->add_js_call('set_group_prop', null); if (!$sid) { // unselect currently selected directory/group - $rcmail->output->command('unselect_directory'); + $rcmail->output->add_js_call('unselect_directory'); // enable "Save search" command - $rcmail->output->command('enable_command', 'search-create', true); + $rcmail->output->add_js_call('enable_command', 'search-create', true); } - $rcmail->output->command('update_group_commands'); + $rcmail->output->add_js_call('update_group_commands'); // send response $rcmail->output->send(); diff --git a/program/actions/contacts/search_create.php b/program/actions/contacts/search_create.php index 8a3a12973c6..6b6f9f4e0b8 100644 --- a/program/actions/contacts/search_create.php +++ b/program/actions/contacts/search_create.php @@ -61,7 +61,7 @@ public function run($args = []) if (!empty($result)) { $rcmail->output->show_message('savedsearchcreated', 'confirmation'); - $rcmail->output->command('insert_saved_search', rcube::Q($name), rcube::Q($result)); + $rcmail->output->add_js_call('insert_saved_search', rcube::Q($name), rcube::Q($result)); } else { $error = !empty($plugin['message']) ? $plugin['message'] : 'savedsearchcreateerror'; $rcmail->output->show_message($error, 'error'); diff --git a/program/actions/contacts/search_delete.php b/program/actions/contacts/search_delete.php index 468ed6c085c..cbaa2519b60 100644 --- a/program/actions/contacts/search_delete.php +++ b/program/actions/contacts/search_delete.php @@ -48,9 +48,9 @@ public function run($args = []) if ($result) { $rcmail->output->show_message('savedsearchdeleted', 'confirmation'); - $rcmail->output->command('remove_search_item', rcube::Q($id)); + $rcmail->output->add_js_call('remove_search_item', rcube::Q($id)); // contact list will be cleared, clear also page counter - $rcmail->output->command('set_rowcount', $rcmail->gettext('nocontactsfound')); + $rcmail->output->add_js_call('set_rowcount', $rcmail->gettext('nocontactsfound')); $rcmail->output->set_env('pagecount', 0); } else { $error = !empty($plugin['message']) ? $plugin['message'] : 'savedsearchdeleteerror'; diff --git a/program/actions/contacts/show.php b/program/actions/contacts/show.php index d875d19d08f..f2a501ee683 100644 --- a/program/actions/contacts/show.php +++ b/program/actions/contacts/show.php @@ -165,11 +165,8 @@ public static function render_email_value($email) return html::a([ 'href' => 'mailto:' . $email, - 'onclick' => sprintf( - "return %s.command('compose','%s',this)", - rcmail_output::JS_OBJECT_NAME, - rcube::JQ($email) - ), + 'data-email' => $email, + 'data-event-handle' => 'contacts_compose', 'title' => $rcmail->gettext('composeto'), 'class' => 'email', ], diff --git a/program/actions/contacts/undo.php b/program/actions/contacts/undo.php index 787688b69de..607e8a2a6b3 100644 --- a/program/actions/contacts/undo.php +++ b/program/actions/contacts/undo.php @@ -47,7 +47,7 @@ public function run($args = []) $error = !empty($plugin['message']) ? $plugin['message'] : 'contactrestoreerror'; $rcmail->output->show_message($error, 'error'); - $rcmail->output->command('list_contacts'); + $rcmail->output->add_js_call('list_contacts'); $rcmail->output->send(); } else { $delcnt += $restored; @@ -59,7 +59,7 @@ public function run($args = []) if ($delcnt) { $rcmail->output->show_message('contactrestored', 'confirmation'); - $rcmail->output->command('list_contacts'); + $rcmail->output->add_js_call('list_contacts'); } // send response diff --git a/program/actions/contacts/upload_photo.php b/program/actions/contacts/upload_photo.php index 290f235d86b..552e13fee9b 100644 --- a/program/actions/contacts/upload_photo.php +++ b/program/actions/contacts/upload_photo.php @@ -78,7 +78,7 @@ public function run($args = []) } if ($inserted) { - $rcmail->output->command('replace_contact_photo', $attachment['id']); + $rcmail->output->add_js_call('replace_contact_photo', $attachment['id']); } else { // upload failed self::upload_error($_FILES['_photo']['error'], $attachment); @@ -87,7 +87,7 @@ public function run($args = []) self::upload_failure(); } - $rcmail->output->command('photo_upload_end'); + $rcmail->output->add_js_call('photo_upload_end'); $rcmail->output->send('iframe'); } } diff --git a/program/actions/mail/addcontact.php b/program/actions/mail/addcontact.php index 89e79f4939b..1b185cfe9ea 100644 --- a/program/actions/mail/addcontact.php +++ b/program/actions/mail/addcontact.php @@ -87,7 +87,7 @@ public function run($args = []) $rcmail->output->show_message('addedsuccessfully', 'confirmation'); if (!empty($_POST['_reload'])) { - $rcmail->output->command('command', 'load-remote'); + $rcmail->output->add_js_call('command', 'load-remote'); } } else { $rcmail->output->show_message($error ?: 'errorsavingcontact', 'error', null, false); diff --git a/program/actions/mail/attachment_delete.php b/program/actions/mail/attachment_delete.php index 5bcbada41f5..3c89ae717c4 100644 --- a/program/actions/mail/attachment_delete.php +++ b/program/actions/mail/attachment_delete.php @@ -35,7 +35,7 @@ public function run($args = []) $rcmail = rcmail::get_instance(); if ($rcmail->delete_uploaded_file(self::$file_id)) { - $rcmail->output->command('remove_from_attachment_list', 'rcmfile' . self::$file_id); + $rcmail->output->add_js_call('remove_from_attachment_list', 'rcmfile' . self::$file_id); } $rcmail->output->send(); diff --git a/program/actions/mail/attachment_rename.php b/program/actions/mail/attachment_rename.php index c1ea08437db..58380fad0c2 100644 --- a/program/actions/mail/attachment_rename.php +++ b/program/actions/mail/attachment_rename.php @@ -38,7 +38,7 @@ public function run($args = []) $filename = trim($filename); if (strlen($filename) && $rcmail->update_uploaded_file(self::$file_id, ['name' => $filename])) { - $rcmail->output->command('rename_attachment_handler', 'rcmfile' . self::$file_id, $filename); + $rcmail->output->add_js_call('rename_attachment_handler', 'rcmfile' . self::$file_id, $filename); } $rcmail->output->send(); diff --git a/program/actions/mail/attachment_upload.php b/program/actions/mail/attachment_upload.php index 3177c61e8be..f8268708728 100644 --- a/program/actions/mail/attachment_upload.php +++ b/program/actions/mail/attachment_upload.php @@ -86,8 +86,8 @@ public function run($args = []) if ($plugin['attachment']) { self::attachment_success($plugin['attachment'], $uploadid); } else { - $rcmail->output->command('display_message', $rcmail->gettext('filelinkerror'), 'error'); - $rcmail->output->command('remove_from_attachment_list', $uploadid); + $rcmail->output->add_js_call('display_message', $rcmail->gettext('filelinkerror'), 'error'); + $rcmail->output->add_js_call('remove_from_attachment_list', $uploadid); } $rcmail->output->send(); @@ -110,8 +110,8 @@ public function run($args = []) if ($err = self::check_message_size($filesize, $filetype)) { if (!in_array($err, $errors)) { - $rcmail->output->command('display_message', $err, 'error'); - $rcmail->output->command('remove_from_attachment_list', $uploadid); + $rcmail->output->add_js_call('display_message', $err, 'error'); + $rcmail->output->add_js_call('remove_from_attachment_list', $uploadid); $errors[] = $err; } @@ -143,19 +143,19 @@ public function run($args = []) if (!empty($attachment['error']) || $err != \UPLOAD_ERR_NO_FILE) { if (!in_array($msg, $errors)) { - $rcmail->output->command('display_message', $msg, 'error'); - $rcmail->output->command('remove_from_attachment_list', $uploadid); + $rcmail->output->add_js_call('display_message', $msg, 'error'); + $rcmail->output->add_js_call('remove_from_attachment_list', $uploadid); $errors[] = $msg; } } } } } elseif (self::upload_failure()) { - $rcmail->output->command('remove_from_attachment_list', $uploadid); + $rcmail->output->add_js_call('remove_from_attachment_list', $uploadid); } // send html page with JS calls as response - $rcmail->output->command('auto_save_start', false); + $rcmail->output->add_js_call('auto_save_start', false); $rcmail->output->send('iframe'); } @@ -201,20 +201,14 @@ public static function attachment_success($attachment, $uploadid) $content_link = html::a([ 'href' => '#load', 'class' => 'filename', - 'onclick' => sprintf( - "return %s.command('load-attachment','rcmfile%s', this, event)", - rcmail_output::JS_OBJECT_NAME, - $id - ), + 'data-mime-id' => "rcmfile{$id}", + 'data-event-handle' => 'mail_load_attachment_with_event', ], $link_content); $delete_link = html::a([ 'href' => '#delete', - 'onclick' => sprintf( - "return %s.command('remove-attachment','rcmfile%s', this, event)", - rcmail_output::JS_OBJECT_NAME, - $id - ), + 'data-mime-id' => "rcmfile{$id}", + 'data-event-handle' => 'mail_remove_attachment', 'title' => $rcmail->gettext('delete'), 'class' => 'delete', 'aria-label' => $rcmail->gettext('delete') . ' ' . $attachment['name'], @@ -226,7 +220,7 @@ public static function attachment_success($attachment, $uploadid) $content = $content_link . $delete_link; } - $rcmail->output->command('add2attachment_list', "rcmfile{$id}", [ + $rcmail->output->add_js_call('add2attachment_list', "rcmfile{$id}", [ 'html' => $content, 'name' => $attachment['name'], 'mimetype' => $attachment['mimetype'], diff --git a/program/actions/mail/autocomplete.php b/program/actions/mail/autocomplete.php index 10e06a09c49..459b9c554f2 100644 --- a/program/actions/mail/autocomplete.php +++ b/program/actions/mail/autocomplete.php @@ -181,7 +181,7 @@ public function run($args = []) $contacts = $plugin['contacts']; - $rcmail->output->command('ksearch_query_results', $contacts, $search, $reqid); + $rcmail->output->add_js_call('ksearch_query_results', $contacts, $search, $reqid); $rcmail->output->send(); } diff --git a/program/actions/mail/check_recent.php b/program/actions/mail/check_recent.php index b1cef31122b..b7e4005a33a 100644 --- a/program/actions/mail/check_recent.php +++ b/program/actions/mail/check_recent.php @@ -112,7 +112,7 @@ public function run($args = []) } if (!empty($_POST['_quota'])) { - $rcmail->output->command('set_quota', self::quota_content(null, $mbox_name)); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $mbox_name)); } $rcmail->output->set_env('exists', $rcmail->storage->count($mbox_name, 'EXISTS', true)); @@ -139,18 +139,18 @@ public function run($args = []) $rcmail->output->set_env('messagecount', $all_count); $rcmail->output->set_env('pagecount', ceil($all_count / $page_size)); - $rcmail->output->command('set_rowcount', self::get_messagecount_text($all_count), $mbox_name); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text($all_count), $mbox_name); $rcmail->output->set_env('current_page', $all_count ? $page : 1); // remove old rows (and clear selection if new list is empty) - $rcmail->output->command('message_list.clear', $all_count ? false : true); + $rcmail->output->add_js_call('message_list_clear', $all_count ? false : true); if ($all_count) { $a_headers = $rcmail->storage->list_messages($mbox_name, null, self::sort_column(), self::sort_order()); // add message rows self::js_message_list($a_headers, false); // remove messages that don't exists from list selection array - $rcmail->output->command('update_selection'); + $rcmail->output->add_js_call('update_selection'); } $list_cleared = true; @@ -158,7 +158,7 @@ public function run($args = []) // set trash folder state if ($mbox_name === $trash) { - $rcmail->output->command('set_trash_count', $rcmail->storage->count($mbox_name, 'EXISTS', true)); + $rcmail->output->add_js_call('set_trash_count', $rcmail->storage->count($mbox_name, 'EXISTS', true)); } } diff --git a/program/actions/mail/compose.php b/program/actions/mail/compose.php index 900fc8161d1..41374d9651f 100644 --- a/program/actions/mail/compose.php +++ b/program/actions/mail/compose.php @@ -513,30 +513,19 @@ public static function spellchecker_init() // include GoogieSpell $rcmail->output->include_script('googiespell.js'); - $rcmail->output->add_script(sprintf( - "var googie = new GoogieSpell('%s/images/googiespell/','%s&lang=', %s);\n" . - "googie.lang_chck_spell = \"%s\";\n" . - "googie.lang_rsm_edt = \"%s\";\n" . - "googie.lang_close = \"%s\";\n" . - "googie.lang_revert = \"%s\";\n" . - "googie.lang_no_error_found = \"%s\";\n" . - "googie.lang_learn_word = \"%s\";\n" . - "googie.setLanguages(%s);\n" . - "googie.setCurrentLanguage('%s');\n" . - "googie.setDecoration(false);\n" . - "googie.decorateTextarea(rcmail.env.composebody);\n", - $rcmail->output->asset_url($rcmail->output->get_skin_path()), - $rcmail->url(['_task' => 'utils', '_action' => 'spell', '_remote' => 1]), - !empty($dictionary) ? 'true' : 'false', - rcube::JQ(rcube::Q($rcmail->gettext('checkspelling'))), - rcube::JQ(rcube::Q($rcmail->gettext('resumeediting'))), - rcube::JQ(rcube::Q($rcmail->gettext('close'))), - rcube::JQ(rcube::Q($rcmail->gettext('revertto'))), - rcube::JQ(rcube::Q($rcmail->gettext('nospellerrors'))), - rcube::JQ(rcube::Q($rcmail->gettext('addtodict'))), - rcube_output::json_serialize($spellcheck_langs), - $lang - ), 'foot'); + $rcmail->output->set_env('googiespell_conf', [ + 'asset_url' => $rcmail->output->asset_url($rcmail->output->get_skin_path()), + 'base_url' => $rcmail->url(['_task' => 'utils', '_action' => 'spell', '_remote' => 1]), + 'use_dict' => !empty($dictionary) ? 'true' : 'false', + 'lang_chck_spell' => $rcmail->gettext('checkspelling'), + 'lang_rsm_edt' => $rcmail->gettext('resumeediting'), + 'lang_close' => $rcmail->gettext('close'), + 'lang_revert' => $rcmail->gettext('revertto'), + 'lang_no_error_found' => $rcmail->gettext('nospellerrors'), + 'lang_learn_word' => $rcmail->gettext('addtodict'), + 'languages' => $spellcheck_langs, + 'currentLanguage' => $lang, + ]); $rcmail->output->add_label('checking'); $rcmail->output->set_env('spell_langs', $spellcheck_langs); @@ -1252,8 +1241,7 @@ public static function write_forward_attachments() 'name' => 'msgsizeerrorfwd', 'vars' => ['num' => $size_errors, 'size' => $limit], ]); - $script = sprintf("%s.display_message('%s', 'error');", rcmail_output::JS_OBJECT_NAME, rcube::JQ($error)); - $rcmail->output->add_script($script, 'docready'); + $rcmail->output->add_js_call('display_message', $error, 'error'); } } @@ -1381,7 +1369,7 @@ public static function compose_attachment_list($attrib) $id = $a_prop['id'] ?? $id; $link_content = sprintf( - '%s' + '%s' . ' (%s)', rcube::Q($a_prop['name']), self::show_bytes($a_prop['size']) @@ -1390,11 +1378,8 @@ public static function compose_attachment_list($attrib) $content_link = html::a([ 'href' => '#load', 'class' => 'filename', - 'onclick' => sprintf( - "return %s.command('load-attachment','rcmfile%s', this, event)", - rcmail_output::JS_OBJECT_NAME, - $id - ), + 'data-event-handle' => 'mail_load_attachment_with_event', + 'data-mime-id' => "rcmfile{$id}", 'tabindex' => !empty($attrib['tabindex']) ? $attrib['tabindex'] : '0', ], $link_content @@ -1403,11 +1388,8 @@ public static function compose_attachment_list($attrib) $delete_link = html::a([ 'href' => '#delete', 'title' => $rcmail->gettext('delete'), - 'onclick' => sprintf( - "return %s.command('remove-attachment','rcmfile%s', this, event)", - rcmail_output::JS_OBJECT_NAME, - $id - ), + 'data-event-handle' => 'mail_remove_attachment', + 'data-mime-id' => "rcmfile{$id}", 'class' => 'delete', 'tabindex' => !empty($attrib['tabindex']) ? $attrib['tabindex'] : '0', 'aria-label' => $rcmail->gettext('delete') . ' ' . $a_prop['name'], @@ -1498,7 +1480,7 @@ public static function editor_selector($attrib) $attrib['name'] = 'editorSelect'; } - $attrib['onchange'] = "return rcmail.command('toggle-editor', {id: '" . $attrib['editorid'] . "', html: this.value == 'html'}, '', event)"; + $attrib['data-event-handle'] = 'mail_toggle_html_editor_by_value'; $select = new html_select($attrib); @@ -1522,7 +1504,8 @@ public static function addressbook_list($attrib = []) html::a([ 'href' => '#list', 'rel' => '%s', - 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('list-addresses','%s',this)", + 'data-arg' => '%s', + 'data-event-handle' => 'mail_list_addresses', ], '%s' ) @@ -1593,11 +1576,8 @@ public static function compose_responses_list($attrib) 'class' => rtrim('insertresponse ' . $attrib['itemclass']), 'unselectable' => 'on', 'tabindex' => '0', - 'onclick' => sprintf( - "return %s.command('insert-response', '%s', this, event)", - rcmail_output::JS_OBJECT_NAME, - rcube::JQ($response['id']) - ), + 'data-event-handle' => 'mail_insert_reponse', + 'data-response-id' => $response['id'], ], rcube::Q($response['name']) ); diff --git a/program/actions/mail/copy.php b/program/actions/mail/copy.php index 6db1a484ef9..18fa8d0b690 100644 --- a/program/actions/mail/copy.php +++ b/program/actions/mail/copy.php @@ -58,7 +58,7 @@ public function run($args = []) self::send_unread_count($target, true); - $rcmail->output->command('set_quota', self::quota_content(null, $multifolder ? $sources[0] : 'INBOX')); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $multifolder ? $sources[0] : 'INBOX')); } $rcmail->output->send(); diff --git a/program/actions/mail/delete.php b/program/actions/mail/delete.php index 74f498dd486..ecbb20d948d 100644 --- a/program/actions/mail/delete.php +++ b/program/actions/mail/delete.php @@ -57,7 +57,7 @@ public function run($args = []) if (empty($deleted)) { // send error message if ($_POST['_from'] != 'show') { - $rcmail->output->command('list_mailbox'); + $rcmail->output->add_js_call('list_mailbox'); } self::display_server_error('errordeleting'); @@ -75,9 +75,9 @@ public function run($args = []) if (!empty($_POST['_from']) && $_POST['_from'] == 'show') { if ($next = rcube_utils::get_input_string('_next_uid', rcube_utils::INPUT_GPC)) { - $rcmail->output->command('show_message', $next); + $rcmail->output->add_js_call('show_message', $next); } else { - $rcmail->output->command('command', 'list'); + $rcmail->output->add_js_call('command', 'list'); } $rcmail->output->send(); @@ -111,8 +111,8 @@ public function run($args = []) $rcmail->output->set_env('current_page', $page); $rcmail->output->set_env('pagecount', $pages); $rcmail->output->set_env('exists', $exists); - $rcmail->output->command('set_quota', self::quota_content(null, $multifolder ? $sources[0] : 'INBOX')); - $rcmail->output->command('set_rowcount', self::get_messagecount_text($msg_count), $mbox); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $multifolder ? $sources[0] : 'INBOX')); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text($msg_count), $mbox); if ($threading) { $count = rcube_utils::get_input_string('_count', rcube_utils::INPUT_POST); @@ -130,7 +130,7 @@ public function run($args = []) // set trash folder state if ($mbox === $trash) { - $rcmail->output->command('set_trash_count', $exists); + $rcmail->output->add_js_call('set_trash_count', $exists); } // send response diff --git a/program/actions/mail/folder_expunge.php b/program/actions/mail/folder_expunge.php index caa83c2a02c..997a7ead63a 100644 --- a/program/actions/mail/folder_expunge.php +++ b/program/actions/mail/folder_expunge.php @@ -40,8 +40,8 @@ public function run($args = []) $rcmail->output->show_message('folderexpunged', 'confirmation'); if (!empty($_REQUEST['_reload'])) { - $rcmail->output->command('set_quota', self::quota_content(null, $mbox)); - $rcmail->output->command('message_list.clear'); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $mbox)); + $rcmail->output->add_js_call('message_list_clear'); $rcmail->action = 'list'; return; } diff --git a/program/actions/mail/folder_purge.php b/program/actions/mail/folder_purge.php index d820d1a7412..d9b6ed96ca4 100644 --- a/program/actions/mail/folder_purge.php +++ b/program/actions/mail/folder_purge.php @@ -58,14 +58,14 @@ public function run($args = []) if ($success) { $rcmail->output->show_message('folderpurged', 'confirmation'); - $rcmail->output->command('set_unread_count', $mbox, 0); + $rcmail->output->add_js_call('set_unread_count', $mbox, 0); self::set_unseen_count($mbox, 0); // set trash folder state if ($mbox === $trash_mbox) { - $rcmail->output->command('set_trash_count', 0); + $rcmail->output->add_js_call('set_trash_count', 0); } elseif (strlen($trash_mbox)) { - $rcmail->output->command('set_trash_count', $rcmail->storage->count($trash_mbox, 'EXISTS')); + $rcmail->output->add_js_call('set_trash_count', $rcmail->storage->count($trash_mbox, 'EXISTS')); } if (!$delete && strlen($trash_mbox)) { @@ -76,9 +76,9 @@ public function run($args = []) $rcmail->output->set_env('messagecount', 0); $rcmail->output->set_env('pagecount', 0); $rcmail->output->set_env('exists', 0); - $rcmail->output->command('message_list.clear'); - $rcmail->output->command('set_rowcount', self::get_messagecount_text(), $mbox); - $rcmail->output->command('set_quota', self::quota_content(null, $mbox)); + $rcmail->output->add_js_call('message_list_clear'); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text(), $mbox); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $mbox)); } } else { self::display_server_error(); diff --git a/program/actions/mail/getunread.php b/program/actions/mail/getunread.php index 1b19df18d5a..8c5f2654675 100644 --- a/program/actions/mail/getunread.php +++ b/program/actions/mail/getunread.php @@ -52,14 +52,14 @@ public function run($args = []) // after possible message status change when opening a message // not in preview frame if ($unseen || $unseen_old === null || $mbox == $current) { - $rcmail->output->command('set_unread_count', $mbox, $unseen, $inbox && $mbox == 'INBOX'); + $rcmail->output->add_js_call('set_unread_count', $mbox, $unseen, $inbox && $mbox == 'INBOX'); } self::set_unseen_count($mbox, $unseen); // set trash folder state if ($mbox === $trash) { - $rcmail->output->command('set_trash_count', $rcmail->storage->count($mbox, 'EXISTS')); + $rcmail->output->add_js_call('set_trash_count', $rcmail->storage->count($mbox, 'EXISTS')); } } } diff --git a/program/actions/mail/group_expand.php b/program/actions/mail/group_expand.php index 545c8981fa1..8253f5a427b 100644 --- a/program/actions/mail/group_expand.php +++ b/program/actions/mail/group_expand.php @@ -49,7 +49,7 @@ public function run($args = []) } } - $rcmail->output->command('replace_group_recipients', $gid, implode(', ', array_unique($members))); + $rcmail->output->add_js_call('replace_group_recipients', $gid, implode(', ', array_unique($members))); } $rcmail->output->send(); diff --git a/program/actions/mail/headers.php b/program/actions/mail/headers.php index a04f873e938..bb8d2f2285b 100644 --- a/program/actions/mail/headers.php +++ b/program/actions/mail/headers.php @@ -72,7 +72,7 @@ public function run($args = []) if ($inline) { $rcmail->output->set_env('dialog_class', 'text-nowrap'); } else { - $rcmail->output->command('set_headers', $source); + $rcmail->output->add_js_call('set_headers', $source); } } elseif (!$inline) { $rcmail->output->show_message('messageopenerror', 'error'); diff --git a/program/actions/mail/import.php b/program/actions/mail/import.php index 6cc59fc25c0..6e5a7550804 100644 --- a/program/actions/mail/import.php +++ b/program/actions/mail/import.php @@ -73,7 +73,7 @@ public function run($args = []) if ($imported) { $rcmail->output->show_message($rcmail->gettext(['name' => 'importmessagesuccess', 'nr' => $imported, 'vars' => ['nr' => $imported]]), 'confirmation'); - $rcmail->output->command('command', 'list'); + $rcmail->output->add_js_call('command', 'list'); } else { $rcmail->output->show_message('importmessageerror', 'error'); } diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php index 189140c13ae..c703652509a 100644 --- a/program/actions/mail/index.php +++ b/program/actions/mail/index.php @@ -491,10 +491,10 @@ public static function js_message_list($a_headers, $insert_top = false, $a_show_ // get name of smart From/To column in folder context $smart_col = self::message_list_smart_column_name(); - $rcmail->output->command('set_message_coltypes', array_values($a_show_cols), $thead, $smart_col); + $rcmail->output->add_js_call('set_message_coltypes', array_values($a_show_cols), $thead, $smart_col); if ($multifolder && $_SESSION['search_scope'] == 'all') { - $rcmail->output->command('select_folder', ''); + $rcmail->output->add_js_call('select_folder', ''); } $rcmail->output->set_env('multifolder_listing', $multifolder); @@ -607,11 +607,11 @@ public static function js_message_list($a_headers, $insert_top = false, $a_show_ $a_msg_cols = array_merge($a_msg_cols, $header->list_cols); } - $rcmail->output->command('add_message_row', $header->uid, $a_msg_cols, $a_msg_flags, $insert_top); + $rcmail->output->add_js_call('add_message_row', $header->uid, $a_msg_cols, $a_msg_flags, $insert_top); } if ($rcmail->storage->get_threading()) { - $rcmail->output->command('init_threads', $roots, $mbox); + $rcmail->output->add_js_call('init_threads', $roots, $mbox); } } @@ -724,11 +724,6 @@ public static function options_menu_link($attrib = []) $rcmail = rcmail::get_instance(); $title = $rcmail->gettext(!empty($attrib['label']) ? $attrib['label'] : 'listoptions'); $inner = $title; - $onclick = sprintf( - "return %s.command('menu-open', '%s', this, event)", - rcmail_output::JS_OBJECT_NAME, - !empty($attrib['ref']) ? $attrib['ref'] : 'messagelistmenu' - ); // Backwards compatibility, attribute renamed in v1.5 if (isset($attrib['optionsmenuicon'])) { @@ -743,7 +738,8 @@ public static function options_menu_link($attrib = []) return html::a([ 'href' => '#list-options', - 'onclick' => $onclick, + 'data-event-handle' => 'listmenulink', + 'data-ref' => !empty($attrib['ref']) ? $attrib['ref'] : 'messagelistmenu', 'class' => $attrib['class'] ?? 'listmenu', 'id' => $attrib['id'] ?? 'listmenulink', 'title' => $title, @@ -835,7 +831,7 @@ public static function send_unread_count($mbox_name, $force = false, $count = nu } if ($unseen !== $old_unseen || ($mbox_name == 'INBOX')) { - $rcmail->output->command('set_unread_count', $mbox_name, $unseen, + $rcmail->output->add_js_call('set_unread_count', $mbox_name, $unseen, $mbox_name == 'INBOX', $unseen && $mark ? $mark : ''); } @@ -1303,13 +1299,10 @@ public static function washtml_link_callback($tag, $attribs, $content, $washtml) if (!empty($addresses)) { $attrib['href'] = 'mailto:' . implode(',', $addresses); - $attrib['onclick'] = sprintf( - "return %s.command('compose','%s',this)", - rcmail_output::JS_OBJECT_NAME, - rcube::JQ(implode(',', $mailto) . ($url ? "?{$url}" : ''))); + $attrib['data-event-handle'] = 'compose_mailto_handle'; + $attrib['data-url'] = implode(',', $mailto) . ($url ? "?{$url}" : ''); } else { $attrib['href'] = '#NOP'; - $attrib['onclick'] = ''; } } elseif (!empty($attrib['href']) && $attrib['href'][0] != '#') { $attrib['target'] = '_blank'; @@ -1322,7 +1315,7 @@ public static function washtml_link_callback($tag, $attribs, $content, $washtml) } // allowed attributes for a|link|area tags - $allow = ['href', 'name', 'target', 'onclick', 'id', 'class', 'style', 'title', + $allow = ['href', 'name', 'target', 'id', 'class', 'style', 'title', 'rel', 'type', 'media', 'alt', 'coords', 'nohref', 'hreflang', 'shape']; return html::tag($tag, $attrib, $content, $allow); @@ -1389,8 +1382,8 @@ public static function address_string($input, $max = null, $linked = false, $add $attrs = [ 'href' => 'mailto:' . $mailto, 'class' => 'rcmContactAddress', - 'onclick' => sprintf("return %s.command('compose','%s',this)", - rcmail_output::JS_OBJECT_NAME, rcube::JQ(format_email_recipient($mailto, $name))), + 'data-event-handle' => 'compose_format_recipient', + 'data-recipient' => format_email_recipient($mailto, $name), ]; if ($show_email && $name && $mailto) { @@ -1417,8 +1410,8 @@ public static function address_string($input, $max = null, $linked = false, $add 'href' => '#add', 'title' => $label, 'class' => 'rcmaddcontact', - 'onclick' => sprintf("return %s.command('add-contact','%s',this)", - rcmail_output::JS_OBJECT_NAME, rcube::JQ($string)), + 'data-event-handle' => 'rcmaddcontactlink', + 'data-string' => $string, ], $addicon == 'virtual' ? '' : $icon ); @@ -1455,17 +1448,16 @@ public static function address_string($input, $max = null, $linked = false, $add $out .= ', ' . html::a([ 'href' => '#more', 'class' => 'morelink', - 'onclick' => '$(this).hide().next().show()', + 'data-event-handle' => 'hide_and_show_next', ], $label) . html::span(['style' => 'display:none'], implode(', ', array_diff($allvalues, $shown_addresses))); } else { $out .= ', ' . html::a([ 'href' => '#more', 'class' => 'morelink', - 'onclick' => sprintf("return %s.simple_dialog('%s','%s',null,{cancel_button:'close'})", - rcmail_output::JS_OBJECT_NAME, - rcube::JQ(implode(', ', $allvalues)), - rcube::JQ($title)), + 'data-event-handle' => 'morelink_simpledialog', + 'data-allvalues' => implode(', ', $allvalues), + 'data-title' => $title, ], $label); } } @@ -1519,7 +1511,7 @@ public static function search_filter($attrib) } if (!self::get_bool_attr($attrib, 'noevent')) { - $attrib['onchange'] = rcmail_output::JS_OBJECT_NAME . '.filter_mailbox(this.value)'; + $attrib['data-event-handle'] = 'filter_mailbox_with_this_value'; } // Content-Type values of messages with attachments diff --git a/program/actions/mail/list.php b/program/actions/mail/list.php index 248a6b78b40..2a37b3530b9 100644 --- a/program/actions/mail/list.php +++ b/program/actions/mail/list.php @@ -115,11 +115,11 @@ public function run($args = []) $rcmail->output->set_env('threading', $threading); $rcmail->output->set_env('current_page', $page); $rcmail->output->set_env('exists', $exists); - $rcmail->output->command('set_rowcount', self::get_messagecount_text($count), $mbox_name); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text($count), $mbox_name); // remove old message rows if commanded by the client if (!empty($_REQUEST['_clear'])) { - $rcmail->output->command('clear_message_list'); + $rcmail->output->add_js_call('clear_message_list'); } // add message rows @@ -149,11 +149,11 @@ public function run($args = []) // set trash folder state if ($mbox_name === $rcmail->config->get('trash_mbox')) { - $rcmail->output->command('set_trash_count', $exists); + $rcmail->output->add_js_call('set_trash_count', $exists); } if ($page == 1) { - $rcmail->output->command('set_quota', self::quota_content(null, !empty($multifolder) ? 'INBOX' : $mbox_name)); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, !empty($multifolder) ? 'INBOX' : $mbox_name)); } // send response diff --git a/program/actions/mail/list_contacts.php b/program/actions/mail/list_contacts.php index 0db084916d5..af71cfab18a 100644 --- a/program/actions/mail/list_contacts.php +++ b/program/actions/mail/list_contacts.php @@ -121,7 +121,7 @@ public function run($args = []) $jsresult[$row_id] = format_email_recipient($email, $name); - $rcmail->output->command('add_contact_row', $row_id, [ + $rcmail->output->add_js_call('add_contact_row', $row_id, [ $keyname => html::a( ['title' => $email], rcube::Q($name ?: $email) @@ -137,7 +137,7 @@ public function run($args = []) // update env $rcmail->output->set_env('contactdata', $jsresult); $rcmail->output->set_env('pagecount', isset($result) ? ceil($result->count / $page_size) : 1); - $rcmail->output->command('set_page_buttons'); + $rcmail->output->add_js_call('set_page_buttons'); // send response $rcmail->output->send(); @@ -160,7 +160,7 @@ public static function compose_contact_groups($abook, $source_id, $search = null foreach ((array) $group['email'] as $email) { $row_id = 'G' . $group['ID']; $jsresult[$row_id] = format_email_recipient($email, $group['name']); - $rcmail->output->command('add_contact_row', $row_id, [ + $rcmail->output->add_js_call('add_contact_row', $row_id, [ 'contactgroup' => html::span(['title' => $email], rcube::Q($group['name'])), ], 'group'); } @@ -168,13 +168,14 @@ public static function compose_contact_groups($abook, $source_id, $search = null // make virtual groups clickable to list their members elseif (!empty($group['virtual'])) { $row_id = 'G' . $group['ID']; - $rcmail->output->command('add_contact_row', $row_id, [ + $rcmail->output->add_js_call('add_contact_row', $row_id, [ 'contactgroup' => html::a([ 'href' => '#list', 'rel' => $group['ID'], 'title' => $rcmail->gettext('listgroup'), - 'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", - rcmail_output::JS_OBJECT_NAME, $source_id, $group['ID']), + 'data-event-handle' => 'contacts_pushgroup', + 'data-source' => $source_id, + 'data-id' => $group['ID'], ], rcube::Q($group['name']) . ' ' . html::span('action', '»') )], @@ -186,7 +187,7 @@ public static function compose_contact_groups($abook, $source_id, $search = null elseif (($result = $abook->count()) && $result->count) { $row_id = 'E' . $group['ID']; $jsresult[$row_id] = ['name' => $group['name'], 'source' => $source_id]; - $rcmail->output->command('add_contact_row', $row_id, [ + $rcmail->output->add_js_call('add_contact_row', $row_id, [ 'contactgroup' => rcube::Q($group['name'] . ' (' . intval($result->count) . ')'), ], 'group'); } diff --git a/program/actions/mail/mark.php b/program/actions/mail/mark.php index 42dba006de0..beb08fbf0c4 100644 --- a/program/actions/mail/mark.php +++ b/program/actions/mail/mark.php @@ -79,7 +79,7 @@ public function run($args = []) if (!$marked) { // send error message if ($from != 'show') { - $rcmail->output->command('list_mailbox'); + $rcmail->output->add_js_call('list_mailbox'); } self::display_server_error('errormarking'); @@ -96,7 +96,7 @@ public function run($args = []) } if ($read && !$skip_deleted) { - $rcmail->output->command('flag_deleted_as_read', $ruids); + $rcmail->output->add_js_call('flag_deleted_as_read', $ruids); } } @@ -109,9 +109,9 @@ public function run($args = []) } elseif ($flag == 'DELETED' && $skip_deleted) { if ($from == 'show') { if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC)) { - $rcmail->output->command('show_message', $next); + $rcmail->output->add_js_call('show_message', $next); } else { - $rcmail->output->command('command', 'list'); + $rcmail->output->add_js_call('command', 'list'); } } else { $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC); @@ -145,7 +145,7 @@ public function run($args = []) $rcmail->output->set_env('messagecount', $msg_count); $rcmail->output->set_env('current_page', $page); $rcmail->output->set_env('pagecount', $pages); - $rcmail->output->command('set_rowcount', self::get_messagecount_text($msg_count), $mbox); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text($msg_count), $mbox); if ($threading) { $count = rcube_utils::get_input_value('_count', rcube_utils::INPUT_POST); diff --git a/program/actions/mail/move.php b/program/actions/mail/move.php index 6f69ac44bfc..b291fb3e1a1 100644 --- a/program/actions/mail/move.php +++ b/program/actions/mail/move.php @@ -66,7 +66,7 @@ public function run($args = []) if (!$success) { // send error message if (empty($_POST['_from']) || $_POST['_from'] != 'show') { - $rcmail->output->command('list_mailbox'); + $rcmail->output->add_js_call('list_mailbox'); } self::display_server_error('errormoving', null, $target == $trash ? 'delete' : ''); @@ -77,7 +77,7 @@ public function run($args = []) if (!empty($_POST['_refresh'])) { // FIXME: send updated message rows instead of reloading the entire list - $rcmail->output->command('refresh_list'); + $rcmail->output->add_js_call('refresh_list'); } else { $addrows = true; } @@ -91,9 +91,9 @@ public function run($args = []) if (!empty($_POST['_from']) && $_POST['_from'] == 'show') { if ($next = rcube_utils::get_input_string('_next_uid', rcube_utils::INPUT_GPC)) { - $rcmail->output->command('show_message', $next); + $rcmail->output->add_js_call('show_message', $next); } else { - $rcmail->output->command('command', 'list'); + $rcmail->output->add_js_call('command', 'list'); } $rcmail->output->send(); @@ -128,8 +128,8 @@ public function run($args = []) $rcmail->output->set_env('current_page', $page); $rcmail->output->set_env('pagecount', $pages); $rcmail->output->set_env('exists', $exists); - $rcmail->output->command('set_quota', self::quota_content(null, $multifolder ? $sources[0] : 'INBOX')); - $rcmail->output->command('set_rowcount', self::get_messagecount_text($msg_count), $mbox); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $multifolder ? $sources[0] : 'INBOX')); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text($msg_count), $mbox); if ($threading) { $count = rcube_utils::get_input_string('_count', rcube_utils::INPUT_POST); @@ -148,9 +148,9 @@ public function run($args = []) // set trash folder state if ($mbox === $trash) { - $rcmail->output->command('set_trash_count', $exists); + $rcmail->output->add_js_call('set_trash_count', $exists); } elseif ($target === $trash) { - $rcmail->output->command('set_trash_count', $rcmail->storage->count($trash, 'EXISTS', true)); + $rcmail->output->add_js_call('set_trash_count', $rcmail->storage->count($trash, 'EXISTS', true)); } // send response diff --git a/program/actions/mail/pagenav.php b/program/actions/mail/pagenav.php index 3213eb92249..078004d09aa 100644 --- a/program/actions/mail/pagenav.php +++ b/program/actions/mail/pagenav.php @@ -41,19 +41,19 @@ public function run($args = []) $last = $pos < $cnt - 1 ? $index->get_element('LAST') : 0; } else { // error, this will at least disable page navigation - $rcmail->output->command('set_rowcount', ''); + $rcmail->output->add_js_call('set_rowcount', ''); $rcmail->output->send(); } // Set UIDs and activate navigation buttons if (!empty($prev)) { $rcmail->output->set_env('prev_uid', $prev); - $rcmail->output->command('enable_command', 'previousmessage', 'firstmessage', true); + $rcmail->output->add_js_call('enable_command', 'previousmessage', 'firstmessage', true); } if (!empty($next)) { $rcmail->output->set_env('next_uid', $next); - $rcmail->output->command('enable_command', 'nextmessage', 'lastmessage', true); + $rcmail->output->add_js_call('enable_command', 'nextmessage', 'lastmessage', true); } if (!empty($first)) { @@ -68,7 +68,7 @@ public function run($args = []) $rcmail->output->set_env('messagecount', 1); // Set rowcount text - $rcmail->output->command('set_rowcount', $rcmail->gettext([ + $rcmail->output->add_js_call('set_rowcount', $rcmail->gettext([ 'name' => 'messagenrof', 'vars' => ['nr' => ($pos ?? 0) + 1, 'count' => $cnt], ])); diff --git a/program/actions/mail/search.php b/program/actions/mail/search.php index 3b2f986896f..f3a3ddc11af 100644 --- a/program/actions/mail/search.php +++ b/program/actions/mail/search.php @@ -139,7 +139,7 @@ public function run($args = []) // advice the client to re-send the (cross-folder) search request elseif (!empty($result) && !empty($result->incomplete)) { $count = 0; // keep UI locked - $rcmail->output->command('continue_search', $search_request); + $rcmail->output->add_js_call('continue_search', $search_request); } else { $count = 0; @@ -147,7 +147,7 @@ public function run($args = []) $rcmail->output->set_env('multifolder_listing', isset($result) ? !empty($result->multi) : false); if (isset($result) && !empty($result->multi) && $scope == 'all') { - $rcmail->output->command('select_folder', ''); + $rcmail->output->add_js_call('select_folder', ''); } } @@ -157,7 +157,7 @@ public function run($args = []) $rcmail->output->set_env('messagecount', $count); $rcmail->output->set_env('pagecount', ceil($count / $rcmail->storage->get_pagesize())); $rcmail->output->set_env('exists', !strlen($mbox) ? 0 : $rcmail->storage->count($mbox, 'EXISTS')); - $rcmail->output->command('set_rowcount', self::get_messagecount_text($count, 1), $mbox); + $rcmail->output->add_js_call('set_rowcount', self::get_messagecount_text($count, 1), $mbox); self::list_pagetitle(); @@ -167,7 +167,7 @@ public function run($args = []) } if (isset($result) && empty($result->incomplete)) { - $rcmail->output->command('set_quota', self::quota_content(null, !empty($result->multi) ? 'INBOX' : $mbox)); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, !empty($result->multi) ? 'INBOX' : $mbox)); } $rcmail->output->send(); diff --git a/program/actions/mail/search_contacts.php b/program/actions/mail/search_contacts.php index 1e1e96df4c6..bc21114f05f 100644 --- a/program/actions/mail/search_contacts.php +++ b/program/actions/mail/search_contacts.php @@ -108,7 +108,7 @@ public function run($args = []) } $link = html::a(['title' => $title], $link_content); - $rcmail->output->command('add_contact_row', $row_id, [$keyname => $link], $classname); + $rcmail->output->add_js_call('add_contact_row', $row_id, [$keyname => $link], $classname); } } @@ -123,7 +123,7 @@ public function run($args = []) $rcmail->output->set_env('search_request', $search_request); $rcmail->output->set_env('source', ''); - $rcmail->output->command('unselect_directory'); + $rcmail->output->add_js_call('unselect_directory'); } elseif (!$group_count) { $rcmail->output->show_message('nocontactsfound', 'notice'); } @@ -131,7 +131,7 @@ public function run($args = []) // update env $rcmail->output->set_env('contactdata', $jsresult); $rcmail->output->set_env('pagecount', ceil($result->count / $page_size)); - $rcmail->output->command('set_page_buttons'); + $rcmail->output->add_js_call('set_page_buttons'); // send response $rcmail->output->send(); diff --git a/program/actions/mail/send.php b/program/actions/mail/send.php index f0e63445d21..18751900b89 100644 --- a/program/actions/mail/send.php +++ b/program/actions/mail/send.php @@ -159,7 +159,7 @@ public function run($args = []) } $rcmail->output->show_message('mispellingsfound', 'error'); - $rcmail->output->command('spellcheck_resume', $result); + $rcmail->output->add_js_call('spellcheck_resume', $result); $rcmail->output->send('iframe'); } } @@ -221,7 +221,7 @@ public function run($args = []) if (!$saved && $savedraft) { self::display_server_error('errorsaving'); // start the auto-save timer again - $rcmail->output->command('auto_save_start'); + $rcmail->output->add_js_call('auto_save_start'); $rcmail->output->send('iframe'); } @@ -264,12 +264,12 @@ public function run($args = []) // update "_draft_saveid" and the "cmp_hash" to prevent "Unsaved changes" warning $COMPOSE['param']['draft_uid'] = $plugin['uid']; - $rcmail->output->command('set_draft_id', $plugin['uid']); - $rcmail->output->command('compose_field_hash', true); + $rcmail->output->add_js_call('set_draft_id', $plugin['uid']); + $rcmail->output->add_js_call('compose_field_hash', true); } // start the auto-save timer again - $rcmail->output->command('auto_save_start'); + $rcmail->output->add_js_call('auto_save_start'); } else { // Collect folders which could contain the composed message, // we'll refresh the list if currently opened folder is one of them (#1490238) @@ -299,7 +299,7 @@ public function run($args = []) $rcmail->session->remove('compose_data_' . $COMPOSE_ID); $_SESSION['last_compose_session'] = $COMPOSE_ID; - $rcmail->output->command('remove_compose_data', $COMPOSE_ID); + $rcmail->output->add_js_call('remove_compose_data', $COMPOSE_ID); if ($store_folder) { $folders[] = $store_target; @@ -308,7 +308,7 @@ public function run($args = []) $msg = $rcmail->gettext($saveonly ? 'successfullysaved' : 'messagesent'); - $rcmail->output->command('sent_successfully', 'confirmation', $msg, $folders, $save_error); + $rcmail->output->add_js_call('sent_successfully', 'confirmation', $msg, $folders, $save_error); } $rcmail->output->send('iframe'); diff --git a/program/actions/mail/show.php b/program/actions/mail/show.php index 4b831754838..e223175aa34 100644 --- a/program/actions/mail/show.php +++ b/program/actions/mail/show.php @@ -132,7 +132,7 @@ public function run($args = []) if ($v > 0) { $rcmail->output->set_env('mail_read_time', $v); } elseif ($v == 0) { - $rcmail->output->command('set_unread_message', $MESSAGE->uid, $mbox_name); + $rcmail->output->add_js_call('set_unread_message', $MESSAGE->uid, $mbox_name); $rcmail->plugins->exec_hook('message_read', [ 'uid' => $MESSAGE->uid, 'mailbox' => $mbox_name, @@ -221,19 +221,17 @@ public static function message_attachments($attrib) $li_class = $class; if (!self::$PRINT_MODE) { + $rcmail->output->include_script('mail-action-show.js'); $link_attrs = [ 'href' => self::$MESSAGE->get_part_url($attach_prop->mime_id, false), - 'onclick' => sprintf('%s.command(\'load-attachment\',\'%s\',this); return false', - rcmail_output::JS_OBJECT_NAME, $attach_prop->mime_id), - 'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)', + 'data-mime-id' => $attach_prop->mime_id, 'title' => $title, 'class' => 'filename', ]; if ($mimetype != 'message/rfc822' && empty($attach_prop->size)) { $li_class .= ' no-menu'; - $link_attrs['onclick'] = sprintf('%s.alert_dialog(%s.get_label(\'emptyattachment\')); return false', - rcmail_output::JS_OBJECT_NAME, rcmail_output::JS_OBJECT_NAME); + $link_attrs['data-emptyattachment'] = 'true'; $rcmail->output->add_label('emptyattachment'); } @@ -261,7 +259,7 @@ public static function remote_objects_msg() $msg = html::span(null, rcube::Q($rcmail->gettext('blockedresources'))); $buttons = html::a( - ['href' => '#loadremote', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('load-remote')"], + ['href' => '#loadremote', 'data-event-handle' => 'mail_load_remote'], rcube::Q($rcmail->gettext('allow')) ); @@ -271,7 +269,8 @@ public static function remote_objects_msg() $arg = $show_images == 3 ? rcube_addressbook::TYPE_TRUSTED_SENDER : 'true'; $buttons .= ' ' . html::a([ 'href' => '#loadremotealways', - 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('load-remote', {$arg})", + 'data-arg' => $arg, + 'data-event-handle' => 'mail_load_remote_with_arg', 'style' => 'white-space:nowrap', ], rcube::Q($rcmail->gettext(['name' => 'alwaysallow', 'vars' => ['sender' => self::$MESSAGE->sender['mailto']]])) @@ -327,7 +326,7 @@ public static function message_buttons() $msg = html::span(null, rcube::Q($rcmail->gettext('isdraft'))) . ' ' . html::a( - ['href' => '#edit', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('edit')"], + ['href' => '#edit', 'data-event-handle' => 'mail_edit'], rcube::Q($rcmail->gettext('edit')) ); @@ -382,7 +381,7 @@ public static function message_contactphoto($attrib) // set error handler on $error_handler = true; - $attrib['onerror'] = "this.onerror = null; this.src = '{$placeholder}';"; + $attrib['data-event-handle'] = 'onerror_set_placeholder_src'; } if (!empty(self::$MESSAGE->sender)) { @@ -602,7 +601,7 @@ public static function message_full_headers($attrib) $html .= html::div([ 'class' => 'more-headers show-headers', - 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('show-headers','',this)", + 'data-event-handle' => 'mail_show_headers', 'title' => $rcmail->gettext('togglefullheaders'), ], ''); @@ -753,11 +752,8 @@ public static function message_body($attrib) $supported = in_array($mimetype, self::$CLIENT_MIMETYPES); $show_link_attr = [ 'href' => self::$MESSAGE->get_part_url($attach_prop->mime_id, false), - 'onclick' => sprintf( - '%s.command(\'load-attachment\',\'%s\',this); return false', - rcmail_output::JS_OBJECT_NAME, - $attach_prop->mime_id - ), + 'data-mime-id' => $attach_prop->mime_id, + 'data-event-handle' => 'mail_load_attachment', ]; $download_link_attr = [ 'href' => $show_link_attr['href'] . '&_download=1', @@ -773,7 +769,7 @@ public static function message_body($attrib) 'title' => $attach_prop->filename, 'alt' => $attach_prop->filename, 'style' => sprintf('max-width:%dpx; max-height:%dpx', $thumbnail_size, $thumbnail_size), - 'onload' => $supported ? '' : '$(this).parents(\'p.image-attachment\').show()', + 'data-event-handle' => $supported ? '' : 'mail_show_sibling_image_attachments', ]) ) . html::span('image-filename', rcube::Q($attach_prop->filename)) . diff --git a/program/actions/settings/folder_delete.php b/program/actions/settings/folder_delete.php index 2b00f2c94af..ee8320a6bef 100644 --- a/program/actions/settings/folder_delete.php +++ b/program/actions/settings/folder_delete.php @@ -51,11 +51,11 @@ public function run($args = []) if (!empty($deleted)) { // Remove folder and subfolders rows - $rcmail->output->command('remove_folder_row', $mbox); + $rcmail->output->add_js_call('remove_folder_row', $mbox); $rcmail->output->show_message('folderdeleted', 'confirmation'); // Clear content frame - $rcmail->output->command('subscription_select'); - $rcmail->output->command('set_quota', self::quota_content()); + $rcmail->output->add_js_call('subscription_select'); + $rcmail->output->add_js_call('set_quota', self::quota_content()); } else { self::display_server_error('errorsaving'); } diff --git a/program/actions/settings/folder_edit.php b/program/actions/settings/folder_edit.php index f3afe75cec4..d3478fcd14b 100644 --- a/program/actions/settings/folder_edit.php +++ b/program/actions/settings/folder_edit.php @@ -230,10 +230,7 @@ public static function folder_form($attrib) // create link with folder-size command if (!isset($size) || $size === false) { - $onclick = sprintf("return %s.command('folder-size', '%s', this)", - rcmail_output::JS_OBJECT_NAME, rcube::JQ($mbox)); - - $attr = ['href' => '#', 'onclick' => $onclick, 'id' => 'folder-size']; + $attr = ['href' => '#', 'data-onclick' => 'folder_form_size', 'data-mbox' => $mbox, 'id' => 'folder-size']; $size = html::a($attr, $rcmail->gettext('getfoldersize')); } } else { @@ -306,7 +303,7 @@ public static function folder_form($attrib) $rcmail->output->set_env('folder', $mbox); if ($mbox !== '' && empty($_POST)) { - $rcmail->output->command('parent.set_quota', self::quota_content(null, $mbox)); + $rcmail->output->add_js_call('parent.set_quota', self::quota_content(null, $mbox)); } return $out; diff --git a/program/actions/settings/folder_purge.php b/program/actions/settings/folder_purge.php index bf92c5c25ff..95578af9174 100644 --- a/program/actions/settings/folder_purge.php +++ b/program/actions/settings/folder_purge.php @@ -53,13 +53,13 @@ public function run($args = []) if ($delete) { $rcmail->output->show_message('folderpurged', 'confirmation'); - $rcmail->output->command('set_quota', self::quota_content(null, $mbox)); + $rcmail->output->add_js_call('set_quota', self::quota_content(null, $mbox)); } else { $rcmail->output->show_message('messagemoved', 'confirmation'); } $_SESSION['unseen_count'][$mbox] = 0; - $rcmail->output->command('show_folder', $mbox, null, true); + $rcmail->output->add_js_call('show_folder', $mbox, null, true); } else { self::display_server_error('errorsaving'); } diff --git a/program/actions/settings/folder_save.php b/program/actions/settings/folder_save.php index dadb845a305..0fc21b41345 100644 --- a/program/actions/settings/folder_save.php +++ b/program/actions/settings/folder_save.php @@ -59,7 +59,7 @@ public function run($args = []) } if (!empty($error)) { - $rcmail->output->command('display_message', $error, 'error'); + $rcmail->output->add_js_call('display_message', $error, 'error'); } else { if (!empty($options['protected']) || !empty($options['norename'])) { $name_imap = $old_imap; @@ -84,7 +84,7 @@ public function run($args = []) } if (!empty($error)) { - $rcmail->output->command('display_message', $error, 'error'); + $rcmail->output->add_js_call('display_message', $error, 'error'); $folder = null; } else { $folder = [ @@ -140,7 +140,7 @@ public function run($args = []) $rcmail->output->show_message('foldercreated', 'confirmation'); // reset folder preview frame - $rcmail->output->command('subscription_select'); + $rcmail->output->add_js_call('subscription_select'); $rcmail->output->send('iframe'); } else { // show error message diff --git a/program/actions/settings/folder_size.php b/program/actions/settings/folder_size.php index e4b673b6d97..df4c62cbca9 100644 --- a/program/actions/settings/folder_size.php +++ b/program/actions/settings/folder_size.php @@ -39,7 +39,7 @@ public function run($args = []) // @TODO: check quota and show percentage usage of specified mailbox? if ($size !== false) { - $rcmail->output->command('folder_size_update', self::show_bytes($size)); + $rcmail->output->add_js_call('folder_size_update', self::show_bytes($size)); } else { self::display_server_error(); } diff --git a/program/actions/settings/folder_subscribe.php b/program/actions/settings/folder_subscribe.php index d4715218090..3f78df389a8 100644 --- a/program/actions/settings/folder_subscribe.php +++ b/program/actions/settings/folder_subscribe.php @@ -53,13 +53,13 @@ public function run($args = []) if (!empty($result)) { // Handle subscription of protected folder (#1487656) if ($rcmail->config->get('protect_default_folders') && $storage->is_special_folder($mbox)) { - $rcmail->output->command('disable_subscription', $mbox); + $rcmail->output->add_js_call('disable_subscription', $mbox); } $rcmail->output->show_message('foldersubscribed', 'confirmation'); } else { self::display_server_error('errorsaving'); - $rcmail->output->command('reset_subscription', $mbox, false); + $rcmail->output->add_js_call('reset_subscription', $mbox, false); } $rcmail->output->send(); diff --git a/program/actions/settings/folder_unsubscribe.php b/program/actions/settings/folder_unsubscribe.php index e8bc1cddeec..2e63db92645 100644 --- a/program/actions/settings/folder_unsubscribe.php +++ b/program/actions/settings/folder_unsubscribe.php @@ -42,7 +42,7 @@ public function run($args = []) $rcmail->output->show_message('folderunsubscribed', 'confirmation'); } else { self::display_server_error('errorsaving'); - $rcmail->output->command('reset_subscription', $mbox, true); + $rcmail->output->add_js_call('reset_subscription', $mbox, true); } $rcmail->output->send(); diff --git a/program/actions/settings/folders.php b/program/actions/settings/folders.php index eabce5504c3..1a3544b18a2 100644 --- a/program/actions/settings/folders.php +++ b/program/actions/settings/folders.php @@ -124,7 +124,7 @@ public static function folder_subscriptions($attrib) $checkbox_subscribe = new html_checkbox([ 'name' => '_subscribed[]', 'title' => $rcmail->gettext('changesubscription'), - 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command(this.checked?'subscribe':'unsubscribe',this.value)", + 'data-event-handle' => 'toggle_change_subscription'; ]); $js_folders = []; @@ -297,7 +297,7 @@ public static function folder_filter($attrib) } if (!self::get_bool_attr($attrib, 'noevent')) { - $attrib['onchange'] = rcmail_output::JS_OBJECT_NAME . '.folder_filter(this.value)'; + $attrib['data-onchange'] = ['filter_folder', '#' . $attrib['id']]; } $roots = []; @@ -366,10 +366,10 @@ public static function update_folder_row($name, $oldname = null, $subscribe = fa $protected = !empty($options['protected']) || !empty($options['noselect']); if ($oldname === null) { - $rcmail->output->command('add_folder_row', $name, $name_utf8, $display_name, + $rcmail->output->add_js_call('add_folder_row', $name, $name_utf8, $display_name, $protected, $subscribe, $class_name); } else { - $rcmail->output->command('replace_folder_row', $oldname, $name, $name_utf8, $display_name, + $rcmail->output->add_js_call('replace_folder_row', $oldname, $name, $name_utf8, $display_name, $protected, $class_name); } } diff --git a/program/actions/settings/identity_delete.php b/program/actions/settings/identity_delete.php index 6ececcca850..074b9fe9f71 100644 --- a/program/actions/settings/identity_delete.php +++ b/program/actions/settings/identity_delete.php @@ -41,7 +41,7 @@ public function run($args = []) if ($deleted === true) { $rcmail->output->show_message('deletedsuccessfully', 'confirmation', null, false); - $rcmail->output->command('remove_identity', $iid); + $rcmail->output->add_js_call('remove_identity', $iid); } else { $msg = !empty($plugin['message']) ? $plugin['message'] : ($deleted === -1 ? 'nodeletelastidentity' : 'errorsaving'); $rcmail->output->show_message($msg, 'error', null, false); diff --git a/program/actions/settings/identity_edit.php b/program/actions/settings/identity_edit.php index 8d7bc8bf7f3..79a1684ed25 100644 --- a/program/actions/settings/identity_edit.php +++ b/program/actions/settings/identity_edit.php @@ -120,7 +120,7 @@ public static function identity_form($attrib) 'html_signature' => [ 'type' => 'checkbox', 'label' => $rcmail->gettext('htmlsignature'), - 'onclick' => "return rcmail.command('toggle-editor', {id: 'rcmfd_signature', html: this.checked}, '', event)", + 'data-event-handle' => 'toggle_html_signature_editor', ], ], ], diff --git a/program/actions/settings/identity_save.php b/program/actions/settings/identity_save.php index f718f74fbe2..11e36ab3690 100644 --- a/program/actions/settings/identity_save.php +++ b/program/actions/settings/identity_save.php @@ -144,7 +144,7 @@ public function run($args = []) // update the changed col in list $name = $save_data['name'] . ' <' . rcube_utils::idn_to_utf8($save_data['email']) . '>'; - $rcmail->output->command('parent.update_identity_row', $iid, rcube::Q(trim($name))); + $rcmail->output->add_js_call('parent.update_identity_row', $iid, rcube::Q(trim($name))); } else { // show error message $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; @@ -185,7 +185,7 @@ public function run($args = []) // add a new row to the list $name = $save_data['name'] . ' <' . rcube_utils::idn_to_utf8($save_data['email']) . '>'; - $rcmail->output->command('parent.update_identity_row', $insert_id, rcube::Q(trim($name)), true); + $rcmail->output->add_js_call('parent.update_identity_row', $insert_id, rcube::Q(trim($name)), true); } else { // show error message $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; diff --git a/program/actions/settings/index.php b/program/actions/settings/index.php index bcac1d5ebb5..f7c2d518ddb 100644 --- a/program/actions/settings/index.php +++ b/program/actions/settings/index.php @@ -335,7 +335,7 @@ public static function user_prefs($current = null) 'alt' => $meta['name'], 'width' => 64, 'height' => 64, - 'onerror' => "this.onerror = null; this.src = 'data:image/gif;base64," . rcmail_output::BLANK_GIF . "';", + 'data-onerror' => ['onerror_set_placeholder_src', '__EVENT__', 'data:image/gif;base64,' . rcmail_output::BLANK_GIF], ]); $blocks['skin']['options'][$skin]['content'] = html::label(['class' => 'skinselection'], @@ -371,8 +371,7 @@ public static function user_prefs($current = null) 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'); + $rcmail->output->add_js_call('check_protocol_handler', $product_name, '#mailtoprotohandler'); } $blocks['browser']['options']['mailtoprotohandler'] = [ @@ -564,7 +563,7 @@ public static function user_prefs($current = null) 'name' => '_prefer_html', 'id' => $field_id, 'value' => 1, - 'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)", + 'data-onchange' => ['disable_show_images_if_plaintext_preferred', '__THIS__'], ]); $blocks['main']['options']['prefer_html'] = [ @@ -1296,7 +1295,7 @@ public static function user_prefs($current = null) ]); // #1486114, #1488279, #1489219 - $onchange = "if ($(this).val() == 'INBOX') $(this).val('')"; + $onchange = ['reset_value_if_inbox', '__THIS__']; } else { $onchange = null; $select = new html_select(); @@ -1307,7 +1306,7 @@ public static function user_prefs($current = null) continue 2; } - $attrs = ['id' => '_drafts_mbox', 'name' => '_drafts_mbox', 'onchange' => $onchange]; + $attrs = ['id' => '_drafts_mbox', 'name' => '_drafts_mbox', 'data-onchange' => $onchange]; $blocks['main']['options']['drafts_mbox'] = [ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('drafts'))), 'content' => $select->show($config['drafts_mbox'], $attrs), @@ -1319,7 +1318,7 @@ public static function user_prefs($current = null) continue 2; } - $attrs = ['id' => '_sent_mbox', 'name' => '_sent_mbox', 'onchange' => '']; + $attrs = ['id' => '_sent_mbox', 'name' => '_sent_mbox', 'data-onchange' => '']; $blocks['main']['options']['sent_mbox'] = [ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('sent'))), 'content' => $select->show($config['sent_mbox'], $attrs), @@ -1331,7 +1330,7 @@ public static function user_prefs($current = null) continue 2; } - $attrs = ['id' => '_junk_mbox', 'name' => '_junk_mbox', 'onchange' => $onchange]; + $attrs = ['id' => '_junk_mbox', 'name' => '_junk_mbox', 'data-onchange' => $onchange]; $blocks['main']['options']['junk_mbox'] = [ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('junk'))), 'content' => $select->show($config['junk_mbox'], $attrs), @@ -1343,7 +1342,7 @@ public static function user_prefs($current = null) continue 2; } - $attrs = ['id' => '_trash_mbox', 'name' => '_trash_mbox', 'onchange' => $onchange]; + $attrs = ['id' => '_trash_mbox', 'name' => '_trash_mbox', 'data-onchange' => $onchange]; $blocks['main']['options']['trash_mbox'] = [ 'title' => html::label($attrs['id'], rcube::Q($rcmail->gettext('trash'))), 'content' => $select->show($config['trash_mbox'], $attrs), @@ -1478,7 +1477,7 @@ public static function user_prefs($current = null) $field_id = 'rcmfd_mailvelope_main_keyring'; $input = new html_checkbox(['name' => '_mailvelope_main_keyring', 'id' => $field_id, 'value' => 1]); - $mailvelope_enable_button = new html_button(['type' => 'button', 'class' => 'btn btn-secondary', 'onclick' => rcmail_output::JS_OBJECT_NAME . '.mailvelope_enable()']); + $mailvelope_enable_button = new html_button(['type' => 'button', 'class' => 'btn btn-secondary', 'data-event-handle' => 'mailvelope_enable']); $blocks['mailvelope']['options']['mailvelope_status'] = [ 'content' => html::div( diff --git a/program/actions/settings/prefs_save.php b/program/actions/settings/prefs_save.php index 2c61456188d..94239148f69 100644 --- a/program/actions/settings/prefs_save.php +++ b/program/actions/settings/prefs_save.php @@ -171,7 +171,7 @@ public function run($args = []) // 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); + $rcmail->output->add_js_call('reload', 500); } // switch skin (if valid, otherwise unset the pref and fall back to default) @@ -179,7 +179,7 @@ public function run($args = []) if (!$rcmail->output->check_skin($a_user_prefs['skin'])) { unset($a_user_prefs['skin']); } elseif ($rcmail->config->get('skin') != $a_user_prefs['skin']) { - $rcmail->output->command('reload', 500); + $rcmail->output->add_js_call('reload', 500); } } diff --git a/program/actions/settings/response_delete.php b/program/actions/settings/response_delete.php index 5edf9786a65..6e0ac1f6a09 100644 --- a/program/actions/settings/response_delete.php +++ b/program/actions/settings/response_delete.php @@ -37,8 +37,8 @@ public function run($args = []) $deleted = !$plugin['abort'] ? $rcmail->user->delete_response($id) : $plugin['result']; if (!empty($deleted)) { - $rcmail->output->command('display_message', $rcmail->gettext('deletedsuccessfully'), 'confirmation'); - $rcmail->output->command('remove_response', $id); + $rcmail->output->add_js_call('display_message', $rcmail->gettext('deletedsuccessfully'), 'confirmation'); + $rcmail->output->add_js_call('remove_response', $id); } else { $msg = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; $rcmail->output->show_message($msg, 'error'); diff --git a/program/actions/settings/response_edit.php b/program/actions/settings/response_edit.php index 2f81f803373..c6fb95ab185 100644 --- a/program/actions/settings/response_edit.php +++ b/program/actions/settings/response_edit.php @@ -92,7 +92,7 @@ public static function response_form($attrib) $chk_attr = [ 'id' => 'ffis_html', 'disabled' => $readonly, - 'onclick' => "return rcmail.command('toggle-editor', {id: 'fftext', html: this.checked}, '', event)", + 'data-event-handle' => 'toggle_html_editor', ]; // Add HTML editor script(s) diff --git a/program/actions/settings/response_get.php b/program/actions/settings/response_get.php index 3b8bf79e064..92899c2314b 100644 --- a/program/actions/settings/response_get.php +++ b/program/actions/settings/response_get.php @@ -51,7 +51,7 @@ public function run($args = []) $response['is_html'] = false; } - $rcmail->output->command('insert_response', $response); + $rcmail->output->add_js_call('insert_response', $response); } $rcmail->output->send(); diff --git a/program/actions/settings/response_save.php b/program/actions/settings/response_save.php index a3290bd5b41..ddd1b14728c 100644 --- a/program/actions/settings/response_save.php +++ b/program/actions/settings/response_save.php @@ -71,7 +71,7 @@ public function run($args = []) if ($updated) { $rcmail->output->show_message('successfullysaved', 'confirmation'); - $rcmail->output->command('parent.update_response_row', $id, rcube::Q($response['name'])); + $rcmail->output->add_js_call('parent.update_response_row', $id, rcube::Q($response['name'])); } else { // show error message $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; @@ -93,7 +93,7 @@ public function run($args = []) $response['id'] = $_GET['_id'] = $insert_id; // add a new row to the list - $rcmail->output->command('parent.update_response_row', $insert_id, rcube::Q($response['name']), true); + $rcmail->output->add_js_call('parent.update_response_row', $insert_id, rcube::Q($response['name']), true); } else { $error = !empty($plugin['message']) ? $plugin['message'] : 'errorsaving'; $rcmail->output->show_message($error, 'error', null, false); diff --git a/program/actions/settings/upload.php b/program/actions/settings/upload.php index 1d3d49edb2f..018cf0ac691 100644 --- a/program/actions/settings/upload.php +++ b/program/actions/settings/upload.php @@ -87,7 +87,7 @@ public function run($args = []) $id = $attachment['id']; $content = rcube::Q($attachment['name']); - $rcmail->output->command('add2attachment_list', "rcmfile{$id}", [ + $rcmail->output->add_js_call('add2attachment_list', "rcmfile{$id}", [ 'html' => $content, 'name' => $attachment['name'], 'mimetype' => $attachment['mimetype'], @@ -108,7 +108,7 @@ public function run($args = []) } } } elseif (self::upload_failure()) { - $rcmail->output->command('remove_from_attachment_list', $uploadid); + $rcmail->output->add_js_call('remove_from_attachment_list', $uploadid); } $rcmail->output->send('iframe'); diff --git a/program/include/rcmail_action.php b/program/include/rcmail_action.php index 167ca6364e0..f4a78e7fad4 100644 --- a/program/include/rcmail_action.php +++ b/program/include/rcmail_action.php @@ -171,7 +171,7 @@ public static function quota_display($attrib) $quota = self::quota_content($attrib); $rcmail->output->add_gui_object('quotadisplay', $attrib['id']); - $rcmail->output->add_script('rcmail.set_quota(' . rcube_output::json_serialize($quota) . ');', 'docready'); + $rcmail->output->add_js_call('set_quota', $quota); return html::span($attrib, ' '); } @@ -431,10 +431,8 @@ public static function html_editor($mode = '', $editorId = null) } if (!empty($editorId)) { - $script = rcmail_output::JS_OBJECT_NAME . ".enable_command('toggle-editor', true);" - . rcmail_output::JS_OBJECT_NAME . ".editor_init(null, '{$editorId}');"; - - $rcmail->output->add_script($script, 'docready'); + $rcmail->output->add_js_call('enable_command', 'toggle-editor', true); + $rcmail->output->add_js_call('editor_init', null, $editorId); } $rcmail->output->include_script('tinymce/tinymce.min.js'); @@ -512,7 +510,6 @@ public static function upload_form($attrib, $name, $action, $input_attr = [], $m // set defaults $attrib += ['id' => 'rcmUploadbox', 'buttons' => 'yes']; - $event = rcmail_output::JS_OBJECT_NAME . ".command('{$action}', this.form)"; $form_id = $attrib['id'] . 'Frm'; // Default attributes of file input and form @@ -536,7 +533,9 @@ public static function upload_form($attrib, $name, $action, $input_attr = [], $m $input_attr = array_merge($input_attr, [ // #5854: Chrome does not execute onchange when selecting the same file. // To fix this we reset the input using null value. - 'onchange' => "{$event}; this.value=null", + 'data-event-handle' => 'command_with_form', + 'data-action' => $action, + 'data-nullify-value' => true, 'class' => 'smart-upload', 'tabindex' => '-1', ]); @@ -552,9 +551,9 @@ public static function upload_form($attrib, $name, $action, $input_attr = [], $m if (self::get_bool_attr($attrib, 'buttons')) { $button = new html_inputfield(['type' => 'button']); $content .= html::div('buttons', - $button->show($rcmail->gettext('close'), ['class' => 'button', 'onclick' => "$('#{$attrib['id']}').hide()"]) + $button->show($rcmail->gettext('close'), ['class' => 'button', 'data-event-handle' => 'hide_by_id', 'data-id' => $attrib['id']]) . ' ' . - $button->show($rcmail->gettext('upload'), ['class' => 'button mainaction', 'onclick' => $event]) + $button->show($rcmail->gettext('upload'), ['class' => 'button mainaction', 'data-event-handle' => 'command_with_form', 'data-action' => $action]) ); } @@ -585,7 +584,7 @@ public static function upload_error($php_error, $attachment = null, $add_error = $msg = $rcmail->gettext('fileuploaderror'); } - $rcmail->output->command('display_message', $msg, 'error'); + $rcmail->output->add_js_call('display_message', $msg, 'error'); } /** @@ -612,7 +611,7 @@ public static function upload_failure() $msg = $rcmail->gettext('fileuploaderror'); } - $rcmail->output->command('display_message', $msg, 'error'); + $rcmail->output->add_js_call('display_message', $msg, 'error'); return true; } @@ -1216,7 +1215,8 @@ protected static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$j $html_name = rcube::Q($foldername) . ($unread ? html::span('unreadcount skip-content', sprintf($attrib['unreadwrap'], $unread)) : ''); $link_attrib = $folder['virtual'] ? [] : [ 'href' => $rcmail->url(['_mbox' => $folder['id']]), - 'onclick' => sprintf("return %s.command('list','%s',this,event)", rcmail_output::JS_OBJECT_NAME, $js_name), + 'data-event-handle' => 'folder_tree_list', + 'data-name' => $js_name, 'rel' => $folder['id'], 'title' => $title, ]; diff --git a/program/include/rcmail_html_page.php b/program/include/rcmail_html_page.php index d82d6f2aa8e..c673903a51e 100644 --- a/program/include/rcmail_html_page.php +++ b/program/include/rcmail_html_page.php @@ -74,8 +74,7 @@ public function register_inline_warning($text, $button_label = null, $button_url $text = html::span(null, $text); if ($button_label) { - $onclick = "location.href = '{$button_url}'"; - $button = html::tag('button', ['onclick' => $onclick], rcube::Q($button_label)); + $button = html::tag('button', ['data-event-handle' => 'call_redirect', 'data-url' => $button_url], rcube::Q($button_label)); $text .= html::p(['class' => 'rcmail-inline-buttons'], $button); } diff --git a/program/include/rcmail_output.php b/program/include/rcmail_output.php index 2d0d7d8fc22..77dc4a29cb1 100644 --- a/program/include/rcmail_output.php +++ b/program/include/rcmail_output.php @@ -107,7 +107,7 @@ public function reset() * @param string $cmd Method to call * @param mixed ...$args Method arguments */ - abstract public function command($cmd, ...$args); + abstract public function add_js_call($cmd, ...$args); /** * Add a localized label(s) to the client environment diff --git a/program/include/rcmail_output_cli.php b/program/include/rcmail_output_cli.php index b7a616e2bba..1f39a1d155f 100644 --- a/program/include/rcmail_output_cli.php +++ b/program/include/rcmail_output_cli.php @@ -30,7 +30,7 @@ class rcmail_output_cli extends rcmail_output * @see rcube_output::command() */ #[Override] - public function command($cmd, ...$args) + public function add_js_call($cmd, ...$args) { // NOP } diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 75e9fbf0e17..fb7296e6799 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -29,14 +29,13 @@ class rcmail_output_html extends rcmail_output protected $objects = []; protected $js_env = []; protected $js_labels = []; - protected $js_commands = []; + protected $js_calls = []; protected $skin_paths = []; protected $skin_extends = []; protected $skin_name = ''; protected $scripts_path = ''; protected $script_files = []; protected $css_files = []; - protected $scripts = []; protected $task; protected $meta_tags = []; protected $link_tags = ['shortcut icon' => '']; @@ -141,12 +140,6 @@ protected function init($framed = false) */ EOF; // add common javascripts - $this->add_script($lic, 'head_top'); - $this->add_script('var ' . self::JS_OBJECT_NAME . ' = new rcube_webmail();', 'head_top'); - - // don't wait for page onload. Call init at the bottom of the page (delayed) - $this->add_script(self::JS_OBJECT_NAME . '.init();', 'docready'); - $this->scripts_path = 'program/js/'; $this->include_script('jquery.min.js'); $this->include_script('common.js'); @@ -490,7 +483,22 @@ protected function find_file_path($file, $skin_paths) */ public function add_gui_object($obj, $id) { - $this->add_script(self::JS_OBJECT_NAME . ".gui_object('{$obj}', '{$id}');"); + $this->js_calls[] = ['gui_object', $obj, $id]; + } + + /** + * Deprecated function to call a client method. + * Left here to allow a grace period for old code. + * + * @deprecated + * + * @param string $cmd Method to call + * @param mixed ...$args Method arguments + */ + public function command($cmd, ...$args) + { + rcube::write_log('errors', 'rcmail_output_html->command() is deprecated, replace it with a call to rcmail_output_html->add_js_call()'); + return $this->add_js_call($cmd, ...$args); } /** @@ -500,14 +508,14 @@ public function add_gui_object($obj, $id) * @param mixed ...$args Method arguments */ #[Override] - public function command($cmd, ...$args) + public function add_js_call($cmd, ...$args) { if (strpos($cmd, 'plugin.') !== false) { - $this->js_commands[] = ['triggerEvent', $cmd, $args[0]]; + $this->js_calls[] = ['triggerEvent', $cmd, $args[0]]; } else { array_unshift($args, $cmd); - $this->js_commands[] = $args; + $this->js_calls[] = $args; } } @@ -537,7 +545,7 @@ public function add_label(...$args) * @param bool $override Override last set message * @param int $timeout Message display time in seconds * - * @uses self::command() + * @uses self::add_js_call() */ #[Override] public function show_message($message, $type = 'notice', $vars = null, $override = true, $timeout = 0) @@ -554,7 +562,7 @@ public function show_message($message, $type = 'notice', $vars = null, $override } $this->message = $message; - $this->command('display_message', $msgtext, $type, $timeout * 1000); + $this->add_js_call('display_message', $msgtext, $type, $timeout * 1000); } } @@ -593,8 +601,7 @@ public function reset($all = false) $this->env = $this->js_env = $env; $this->framed = $framed || !empty($this->env['framed']); $this->js_labels = []; - $this->js_commands = []; - $this->scripts = []; + $this->js_calls = []; $this->header = ''; $this->footer = ''; $this->body = ''; @@ -688,23 +695,6 @@ public function write($template = '') $this->js_env['blankpage'] = $this->asset_url($this->js_env['blankpage'], true); } - $commands = $this->get_js_commands($framed); - - // if all js commands go to parent window we can ignore all - // script files and skip rcube_webmail initialization (#1489792) - // but not on error pages where skins may need jQuery, etc. - if ($framed && empty($this->js_env['server_error'])) { - $this->scripts = []; - $this->script_files = []; - $this->header = ''; - $this->footer = ''; - } - - // write all javascript commands - if (!empty($commands)) { - $this->add_script($commands, 'head_top'); - } - $this->page_headers(); // call super method @@ -728,6 +718,7 @@ public function page_headers() $this->header('X-Frame-Options: sameorigin', true); } } + $this->header("Content-Security-Policy: script-src 'self'", true); } /** @@ -853,7 +844,7 @@ public function parse($name = 'main', $exit = true, $write = true) /** * Return executable javascript code for all registered commands */ - protected function get_js_commands(&$framed = null) + protected function get_js_commands() { $out = ''; $parent_commands = 0; @@ -877,38 +868,22 @@ protected function get_js_commands(&$framed = null) $top_commands[] = ['hide_message', $unlock]; } - $commands = array_merge($top_commands, $this->js_commands); - - foreach ($commands as $args) { - $method = array_shift($args); - $parent = $this->framed || preg_match('/^parent\./', $method); + $commands = array_merge($top_commands, $this->js_calls); - foreach ($args as $i => $arg) { - $args[$i] = self::json_serialize($arg, $this->devel_mode); - } - - if ($parent) { - $parent_commands++; - $method = preg_replace('/^parent\./', '', $method); - $parent_prefix = 'if (window.parent && parent.' . self::JS_OBJECT_NAME . ') parent.'; - $method = $parent_prefix . self::JS_OBJECT_NAME . '.' . $method; - } else { - $method = self::JS_OBJECT_NAME . '.' . $method; + // If this is framed, prefix all commands (which are the first element + // of each sub-array) so they're called on the parent's `rcmail` + // instance. + if ($this->framed) { + // Using `for` because we modify the array's content and want to + // avoid the pitfalls of `foreach` and passing by reference. + for ($i = 0; $i < count($commands); $i++) { + if (strpos($commands[$i][0], 'parent.') !== 0) { + $commands[$i][0] = "parent.{$commands[$i][0]}"; + } } - - $out .= sprintf("%s(%s);\n", $method, implode(',', $args)); } - $framed = $parent_prefix && $parent_commands == count($commands); - - // make the output more compact if all commands go to parent window - if ($framed) { - $out = 'if (window.parent && parent.' . self::JS_OBJECT_NAME . ") {\n" - . str_replace($parent_prefix, "\tparent.", $out) - . "}\n"; - } - - return $out; + return self::json_serialize($commands, $this->devel_mode); } /** @@ -1447,7 +1422,7 @@ protected function xml_command($matches) // 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']); + $this->add_js_call('gui_container', $attrib['name'], $attrib['id']); // let plugins insert some content here $hook = $this->app->plugins->exec_hook('template_container', $attrib + ['content' => '']); return $hook['content']; @@ -1496,7 +1471,8 @@ protected function xml_command($matches) } if (($link = $this->get_template_logo('link')) !== null) { - $attrib['onclick'] = "location.href='{$link}';"; + $attrib['data-url'] = $link; + $attrib['data-event-handle'] = 'call_redirect'; $attrib['style'] = 'cursor:pointer;'; } @@ -1801,21 +1777,21 @@ public function button($attrib) // register button in the system if (!empty($attrib['command'])) { - $this->add_script(sprintf( - "%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');", - self::JS_OBJECT_NAME, + $this->js_calls[] = [ + 'register_button', $command, $attrib['id'], $attrib['type'], !empty($attrib['imageact']) ? $this->abs_url($attrib['imageact']) : (!empty($attrib['classact']) ? $attrib['classact'] : ''), !empty($attrib['imagesel']) ? $this->abs_url($attrib['imagesel']) : (!empty($attrib['classsel']) ? $attrib['classsel'] : ''), - !empty($attrib['imageover']) ? $this->abs_url($attrib['imageover']) : '' - )); + !empty($attrib['imageover']) ? $this->abs_url($attrib['imageover']) : '', + ]; // make valid href to specific buttons if (in_array($attrib['command'], rcmail::$main_tasks)) { $attrib['href'] = $this->app->url(['task' => $attrib['command']]); - $attrib['onclick'] = sprintf("return %s.command('switch-task','%s',this,event)", self::JS_OBJECT_NAME, $attrib['command']); + $attrib['data-arg'] = $attrib['command']; + $attrib['data-event-handle'] = 'switch_task'; } elseif (!empty($attrib['task']) && in_array($attrib['task'], rcmail::$main_tasks)) { $attrib['href'] = $this->app->url(['action' => $attrib['command'], 'task' => $attrib['task']]); } elseif (in_array($attrib['command'], $a_static_commands)) { @@ -1834,13 +1810,10 @@ public function button($attrib) if (!empty($attrib['classact'])) { $attrib['class'] = $attrib['classact']; } - } elseif ($command && empty($attrib['onclick'])) { - $attrib['onclick'] = sprintf( - "return %s.command('%s','%s',this,event)", - self::JS_OBJECT_NAME, - $command, - !empty($attrib['prop']) ? $attrib['prop'] : '' - ); + } elseif ($command && empty($attrib['data-event-handle'])) { + $attrib['data-command'] = $command; + $attrib['data-prop'] = !empty($attrib['prop']) ? $attrib['prop'] : ''; + $attrib['data-event-handle'] = 'call_command'; } $out = ''; @@ -1860,10 +1833,10 @@ public function button($attrib) if (!empty($attrib['label'])) { $btn_content .= ' ' . $attrib['label']; } - $link_attrib = ['href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'target']; + $link_attrib = ['href', 'target']; } elseif ($attrib['type'] == 'link') { $btn_content = $attrib['content'] ?? (!empty($attrib['label']) ? $attrib['label'] : $attrib['command']); - $link_attrib = array_merge(html::$common_attrib, ['href', 'onclick', 'tabindex', 'target', 'rel']); + $link_attrib = array_merge(html::$common_attrib, ['href', 'tabindex', 'target', 'rel']); if (!empty($attrib['innerclass'])) { $btn_content = html::span($attrib['innerclass'], $btn_content); } @@ -1877,7 +1850,7 @@ public function button($attrib) $attrib['disabled'] = 'disabled'; } - $out = html::tag('input', $attrib, null, ['type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex', 'disabled']); + $out = html::tag('input', $attrib, null, ['type', 'value', 'id', 'class', 'style', 'tabindex', 'disabled']); } else { if (!empty($attrib['label'])) { $attrib['value'] = $attrib['label']; @@ -1887,7 +1860,7 @@ public function button($attrib) } $content = $attrib['content'] ?? $attrib['label']; - $out = html::tag('button', $attrib, $content, ['type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex', 'disabled']); + $out = html::tag('button', $attrib, $content, ['type', 'value', 'id', 'class', 'style', 'tabindex', 'disabled']); } // generate html code for button @@ -1929,21 +1902,6 @@ public function include_script($file, $position = 'head', $add_path = true) } } - /** - * Add inline javascript code - * - * @param string $script JS code snippet - * @param string $position Target position [head|head_top|foot|docready] - */ - public function add_script($script, $position = 'head') - { - if (!isset($this->scripts[$position])) { - $this->scripts[$position] = rtrim($script); - } else { - $this->scripts[$position] .= "\n" . rtrim($script); - } - } - /** * Link an external css file * @@ -1993,15 +1951,6 @@ protected function _write($output = '') return $output . html::script($script); }; - $merge_scripts = static function ($output, $script) { - return $output . html::script([], $script); - }; - - // put docready commands into page footer - if (!empty($this->scripts['docready'])) { - $this->add_script("\$(function() {\n" . $this->scripts['docready'] . "\n});", 'foot'); - } - $page_header = ''; $page_footer = ''; $meta = ''; @@ -2042,24 +1991,21 @@ protected function _write($output = '') $page_header .= array_reduce((array) $this->script_files['head'], $merge_script_files); } - $head = $this->scripts['head_top'] ?? ''; - $head .= $this->scripts['head'] ?? ''; - - $page_header .= array_reduce((array) $head, $merge_scripts); $page_header .= $this->header . "\n"; if (!empty($this->script_files['head_bottom'])) { $page_header .= array_reduce((array) $this->script_files['head_bottom'], $merge_script_files); } - if (!empty($this->script_files['foot'])) { - $page_footer .= array_reduce((array) $this->script_files['foot'], $merge_script_files); - } + $page_footer .= html::div(['id' => 'js-calls', 'style' => 'display: none', 'hidden' => true, 'data-js' => $this->get_js_commands()], ''); $page_footer .= $this->footer . "\n"; - if (!empty($this->scripts['foot'])) { - $page_footer .= array_reduce((array) $this->scripts['foot'], $merge_scripts); + // Make sure to add the 'foot' scripts after the footer data, because + // that data can contain e.g. relevant elements for popups that are + // triggered from `rcmail.init()`. + if (!empty($this->script_files['foot'])) { + $page_footer .= array_reduce((array) $this->script_files['foot'], $merge_script_files); } // find page header @@ -2155,7 +2101,7 @@ public function frame($attrib, $is_contentframe = false) } $attrib['name'] = $attrib['id']; - $attrib['src'] = !empty($attrib['src']) ? $this->abs_url($attrib['src'], true) : 'javascript:false;'; + $attrib['src'] = !empty($attrib['src']) ? $this->abs_url($attrib['src'], true) : 'about:blank'; // register as 'contentframe' object if ($is_contentframe || !empty($attrib['contentframe'])) { @@ -2194,7 +2140,7 @@ public function form_tag($attrib, $content = null) return html::tag('form', $attrib + ['action' => $this->app->comm_path, 'method' => 'get'], $hidden . $content, - ['id', 'class', 'style', 'name', 'method', 'action', 'enctype', 'onsubmit'] + ['id', 'class', 'style', 'name', 'method', 'action', 'enctype', 'data-onsubmit'] ); } @@ -2424,11 +2370,7 @@ protected function preloader($attrib): void return; } - $this->add_script('var images = ' . self::json_serialize($images, $this->devel_mode) . '; - for (var i=0; iadd_js_call('preload_images', $images); } /** @@ -2473,11 +2415,7 @@ public function search_form($attrib) if (empty($attrib['form']) && empty($attrib['no-form'])) { $out = $this->form_tag([ 'name' => !empty($attrib['form-name']) ? $attrib['form-name'] : 'rcmqsearchform', - 'onsubmit' => sprintf( - "%s.command('%s'); return false", - self::JS_OBJECT_NAME, - !empty($attrib['command']) ? $attrib['command'] : 'search' - ), + 'data-onsubmit' => ['command', !empty($attrib['command']) ? $attrib['command'] : 'search', ['preventDefault' => true]], // 'style' => "display:inline" ], $out); } diff --git a/program/include/rcmail_output_json.php b/program/include/rcmail_output_json.php index 6c2902f4bd9..9e6820dd35f 100644 --- a/program/include/rcmail_output_json.php +++ b/program/include/rcmail_output_json.php @@ -24,7 +24,7 @@ class rcmail_output_json extends rcmail_output { protected $texts = []; - protected $commands = []; + protected $js_calls = []; protected $callbacks = []; protected $message; protected $header_sent = false; @@ -63,7 +63,7 @@ public function set_pagetitle($title) $name = $this->config->get('product_name'); } - $this->command('set_pagetitle', empty($name) ? $title : $name . ' :: ' . $title); + $this->add_js_call('set_pagetitle', empty($name) ? $title : $name . ' :: ' . $title); } /** @@ -89,6 +89,21 @@ public function add_handlers($arr) // ignore } + /** + * Deprecated function to call a client method. + * Left here to allow a grace period for old code. + * + * @deprecated + * + * @param string $cmd Method to call + * @param mixed ...$args Method arguments + */ + public function command($cmd, ...$args) + { + rcube::write_log('errors', 'rcmail_output_json->command() is deprecated, replace it with a call to rcmail_output_html->add_js_call()'); + return $this->add_js_call($cmd, ...$args); + } + /** * Call a client method * @@ -96,14 +111,14 @@ public function add_handlers($arr) * @param mixed ...$args Additional arguments */ #[Override] - public function command($cmd, ...$args) + public function add_js_call($cmd, ...$args) { array_unshift($args, $cmd); if (strpos($args[0], 'plugin.') === 0) { $this->callbacks[] = $args; } else { - $this->commands[] = $args; + $this->js_calls[] = $args; } } @@ -133,7 +148,7 @@ public function add_label(...$args) * @param bool $override Override last set message * @param int $timeout Message displaying time in seconds * - * @uses self::command() + * @uses self::add_js_call() */ #[Override] public function show_message($message, $type = 'notice', $vars = null, $override = true, $timeout = 0) @@ -149,19 +164,19 @@ public function show_message($message, $type = 'notice', $vars = null, $override } $this->message = $message; - $this->command('display_message', $msgtext, $type, $timeout * 1000); + $this->add_js_call('display_message', $msgtext, $type, $timeout * 1000); } } /** - * Delete all stored env variables and commands + * Delete all stored env variables and js_calls */ #[Override] public function reset() { parent::reset(); $this->texts = []; - $this->commands = []; + $this->js_calls = []; } /** @@ -242,7 +257,7 @@ protected function remote_response($add = '') } // send function calls - $response['exec'] = $this->get_js_commands() . $add; + $response['js_calls'] = $this->get_js_calls() . $add; if (!empty($this->callbacks)) { $response['callbacks'] = $this->callbacks; @@ -259,25 +274,10 @@ protected function remote_response($add = '') } /** - * Return executable javascript code for all registered commands + * Return executable javascript code for all registered js_calls */ - protected function get_js_commands() + protected function get_js_calls() { - $out = ''; - - foreach ($this->commands as $args) { - $method = array_shift($args); - foreach ($args as $i => $arg) { - $args[$i] = self::json_serialize($arg, $this->devel_mode, false); - } - - $out .= sprintf( - "this.%s(%s);\n", - preg_replace('/^parent\./', '', $method), - implode(',', $args) - ); - } - - return $out; + return json_encode($this->js_calls); } } diff --git a/program/include/rcmail_sendmail.php b/program/include/rcmail_sendmail.php index aa0f0f8653e..78d3e64ec55 100644 --- a/program/include/rcmail_sendmail.php +++ b/program/include/rcmail_sendmail.php @@ -983,7 +983,7 @@ protected function compose_header_from($attrib) $separator = $top_posting ? '---' : '-- '; $add_separator = (bool) $this->rcmail->config->get('sig_separator'); - $field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME . '.change_identity(this)'; + $field_attrib['data-onchange'] = ['change_identity', '__THIS__']; $select_from = new html_select($field_attrib); // create SELECT element diff --git a/program/include/rcmail_string_replacer.php b/program/include/rcmail_string_replacer.php index bbdcbbadf4b..3284c11a098 100644 --- a/program/include/rcmail_string_replacer.php +++ b/program/include/rcmail_string_replacer.php @@ -52,10 +52,8 @@ protected function mailto_callback($matches) $attribs = [ 'href' => 'mailto:' . $href, - 'onclick' => sprintf("return %s.command('compose','%s',this)", - rcmail_output::JS_OBJECT_NAME, - rcube::JQ($href) - ), + 'data-href' => $href, + 'data-event-handle' => 'compose_mailto_callback', ]; $i = $this->add(html::a($attribs, rcube::Q($href)) . $suffix); diff --git a/program/js/app.js b/program/js/app.js index 21c907ae13a..1c38bfac637 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -224,6 +224,9 @@ function rcube_webmail() { // initialize webmail client this.init = function () { var n; + + this.interpret_js_calls(document.getElementById('js-calls').dataset.js); + this.task = this.env.task; if (!this.env.blankpage) { @@ -414,19 +417,18 @@ function rcube_webmail() { // add more commands (not enabled) $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']); - if (window.googie) { - this.env.editor_config.spellchecker = googie; - this.env.editor_config.spellcheck_observer = function (s) { - ref.spellcheck_state(); - }; + this.env.editor_config.spellcheck_observer = function (s) { + ref.spellcheck_state(); + }; + // initialize HTML editor + this.editor_init(null, this.env.composebody); + + if (this.editor.spellchecker) { this.env.compose_commands.push('spellcheck'); this.enable_command('spellcheck', true); } - // initialize HTML editor - this.editor_init(null, this.env.composebody); - // init message compose form this.init_messageform(); } else if (this.env.action == 'bounce') { @@ -692,6 +694,8 @@ function rcube_webmail() { break; } + this.addAllEventListenersFromElements(); + // select first input field in an edit form if (this.gui_objects.editform) { $('input,select,textarea', this.gui_objects.editform) @@ -775,7 +779,7 @@ function rcube_webmail() { return ref.doc_keypress(e); }); - rcube_webmail.set_iframe_events({ mouseup: body_mouseup }); + ref.set_iframe_events({ mouseup: body_mouseup }); // trigger init event hook this.triggerEvent('init', { task: this.task, action: this.env.action }); @@ -800,6 +804,37 @@ function rcube_webmail() { this.start_keepalive(); }; + /** + * Handle function calls passed in via #js-calls. Through this, server code + * can trigger Javascript-methods to be called. + */ + this.interpret_js_calls = function (input) { + if (!input) { + return; + } + var data = JSON.parse(input); + data.forEach((args) => { + if (!Array.isArray(args)) { + this.log("Unexpected data in '#js-calls'! This is not an array: ", args); + } + var command = args.shift(); + if (command.startsWith('parent.')) { + command = command.replace(/^parent\./, ''); + if (typeof parent.rcmail[command] !== 'function') { + this.log("'" + command + "' is not a callable function!"); + return; + } + parent.rcmail[command](...args); + } else { + if (typeof this[command] !== 'function') { + this.log("'" + command + "' is not a callable function!"); + return; + } + this[command](...args); + } + }); + }; + this.log = function (msg) { if (this.env.devel_mode && window.console && console.log) { console.log(msg); @@ -2342,9 +2377,9 @@ function rcube_webmail() { // attach events $.each(fn, function (i, f) { - row[i].onclick = function (e) { + row[i].addEventListener('click', function (e) { f(e); return rcube_event.cancel(e); - }; + }); if (bw.touch && row[i].addEventListener) { row[i].addEventListener('touchend', function (e) { if (e.changedTouches.length == 1) { @@ -2400,7 +2435,7 @@ function rcube_webmail() { flags: flags.extra_flags, // flags from plugins }); - var c, n, col, html, css_class, label, status_class = '', status_label = '', tree = '', expando = '', + var c, n, col, html, css_class, label, status_class = '', status_label = '', tree = [], expando = '', list = this.message_list, rows = list.rows, message = this.env.messages[uid], @@ -2455,7 +2490,7 @@ function rcube_webmail() { if (this.env.threading) { if (message.depth) { // This assumes that div width is hardcoded to 15px, - tree += '  '; + tree.push($('').attr({id: 'rcmtab' + msg_id, class: 'branch', style: 'width: ' + (message.depth * 15) + 'px;'}).text('\u00A0\u00A0')); if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false) || ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) @@ -2473,7 +2508,7 @@ function rcube_webmail() { message.expanded = true; } - expando = '
  
'; + expando = $('
').attr({id: 'rcmexpando' + row.id, class: (message.expanded ? 'expanded' : 'collapsed')}).text('\u00A0\u00A0'); row_class += ' thread' + (message.expanded ? ' expanded' : ''); } @@ -2486,7 +2521,7 @@ function rcube_webmail() { } } - tree += ''; + tree.push($('').attr({id: 'msgicn' + row.id, class: css_class + status_class, title: status_label})); row.className = row_class; // build subject link @@ -2496,14 +2531,17 @@ function rcube_webmail() { query = { _mbox: flags.mbox }; query[uid_param] = uid; - cols.subject = '' + cols.subject + ''; + cols.subject = $('') + .attr({href: this.url(action, query), tabindex: "-1"}) + .on('click', function (event) { return rcube_event.keyboard_only(event) }) + .on('mouseover', function (event) { rcmail.long_subject_title(event.target) }) + .append($('').append(cols.subject)); } // add each submitted col for (n in listcols) { c = listcols[n]; - col = { className: String(c).toLowerCase(), events: {} }; + col = { className: String(c).toLowerCase(), events: {}, contentNodes: [] }; if (this.env.coltypes[c] && this.env.coltypes[c].hidden) { col.className += ' hidden'; @@ -2512,19 +2550,19 @@ function rcube_webmail() { if (c == 'flag') { css_class = (flags.flagged ? 'flagged' : 'unflagged'); label = this.get_label(css_class); - html = ''; + html = $('').attr({id: 'flagicn' + row.id, class: css_class, title: label}); } else if (c == 'attachment') { label = this.get_label('withattachment'); if (flags.attachmentClass) { - html = ''; + html = $('').attr({class: flags.attachmentClass, title: label}); } else if (flags.ctype == 'multipart/report') { - html = ''; + html = $('').attr({class: 'report'}); } else if (flags.ctype == 'multipart/encrypted' || flags.ctype == 'application/pkcs7-mime') { - html = ''; + html = $('').attr({class: 'encrypted'}); } else if (flags.hasattachment || (!flags.hasnoattachment && /application\/|multipart\/(m|signed)/.test(flags.ctype))) { - html = ''; + html = $('').attr({class: 'attachment', title: label}); } else { - html = ' '; + html = document.createTextNode('\u00A0'); } } else if (c == 'status') { label = ''; @@ -2539,25 +2577,25 @@ function rcube_webmail() { } else { css_class = 'msgicon'; } - html = ''; + html = $('').attr({id: 'statusicn' + row.id, class: css_class + status_class, title: label}); } else if (c == 'threads') { html = expando; } else if (c == 'subject') { - html = tree + cols[c]; + html = tree.concat(cols[c]); } else if (c == 'priority') { if (flags.prio > 0 && flags.prio < 6) { label = this.get_label('priority') + ' ' + flags.prio; - html = ''; + html = $('').attr({class: 'prio' + flags.prio, title: label}); } else { - html = ' '; + html = document.createTextNode('\u00A0'); } } else if (c == 'folder') { - html = '' + cols[c] + ''; + html = $('').on('mouseover', function (event) { rcmail.long_subject_title(event.target) }).append(cols[c]); } else { html = cols[c]; } - col.innerHTML = html; + col.contentNodes = this.makeNodesFromInput(html); row.cols.push(col); } @@ -2607,8 +2645,8 @@ function rcube_webmail() { if (this.className == 'subject' && domcol.className != 'subject') { domcol.className += ' skip-on-drag'; } - if (col.innerHTML) { - domcol.innerHTML = col.innerHTML; + if (col.contentNodes) { + domcol.append(...col.contentNodes); } domcell.appendChild(domcol); break; @@ -4134,7 +4172,7 @@ function rcube_webmail() { // re-enable commands that operate on the compose body ref.enable_command('toggle-editor', 'insert-response', true); - ref.enable_command('spellcheck', !!window.googie); + ref.enable_command('spellcheck', !!ref.editor.spellchecker); ref.enable_command('insert-sig', !!(ref.env.signatures && ref.env.identity && ref.env.signatures[ref.env.identity])); ref.triggerEvent('compose-encrypted', { active: false }); @@ -5720,7 +5758,7 @@ function rcube_webmail() { li.attr('id', name).addClass(att.classname).html(att.html) .find('.attachment-name').on('mouseover', function () { - rcube_webmail.long_subject_title_ex(this); + ref.long_subject_title_ex(this); }); // replace indicator's li @@ -6284,7 +6322,7 @@ function rcube_webmail() { this.ksearch_pane.data('reqid', reqid); init = 1; // reset content - ul.innerHTML = ''; + $(ul).empty(); this.env.contacts = []; // Calculate the results pane position and size @@ -6941,6 +6979,7 @@ function rcube_webmail() { this.update_contact_row = function (cid, cols_arr, newcid, source, data) { var list = this.contact_list; + cols_arr = this.makeNodesFromInput(cols_arr); cid = this.html_identifier(cid); // when in searching mode, concat cid with the source name @@ -6975,7 +7014,7 @@ function rcube_webmail() { for (c in cols) { col = {}; col.className = String(c).toLowerCase(); - col.innerHTML = cols[c]; + col.contentNodes = this.makeNodesFromInput(cols[c]); row.cols.push(col); } @@ -7677,7 +7716,7 @@ function rcube_webmail() { rid = this.html_identifier(id); if (add) { - list.insert_row({ id: 'rcmrow' + rid, cols: [{ className: 'mail', innerHTML: name }] }); + list.insert_row({ id: 'rcmrow' + rid, cols: [{ className: 'mail', contentNodes: this.makeNodesFromInput(name) }] }); list.select(rid); } else { list.update_row(rid, [name]); @@ -7689,7 +7728,7 @@ function rcube_webmail() { var list = this.responses_list; if (add) { - list.insert_row({ id: 'rcmrow' + id, cols: [{ className: 'name', innerHTML: name }] }); + list.insert_row({ id: 'rcmrow' + id, cols: [{ className: 'name', contentNodes: this.makeNodesFromInput(name) }] }); list.select(id); } else { list.update_row(id, [name]); @@ -8013,6 +8052,8 @@ function rcube_webmail() { this.triggerEvent('clonerow', { row: row, id: id }); } + this.addAllEventListenersFromElements(row); + return row; }; @@ -8220,24 +8261,24 @@ function rcube_webmail() { elm._id = prop.id; if (prop.sel) { - elm.onmousedown = function (e) { + elm.addEventListener('mousedown', function (e) { return ref.button_sel(this._command, this._id); - }; - elm.onmouseup = function (e) { + }); + elm.addEventListener('mouseup', function (e) { return ref.button_out(this._command, this._id); - }; + }); if (preload) { new Image().src = prop.sel; } } if (prop.over) { - elm.onmouseover = function (e) { + elm.addEventListener('mouseover', function (e) { return ref.button_over(this._command, this._id); - }; - elm.onmouseout = function (e) { + }); + elm.addEventListener('mouseout', function (e) { return ref.button_out(this._command, this._id); - }; + }); if (preload) { new Image().src = prop.over; } @@ -8827,13 +8868,15 @@ function rcube_webmail() { // replace old column headers if (thead) { if (repl) { - thead.innerHTML = ''; + $(thead).empty(); tr = document.createElement('tr'); for (n in listcols) { c = listcols[n]; cell = document.createElement('th'); - cell.innerHTML = repl[c].html || ''; + if (repl[c].html) { + cell.append(this.makeNodesFromInput(repl[c].html)); + } if (repl[c].id) { cell.id = repl[c].id; } @@ -8901,7 +8944,7 @@ function rcube_webmail() { // replace content of mailboxname display this.set_mailboxname = function (content) { if (this.gui_objects.mailboxname && content) { - this.gui_objects.mailboxname.innerHTML = content; + this.gui_objects.mailboxname.append(this.makeNodesFromInput(content)); } }; @@ -9020,9 +9063,9 @@ function rcube_webmail() { $(elem).removeClass('show-headers').addClass('hide-headers'); $(this.gui_objects.all_headers_row).show(); - elem.onclick = function () { + elem.addEventListener('click', function () { ref.command('hide-headers', '', elem); - }; + }); // fetch headers only once if (!this.gui_objects.all_headers_box.innerHTML) { @@ -9040,9 +9083,9 @@ function rcube_webmail() { $(elem).removeClass('hide-headers').addClass('show-headers'); $(this.gui_objects.all_headers_row).hide(); - elem.onclick = function () { + elem.addEventListener('click', function () { ref.command('show-headers', '', elem); - }; + }); }; // create folder selector popup @@ -9345,6 +9388,7 @@ function rcube_webmail() { // initialize HTML editor this.editor_init = function (config, id) { this.editor = new rcube_text_editor(config || this.env.editor_config, id); + this.editor.init(); }; @@ -9622,8 +9666,8 @@ function rcube_webmail() { } // if we get javascript code from server -> execute it - if (response.exec) { - eval(response.exec); + if (response.js_calls) { + this.interpret_js_calls(response.js_calls); } // execute callback functions of plugins @@ -10299,6 +10343,38 @@ function rcube_webmail() { /* helper methods */ /********************************************************/ + /** + * Returns an array of Nodes from a given input. + * This is used to circumvent the use of `.innerHTML`. + */ + this.makeNodesFromInput = function (input) { + if (!Array.isArray(input)) { + input = [input]; + } + var domparser = new DOMParser(); + var result = input.map((thing) => { + if (thing.nodeName) { + // A Node. + return thing; + } else if (thing.jquery) { + // A jQuery object. + return thing[0]; + } else if (typeof thing === 'string') { + // A string that might contain HTML markup (as the server + // sometimes sends). + // TODO: This is a pretty expensive operation, and is an open + // door for XSS attacks. We should make the server send + // structured data, not HTML. + var doc = domparser.parseFromString(thing, 'text/html'); + return Array.from(doc.body.childNodes); + } else { + // Something else. + throw new Error("Unknown thing in input, cannot continue: " + JSON.stringify(thing)); + } + }); + return result.flat(); + }; + /** * Quote html entities */ @@ -10500,12 +10576,12 @@ function rcube_webmail() { this.image_support_check = function (type) { setTimeout(function () { var img = new Image(); - img.onload = function () { + img.addEventListener('load', function () { ref.env.browser_capabilities[type] = 1; - }; - img.onerror = function () { + }); + img.addEventListener('error', function () { ref.env.browser_capabilities[type] = 0; - }; + }); img.src = ref.assets_path('program/resources/blank.' + type); }, 10); }; @@ -10652,72 +10728,185 @@ function rcube_webmail() { // setTimeout for Safari setTimeout('window.print()', 10); }; -} // end object rcube_webmail + this.preload_images = function (urls) { + for (var i = 0; i < urls.length; i++) { + var img = new Image(); + img.src = urls[i]; + } + }; + + this.toggle_html_editor = function (event) { + return this.toggle_editor({ html: event.target.checked }, null, event); + }; -// some static methods -rcube_webmail.long_subject_title = function (elem, indent, text_elem) { - if (!elem.title) { - var siblings_width = 0, $elem = $(text_elem || elem); + this.reset_value_if_inbox = function (elem) { + if ($(elem).val() == 'INBOX') { + $(elem).val(''); + } + }; - $elem.siblings().each(function () { - // Note: width() returns 0 for elements with icons in :before (Elastic) - siblings_width += $(this).width() + (parseFloat(window.getComputedStyle(this, ':before').width) || 0); - }); + this.disable_show_images_if_plaintext_preferred = function (elem) { + $('#rcmfd_show_images').prop('disabled', !elem.checked).val(0); + }; - // Note: 3px to be on the safe side, but also specifically for Elastic - if ($elem.width() + siblings_width + (indent || 0) * 15 >= $elem.parent().width() - 3) { - elem.title = rcube_webmail.subject_text($elem[0]); + /** + * Simple helper functions to be called from event handlers. + */ + // Allow to call rcmail.message_list.clear() without the extra calls in + // rcmail.clear_message_list(). + this.message_list_clear = function (arg) { + ref.message_list.clear(arg); + }; + + this.reloadForm = function (elem) { + this.command('save', 'reload', elem.form); + }; + + /** + * Add eventListeners parsed from element datasets. This allows to avoid + * inline javascript event handlers (which require a very lax CSP). + * The first element of the array is the function on `rcmail` to call. + * All further elements of the array are arguments that are handed to the + * called function. + * In that list, '__THIS__' is replaced with the element that the event was + * attached to, and '__EVENT__' is the event itself. + * E.g. with this element: + * something + * A click will cause a call to `this[aMethodToCall]("arg1")`, and a double + * click will cause a call to `this[something](theDoubleClickedElement)`. + */ + this.addEventListenerFromElement = function (elem, eventName) { + var value = elem.dataset['on' + eventName]; + if (!value) { + return; } - } -}; + var eventArgs = JSON.parse(value); + var methodName = eventArgs.shift(); + if (!methodName) { + this.log("data-on'" + eventName + "' has invalid value (no method name)"); + return; + } + if (typeof this[methodName] !== 'function') { + this.log("'" + methodName + "' is not a valid method name of this class"); + return; + } + // Inject a reference to the event target element, if required. + eventArgs = eventArgs.map(function (arg) { + if (arg === '__THIS__') { + return elem; + } + return arg; + }); + var options = {}; + if (typeof eventArgs.at(-1) === 'object') { + options = eventArgs.pop(); + } + elem.addEventListener(eventName, (ev) => { + // Inject a reference to the event object, if required. + var localEventArgs = eventArgs.map((arg) => { + if (arg === '__EVENT__') { + return ev; + } + return arg; + }); + if (options.preventDefault) { + ev.preventDefault(); + } + var result = this[methodName](...localEventArgs); + if (options.returnResult) { + return result; + } + }); + }; -rcube_webmail.long_subject_title_ex = function (elem) { - if (!elem.title) { - var $elem = $(elem), + this.addEventListenerFromElements = function (rootElem, eventName) { + rootElem ||= document.body; + rootElem.querySelectorAll('[data-on' + eventName + ']').forEach(function (elem) { + ref.addEventListenerFromElement(elem, eventName); + }); + }; + + this.addAllEventListenersFromElements = function (rootElem) { + [ + 'click', + 'dblclick', + 'mouseup', + 'mousedown', + 'mouseout', + 'mouseover', + 'error', + 'load', + 'change', + 'submit', + ].forEach(function (name) { + ref.addEventListenerFromElements(rootElem, name); + }); + }; + + this.long_subject_title_ex = function (elem) { + if (!elem.title) { + var $elem = $(elem), txt = $elem.text().trim(), indent = $('span.branch', $elem).width() || 0, tmp = $('').text(txt) - .css({ - position: 'absolute', - float: 'left', - visibility: 'hidden', - 'font-size': $elem.css('font-size'), - 'font-weight': $elem.css('font-weight'), - }) - .appendTo(document.body), + .css({ + position: 'absolute', + float: 'left', + visibility: 'hidden', + 'font-size': $elem.css('font-size'), + 'font-weight': $elem.css('font-weight'), + }) + .appendTo(document.body), w = tmp.width(); - tmp.remove(); - if (w + indent * 15 > $elem.width()) { - elem.title = rcube_webmail.subject_text(elem); - } - } -}; - -rcube_webmail.subject_text = function (elem) { - var t = $(elem).clone(); - t.find('.skip-on-drag,.skip-content,.voice').remove(); - return t.text().trim(); -}; - -// set event handlers on all iframe elements (and their contents) -rcube_webmail.set_iframe_events = function (events) { - $('iframe').each(function () { - var frame = $(this); - $.each(events, function (event_name, event_handler) { - frame.on('load', function (e) { + tmp.remove(); + if (w + indent * 15 > $elem.width()) { + elem.title = ref.subject_text(elem); + } + } + }; + + this.long_subject_title = function (elem, indent, text_elem) { + if (!elem.title) { + var siblings_width = 0, $elem = $(text_elem || elem); + + $elem.siblings().each(function () { + // Note: width() returns 0 for elements with icons in :before (Elastic) + siblings_width += $(this).width() + (parseFloat(window.getComputedStyle(this, ':before').width) || 0); + }); + + // Note: 3px to be on the safe side, but also specifically for Elastic + if ($elem.width() + siblings_width + (indent || 0) * 15 >= $elem.parent().width() - 3) { + elem.title = rcube_webmail.subject_text($elem[0]); + } + } + }; + + this.subject_text = function (elem) { + var t = $(elem).clone(); + t.find('.skip-on-drag,.skip-content,.voice').remove(); + return t.text().trim(); + }; + + // set event handlers on all iframe elements (and their contents) + this.set_iframe_events = function (events) { + $('iframe').each(function () { + var frame = $(this); + $.each(events, function (event_name, event_handler) { + frame.on('load', function (e) { + try { + $(this).contents().on(event_name, event_handler); + } catch (e) { /* catch possible permission error in IE */ } + }); + try { - $(this).contents().on(event_name, event_handler); + frame.contents().on(event_name, event_handler); } catch (e) { /* catch possible permission error in IE */ } }); - - try { - frame.contents().on(event_name, event_handler); - } catch (e) { /* catch possible permission error in IE */ } }); - }); -}; + }; +} // end object rcube_webmail rcube_webmail.prototype.get_cookie = getCookie; @@ -10725,3 +10914,6 @@ rcube_webmail.prototype.get_cookie = getCookie; rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener; rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener; rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent; + +window.rcmail = new rcube_webmail(); +document.addEventListener('DOMContentLoaded', function () { window.rcmail.init(); }); diff --git a/program/js/editor.js b/program/js/editor.js index a8058bd09cf..7dd89ace631 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -77,145 +77,149 @@ function rcube_text_editor(config, id) { deprecation_warnings: false, }; - // register spellchecker for plain text editor - this.spellcheck_observer = function () {}; - if (config.spellchecker) { - this.spellchecker = config.spellchecker; - if (config.spellcheck_observer) { - this.spellchecker.spelling_state_observer = this.spellcheck_observer = config.spellcheck_observer; - } - } - - // Note: must be registered only once (#1490311) - if (!tinymce.registered_request_token) { - tinymce.registered_request_token = true; - tinymce.util.XHR.on('beforeSend', function (e) { - // secure spellchecker requests with Roundcube token - e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token); - // A hacky way of setting spellchecker language (there's no API for this in Tiny) - if (e.settings && e.settings.data) { - e.settings.data = e.settings.data.replace(/^(method=[a-zA-Z]+&lang=)([^&]+)/, '$1' + rcmail.env.spell_lang); + this.init = function () { + var googie = this.googiespell_init(); + + // register spellchecker for plain text editor + this.spellcheck_observer = function () {}; + if (googie) { + this.spellchecker = googie; + if (config.spellcheck_observer) { + this.spellchecker.spelling_state_observer = this.spellcheck_observer = config.spellcheck_observer; + } + } + + // Note: must be registered only once (#1490311) + if (!tinymce.registered_request_token) { + tinymce.registered_request_token = true; + tinymce.util.XHR.on('beforeSend', function (e) { + // secure spellchecker requests with Roundcube token + e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token); + // A hacky way of setting spellchecker language (there's no API for this in Tiny) + if (e.settings && e.settings.data) { + e.settings.data = e.settings.data.replace(/^(method=[a-zA-Z]+&lang=)([^&]+)/, '$1' + rcmail.env.spell_lang); + } + }); + } + + // minimal editor + if (config.mode == 'identity' || config.mode == 'response') { + conf.toolbar += ' | charmap hr link unlink image code $extra'; + $.extend(conf, { + plugins: 'autolink charmap code hr image link paste tabfocus', + file_picker_types: 'image', + }); + } + // full-featured editor + else { + conf.toolbar += ' | bullist numlist outdent indent ltr rtl blockquote' + + ' | link unlink table | $extra charmap image media | code searchreplace undo redo', + $.extend(conf, { + plugins: 'autolink charmap code directionality link lists image media nonbreaking' + + ' paste table tabfocus searchreplace spellchecker', + spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1', + spellchecker_language: rcmail.env.spell_lang, + }); + } + + // add TinyMCE plugins/buttons from Roundcube plugin + $.each(config.extra_plugins || [], function () { + if (conf.plugins.indexOf(this) < 0) { + conf.plugins = conf.plugins + ' ' + this; } }); - } - - // minimal editor - if (config.mode == 'identity' || config.mode == 'response') { - conf.toolbar += ' | charmap hr link unlink image code $extra'; - $.extend(conf, { - plugins: 'autolink charmap code hr image link paste tabfocus', - file_picker_types: 'image', - }); - } - // full-featured editor - else { - conf.toolbar += ' | bullist numlist outdent indent ltr rtl blockquote' - + ' | link unlink table | $extra charmap image media | code searchreplace undo redo', - $.extend(conf, { - plugins: 'autolink charmap code directionality link lists image media nonbreaking' - + ' paste table tabfocus searchreplace spellchecker', - spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1', - spellchecker_language: rcmail.env.spell_lang, + $.each(config.extra_buttons || [], function () { + if (conf.toolbar.indexOf(this) < 0) { + conf.toolbar = conf.toolbar.replace('$extra', '$extra ' + this); + } }); - } - - // add TinyMCE plugins/buttons from Roundcube plugin - $.each(config.extra_plugins || [], function () { - if (conf.plugins.indexOf(this) < 0) { - conf.plugins = conf.plugins + ' ' + this; - } - }); - $.each(config.extra_buttons || [], function () { - if (conf.toolbar.indexOf(this) < 0) { - conf.toolbar = conf.toolbar.replace('$extra', '$extra ' + this); - } - }); - - // disable TinyMCE plugins/buttons from Roundcube plugin - $.each(config.disabled_plugins || [], function () { - conf.plugins = conf.plugins.replace(this, ''); - }); - $.each(config.disabled_buttons || [], function () { - conf.toolbar = conf.toolbar.replace(this, ''); - }); - - // font list, convert to TinyMCE format - var fonts = []; - $.each(config.font_formats || [], function (key) { - fonts.push(key + '=' + this.replace(/"/g, '').toLowerCase()); - }); - conf.font_formats = fonts.join('; '); - if (fonts.length > 1) { - conf.toolbar = conf.toolbar.replace('$font', 'fontselect $font'); - } - - // font size list - conf.fontsize_formats = config.fontsize_formats.join(' '); - if (config.fontsize_formats.length > 1) { - conf.toolbar = conf.toolbar.replace('$font', 'fontsizeselect $font'); - } - - conf.toolbar = conf.toolbar.replace(/($extra|$font)/, '').replace(/\|\s+\|/g, '|'); - - // support external configuration settings e.g. from skin - if (window.rcmail_editor_settings) { - $.extend(conf, window.rcmail_editor_settings); - } - - conf.setup = function (ed) { - ed.on('init', function () { - ref.init_callback(ed); + + // disable TinyMCE plugins/buttons from Roundcube plugin + $.each(config.disabled_plugins || [], function () { + conf.plugins = conf.plugins.replace(this, ''); }); - // add handler for spellcheck button state update - ed.on('SpellcheckStart SpellcheckEnd', function (args) { - ref.spellcheck_active = args.type == 'spellcheckstart'; - ref.spellcheck_observer(); + $.each(config.disabled_buttons || [], function () { + conf.toolbar = conf.toolbar.replace(this, ''); }); - ed.on('keypress', function () { - rcmail.compose_type_activity++; + + // font list, convert to TinyMCE format + var fonts = []; + $.each(config.font_formats || [], function (key) { + fonts.push(key + '=' + this.replace(/"/g, '').toLowerCase()); }); - ed.on('PastePostProcess', function (e) { - $(e.node).find('img').each(function () { - var id = 'i' + Date.now(); + conf.font_formats = fonts.join('; '); + if (fonts.length > 1) { + conf.toolbar = conf.toolbar.replace('$font', 'fontselect $font'); + } - // No referrer for privacy - this.referrerPolicy = 'no-referrer'; + // font size list + conf.fontsize_formats = config.fontsize_formats.join(' '); + if (config.fontsize_formats.length > 1) { + conf.toolbar = conf.toolbar.replace('$font', 'fontsizeselect $font'); + } - // Need an attribute to find the image element after paste - this.setAttribute('data-img-id', id); + conf.toolbar = conf.toolbar.replace(/($extra|$font)/, '').replace(/\|\s+\|/g, '|'); - // Replace the 'src' with data: URI after the image has been loaded - // This way if we fetch the image again the browser will fetch it from cache - this.onload = function () { - this.onload = null; ref.replace_img_src(this.src, id); - }; + // support external configuration settings e.g. from skin + if (window.rcmail_editor_settings) { + $.extend(conf, window.rcmail_editor_settings); + } + + conf.setup = function (ed) { + ed.on('init', function () { + ref.init_callback(ed); }); - }); - // make links open on shift-click - ed.on('click', function (e) { - var link = $(e.target).closest('a'); - if (link.length && e.shiftKey) { - window.open(link.get(0).href, '_blank'); - return false; - } - }); - ed.on('focus blur', function (e) { - $(ed.getContainer()).toggleClass('focused'); - }); + // add handler for spellcheck button state update + ed.on('SpellcheckStart SpellcheckEnd', function (args) { + ref.spellcheck_active = args.type == 'spellcheckstart'; + ref.spellcheck_observer(); + }); + ed.on('keypress', function () { + rcmail.compose_type_activity++; + }); + ed.on('PastePostProcess', function (e) { + $(e.node).find('img').each(function () { + var id = 'i' + Date.now(); - if (conf.setup_callback) { - conf.setup_callback(ed); - } - }; + // No referrer for privacy + this.referrerPolicy = 'no-referrer'; - rcmail.triggerEvent('editor-init', { config: conf, ref: ref, id: id }); + // Need an attribute to find the image element after paste + this.setAttribute('data-img-id', id); - // textarea identifier - this.id = id; - // reference to active editor (if in HTML mode) - this.editor = null; + // Replace the 'src' with data: URI after the image has been loaded + // This way if we fetch the image again the browser will fetch it from cache + this.onload = function () { + this.onload = null; ref.replace_img_src(this.src, id); + }; + }); + }); + // make links open on shift-click + ed.on('click', function (e) { + var link = $(e.target).closest('a'); + if (link.length && e.shiftKey) { + window.open(link.get(0).href, '_blank'); + return false; + } + }); + ed.on('focus blur', function (e) { + $(ed.getContainer()).toggleClass('focused'); + }); - tinymce.init(conf); + if (conf.setup_callback) { + conf.setup_callback(ed); + } + }; + + rcmail.triggerEvent('editor-init', { config: conf, ref: ref, id: id }); + + // textarea identifier + this.id = id; + // reference to active editor (if in HTML mode) + this.editor = null; + + tinymce.init(conf); + }; // react to real individual tinyMCE editor init this.init_callback = function (editor) { @@ -677,7 +681,9 @@ function rcube_text_editor(config, id) { } } - sigElem.innerHTML = rcmail.env.signatures[id] ? rcmail.env.signatures[id].html : ''; + if (rcmail.env.signatures[id]) { + sigElem.append(rcmail.makeNodesFromInput(rcmail.env.signatures[id].html)); + } } else if (!rcmail.env.top_posting) { position_element = $(this.editor.getBody()).children().last(); } @@ -707,6 +713,8 @@ function rcube_text_editor(config, id) { type = meta.filetype, form = $('.upload-form').clone(); + rcmail.addAllEventListenersFromElements(form[0]); + // open image selector dialog this.editor.windowManager.open({ title: rcmail.get_label('select' + type), @@ -899,7 +907,8 @@ function rcube_text_editor(config, id) { rcmail.upload_file(form, 'upload'); }), wrapper = $('
') - .append($(' +
@@ -121,7 +121,7 @@

diff --git a/skins/elastic/templates/bounce.html b/skins/elastic/templates/bounce.html index f9fbf02f374..48e7c8d57a3 100644 --- a/skins/elastic/templates/bounce.html +++ b/skins/elastic/templates/bounce.html @@ -35,7 +35,7 @@

- +

@@ -46,7 +46,7 @@

- + diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html index 0f7cad8caf0..218cfb04704 100644 --- a/skins/elastic/templates/compose.html +++ b/skins/elastic/templates/compose.html @@ -21,7 +21,7 @@

- +
@@ -78,7 +78,7 @@

@@ -138,7 +138,7 @@

- " tabindex="1"> + " tabindex="1"> " tabindex="1"> @@ -152,10 +152,10 @@

- " tabindex="1"> + " tabindex="1"> - + @@ -166,10 +166,10 @@

- " tabindex="1"> + " tabindex="1"> - + @@ -180,10 +180,10 @@

- " tabindex="1"> + " tabindex="1"> - + @@ -194,10 +194,10 @@

- " tabindex="1"> + " tabindex="1"> - + @@ -248,7 +248,7 @@

- + diff --git a/skins/elastic/templates/folders.html b/skins/elastic/templates/folders.html index c3632744b24..ddfc9ebaa0a 100644 --- a/skins/elastic/templates/folders.html +++ b/skins/elastic/templates/folders.html @@ -19,7 +19,7 @@

- +
diff --git a/skins/elastic/templates/includes/layout.html b/skins/elastic/templates/includes/layout.html index 90a83741475..d4ed18fd7c8 100644 --- a/skins/elastic/templates/includes/layout.html +++ b/skins/elastic/templates/includes/layout.html @@ -29,15 +29,7 @@ - + action-"> diff --git a/skins/elastic/templates/includes/mail-menu.html b/skins/elastic/templates/includes/mail-menu.html index b50d7810154..1f9cd102150 100644 --- a/skins/elastic/templates/includes/mail-menu.html +++ b/skins/elastic/templates/includes/mail-menu.html @@ -64,7 +64,7 @@

+ name="messageimport" data-event-handle="ui_import_dialog" /> diff --git a/skins/elastic/templates/includes/menu.html b/skins/elastic/templates/includes/menu.html index 352eeb58a82..62063ddddfb 100644 --- a/skins/elastic/templates/includes/menu.html +++ b/skins/elastic/templates/includes/menu.html @@ -34,7 +34,7 @@

+ class="about" innerClass="inner" data-event-handle="ui_about_dialog" /> diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html index 2e483e9d6e1..b6ba070b805 100644 --- a/skins/elastic/templates/mail.html +++ b/skins/elastic/templates/mail.html @@ -96,7 +96,7 @@

- +
@@ -132,8 +132,8 @@

@@ -152,7 +152,7 @@