From e7008cd4c632ceca938d0ccc2a82ec02d6220884 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 21 May 2009 15:08:25 -0400
Subject: [PATCH] Add fallback to default skin in plugins + replace links to plugin directory with the real plugin dir
---
program/include/rcube_template.php | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 5de7738..1a83e5c 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -34,6 +34,7 @@
var $config;
var $framed = false;
var $pagetitle = '';
+ var $message = null;
var $env = array();
var $js_env = array();
var $js_commands = array();
@@ -225,14 +226,18 @@
* @param string Message to display
* @param string Message type [notice|confirm|error]
* @param array Key-value pairs to be replaced in localized text
+ * @param boolean Override last set message
* @uses self::command()
*/
- public function show_message($message, $type='notice', $vars=NULL)
+ public function show_message($message, $type='notice', $vars=null, $override=true)
{
- $this->command(
- 'display_message',
- rcube_label(array('name' => $message, 'vars' => $vars)),
- $type);
+ if ($override || !$this->message) {
+ $this->message = $message;
+ $this->command(
+ 'display_message',
+ rcube_label(array('name' => $message, 'vars' => $vars)),
+ $type);
+ }
}
@@ -327,6 +332,17 @@
private function parse($name = 'main', $exit = true)
{
$skin_path = $this->config['skin_path'];
+ $plugin = false;
+
+ $temp = explode(".", $name, 2);
+ if (count($temp) > 1) {
+ $plugin = $temp[0];
+ $name = $temp[1];
+ $skin_path = $this->config['plugins_dir'] . '/' . $temp[0] . '/skins/' . $this->config['skin'];
+ if (!is_dir($skin_path)) // fallback to default skin
+ $skin_path = $this->config['plugins_dir'] . '/' . $temp[0] . '/skins/default';
+ }
+
$path = "$skin_path/templates/$name.html";
// read template file
@@ -339,6 +355,11 @@
'message' => 'Error loading template for '.$name
), true, true);
return false;
+ }
+
+ // replace all path references to plugins/... with the current plugins dir
+ if ($plugin) {
+ $templ = preg_replace('/\bplugins\//', $this->config['plugins_dir'].'/', $templ);
}
// parse for specialtags
@@ -732,13 +753,13 @@
}
// get localized text for labels and titles
if ($attrib['title']) {
- $attrib['title'] = Q(rcube_label($attrib['title']));
+ $attrib['title'] = Q(rcube_label($attrib['title'], $attrib['domain']));
}
if ($attrib['label']) {
- $attrib['label'] = Q(rcube_label($attrib['label']));
+ $attrib['label'] = Q(rcube_label($attrib['label'], $attrib['domain']));
}
if ($attrib['alt']) {
- $attrib['alt'] = Q(rcube_label($attrib['alt']));
+ $attrib['alt'] = Q(rcube_label($attrib['alt'], $attrib['domain']));
}
// set title to alt attribute for IE browsers
if ($this->browser->ie && $attrib['title'] && !$attrib['alt']) {
--
Gitblit v1.9.1