From f06aa8058b7e32ba32d4551074b6e0b8a300f751 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 21 Oct 2013 15:02:40 -0400
Subject: [PATCH] Bump version after security fix
---
program/include/rcube_plugin.php | 98 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index cce04cd..de0aabb 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -6,7 +6,10 @@
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2008-2009, The Roundcube Dev Team |
- | Licensed under the GNU GPL |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Abstract plugins interface/class |
@@ -14,9 +17,6 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
@@ -61,6 +61,14 @@
*/
public $noframe = false;
+ /**
+ * A list of config option names that can be modified
+ * by the user via user interface (with save-pref command)
+ *
+ * @var array
+ */
+ public $allowed_prefs;
+
protected $home;
protected $urlbase;
private $mytask;
@@ -78,7 +86,7 @@
$this->home = $api->dir . $this->ID;
$this->urlbase = $api->url . $this->ID . '/';
}
-
+
/**
* Initialization method, needs to be implemented by the plugin itself
*/
@@ -114,7 +122,7 @@
'message' => "Failed to load config from $fpath"), true, false);
return false;
}
-
+
return true;
}
@@ -128,7 +136,18 @@
{
$this->api->register_hook($hook, $callback);
}
-
+
+ /**
+ * Unregister a callback function for a specific (server-side) hook.
+ *
+ * @param string $hook Hook name
+ * @param mixed $callback Callback function as string or array with object reference and method name
+ */
+ public function remove_hook($hook, $callback)
+ {
+ $this->api->unregister_hook($hook, $callback);
+ }
+
/**
* Load localized texts from the plugins dir
*
@@ -138,17 +157,48 @@
public function add_texts($dir, $add2client = false)
{
$domain = $this->ID;
-
- $lang = $_SESSION['language'];
+ $lang = $_SESSION['language'];
+ $langs = array_unique(array('en_US', $lang));
$locdir = slashify(realpath(slashify($this->home) . $dir));
- $texts = array();
+ $texts = array();
+
+ // Language aliases used to find localization in similar lang, see below
+ $aliases = array(
+ 'de_CH' => 'de_DE',
+ 'es_AR' => 'es_ES',
+ 'fa_AF' => 'fa_IR',
+ 'nl_BE' => 'nl_NL',
+ 'pt_BR' => 'pt_PT',
+ 'zh_CN' => 'zh_TW',
+ );
// 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;
+ foreach ($langs as $lng) {
+ $fpath = $locdir . $lng . '.inc';
+ if (is_file($fpath) && is_readable($fpath)) {
+ include $fpath;
+ $texts = (array)$labels + (array)$messages + (array)$texts;
+ }
+ else if ($lng != 'en_US') {
+ // Find localization in similar language (#1488401)
+ $alias = null;
+ if (!empty($aliases[$lng])) {
+ $alias = $aliases[$lng];
+ }
+ else if ($key = array_search($lng, $aliases)) {
+ $alias = $key;
+ }
+
+ if (!empty($alias)) {
+ $fpath = $locdir . $alias . '.inc';
+ if (is_file($fpath) && is_readable($fpath)) {
+ include $fpath;
+ $texts = (array)$labels + (array)$messages + (array)$texts;
+ }
+ }
+ }
}
ob_end_clean();
@@ -161,7 +211,7 @@
$rcmail = rcmail::get_instance();
$rcmail->load_language($lang, $add);
-
+
// add labels to client
if ($add2client) {
$js_labels = is_array($add2client) ? array_map(array($this, 'label_map_callback'), $add2client) : array_keys($add);
@@ -169,7 +219,7 @@
}
}
}
-
+
/**
* Wrapper for rcmail::gettext() adding the plugin ID as domain
*
@@ -239,7 +289,7 @@
{
$this->api->include_stylesheet($this->resource_url($fn));
}
-
+
/**
* Append a button to a certain container
*
@@ -254,11 +304,11 @@
foreach (array('imagepas', 'imageact', 'imagesel') as $key)
if ($p[$key])
$p[$key] = $this->api->url . $this->resource_url($p[$key]);
-
+
$this->api->add_content($this->api->output->button($p), $container);
}
}
-
+
/**
* Generate an absolute URL to the given resource within the current
* plugin directory
@@ -292,9 +342,13 @@
*/
public function local_skin_path()
{
- $skin_path = 'skins/'.$this->api->config->get('skin');
- if (!is_dir(realpath(slashify($this->home) . $skin_path)))
- $skin_path = 'skins/default';
+ $rcmail = rcmail::get_instance();
+ foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
+ $skin_path = 'skins/' . $skin;
+ if (is_dir(realpath(slashify($this->home) . $skin_path)))
+ break;
+ }
+
return $skin_path;
}
@@ -309,6 +363,4 @@
return $this->ID.'.'.$key;
}
-
}
-
--
Gitblit v1.9.1