From af58c3ec6a464d06bcff3e3b1b73d87fa2e8c1d9 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Tue, 14 Jul 2009 10:30:28 -0400
Subject: [PATCH]
---
program/include/rcube_plugin.php | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 63acaf8..d3ab7af 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -53,13 +53,18 @@
* The loaded values are patched over the global configuration.
*
* @param string Config file name relative to the plugin's folder
+ * @return boolean True on success, false on failure
*/
public function load_config($fname = 'config.inc.php')
{
$fpath = $this->home.'/'.$fname;
$rcmail = rcmail::get_instance();
- if (!$rcmail->config->load_from_file($fpath))
+ if (!$rcmail->config->load_from_file($fpath)) {
raise_error(array('code' => 527, 'type' => 'php', 'message' => "Failed to load config from $fpath"), true, false);
+ return false;
+ }
+
+ return true;
}
/**
@@ -172,7 +177,7 @@
*/
public function include_script($fn)
{
- $this->api->include_script($this->ressource_url($fn));
+ $this->api->include_script($this->resource_url($fn));
}
/**
@@ -182,7 +187,7 @@
*/
public function include_stylesheet($fn)
{
- $this->api->include_stylesheet($this->ressource_url($fn));
+ $this->api->include_stylesheet($this->resource_url($fn));
}
/**
@@ -198,7 +203,7 @@
// fix relative paths
foreach (array('imagepas', 'imageact', 'imagesel') as $key)
if ($p[$key])
- $p[$key] = $this->api->url . $this->ressource_url($p[$key]);
+ $p[$key] = $this->api->url . $this->resource_url($p[$key]);
$this->api->add_content($this->api->output->button($p), $container);
}
@@ -207,7 +212,7 @@
/**
* Make the given file name link into the plugin directory
*/
- private function ressource_url($fn)
+ private function resource_url($fn)
{
if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
return $this->ID . '/' . $fn;
--
Gitblit v1.9.1