summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorTakika <taki@alkoholista.hu>2014-01-07 14:32:33 +0100
committerTakika <taki@alkoholista.hu>2014-01-07 14:32:33 +0100
commitd073a66db3abf13a769ffaab50028bac4e771916 (patch)
treef344600c9112cd8581135f3d979e4826a1bffaa2 /program
parentf67037ce5779929678c9facc5dc925c0e054998d (diff)
Load plugin config file from any configured path
Try to load plugin_name.inc.php config file from any pre-configured config path (rcube_config::path array) so webmail admins can move plugin configurations out of www root.
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_plugin.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index aa6d8376e..a571609f1 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -131,6 +131,16 @@ abstract class rcube_plugin
'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load config from $fpath"), true, false);
return false;
+ } else {
+ $fname = $this->ID . '.inc.php';
+ // Search plugin_name.inc.php file in any configured path
+ if (!$rcube->config->load_from_file($fname)) {
+ rcube::raise_error(array(
+ 'code' => 527, 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Failed to load $fname config file from any configured path"), true, false);
+ return false;
+ }
}
return true;