4 files changed, 110 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 254514558..37a29255d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -155,7 +155,7 @@ function rcube_webmail()
     }
 
     // enable general commands
-    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', true);
+    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', true);
 
     if (this.env.permaurl)
       this.enable_command('permaurl', true);
@@ -504,6 +504,10 @@ function rcube_webmail()
         this.switch_task(command);
         break;
 
+      case 'about':
+        location.href = '?_task=settings&_action=about';
+        break;
+
       case 'permaurl':
         if (obj && obj.href && obj.target)
           return true;
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 6aefd6c4a..d7df39771 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -343,7 +343,7 @@ $labels['done'] = 'Done';
 
 // settings
 $labels['settingsfor']  = 'Settings for';
-
+$labels['about'] = 'About';
 $labels['preferences']  = 'Preferences';
 $labels['userpreferences']  = 'User preferences';
 $labels['editpreferences']  = 'Edit user preferences';
@@ -465,6 +465,12 @@ $labels['sortasc']  = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
 $labels['undo'] = 'Undo';
 
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['webpage'] = 'Webpage';
+
 // units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index cdebe50f5..164e508a3 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -434,5 +434,11 @@ $labels['dateformat'] = 'Format daty';
 $labels['timeformat'] = 'Format czasu';
 $labels['isdraft'] = 'To jest kopia robocza wiadomości.';
 $labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
+$labels['plugin'] = 'Wtyczka';
+$labels['version'] = 'Wersja';
+$labels['source'] = 'Źródła';
+$labels['license'] = 'Licencja';
+$labels['webpage'] = 'Strona internetowa';
+$labels['about'] = 'O programie';
 
 ?>
diff --git a/program/steps/settings/about.inc b/program/steps/settings/about.inc
new file mode 100644
index 000000000..ed85a9446
--- /dev/null
+++ b/program/steps/settings/about.inc
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/settings/about.inc                                      |
+ |                                                                       |
+ | 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                                            |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Display license information about program and enabled plugins       |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+
+ $Id: identities.inc 4410 2011-01-12 18:25:02Z thomasb $
+
+*/
+
+function rcmail_plugins_list($attrib)
+{
+  global $RCMAIL;
+
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmpluginlist';
+
+  $plugins = array_filter((array) $RCMAIL->config->get('plugins'));
+  $plugins = array_flip($plugins);
+
+  $metadata = array(
+    'name'    => 'string(//rc:package/rc:name)',
+    'version' => 'string(//rc:package/rc:version/rc:release)',
+    'license' => 'string(//rc:package/rc:license)',
+    'license_uri' => 'string(//rc:package/rc:license/@uri)',
+    'source_uri' => 'string(//rc:package/rc:srcuri)',
+  );
+
+  foreach ($plugins as $name => $plugin) {
+    $package = INSTALL_PATH . "/plugins/$name/package.xml";
+    if (file_exists($package) && ($file = file_get_contents($package))) {
+      $doc = new DOMDocument();
+      $doc->loadXML($file);
+      $xpath = new DOMXPath($doc);
+      $xpath->registerNamespace('rc', "http://pear.php.net/dtd/package-2.0");
+      $data = array();
+
+      foreach ($metadata as $key => $path) {
+        $data[$key] = $xpath->evaluate($path);
+      }
+
+      $plugins[$name] = $data;
+    }
+    else {
+      unset($plugins[$name]);
+    }
+  }
+
+  if (empty($plugins)) {
+    return '';
+  }
+
+  ksort($plugins, SORT_LOCALE_STRING);
+
+  $table = new html_table($attrib);
+
+  // add table header
+  $table->add_header('name', rcube_label('plugin'));
+  $table->add_header('version', rcube_label('version'));
+  $table->add_header('license', rcube_label('license'));
+  $table->add_header('source', rcube_label('source'));
+
+  foreach ($plugins as $name => $data) {
+    $table->add_row();
+    $table->add('name', Q($data['name'] ? $data['name'] : $name));
+    $table->add('version', Q($data['version']));
+    $table->add('license', $data['license_uri'] ? html::a(array('target' => '_blank', href=> Q($data['license_uri'])),
+        Q($data['license'])) : $data['license']);
+    $table->add('source', $data['source_uri'] ? html::a(array('target' => '_blank', href=> Q($data['source_uri'])),
+        Q(rcube_label('source'))) : '');
+  }
+
+  return $table->show();
+}
+
+$OUTPUT->set_pagetitle(rcube_label('about'));
+
+$OUTPUT->add_handler('pluginlist', 'rcmail_plugins_list');
+
+$OUTPUT->send('about');