diff options
| author | Alexander Pickering <Apickx@cogarr.org> | 2016-03-07 20:40:11 -0500 |
|---|---|---|
| committer | Alexander Pickering <Apickx@cogarr.org> | 2016-03-07 20:40:11 -0500 |
| commit | e996a405877dd72f72d9bd44d383150988049614 (patch) | |
| tree | 21dd437c3965a756f5c63d0a05fa11148777801e | |
| parent | 2996819f2f70e0bbc21f54fcb161c26a0c720cab (diff) | |
| parent | 0404e75e073819804c0ca7656b691b3486a7b383 (diff) | |
| download | webpage-e996a405877dd72f72d9bd44d383150988049614.tar.gz webpage-e996a405877dd72f72d9bd44d383150988049614.tar.bz2 webpage-e996a405877dd72f72d9bd44d383150988049614.zip | |
Merge branch 'development'
Conflicts:
report.sh
| -rw-r--r-- | report.sh | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -1,10 +1,24 @@ echo "Content-type: text/html" echo "" +shortname = `param sname` + cat ./fileparts/header.html +<<<<<<< HEAD echo "<!--" set echo "Sname: $FORM_sname" echo "-->" cat ./fileparts/report.html +======= + +if [ "REQUEST_METHOD" = "POST"]; then + #Make a thank-you-for-reporting-bug page + echo "<!--" + echo "Sname: $shortname" + echo "-->" +else + cat ./fileparts/report.html +fi +>>>>>>> development cat ./fileparts/footer.html |