From f7f08956a2e302e8dd08ee7e7e300b26778598f8 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sat, 23 Jun 2001 06:15:37 +0000
Subject: [PATCH] Change from checkboxes to select so we get a null back from
 the form

---
 admin/setup/config.inc.php       | 29 +++++++++----
 phpgwapi/setup/config.inc.php    |  9 +++-
 preferences/setup/config.inc.php | 70 +++++++++++++++++++++++++-------
 3 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/admin/setup/config.inc.php b/admin/setup/config.inc.php
index 76ac4fac1f..b25e30013c 100644
--- a/admin/setup/config.inc.php
+++ b/admin/setup/config.inc.php
@@ -42,12 +42,19 @@
     <td>Maximum account id (e.g. 65535 or 1000000):</td>
     <td><input name="newsettings[account_max_id]" value="<?php echo $current_config["account_max_id"]; ?>"></td>
    </tr>
-   <?php $selected = array(); ?>
 
+   <?php $selected = array(); ?>
+   <?php $selected[$current_config['ldap_extra_attributes']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
-    <td>If using LDAP, do you want to be able to manage homedirectory and loginshell attributes?:</td>
-    <td><input type="checkbox" name="newsettings[ldap_extra_attributes]" value="True"<?php echo ($current_config["ldap_extra_attributes"]?" checked":""); ?>></td>
-   </tr>
+     <td>If using LDAP, do you want to be able to manage homedirectory and loginshell attributes?:</td>
+     <td>
+      <select name="newsettings[ldap_extra_attributes]">
+       <option value="">No</option>
+       <option value="True"<?php echo $selected['True']?>>Yes</option>
+      </select>
+     </td>
+    </tr>
+
    <tr bgcolor="e6e6e6">
     <td>&nbsp;&nbsp;&nbsp;LDAP Default homedirectory prefix (e.g. /home for /home/username):</td>
     <td><input name="newsettings[ldap_account_home]" value="<?php echo $current_config["ldap_account_home"]; ?>"></td>
@@ -59,12 +66,18 @@
    </tr>
 
    <?php $selected = array(); ?>
-
+   <?php $selected[$current_config['auto_create_acct']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
-    <td>Auto create account records for authenticated users:</td>
-    <td><input type="checkbox" name="newsettings[auto_create_acct]" value="True"<?php echo ($current_config["auto_create_acct"]?" checked":""); ?>></td>
-   </tr>
+     <td>Auto create account records for authenticated users:</td>
+     <td>
+      <select name="newsettings[auto_create_acct]">
+       <option value="">No</option>
+       <option value="True"<?php echo $selected['True']?>>Yes</option>
+      </select>
+     </td>
+    </tr>
 
+   <?php $selected = array(); ?>
    <?php $selected[$current_config["acl_default"]] = " selected"; ?>
    <tr bgcolor="e6e6e6">
     <td>If no ACL records for user or any group the user is a member of: </td>
diff --git a/phpgwapi/setup/config.inc.php b/phpgwapi/setup/config.inc.php
index 3ee41cac2c..611512a38a 100644
--- a/phpgwapi/setup/config.inc.php
+++ b/phpgwapi/setup/config.inc.php
@@ -39,9 +39,16 @@
     <td><input name="newsettings[default_ftp_server]" value="<?php echo $current_config['default_ftp_server']; ?>"></td>
    </tr>
 
+   <?php $selected = array(); ?>
+   <?php $selected[$current_config['ftp_use_mime']] = " selected"; ?>
    <tr bgcolor="e6e6e6">
     <td>Attempt to use correct mimetype for FTP instead of default 'application/octet-stream'.</td>
-    <td><input type="checkbox" name="newsettings[ftp_use_mime]" value="True"<?php echo ($current_config['ftp_use_mime']?' checked':''); ?>></td>
+    <td>
+     <select name="newsettings[ftp_use_mime]">
+      <option value="">No</option>
+      <option value="True"<?php echo $selected['True']; ?>>Yes</option>
+     </select>
+    </td>
    </tr>
 
    <tr bgcolor="e6e6e6">
diff --git a/preferences/setup/config.inc.php b/preferences/setup/config.inc.php
index ecb81bddd9..c8dd4e907b 100644
--- a/preferences/setup/config.inc.php
+++ b/preferences/setup/config.inc.php
@@ -23,6 +23,20 @@
    </tr>
    <?php $selected = array(); ?>
 
+   <?php $selected[$current_config["countrylist"]] = " selected"; ?>
+   <tr bgcolor="e6e6e6">
+    <td>Country Selection (Text Entry/SelectBox):</td>
+    <td>
+     <select name="newsettings[countrylist]">
+    <?php
+    echo '<option value="user_choice"'  . $selected['user_choice']  . '>Users Choice</option>';
+    echo '<option value="force_select"' . $selected['force_select'] . '>Force Selectbox</option>';
+    ?>
+     </select>
+    </td>
+   </tr>
+   <?php $selected = array(); ?>
+
    <?php $selected[$current_config["template_set"]] = " selected"; ?>
    <tr bgcolor="e6e6e6">
     <td>Interface/Template Selection:<br> <!---(if user choice, and they dont make a selection, then classic will be used)---></td>
@@ -88,24 +102,50 @@
    <?php $selected = array(); */
    ?>
 
-   <tr bgcolor="e6e6e6">
-    <td>Use pure HTML compliant code (not fully working yet):</td>
-    <td><input type="checkbox" name="newsettings[htmlcompliant]" value="True"<?php echo ($current_config["htmlcompliant"]?" checked":""); ?>></td>
-   </tr>
    <?php $selected = array(); ?>
-
+   <?php $selected[$current_config['htmlcompliant']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
-    <td>Use cookies to pass sessionid:</td>
-    <td><input type="checkbox" name="newsettings[usecookies]" value="True"<?php echo ($current_config["usecookies"]?" checked":""); ?>></td>
-   </tr>
+     <td>Use pure HTML compliant code (not fully working yet):</td>
+     <td>
+      <select name="newsettings[htmlcompliant]">
+       <option value="">No</option>
+       <option value="True"<?php echo $selected['True']?>>Yes</option>
+      </select>
+     </td>
+    </tr>
 
+   <?php $selected = array(); ?>
+   <?php $selected[$current_config['usecookies']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
-    <td>Would you like phpGroupWare to check for new version<br>when admins login ?:</td>
-    <td><input type="checkbox" name="newsettings[checkfornewversion]" value="True"<?php echo ($current_config["checkfornewversion"]?" checked":""); ?>></td>
-   </tr>
+     <td>Use cookies to pass sessionid:</td>
+     <td>
+      <select name="newsettings[usecookies]">
+       <option value="">No</option>
+       <option value="True"<?php echo $selected['True']?>>Yes</option>
+      </select>
+     </td>
+    </tr>
 
-   <tr bgcolor="e6e6e6">   
-     <td>Would you like phpGroupWare to cache the phpgw_info array ?:</td>   
-     <td><input type="checkbox" name="newsettings[cache_phpgw_info]" value="True"<?php echo ($current_config["cache_phpgw_info"]?" checked":""); ?>></td>   
-    </tr> 
+   <?php $selected = array(); ?>
+   <?php $selected[$current_config['checkfornewversion']] = ' selected'; ?>
+   <tr bgcolor="e6e6e6">
+     <td>Would you like phpGroupWare to check for new version<br>when admins login ?:</td>
+     <td>
+      <select name="newsettings[checkfornewversion]">
+       <option value="">No</option>
+       <option value="True"<?php echo $selected['True']?>>Yes</option>
+      </select>
+     </td>
+    </tr>
 
+   <?php $selected = array(); ?>
+   <?php $selected[$current_config['cache_phpgw_info']] = ' selected'; ?>
+   <tr bgcolor="e6e6e6">
+     <td>Would you like phpGroupWare to cache the phpgw_info array ?:</td>
+     <td>
+      <select name="newsettings[cache_phpgw_info]">
+       <option value="">No</option>
+       <option value="True"<?php echo $selected['True']?>>Yes</option>
+      </select>
+     </td>
+    </tr>