From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/steps/settings/about.inc | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/program/steps/settings/about.inc b/program/steps/settings/about.inc
index 1125b70..9b13402 100644
--- a/program/steps/settings/about.inc
+++ b/program/steps/settings/about.inc
@@ -7,7 +7,10 @@
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2011, The Roundcube Dev Team |
| Copyright (C) 2011, Kolab Systems AG |
- | 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: |
| Display license information about program and enabled plugins |
@@ -15,10 +18,19 @@
+-----------------------------------------------------------------------+
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id: identities.inc 4410 2011-01-12 18:25:02Z thomasb $
-
*/
+
+
+function rcmail_supportlink($attrib)
+{
+ global $RCMAIL;
+
+ if ($url = $RCMAIL->config->get('support_url')) {
+ $label = $attrib['label'] ? $attrib['label'] : 'support';
+ $attrib['href'] = $url;
+ return html::a($attrib, rcube_label($label));
+ }
+}
function rcmail_plugins_list($attrib)
{
@@ -49,7 +61,7 @@
$table->add_header('source', rcube_label('source'));
foreach ($plugins as $name => $data) {
- $uri = $data['uri'] ? $data['uri'] : $data['channel'];
+ $uri = $data['srcuri'] ? $data['srcuri'] : $data['uri'];
if ($uri && stripos($uri, 'http') !== 0) {
$uri = 'http://' . $uri;
}
@@ -60,7 +72,7 @@
$table->add('license', $data['license_uri'] ? html::a(array('target' => '_blank', href=> Q($data['license_uri'])),
Q($data['license'])) : $data['license']);
$table->add('source', $uri ? html::a(array('target' => '_blank', href=> Q($uri)),
- Q(rcube_label('source'))) : '');
+ Q(rcube_label('download'))) : '');
}
return $table->show();
@@ -74,8 +86,8 @@
'version' => 'string(//rc:package/rc:version/rc:release)',
'license' => 'string(//rc:package/rc:license)',
'license_uri' => 'string(//rc:package/rc:license/@uri)',
+ 'srcuri' => 'string(//rc:package/rc:srcuri)',
'uri' => 'string(//rc:package/rc:uri)',
- 'channel' => 'string(//rc:package/rc:channel)',
);
$package = INSTALL_PATH . "/plugins/$name/package.xml";
@@ -111,6 +123,7 @@
$OUTPUT->set_pagetitle(rcube_label('about'));
+$OUTPUT->add_handler('supportlink', 'rcmail_supportlink');
$OUTPUT->add_handler('pluginlist', 'rcmail_plugins_list');
$OUTPUT->send('about');
--
Gitblit v1.9.1