[Phpgroupware-cvs] CVS: setup ldap.php,1.51,1.52 ldapexport.php,1.4,1.5 ldapimport.php,1.6,1.7 ldapmodify.php,1.6,1.7 manageheader.php,1.32,1.33

[Miles Lott <address@hidden>]

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

Modified Files:
        ldap.php ldapexport.php ldapimport.php ldapmodify.php 
        manageheader.php 
Log Message:
Hopefully better logic for login/logout of the two setup logins



Index: ldap.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldap.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** ldap.php    3 Mar 2002 21:52:52 -0000       1.51
--- ldap.php    4 Mar 2002 02:55:53 -0000       1.52
***************
*** 44,48 ****
        ));
  
!       $GLOBALS['phpgw_setup']->html->show_header(lang('LDAP 
Config'),'','ldap',$ConfigDomain);
  
        if ($error)
--- 44,48 ----
        ));
  
!       $GLOBALS['phpgw_setup']->html->show_header(lang('LDAP 
Config'),'','config',$ConfigDomain);
  
        if ($error)

Index: ldapexport.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldapexport.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ldapexport.php      3 Mar 2002 21:52:52 -0000       1.4
--- ldapexport.php      4 Mar 2002 02:55:53 -0000       1.5
***************
*** 231,235 ****
        }
  
!       $GLOBALS['phpgw_setup']->html->show_header('LDAP 
Export','','ldapexport',$ConfigDomain);
  
        if($error)
--- 231,235 ----
        }
  
!       $GLOBALS['phpgw_setup']->html->show_header('LDAP 
Export','','config',$ConfigDomain);
  
        if($error)

Index: ldapimport.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldapimport.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ldapimport.php      3 Mar 2002 21:52:52 -0000       1.6
--- ldapimport.php      4 Mar 2002 02:55:53 -0000       1.7
***************
*** 397,401 ****
        }
  
!       $GLOBALS['phpgw_setup']->html->show_header('LDAP 
Import','','ldapimport',$ConfigDomain);
  
        if ($error)
--- 397,401 ----
        }
  
!       $GLOBALS['phpgw_setup']->html->show_header('LDAP 
Import','','config',$ConfigDomain);
  
        if ($error)

Index: ldapmodify.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldapmodify.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ldapmodify.php      3 Mar 2002 21:52:52 -0000       1.6
--- ldapmodify.php      4 Mar 2002 02:55:53 -0000       1.7
***************
*** 124,128 ****
        }
  
!       $GLOBALS['phpgw_setup']->html->show_header('LDAP 
Modify','','ldapmodify',$ConfigDomain);
  
        if ($submit)
--- 124,128 ----
        }
  
!       $GLOBALS['phpgw_setup']->html->show_header('LDAP 
Modify','','config',$ConfigDomain);
  
        if ($submit)

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** manageheader.php    3 Mar 2002 21:52:52 -0000       1.32
--- manageheader.php    4 Mar 2002 02:55:53 -0000       1.33
***************
*** 82,85 ****
--- 82,86 ----
                                
$GLOBALS['phpgw_setup']->html->show_header('Please login',True);
                                $GLOBALS['phpgw_setup']->html->login_form();
+                               $GLOBALS['phpgw_setup']->html->show_footer();
                                exit;
                        }
***************
*** 90,93 ****
--- 91,95 ----
                                
$GLOBALS['phpgw_setup']->html->show_header('Please login',True);
                                $GLOBALS['phpgw_setup']->html->login_form();
+                               $GLOBALS['phpgw_setup']->html->show_footer();
                                exit;
                        }