[Phpgroupware-cvs] CVS: setup manageheader.php,1.31.2.2,1.31.2.3

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        manageheader.php 
Log Message:
Cleanup of warnings.

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -C2 -r1.31.2.2 -r1.31.2.3
*** manageheader.php    7 Apr 2002 17:49:42 -0000       1.31.2.2
--- manageheader.php    7 Apr 2002 19:45:56 -0000       1.31.2.3
***************
*** 27,37 ****
        function check_form_values()
        {
                if (! $GLOBALS['HTTP_POST_VARS']['setting']['config_pass'])
                {
!                       $errors .= "<br>You didn't enter a config password";
                }
                if (! 
$GLOBALS['HTTP_POST_VARS']['setting']['HEADER_ADMIN_PASSWORD'])
                {
!                       $errors .= "<br>You didn't enter a header admin 
password";
                }
  
--- 27,39 ----
        function check_form_values()
        {
+               $errors = '';
+               
                if (! $GLOBALS['HTTP_POST_VARS']['setting']['config_pass'])
                {
!                       $errors .= '<br>You didn't enter a config password';
                }
                if (! 
$GLOBALS['HTTP_POST_VARS']['setting']['HEADER_ADMIN_PASSWORD'])
                {
!                       $errors .= '<br>You didn't enter a header admin 
password';
                }
  
***************
*** 326,336 ****
        <form action="manageheader.php" method="post">
        <input type="hidden" name="setting[write_config]" value="true">
!         <tr><td colspan="2"><b>Server Root</b><br><input type="text" 
name="setting[server_root]" size="80" value="<?php echo 
$phpgw_info['server']['server_root'] ?>"></td></tr>
!         <tr><td colspan="2"><b>Include Root (this should be the same as 
Server Root unless you know what you are doing)</b><br><input type="text" 
name="setting[include_root]" size="80" value="<?php echo 
$phpgw_info['server']['include_root'] ?>"></td></tr>
!         <tr><td colspan="2"><b>Admin password to header manager 
</b><br><input type="text" name="setting[HEADER_ADMIN_PASSWORD]" size="80" 
value="<?php echo $phpgw_info['server']['header_admin_password'] ?>"></td></tr>
          <br><br>
!         <tr><td><b>DB Host</b><br><input type="text" name="setting[db_host]" 
value="<?php echo $phpgw_info['server']['db_host'] ?>"></td><td>Hostname/IP of 
Databaseserver</td></tr>
!         <tr><td><b>DB Name</b><br><input type="text" name="setting[db_name]" 
value="<?php echo $phpgw_info['server']['db_name'] ?>"></td><td>Name of 
Database</td></tr>
!         <tr><td><b>DB User</b><br><input type="text" name="setting[db_user]" 
value="<?php echo $phpgw_info['server']['db_user'] ?>"></td><td>Name of DB User 
as phpgroupware has to connect as</td></tr>
          <tr><td><b>DB Password</b><br><input type="text" 
name="setting[db_pass]" value="<?php echo $phpgw_info['server']['db_pass'] 
?>"></td><td>Password of DB User</td></tr>
          <tr><td><b>DB Type</b><br><select name="setting[db_type]">
--- 328,338 ----
        <form action="manageheader.php" method="post">
        <input type="hidden" name="setting[write_config]" value="true">
!         <tr><td colspan="2"><b>Server Root</b><br><input type="text" 
name="setting[server_root]" size="80" value="<?php echo 
@$phpgw_info['server']['server_root'] ?>"></td></tr>
!         <tr><td colspan="2"><b>Include Root (this should be the same as 
Server Root unless you know what you are doing)</b><br><input type="text" 
name="setting[include_root]" size="80" value="<?php echo 
@$phpgw_info['server']['include_root'] ?>"></td></tr>
!         <tr><td colspan="2"><b>Admin password to header manager 
</b><br><input type="text" name="setting[HEADER_ADMIN_PASSWORD]" size="80" 
value="<?php echo @$phpgw_info['server']['header_admin_password'] ?>"></td></tr>
          <br><br>
!         <tr><td><b>DB Host</b><br><input type="text" name="setting[db_host]" 
value="<?php echo @$phpgw_info['server']['db_host'] ?>"></td><td>Hostname/IP of 
Databaseserver</td></tr>
!         <tr><td><b>DB Name</b><br><input type="text" name="setting[db_name]" 
value="<?php echo @$phpgw_info['server']['db_name'] ?>"></td><td>Name of 
Database</td></tr>
!         <tr><td><b>DB User</b><br><input type="text" name="setting[db_user]" 
value="<?php echo @$phpgw_info['server']['db_user'] ?>"></td><td>Name of DB 
User as phpgroupware has to connect as</td></tr>
          <tr><td><b>DB Password</b><br><input type="text" 
name="setting[db_pass]" value="<?php echo $phpgw_info['server']['db_pass'] 
?>"></td><td>Password of DB User</td></tr>
          <tr><td><b>DB Type</b><br><select name="setting[db_type]">
***************
*** 396,401 ****
          <tr><td><b>Domain select box on login</b><br>
           <select name="setting[domain_selectbox]">
!           <option value="True"<?php echo 
($phpgw_info['server']['domain_selectbox']?' selected':''); ?>>True</option>
!           <option value="False"<?php echo (! 
$phpgw_info['server']['domain_selectbox']?' selected':''); ?>>False</option>
           </select></td><td>&nbsp;</td>
          </tr>
--- 398,403 ----
          <tr><td><b>Domain select box on login</b><br>
           <select name="setting[domain_selectbox]">
!           <option value="True"<?php echo 
(@$phpgw_info['server']['domain_selectbox']?' selected':''); ?>>True</option>
!           <option value="False"<?php echo (! 
@$phpgw_info['server']['domain_selectbox']?' selected':''); ?>>False</option>
           </select></td><td>&nbsp;</td>
          </tr>