From 2fe4597371876552e14acf7004160ca8cb3d6efd Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Mon, 25 Jun 2001 22:57:11 +0000
Subject: [PATCH] Undo needless use of hook, fix one typo in config.inc.php

---
 preferences/inc/hook_config.inc.php      | 20 --------------------
 preferences/setup/config.inc.php         |  2 +-
 preferences/templates/default/config.tpl |  5 ++++-
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/preferences/inc/hook_config.inc.php b/preferences/inc/hook_config.inc.php
index 22706b5d20..fb5893eaf6 100644
--- a/preferences/inc/hook_config.inc.php
+++ b/preferences/inc/hook_config.inc.php
@@ -95,24 +95,4 @@
 		}
 		return $out;
 	}
-
-	function size_type($config)
-	{
-		$size = array('gb','mb','kb','b');
-		
-		while(list($x,$val) = each($size))
-		{
-			if($config['vfs_default_account_size_type'] == $val)
-			{
-				$selected = ' selected';
-			}
-			else
-			{
-				$selected = '';
-			}
-			$descr = strtoupper($val);
-			$out .= '<option value="' . $val . '"' . $selected . '>'.$descr.'</option>' . "\n";
-		}
-		return $out;
-	}
 ?>
diff --git a/preferences/setup/config.inc.php b/preferences/setup/config.inc.php
index bb0ec2f58c..a7d115133e 100644
--- a/preferences/setup/config.inc.php
+++ b/preferences/setup/config.inc.php
@@ -161,7 +161,7 @@
        <option value="gb" <?php echo $selected['gb']?>>GB</option>
        <option value="mb" <?php echo $selected['mb']?>>MB</option>
        <option value="kb" <?php echo $selected['mb']?>>KB</option>
-       <option value="b" <?php echo $selected['mb']?>>B</option>
+       <option value="b" <?php echo $selected['b']?>>B</option>
       </select>
      </td>
     </tr>
diff --git a/preferences/templates/default/config.tpl b/preferences/templates/default/config.tpl
index 58c82efd27..a6841904ac 100644
--- a/preferences/templates/default/config.tpl
+++ b/preferences/templates/default/config.tpl
@@ -100,7 +100,10 @@
      <td>
       <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="{value_vfs_default_account_size_number}">&nbsp;&nbsp;
       <select name="newsettings[vfs_default_account_size_type]">
-{hook_size_type}
+       <option value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
+       <option value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
+       <option value="kb"{selected_vfs_default_account_size_type_mb}>KB</option>
+       <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
       </select>
      </td>
     </tr>