Commit 4e338182 authored by Leigh Stoller's avatar Leigh Stoller

Fix a couple php warnings.

parent 8db4850e
......@@ -86,6 +86,15 @@ elseif (! isset($formfields)) {
PAGEARGERROR();
}
#
# For the benefit of the form. Remember to pass back actual filename, not
# the php temporary file name. Note that there appears to be some kind
# of breakage, at least in opera; filename has no path.
#
if (isset($_FILES['exp_nsfile'])) {
$formfields['exp_nsfile'] = $_FILES['exp_nsfile']['name'];
}
# Some local variables.
$nsfilelocale = "";
$thensfile = 0;
......@@ -204,12 +213,6 @@ elseif (isset($_FILES['exp_nsfile']) && $_FILES['exp_nsfile']['size'] != 0) {
$_FILES['exp_nsfile']['tmp_name'])) {
$errors["Local NS File"] = "Temp path includes illegal characters";
}
#
# For the benefit of the form. Remember to pass back actual filename, not
# the php temporary file name. Note that there appears to be some kind
# of breakage, at least in opera; filename has no path.
#
$formfields['exp_nsfile'] = $_FILES['exp_nsfile']['name'];
$nsfilelocale = "upload";
}
elseif (isset($formfields["exp_nsfile_contents"]) &&
......
......@@ -231,6 +231,10 @@ function SPITFORM($target_user, $formfields, $errors)
value=\"" . $formfields["passphrase2"] . "\"
size=24></td>
</tr>\n";
if (!isset($formfields["oldpassphrase"])) {
$formfields["oldpassphrase"] = "";
}
echo "<tr>
<td>Old PassPhrase:</td>
<td class=left>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment