From 7dbe2fa6bf629e1089c61a7bb89885e9936de8a9 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 25 May 2009 05:22:59 -0400
Subject: [PATCH] - get rid of 'plugins_dir' option, plugins directory must be in Roundcube root (like skins)
---
program/include/rcube_plugin_api.php | 3 +--
config/main.inc.php.dist | 5 +----
program/include/rcube_template.php | 4 ++--
program/include/rcube_config.php | 1 -
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 0141602..e092db7 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -39,10 +39,7 @@
// use this folder to store temp files (must be writeable for apache user)
$rcmail_config['temp_dir'] = 'temp/';
-// use this folder to search for plugin sources
-$rcmail_config['plugins_dir'] = 'plugins/';
-
-// List of active plugins. Add the name of a directory found in 'plugins_dir'
+// List of active plugins (in plugins/ directory)
$rcmail_config['plugins'] = array();
// enable caching of messages and mailbox data in the local database.
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index d4adb7b..da6c094 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -70,7 +70,6 @@
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
$this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
- $this->prop['plugins_dir'] = $this->prop['plugins_dir'] ? unslashify($this->prop['plugins_dir']) : INSTALL_PATH . 'plugins';
// fix default imap folders encoding
foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index c23b1e6..5103ce1 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -61,8 +61,7 @@
*/
private function __construct()
{
- $rcmail = rcmail::get_instance();
- $this->dir = realpath($rcmail->config->get('plugins_dir'));
+ $this->dir = INSTALL_PATH . $this->url;
}
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index b597c55..dc4b5e1 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -339,10 +339,10 @@
$plugin = $temp[0];
$name = $temp[1];
$skin_dir = $plugin . '/skins/' . $this->config['skin'];
- $skin_path = $this->config['plugins_dir'] . '/' . $skin_dir;
+ $skin_path = $this->app->plugins->dir . $skin_dir;
if (!is_dir($skin_path)) { // fallback to default skin
$skin_dir = $plugin . '/skins/default';
- $skin_path = $this->config['plugins_dir'] . '/' . $skin_dir;
+ $skin_path = $this->app->plugins->dir . $skin_dir;
}
}
--
Gitblit v1.9.1