[Phpgroupware-cvs] CVS: phpgwapi/inc class.preferences.inc.php,1.43.2.2.2.4,1.43.2.2.2.5

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv9530

Modified Files:
      Tag: Version-0_9_16-branch
        class.preferences.inc.php 
Log Message:
changed pref-name maildomain to domain


Index: class.preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.preferences.inc.php,v
retrieving revision 1.43.2.2.2.4
retrieving revision 1.43.2.2.2.5
diff -C2 -r1.43.2.2.2.4 -r1.43.2.2.2.5
*** class.preferences.inc.php   3 May 2003 12:15:35 -0000       1.43.2.2.2.4
--- class.preferences.inc.php   4 May 2003 10:31:20 -0000       1.43.2.2.2.5
***************
*** 141,160 ****
                                'firstname' => $fname,
                                'lastname'  => $lname,
!                               'maildomain'=> 
$GLOBALS['phpgw_info']['server']['mail_suffix'],
                                'email'     => 
$this->email_address($this->account_id),
                                'date'      => 
$GLOBALS['phpgw']->common->show_date('',$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
                        );
                        $this->vars = array(    // langs have to be in common 
!!!
                                'username'  => lang('name of the user, eg. 
"%1"',$this->values['username']),
                                'firstname' => lang('first name of the user, 
eg. "%1"',$this->values['firstname']),
                                'lastname'  => lang('last name of the user, eg. 
"%1"',$this->values['lastname']),
!                               'maildomain'=> lang('mail domain, eg. 
"%1"',$this->values['maildomain']),
                                'email'     => lang('email-address of the user, 
eg. "%1"',$this->values['email']),
                                'date'      => lang('todays date, eg. 
"%1"',$this->values['date']),
                        );
-                       // do this first, as it might be already contain some 
substitues
-                       //
-                       $this->values['email'] = 
$this->parse_notify($this->values['email']);
- 
                        // do the substituetion in the effective prefs (data)
                        //
--- 141,160 ----
                                'firstname' => $fname,
                                'lastname'  => $lname,
!                               'domain'    => 
$GLOBALS['phpgw_info']['server']['mail_suffix'],
                                'email'     => 
$this->email_address($this->account_id),
                                'date'      => 
$GLOBALS['phpgw']->common->show_date('',$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
                        );
+                       // do this first, as it might be already contain some 
substitues
+                       //
+                       $this->values['email'] = 
$this->parse_notify($this->values['email']);
+ 
                        $this->vars = array(    // langs have to be in common 
!!!
                                'username'  => lang('name of the user, eg. 
"%1"',$this->values['username']),
                                'firstname' => lang('first name of the user, 
eg. "%1"',$this->values['firstname']),
                                'lastname'  => lang('last name of the user, eg. 
"%1"',$this->values['lastname']),
!                               'domain'    => lang('domain name for 
mail-address, eg. "%1"',$this->values['domain']),
                                'email'     => lang('email-address of the user, 
eg. "%1"',$this->values['email']),
                                'date'      => lang('todays date, eg. 
"%1"',$this->values['date']),
                        );
                        // do the substituetion in the effective prefs (data)
                        //