Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 55 insertions, 0 deletions

diff --git a/plugins/userinfo/userinfo.php b/plugins/userinfo/userinfo.php
new file mode 100644
index 000000000..a175563ef
--- /dev/null
+++ b/plugins/userinfo/userinfo.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Sample plugin that adds a new tab to the settings section
+ * to display some information about the current user
+ */
+class userinfo extends rcube_plugin
+{
+  public $task    = 'settings';
+  public $noajax  = true;
+  public $noframe = true;
+
+  function init()
+  {
+    $this->add_texts('localization/', array('userinfo'));
+    $this->register_action('plugin.userinfo', array($this, 'infostep'));
+    $this->include_script('userinfo.js');
+  }
+
+  function infostep()
+  {
+    $this->register_handler('plugin.body', array($this, 'infohtml'));
+    rcmail::get_instance()->output->send('plugin');
+  }
+  
+  function infohtml()
+  {
+    $rcmail = rcmail::get_instance();
+    $user = $rcmail->user;
+    
+    $table = new html_table(array('cols' => 2, 'cellpadding' => 3));
+
+    $table->add('title', 'ID');
+    $table->add('', rcube::Q($user->ID));
+    
+    $table->add('title', rcube::Q($this->gettext('username')));
+    $table->add('', rcube::Q($user->data['username']));
+    
+    $table->add('title', rcube::Q($this->gettext('server')));
+    $table->add('', rcube::Q($user->data['mail_host']));
+
+    $table->add('title', rcube::Q($this->gettext('created')));
+    $table->add('', rcube::Q($user->data['created']));
+
+    $table->add('title', rcube::Q($this->gettext('lastlogin')));
+    $table->add('', rcube::Q($user->data['last_login']));
+    
+    $identity = $user->get_identity();
+    $table->add('title', rcube::Q($this->gettext('defaultidentity')));
+    $table->add('', rcube::Q($identity['name'] . ' <' . $identity['email'] . '>'));
+    
+    return html::tag('h4', null, rcube::Q('Infos for ' . $user->get_username())) . $table->show();
+  }
+
+}