Page MenuHomePhorge
Files F224142

No OneTemporary
Actions

View Options

diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 871384e47..8d641c946 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -1,145 +1,143 @@
<?php
/**
* Present identities settings dialog to new users
*
* When a new user is created, this plugin checks the default identity
* and sets a session flag in case it is incomplete. An overlay box will appear
* on the screen until the user has reviewed/completed his identity.
*
* @version @package_version@
* @license GNU GPLv3+
* @author Thomas Bruederli
*/
class new_user_dialog extends rcube_plugin
{
public $task = 'login|mail';
function init()
{
$this->add_hook('identity_create', array($this, 'create_identity'));
$this->register_action('plugin.newusersave', array($this, 'save_data'));
// register additional hooks if session flag is set
if ($_SESSION['plugin.newuserdialog']) {
$this->add_hook('render_page', array($this, 'render_page'));
}
}
/**
* Check newly created identity at first login
*/
function create_identity($p)
{
// set session flag when a new user was created and the default identity seems to be incomplete
if ($p['login'] && !$p['complete'])
$_SESSION['plugin.newuserdialog'] = true;
}
/**
* Callback function when HTML page is rendered
* We'll add an overlay box here.
*/
function render_page($p)
{
if ($_SESSION['plugin.newuserdialog'] && $p['template'] == 'mail') {
$this->add_texts('localization');
$rcmail = rcmail::get_instance();
$identity = $rcmail->user->get_identity();
$identities_level = intval($rcmail->config->get('identities_level', 0));
// compose user-identity dialog
$table = new html_table(array('cols' => 2));
$table->add('title', $this->gettext('name'));
$table->add(null, html::tag('input', array(
'type' => 'text',
'name' => '_name',
'value' => $identity['name']
)));
$table->add('title', $this->gettext('email'));
$table->add(null, html::tag('input', array(
'type' => 'text',
'name' => '_email',
'value' => rcube_utils::idn_to_utf8($identity['email']),
'disabled' => ($identities_level == 1 || $identities_level == 3)
)));
$table->add('title', $this->gettext('organization'));
$table->add(null, html::tag('input', array(
'type' => 'text',
'name' => '_organization',
'value' => $identity['organization']
)));
$table->add('title', $this->gettext('signature'));
$table->add(null, html::tag('textarea', array(
'name' => '_signature',
'rows' => '3',
),$identity['signature']
));
// add overlay input box to html page
$rcmail->output->add_footer(html::tag('form', array(
'id' => 'newuserdialog',
'action' => $rcmail->url('plugin.newusersave'),
'method' => 'post'),
html::tag('h3', null, rcube::Q($this->gettext('identitydialogtitle'))) .
html::p('hint', rcube::Q($this->gettext('identitydialoghint'))) .
$table->show() .
html::p(array('class' => 'formbuttons'),
html::tag('input', array('type' => 'submit',
'class' => 'button mainaction', 'value' => $this->gettext('save'))))
));
// disable keyboard events for messages list (#1486726)
$rcmail->output->add_script(
"rcmail.message_list.key_press = function(){};
rcmail.message_list.key_down = function(){};
$('#newuserdialog').show().dialog({ modal:true, resizable:false, closeOnEscape:false, width:420 });
$('input[name=_name]').focus();
", 'docready');
$this->include_stylesheet('newuserdialog.css');
}
}
/**
* Handler for submitted form
*
* Check fields and save to default identity if valid.
* Afterwards the session flag is removed and we're done.
*/
function save_data()
{
$rcmail = rcmail::get_instance();
$identity = $rcmail->user->get_identity();
$identities_level = intval($rcmail->config->get('identities_level', 0));
$save_data = array(
'name' => rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST),
'email' => rcube_utils::get_input_value('_email', rcube_utils::INPUT_POST),
'organization' => rcube_utils::get_input_value('_organization', rcube_utils::INPUT_POST),
'signature' => rcube_utils::get_input_value('_signature', rcube_utils::INPUT_POST),
);
// don't let the user alter the e-mail address if disabled by config
- if ($identities_level == 1 || $identities_level == 3)
+ if (in_array($identities_level, array(1,3,4)))
$save_data['email'] = $identity['email'];
else
$save_data['email'] = rcube_utils::idn_to_ascii($save_data['email']);
// save data if not empty
if (!empty($save_data['name']) && !empty($save_data['email'])) {
$rcmail->user->update_identity($identity['identity_id'], $save_data);
$rcmail->session->remove('plugin.newuserdialog');
}
$rcmail->output->redirect('');
}
}
-
-?>
diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml
index 0bca1d9d4..c9f1965de 100644
--- a/plugins/new_user_dialog/package.xml
+++ b/plugins/new_user_dialog/package.xml
@@ -1,154 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
http://pear.php.net/dtd/tasks-1.0.xsd
http://pear.php.net/dtd/package-2.0
http://pear.php.net/dtd/package-2.0.xsd">
<name>new_user_dialog</name>
<channel>pear.roundcube.net</channel>
<summary>Present identities settings dialog to new users</summary>
<description>When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.</description>
<lead>
<name>Thomas Bruederli</name>
<user>thomasb</user>
<email>roundcube@gmail.com</email>
<active>yes</active>
</lead>
- <date>2012-01-16</date>
- <time>17:00</time>
+ <date>2013-04-16</date>
<version>
- <release>1.5</release>
+ <release>1.6</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
<notes>
-- Use jquery UI to render the dialog
-- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
+- Fix handling of identities_level=4
</notes>
<contents>
<dir baseinstalldir="/" name="/">
<file name="new_user_dialog.php" role="php">
<tasks:replace from="@name@" to="name" type="package-info"/>
<tasks:replace from="@package_version@" to="version" type="package-info"/>
</file>
<file name="newuserdialog.css" role="data">
<tasks:replace from="@name@" to="name" type="package-info"/>
<tasks:replace from="@package_version@" to="version" type="package-info"/>
</file>
<dir name="localization">
<file name="en_US.inc" role="data" />
<file name="cs_CZ.inc" role="data" />
<file name="de_CH.inc" role="data" />
<file name="de_DE.inc" role="data" />
<file name="es_ES.inc" role="data" />
<file name="et_EE.inc" role="data" />
<file name="gl_ES.inc" role="data" />
<file name="it_IT.inc" role="data" />
<file name="ja_JP.inc" role="data" />
<file name="nl_NL.inc" role="data" />
<file name="pl_PL.inc" role="data" />
<file name="pt_BR.inc" role="data" />
<file name="pt_PT.inc" role="data" />
<file name="ru_RU.inc" role="data" />
<file name="sl_SI.inc" role="data" />
<file name="sv_DE.inc" role="data" />
<file name="zh_TW.inc" role="data" />
</dir>
</dir>
<!-- / -->
</contents>
<dependencies>
<required>
<php>
<min>5.2.1</min>
</php>
<pearinstaller>
<min>1.7.0</min>
</pearinstaller>
</required>
</dependencies>
<phprelease/>
<changelog>
<release>
<date>2010-03-29</date>
<time>13:20:00</time>
<version>
<release>1.0</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes></notes>
</release>
<release>
<date>2010-05-13</date>
<time>19:35:00</time>
<version>
<release>1.1</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>
- Fix space bar and backspace buttons not working (#1486726)
</notes>
</release>
<release>
<date>2010-05-27</date>
<time>12:00:00</time>
<version>
<release>1.2</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>
- Add overlay box only to mail task main template
- Fix possible error on form submission (#1486103)
</notes>
</release>
<release>
<date>2010-12-02</date>
<time>12:00:00</time>
<version>
<release>1.3</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>
- Added setting of focus on name input
- Added gl_ES translation
</notes>
</release>
<release>
<date>2012-01-16</date>
<time>17:00:00</time>
<version>
<release>1.5</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>- Use jquery UI to render the dialog</notes>
</release>
+ <release>
+ <date>2012-01-16</date>
+ <time>17:00</time>
+ <version>
+ <release>1.5</release>
+ <api>1.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
+ <notes>
+- Use jquery UI to render the dialog
+- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
+ </notes>
+ </release>
</changelog>
</package>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 8:10 AM (1 d, 12 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
166338
Default Alt Text
(10 KB)

Event Timeline