- Added option 'identities_level', removed 'multiple_identities' - Allow de...

alecpl

2008-10-24 ec01712a998b35d48be3daaf272779fdbc63cd74

- Added option 'identities_level', removed 'multiple_identities'
- Allow deleting identities when multiple_identities=false (#1485435)

 CHANGELOG

@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
---------------------------

2008/10/24 (alec)
----------
- Added option 'identities_level', removed 'multiple_identities'
- Allow deleting identities when multiple_identities=false (#1485435)

2008/10/22 (alec)
----------
- Added option focus_on_new_message (#1485374)

 config/main.inc.php.dist

@@ -285,8 +285,12 @@
// don't allow these settings to be overriden by the user
$rcmail_config['dont_override'] = array();

// allow users to add and delete sender identities
$rcmail_config['multiple_identities'] = true;
// Set identities access level:
// 0 - many identities with possibility to edit all params
// 1 - many identities with possibility to edit all params but not email address
// 2 - one identity with possibility to edit all params
// 3 - one identity with possibility to edit all params but not email address
$rcmail_config['identities_level'] = 0;

// try to load host-specific configuration
// see http://trac.roundcube.net/wiki/Howto_Config for more details

 installer/config.php

@@ -122,6 +122,22 @@
<p class="hint">It is based on GoogieSpell what implies that the message content will be sent to Google in order to check the spelling.</p>
</dd>

<dt class="propname">identities_level</dt>
<dd>
<?php

$input_ilevel = new html_select(array('name' => '_identities_level', 'id' => "cfgidentitieslevel"));
$input_ilevel->add('many identities with possibility to edit all params', 0);
$input_ilevel->add('many identities with possibility to edit all params but not email address', 1);
$input_ilevel->add('one identity with possibility to edit all params', 2);
$input_ilevel->add('one identity with possibility to edit all params but not email address', 3);
echo $input_ilevel->show($RCI->getprop('identities_level'), 0);

?>
<div>Level of identities access</div>
<p class="hint">Defines what users can do with their identities.</p>
</dd>

</dl>
</fieldset>


 program/include/rcmail.php

@@ -433,7 +433,7 @@

    // lowercase username if it's an e-mail address (#1484473)
    if (strpos($username, '@'))
      $username = strtolower($username);
      $username = rc_strtolower($username);

    // user already registered -> overwrite username
    if ($user = rcube_user::query($username, $host))

 program/js/app.js

@@ -288,8 +288,8 @@
        this.enable_command('preferences', 'identities', 'save', 'folders', true);
        
        if (this.env.action=='identities' || this.env.action=='edit-identity' || this.env.action=='add-identity') {
          this.enable_command('add', 'delete', this.env.multiple_identities);
          this.enable_command('edit', true);
          this.enable_command('add', this.env.identities_level < 2);
          this.enable_command('delete', 'edit', true);
        }

        if (this.env.action=='edit-identity' || this.env.action=='add-identity')

 program/steps/settings/edit_identity.inc

@@ -19,22 +19,26 @@

*/

$OUTPUT->set_pagetitle(rcube_label('identities'));
define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));

// edit-identity
if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') {
  $IDENTITY_RECORD = $USER->get_identity(get_input_value('_iid', RCUBE_INPUT_GPC));
  
  if (is_array($IDENTITY_RECORD))
    $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
}
else if (!$RCMAIL->config->get('multiple_identities', true)) {
  $OUTPUT->show_message('opnotpermitted', 'error');
  // go to identities page
  rcmail_overwrite_action('identities');
  return;
// add-identity
else {
  if (IDENTITIES_LEVEL > 1) {
    $OUTPUT->show_message('opnotpermitted', 'error');
    // go to identities page
    rcmail_overwrite_action('identities');
    return;
  }
  else if (IDENTITIES_LEVEL == 1)
    $IDENTITY_RECORD['email'] = rcmail_get_email();
}

$OUTPUT->include_script('list.js');


function rcube_identity_form($attrib)
@@ -85,7 +89,12 @@
                       'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'rcmfd_signature\');'),
                       'standard'     => array('type' => 'checkbox', 'label' => 'setdefault'));


  // disable some field according to access level
  if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3) {
    $a_show_cols['email']['disabled'] = true;
    $a_show_cols['email']['class'] = 'disabled';
  }
  
  // a specific part is requested
  if ($attrib['part'])
    {
@@ -131,7 +140,9 @@
  return $out;  
  }

