Add skin name to the (javascript) environment

Aleksander Machniak

2012-06-13 740875e5cd55581f146fd1fbd2c4d4b904775832

Add skin name to the (javascript) environment

 program/include/rcube_config.php

@@ -71,10 +71,14 @@
        $this->load_host_config();

        // set skin (with fallback to old 'skin_path' property)
        if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
        if (empty($this->prop['skin'])) {
            if (!empty($this->prop['skin_path'])) {
            $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
        else if (empty($this->prop['skin']))
            }
            else {
            $this->prop['skin'] = 'default';
            }
        }

        // fix paths
        $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';

 program/include/rcube_output_html.php

@@ -68,7 +68,9 @@
        $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));

        // load the correct skin (in case user-defined)
        $this->set_skin($this->config->get('skin'));
        $skin = $this->config->get('skin');
        $this->set_skin($skin);
        $this->set_env('skin', $skin);

        // add common javascripts
        $this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');