diff --git a/setup.php-presetup b/setup.php-presetup
index 81d574e..cda198c 100644
--- a/setup.php-presetup
+++ b/setup.php-presetup
@@ -3,29 +3,6 @@ include('./config.php');
include('./include/my_functions.php');
include('./include/common.php');
-function flush_exec($command, $line_length = 200)
-{
- $handle = popen("$command 2>&1", 'r');
-
- $line = '';
- while (! feof($handle)) {
- $chr = fread($handle, 1);
- $line .= $chr;
- if ($chr == "\n") {
- print str_replace("\n", "
\n", $line);
- $line = '';
- flush();
- } elseif (strlen($line) > $line_length) {
- print $line."
\n";
- $line = '';
- flush();
- }
- }
- print $line."
\n";
- flush();
- return;
-}
-
$version = PHPKI_VERSION;
# Who does the webserver run as (apache,www-data,etc)?
@@ -184,10 +161,10 @@ switch ($stage) {
$er .= "The store directory \"$store_dir\" is not readable by the web server user \"$uname\"
";
}
if (! is_writeable($store_dir)) {
- $er .= "The store directory \"$store_dir\: is not writeable by the web server user \"$uname\"
";
+ $er .= "The store directory \"$store_dir\: is not writable by the web server user \"$uname\"
";
}
} else {
- $er .= "Store directory \"$store_dir\" does not exist. You will have to manually create it as desribed in the setup form.
";
+ $er .= "Store directory \"$store_dir\" does not exist. You will have to manually create it as described in the setup form.
";
}
}
@@ -1227,9 +1204,6 @@ E-mail: someone@somewhere.com &nbs
This may take a few minutes. Please do not interrupt the process.....