Changeset 2383 in subversion

Timestamp:

Apr 10, 2009 4:16:41 AM (4 years ago)

Author:

alec

Message:

• clean up, use simpler _get_email() replacement

Location:

trunk/roundcubemail/program/steps/settings

Files:

• edit_identity.inc (modified) (1 diff)
• func.inc (modified) (2 diffs)
• save_identity.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/settings/edit_identity.inc

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

trunk/roundcubemail/program/steps/settings/func.inc

@@ -470 +470 @@
 
 
-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(
@@ -495 +477 @@
 ));
 
-
 ?>

trunk/roundcubemail/program/steps/settings/save_identity.inc

@@ -87 +87 @@
 {
   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)))