[Phpgroupware-cvs] CVS: phpgroupware login.php,1.85,1.86

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgroupware
In directory subversions:/tmp/cvs-serv31118

Modified Files:
        login.php 
Log Message:
update

Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** login.php   18 Oct 2002 21:45:46 -0000      1.85
--- login.php   19 Oct 2002 14:33:05 -0000      1.86
***************
*** 16,22 ****
        $GLOBALS['phpgw_info']['flags'] = array
        (
!               'login'                  => True,
!               'currentapp'             => 'login',
!               'noheader'               => True
        );
  
--- 16,23 ----
        $GLOBALS['phpgw_info']['flags'] = array
        (
!               'login'                 => True,
!               'currentapp'    => 'login',
!               'noheader'              => True,
!               'nodisplay'             => True
        );
  
***************
*** 212,226 ****
        if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
        {
-               $data['login_standard']['domain_select'] = True;
                reset($phpgw_domain);
-               unset($domain_select);      // For security ... just in case
                while ($domain = each($phpgw_domain))
                {
-                       $domain_select .= '<option value="' . $domain[0] . '"';
                        if ($domain[0] == $last_domain)
                        {
!                               $domain_select .= ' selected';
                        }
-                       $domain_select .= '>' . $domain[0] . '</option>';
                }
        }
--- 213,237 ----
        if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
        {
                reset($phpgw_domain);
                while ($domain = each($phpgw_domain))
                {
                        if ($domain[0] == $last_domain)
                        {
!                               $select = 'selected';
!                       }
! 
!                       $data['login_standard']['domain_select'] = array
!                       (
!                               'domain'        => $domain[0],
!                               'selected'      => $selected
!                       );
!               }
! 
!               for 
($i=0;$i<count($data['login_standard']['domain_select']);$i++)
!               {
!                       if 
($data['login_standard']['domain_select'][$i]['selected'] != 'selected')
!                       {
!                               
unset($data['login_standard']['domain_select'][$i]['selected']);
                        }
                }
        }
***************
*** 243,250 ****
--- 254,264 ----
        
$GLOBALS['phpgw']->template->set_var('registration_url','registration/');*/
  
+       $data['login_standard']['website_title']        = 
$GLOBALS['phpgw_info']['server']['site_title'];
        $data['login_standard']['msgbox']                       = 
$GLOBALS['phpgw']->common->msgbox('',False);
        $data['login_standard']['login_url']            = 'login.php' . 
$extra_vars;
        $data['login_standard']['cookie']                       = show_cookie();
        $data['login_standard']['lang_username']        = lang('username');
+       $data['login_standard']['lang_powered_by']      = lang('powered by');
+       $data['login_standard']['lang_version']         = lang('version');
        $data['login_standard']['phpgw_version']        = 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
        $data['login_standard']['lang_password']        = lang('password');