From bc8c2c57880523472b30f475d566a8133e2d2e20 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 21 May 2011 14:04:51 -0400
Subject: [PATCH] - Fix s/pattern/prefix/ in clear_cache()
---
program/include/rcube_plugin.php | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 0c7f566..0979137 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -5,7 +5,7 @@
| program/include/rcube_plugin.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland |
+ | Copyright (C) 2008-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -26,18 +26,45 @@
*/
abstract class rcube_plugin
{
+ /**
+ * Class name of the plugin instance
+ *
+ * @var string
+ */
public $ID;
/**
- * Holds an istance of Plugin API
+ * Instance of Plugin API
*
* @var rcube_plugin_api
*/
public $api;
+
+ /**
+ * Regular expression defining task(s) to bind with
+ *
+ * @var string
+ */
public $task;
+
+ /**
+ * Disables plugin in AJAX requests
+ *
+ * @var boolean
+ */
+ public $noajax = false;
+
+ /**
+ * Disables plugin in framed mode
+ *
+ * @var boolean
+ */
+ public $noframe = false;
+
protected $home;
protected $urlbase;
private $mytask;
+
/**
* Default constructor.
@@ -48,7 +75,7 @@
{
$this->ID = get_class($this);
$this->api = $api;
- $this->home = $api->dir . DIRECTORY_SEPARATOR . $this->ID;
+ $this->home = $api->dir . $this->ID;
$this->urlbase = $api->url . $this->ID . '/';
}
@@ -56,7 +83,20 @@
* Initialization method, needs to be implemented by the plugin itself
*/
abstract function init();
-
+
+
+ /**
+ * Attempt to load the given plugin which is required for the current plugin
+ *
+ * @param string Plugin name
+ * @return boolean True on success, false on failure
+ */
+ public function require_plugin($plugin_name)
+ {
+ return $this->api->load_plugin($plugin_name);
+ }
+
+
/**
* Load local config file from plugins directory.
* The loaded values are patched over the global configuration.
@@ -102,11 +142,16 @@
$lang = $_SESSION['language'];
$locdir = slashify(realpath(slashify($this->home) . $dir));
$texts = array();
-
+
+ // use buffering to handle empty lines/spaces after closing PHP tag
+ ob_start();
+
foreach (array('en_US', $lang) as $lng) {
@include($locdir . $lng . '.inc');
$texts = (array)$labels + (array)$messages + (array)$texts;
}
+
+ ob_end_clean();
// prepend domain to text keys and add to the application texts repository
if (!empty($texts)) {
@@ -247,7 +292,7 @@
*/
protected function local_skin_path()
{
- $skin_path = 'skins/'.$this->api->output->config['skin'];
+ $skin_path = 'skins/'.$this->api->config->get('skin');
if (!is_dir(realpath(slashify($this->home) . $skin_path)))
$skin_path = 'skins/default';
return $skin_path;
--
Gitblit v1.9.1