From d5190084980835d68847a9b9c18f68c00b4cd37a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 12 May 2014 12:13:24 +0200 Subject: Add configurable LDAP_OPT_DEREF option (#1489864) - patch from Stuart C. Naifeh --- program/lib/Roundcube/rcube_ldap_generic.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'program') diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php index f1048ef39..f6f9884d8 100644 --- a/program/lib/Roundcube/rcube_ldap_generic.php +++ b/program/lib/Roundcube/rcube_ldap_generic.php @@ -190,6 +190,9 @@ class rcube_ldap_generic if (isset($this->config['referrals'])) ldap_set_option($lc, LDAP_OPT_REFERRALS, $this->config['referrals']); + + if (isset($this->config['dereference'])) + ldap_set_option($lc, LDAP_OPT_DEREF, $this->config['dereference']); } else { $this->_debug("S: NOT OK"); -- cgit v1.2.3 From 8f57ce136b3f66de6a8490c0b28551278da4fc5f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 12 May 2014 13:32:40 +0200 Subject: Code improvements --- program/include/rcmail_output_html.php | 83 +++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 37 deletions(-) (limited to 'program') diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 42b208e89..154bbefaf 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -30,16 +30,16 @@ class rcmail_output_html extends rcmail_output { public $type = 'html'; - protected $message = null; - protected $js_env = array(); - protected $js_labels = array(); - protected $js_commands = array(); - protected $skin_paths = array(); + protected $message; protected $template_name; + protected $js_env = array(); + protected $js_labels = array(); + protected $js_commands = array(); + protected $skin_paths = array(); protected $scripts_path = ''; protected $script_files = array(); - protected $css_files = array(); - protected $scripts = array(); + protected $css_files = array(); + protected $scripts = array(); protected $default_template = "\n\n\n"; protected $header = ''; protected $footer = ''; @@ -58,8 +58,6 @@ class rcmail_output_html extends rcmail_output /** * Constructor - * - * @todo Replace $this->config with the real rcube_config object */ public function __construct($task = null, $framed = false) { @@ -67,7 +65,6 @@ class rcmail_output_html extends rcmail_output $this->devel_mode = $this->config->get('devel_mode'); - //$this->framed = $framed; $this->set_env('task', $task); $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin')); $this->set_env('standard_windows', (bool) $this->config->get('standard_windows')); @@ -84,7 +81,7 @@ class rcmail_output_html extends rcmail_output if (!empty($_REQUEST['_extwin'])) $this->set_env('extwin', 1); - if ($this->framed || !empty($_REQUEST['_framed'])) + if ($this->framed || $framed) $this->set_env('framed', 1); $lic = <<skin_paths; - if ($add_path) + if ($add_path) { array_unshift($skin_paths, $add_path); + } foreach ($skin_paths as $skin_path) { $path = realpath($skin_path . $file); @@ -291,9 +289,9 @@ EOF; { $cmd = func_get_args(); if (strpos($cmd[0], 'plugin.') !== false) - $this->js_commands[] = array('triggerEvent', $cmd[0], $cmd[1]); + $this->js_commands[] = array('triggerEvent', $cmd[0], $cmd[1]); else - $this->js_commands[] = $cmd; + $this->js_commands[] = $cmd; } /** @@ -303,7 +301,7 @@ EOF; { $args = func_get_args(); if (count($args) == 1 && is_array($args[0])) - $args = $args[0]; + $args = $args[0]; foreach ($args as $name) { $this->js_labels[$name] = $this->app->gettext($name); @@ -344,13 +342,13 @@ EOF; public function reset($all = false) { $framed = $this->framed; - $env = $all ? null : array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1)); + $env = $all ? null : array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1)); parent::reset(); // let some env variables survive - $this->env = $this->js_env = $env; - $this->framed = $framed || $this->env['framed']; + $this->env = $this->js_env = $env; + $this->framed = $framed || $this->env['framed']; $this->js_labels = array(); $this->js_commands = array(); $this->script_files = array(); @@ -429,20 +427,25 @@ EOF; array_unshift($this->js_commands, array('hide_message', $unlock)); } - if (!empty($this->script_files)) - $this->set_env('request_token', $this->app->get_request_token()); + if (!empty($this->script_files)) { + $this->set_env('request_token', $this->app->get_request_token()); + } // write all env variables to client if ($commands = $this->get_js_commands()) { - $js = $this->framed ? "if (window.parent) {\n" : ''; - $js .= $commands . ($this->framed ? ' }' : ''); - $this->add_script($js, 'head_top'); + if ($this->framed) { + $prefix = "if (window.parent) {\n"; + $suffix = " }"; + } + + $this->add_script($prefix . $commands . $suffix, 'head_top'); } // send clickjacking protection headers - $iframe = $this->framed || !empty($_REQUEST['_framed']); - if (!headers_sent() && ($xframe = $this->app->config->get('x_frame_options', 'sameorigin'))) + $iframe = $this->framed || $this->env['framed']; + if (!headers_sent() && ($xframe = $this->app->config->get('x_frame_options', 'sameorigin'))) { header('X-Frame-Options: ' . ($iframe && $xframe == 'deny' ? 'sameorigin' : $xframe)); + } // call super method $this->_write($template, $this->config->get('skin_path')); @@ -459,15 +462,15 @@ EOF; */ function parse($name = 'main', $exit = true, $write = true) { - $plugin = false; - $realname = $name; + $plugin = false; + $realname = $name; $this->template_name = $realname; $temp = explode('.', $name, 2); if (count($temp) > 1) { - $plugin = $temp[0]; - $name = $temp[1]; - $skin_dir = $plugin . '/skins/' . $this->config->get('skin'); + $plugin = $temp[0]; + $name = $temp[1]; + $skin_dir = $plugin . '/skins/' . $this->config->get('skin'); // apply skin search escalation list to plugin directory $plugin_skin_paths = array(); @@ -567,21 +570,26 @@ EOF; protected function get_js_commands() { $out = ''; + if (!$this->framed && !empty($this->js_env)) { $out .= self::JS_OBJECT_NAME . '.set_env('.self::json_serialize($this->js_env).");\n"; } + if (!empty($this->js_labels)) { $this->command('add_label', $this->js_labels); } + foreach ($this->js_commands as $i => $args) { $method = array_shift($args); + $parent = $this->framed || preg_match('/^parent\./', $method); + foreach ($args as $i => $arg) { $args[$i] = self::json_serialize($arg); } - $parent = $this->framed || preg_match('/^parent\./', $method); + $out .= sprintf( "%s.%s(%s);\n", - ($parent ? 'if(window.parent && parent.'.self::JS_OBJECT_NAME.') parent.' : '') . self::JS_OBJECT_NAME, + ($parent ? 'if (window.parent && parent.'.self::JS_OBJECT_NAME.') parent.' : '') . self::JS_OBJECT_NAME, preg_replace('/^parent\./', '', $method), implode(',', $args) ); @@ -600,13 +608,14 @@ EOF; public function abs_url($str, $search_path = false) { if ($str[0] == '/') { - if ($search_path && ($file_url = $this->get_skin_file($str, $skin_path))) + if ($search_path && ($file_url = $this->get_skin_file($str, $skin_path))) { return $file_url; + } return $this->base_path . $str; } - else - return $str; + + return $str; } /** @@ -1478,7 +1487,7 @@ EOF; */ public function form_tag($attrib, $content = null) { - if ($this->framed || !empty($_REQUEST['_framed'])) { + if ($this->framed || $this->env['framed']) { $hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1')); $hidden = $hiddenfield->show(); } @@ -1518,7 +1527,7 @@ EOF; // we already have a

tag if ($attrib['form']) { - if ($this->framed || !empty($_REQUEST['_framed'])) + if ($this->framed || $this->env['framed']) $hidden->add(array('name' => '_framed', 'value' => '1')); return $hidden->show() . $content; } -- cgit v1.2.3 From 2b72ec46a761ded28c83ef2ac544c9406a874802 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 12 May 2014 13:41:20 +0200 Subject: Bypass cache when counting EXISTS messages --- program/steps/mail/check_recent.inc | 4 ++-- program/steps/mail/list.inc | 2 +- program/steps/mail/move_del.inc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'program') diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index cfdcda605..70f4c03a6 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -85,7 +85,7 @@ foreach ($a_mailboxes as $mbox_name) { $OUTPUT->command('set_quota', $RCMAIL->quota_content()); } - $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS')); + $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS', true)); // "No-list" mode, don't get messages if (empty($_POST['_list'])) { @@ -146,7 +146,7 @@ foreach ($a_mailboxes as $mbox_name) { // set trash folder state if ($mbox_name === $trash) { - $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox_name, 'EXISTS')); + $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox_name, 'EXISTS', true)); } } diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index c4a6df57b..929dda299 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -93,7 +93,7 @@ rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']), $unseen); // update message count display $pages = ceil($count/$RCMAIL->storage->get_pagesize()); -$exists = $RCMAIL->storage->count($mbox_name, 'EXISTS'); +$exists = $RCMAIL->storage->count($mbox_name, 'EXISTS', true); $OUTPUT->set_env('messagecount', $count); $OUTPUT->set_env('pagecount', $pages); diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index c29985875..d98d49d1f 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -166,7 +166,7 @@ else { $OUTPUT->command('set_trash_count', $exists); } else if ($target !== null && $target === $trash) { - $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($trash, 'EXISTS')); + $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($trash, 'EXISTS', true)); } } -- cgit v1.2.3 From 3d36e8380648e231e8db1bb8410a47451b598776 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 12 May 2014 14:25:49 +0200 Subject: Performance fix: don't send vcard/photo data to the browser after contact update --- program/steps/addressbook/save.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'program') diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 94556f96b..7451f433b 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -165,6 +165,10 @@ if (!empty($cid)) { $a_js_cols[] = rcube::Q((string)$record[$col]); } + // performance: unset some big data items we don't need here + $record = array_intersect_key($record, array('ID' => 1,'email' => 1,'name' => 1)); + $record['_type'] = 'person'; + // update the changed col in list $OUTPUT->command('parent.update_contact_row', $cid, $a_js_cols, $newcid, $source, $record); -- cgit v1.2.3 From ffc74814c1c2a3d70bada9693ddda238f69cb238 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 12 May 2014 15:53:47 +0200 Subject: Optimize "empty" framed pages size (#1489792) --- CHANGELOG | 1 + program/include/rcmail_output_html.php | 58 ++++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 23 deletions(-) (limited to 'program') diff --git a/CHANGELOG b/CHANGELOG index 57293452d..9ca544e1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ CHANGELOG Roundcube Webmail - Removed redundant default_folders config option (#1489737) - Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830) - Add configurable LDAP_OPT_DEREF option (#1489864) +- Optimize framed pages size (#1489792) - Fix mbox files import RELEASE 1.0.1 diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 154bbefaf..2a90f6a01 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -431,16 +431,18 @@ EOF; $this->set_env('request_token', $this->app->get_request_token()); } - // write all env variables to client - if ($commands = $this->get_js_commands()) { - if ($this->framed) { - $prefix = "if (window.parent) {\n"; - $suffix = " }"; - } + $commands = $this->get_js_commands($framed); - $this->add_script($prefix . $commands . $suffix, 'head_top'); + // if all js commands go to parent window we can ignore all + // script files and skip rcube_webmail initialization (#1489792) + if ($framed) { + $this->scripts = array(); + $this->script_files = array(); } + // write all javascript commands + $this->add_script($commands, 'head_top'); + // send clickjacking protection headers $iframe = $this->framed || $this->env['framed']; if (!headers_sent() && ($xframe = $this->app->config->get('x_frame_options', 'sameorigin'))) { @@ -567,18 +569,19 @@ EOF; * * @return string $out */ - protected function get_js_commands() + protected function get_js_commands(&$framed = null) { - $out = ''; - if (!$this->framed && !empty($this->js_env)) { - $out .= self::JS_OBJECT_NAME . '.set_env('.self::json_serialize($this->js_env).");\n"; + $this->command('set_env', $this->js_env); } if (!empty($this->js_labels)) { $this->command('add_label', $this->js_labels); } + $out = ''; + $parent_commands = 0; + foreach ($this->js_commands as $i => $args) { $method = array_shift($args); $parent = $this->framed || preg_match('/^parent\./', $method); @@ -587,12 +590,26 @@ EOF; $args[$i] = self::json_serialize($arg); } - $out .= sprintf( - "%s.%s(%s);\n", - ($parent ? 'if (window.parent && parent.'.self::JS_OBJECT_NAME.') parent.' : '') . self::JS_OBJECT_NAME, - preg_replace('/^parent\./', '', $method), - implode(',', $args) - ); + 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; + } + + $out .= sprintf("%s(%s);\n", $method, implode(',', $args)); + } + + $framed = $parent_prefix && $parent_commands == count($this->js_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; @@ -1331,15 +1348,10 @@ EOF; $output = trim($templ); if (empty($output)) { - $output = $this->default_template; + $output = html::doctype('html5') . "\n" . $this->default_template; $is_empty = true; } - // set default page title - if (empty($this->pagetitle)) { - $this->pagetitle = 'Roundcube Mail'; - } - // replace specialchars in content $page_title = html::quote($this->pagetitle); $page_header = ''; -- cgit v1.2.3