All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit b36b9a2d authored by Russ Fish's avatar Russ Fish

Quiet php warnings.

parent 55d1bb6e
......@@ -180,7 +180,10 @@ $script = "cvsweb.cgi";
$query = escapeshellcmd($_SERVER["QUERY_STRING"]);
$name = escapeshellcmd($_SERVER["SCRIPT_NAME"]);
$agent = escapeshellcmd($_SERVER["HTTP_USER_AGENT"]);
$encoding = escapeshellcmd($_SERVER["HTTP_ACCEPT_ENCODING"]);
if (isset($_SERVER["HTTP_ACCEPT_ENCODING"])
&& $_SERVER["HTTP_ACCEPT_ENCODING"] != "") {
$encoding = escapeshellcmd($_SERVER["HTTP_ACCEPT_ENCODING"]);
}
# This is special ...
if (isset($_SERVER["PATH_INFO"]) && $_SERVER["PATH_INFO"] != "") {
......@@ -197,7 +200,9 @@ $script = preg_replace("/ /","\\ ",$script);
$query = preg_replace("/ /","\\ ",$query);
$name = preg_replace("/ /","\\ ",$name);
$agent = preg_replace("/ /","\\ ",$agent);
$encoding = preg_replace("/ /","\\ ",$encoding);
if (isset($encoding)) {
$encoding = preg_replace("/ /","\\ ",$encoding);
}
#
# A cleanup function to keep the child from becoming a zombie, since
......@@ -223,8 +228,10 @@ set_time_limit(0);
register_shutdown_function("SPEWCLEANUP");
$shellcmd = "env PATH=./cvsweb/ QUERY_STRING=$query PATH_INFO=$path " .
"SCRIPT_NAME=$name HTTP_USER_AGENT=$agent " .
"HTTP_ACCEPT_ENCODING=$encoding ";
"SCRIPT_NAME=$name HTTP_USER_AGENT=$agent ";
if (isset($encoding)) {
$shellcmd .= "HTTP_ACCEPT_ENCODING=$encoding ";
}
if (isset($repodir)) {
$prog = ($use_viewvc ? "webviewvc" : "webcvsweb");
......
......@@ -55,7 +55,9 @@ if (isset($copyid) && $copyid != "") {
$copyid, $matches)) {
$copypid = $matches[1];
$copyeid = $matches[2];
$copytag = $matches[3];
if (isset($matches[3])) {
$copytag = $matches[3];
}
}
else {
PAGEARGERROR("Invalid ID");
......@@ -145,6 +147,8 @@ if (isset($experiment)) {
echo "$nsfile\n";
}
else {
$pid = $experiment->pid();
$eid = $experiment->eid();
USERERROR("There is no NS file recorded for ".
"experiment $eid in project $pid!", 1);
}
......
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