Merge branch 'master' of github.com:roundcube/roundcubemail

author: Thomas Bruederli <thomas@roundcube.net> 2014-05-12 17:05:53 +0200
committer: Thomas Bruederli <thomas@roundcube.net> 2014-05-12 17:05:53 +0200
commit: b693dcf4e3981425df7b3cda504cab3966d32ebe (patch)
tree: cb05dec92cedb623a9737aa6290fd324b01e4d3a /program/include
parent: 5983ba959db52d232a074414cbb781a784ca916f (diff)
parent: 618318ba036f083071182e49170abd1b96dd8ba8 (diff)
1 files changed, 74 insertions, 53 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 42b208e89..2a90f6a01 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 = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
     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 = <<<EOF
@@ -256,8 +253,9 @@ EOF;
     public function get_skin_file($file, &$skin_path = null, $add_path = null)
     {
         $skin_paths = $this->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,27 @@ 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());
+        }
+
+        $commands = $this->get_js_commands($framed);
 
-        // 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 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 || !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 +464,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();
@@ -564,27 +569,47 @@ 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);
+
             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,
-                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;
@@ -600,13 +625,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;
     }
 
     /**
@@ -1322,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 = '';
@@ -1478,7 +1499,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 +1539,7 @@ EOF;
 
         // we already have a <form> 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;
         }
author	Thomas Bruederli <thomas@roundcube.net>	2014-05-12 17:05:53 +0200
committer	Thomas Bruederli <thomas@roundcube.net>	2014-05-12 17:05:53 +0200
commit	b693dcf4e3981425df7b3cda504cab3966d32ebe (patch)
tree	cb05dec92cedb623a9737aa6290fd324b01e4d3a /program/include
parent	5983ba959db52d232a074414cbb781a784ca916f (diff)
parent	618318ba036f083071182e49170abd1b96dd8ba8 (diff)