diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2010-12-17 15:34:22 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2010-12-17 15:34:22 -0500 |
commit | ffdc499ab1cfe02660daa881b2cfaeea48bd73d0 (patch) | |
tree | 7db4ab5562b29847b9037d19984cc33859456bf5 /usr/local | |
parent | d48927b4eadc42c43fefa3ecf539a5467906b4d4 (diff) | |
download | pfsense-ffdc499ab1cfe02660daa881b2cfaeea48bd73d0.zip pfsense-ffdc499ab1cfe02660daa881b2cfaeea48bd73d0.tar.gz |
Show when disk is encrypted. Do not uppercase .eli
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/installer.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php index 1be0720..cd0e80b 100644 --- a/usr/local/www/installer.php +++ b/usr/local/www/installer.php @@ -313,7 +313,7 @@ function begin_install() { } // Handle other type of file systems if($_REQUEST['fstype']) - $fstype = htmlspecialchars(strtoupper($_REQUEST['fstype'])); + $fstype = htmlspecialchars($_REQUEST['fstype']); else $fstype = "UFS+S"; if(substr($_REQUEST['fstype'], -4, 4) == ".eli") { @@ -447,6 +447,8 @@ function verify_before_install() { $disksize = format_bytes($disk['size'] * 1048576); $swapsize = htmlspecialchars($_REQUEST['swapsize']); $fstype_echo = htmlspecialchars($_REQUEST['fstype']); + if(stristr($fstype_echo, ".eli")) + $fstype_echo_enc = " (Encrypted)"; $disk_echo = htmlspecialchars($_REQUEST['disk']); $swapsize_echo = htmlspecialchars($_REQUEST['swapsize']); echo <<<EOF @@ -479,7 +481,7 @@ function verify_before_install() { <tr><td align="right"><b>Description:</td><td>{$disk['desc']}</td></tr> <tr><td align="right"><b>Size:</td><td>{$disksize}</td></tr> <tr><td align="right"><b>SWAP Size:</td><td>{$swapsize}</td></tr> - <tr><td align="right"><b>Filesystem:</td><td>{$fstype_echo}</td></tr> + <tr><td align="right"><b>Filesystem:</td><td>{$fstype_echo}{$fstype_echo_enc}</td></tr> </table> </div> </center> |