- clean up, use simpler _get_email() replacement

alecpl

2009-04-10 82c45a19529e818dc6b290491e79e7e2feeedcf6

- clean up, use simpler _get_email() replacement

 program/steps/settings/edit_identity.inc

@@ -43,7 +43,7 @@
    return;
  }
  else if (IDENTITIES_LEVEL == 1)
    $IDENTITY_RECORD['email'] = rcmail_get_email();
    $IDENTITY_RECORD['email'] = $RCMAIL->user->get_username();
}



 program/steps/settings/func.inc

@@ -469,30 +469,11 @@
  }


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(
  'userprefs' => 'rcmail_user_prefs_form',
  'identitieslist' => 'rcmail_identities_list',
  'itentitieslist' => 'rcmail_identities_list'  // keep this for backward compatibility
));


?>

 program/steps/settings/save_identity.inc

@@ -86,7 +86,7 @@
else if (IDENTITIES_LEVEL < 2)
{
  if (IDENTITIES_LEVEL == 1)
    $save_data['email'] = rcmail_get_email();
    $save_data['email'] = $RCMAIL->user->get_username();

  if ($save_data['email'] && ($insert_id = $USER->insert_identity($save_data)))
  {