From 6bfac4ced3f36071306a2143c16a34a03ebc331d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 27 Jun 2009 10:28:04 -0400
Subject: [PATCH] - make private methods really private - rename _mod_mailbox() to mod_mailbox() and make it public
---
program/include/rcube_plugin_api.php | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index 588f35e..52bbc40 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;
}
@@ -90,7 +89,7 @@
if (class_exists($plugin_name, false)) {
$plugin = new $plugin_name($this);
// check inheritance and task specification
- if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task || $plugin->task == $rcmail->task)) {
+ if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task || preg_match('/('.$plugin->task.')/i', $rcmail->task))) {
$plugin->init();
$this->plugins[] = $plugin;
}
@@ -264,7 +263,7 @@
public function include_script($fn)
{
if ($this->output->type == 'html') {
- $src = $this->ressource_url($fn);
+ $src = $this->resource_url($fn);
$this->output->add_header(html::tag('script', array('type' => "text/javascript", 'src' => $src)));
}
}
@@ -275,7 +274,7 @@
public function include_stylesheet($fn)
{
if ($this->output->type == 'html') {
- $src = $this->ressource_url($fn);
+ $src = $this->resource_url($fn);
$this->output->add_header(html::tag('link', array('rel' => "stylesheet", 'type' => "text/css", 'href' => $src)));
}
}
@@ -300,7 +299,7 @@
/**
* Make the given file name link into the plugins directory
*/
- private function ressource_url($fn)
+ private function resource_url($fn)
{
if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
return $this->url . $fn;
--
Gitblit v1.9.1