$OUTPUT->include_script('list.js');
$OUTPUT->add_handler('identityform', 'rcube_identity_form');
$OUTPUT->set_env('identities_level', IDENTITIES_LEVEL);

$OUTPUT->set_pagetitle(rcube_label(($RCMAIL->action=='add-identity' ? 'newidentity' : 'edititem')));

@@ -139,4 +150,5 @@
  $OUTPUT->send('addidentity');

$OUTPUT->send('editidentity');

?>

 program/steps/settings/func.inc

@@ -401,7 +401,24 @@
  return $skins;
  }

$OUTPUT->set_env('multiple_identities', $RCMAIL->config->get('multiple_identities', true));

function rcmail_get_email()
  {
  global $RCMAIL;
  
  if (strpos($RCMAIL->user->data['username'], '@'))
    return $RCMAIL->user->data['username'];
  else {
    if ($RCMAIL->config->get('virtuser_file'))
      $user_email = rcube_user::user2email($RCMAIL->user->data['username']);

    if ($user_email == '')
      $user_email = sprintf('%s@%s', $RCMAIL->user->data['username'], 
            $RCMAIL->config->mail_domain($_SESSION['imap_host']));

    return $user_email;
    }		      
  }

// register UI objects
$OUTPUT->add_handlers(array(

 program/steps/settings/identities.inc

@@ -19,6 +19,8 @@

*/

define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));

$OUTPUT->set_pagetitle(rcube_label('identities'));

$OUTPUT->include_script('list.js');
@@ -40,6 +42,7 @@
  }

$OUTPUT->add_handler('identityframe', 'rcmail_identity_frame');
$OUTPUT->set_env('identities_level', IDENTITIES_LEVEL);

$OUTPUT->send('identities');
?>

 program/steps/settings/save_identity.inc

@@ -19,13 +19,15 @@

*/

define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));

$a_save_cols = array('name', 'email', 'organization', 'reply-to', 'bcc', 'standard', 'signature', 'html_signature');
$a_html_cols = array('signature');
$a_boolean_cols = array('standard', 'html_signature');
$updated = $default_id = false;

// check input
if (empty($_POST['_name']) || empty($_POST['_email']))
if (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3))
  {
  $OUTPUT->show_message('formincomplete', 'warning');
  rcmail_overwrite_action('edit-identity');
@@ -49,6 +51,10 @@
  if (!isset($_POST[$fname]))
    $save_data[$col] = 0;
}

// unset email address if user has no rights to change it
if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3)
  unset($save_data['email']);


// update an existing contact
@@ -77,9 +83,12 @@
}

// insert a new identity record
else if ($RCMAIL->config->get('multiple_identities', true))
else if (IDENTITIES_LEVEL < 2)
{
  if ($insert_id = $USER->insert_identity($save_data))
  if (IDENTITIES_LEVEL == 1)
    $save_data['email'] = rcmail_get_email();

  if ($save_data['email'] && ($insert_id = $USER->insert_identity($save_data)))
  {
    $OUTPUT->show_message('successfullysaved', 'confirmation');
    
@@ -107,4 +116,4 @@
// go to next step
rcmail_overwrite_action('identities');

?>
?>

 skins/default/settings.css

@@ -161,6 +161,11 @@
  padding-right: 10px;
}

input.disabled
{
  color: #999999;
}

#bottomboxes
{
  position: absolute;

 skins/default/templates/editidentity.html

@@ -17,7 +17,7 @@
</div>

<p id="listbuttons">
<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" />
</p>

<div id="identity-details">
@@ -27,7 +27,7 @@
<roundcube:object name="identityform" size="40" textareacols="60" textarearows="6" />

<p><br />
<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'&&config:multiple_identities:true" style="margin-right:0.5em" />
<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" style="margin-right:0.5em" />
<roundcube:button command="save" type="input" class="button mainaction" label="save" />
</p>
</div>

 skins/default/templates/identities.html

@@ -17,7 +17,7 @@
</div>

<p id="listbuttons">
<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" />
</p>

<div id="identity-details">