From 01accaff5b52d8fa53a1821d452f265aef67cef1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 28 Oct 2009 18:53:40 -0400
Subject: [PATCH] Add fallback to default skin if the selected one is not available in plugin directory
---
program/include/rcube_plugin.php | 14 ++++++++++++++
plugins/archive/archive.php | 4 ++--
plugins/markasjunk/markasjunk.php | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 8c855fe..27887ce 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -24,8 +24,8 @@
if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
&& ($archive_folder = $rcmail->config->get('archive_mbox'))) {
- $skin_path = 'skins/'.$rcmail->output->config['skin'];
-
+ $skin_path = $this->local_skin_path();
+
$this->include_script('archive.js');
$this->add_texts('localization', true);
$this->add_button(
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index f3e652d..4f41a7e 100644
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -19,7 +19,7 @@
$rcmail = rcmail::get_instance();
if ($rcmail->action == '' || $rcmail->action == 'show') {
- $skin_path = 'skins/'.$rcmail->output->config['skin'];
+ $skin_path = $this->local_skin_path();;
$this->include_script('markasjunk.js');
$this->add_texts('localization', true);
$this->add_button(array(
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 5e37764..ed30e8f 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -231,6 +231,20 @@
else
return $fn;
}
+
+ /**
+ * Provide path to the currently selected skin folder within the plugin directory
+ * with a fallback to the default skin folder.
+ *
+ * @return string Skin path relative to plugins directory
+ */
+ protected function local_skin_path()
+ {
+ $skin_path = 'skins/'.$this->api->output->config['skin'];
+ if (!is_dir(realpath(slashify($this->home) . $skin_path)))
+ $skin_path = 'skins/default';
+ return $skin_path;
+ }
/**
* Callback function for array_map
--
Gitblit v1.9.1