diff options
| author | cassiopc <cassiopc@gmail.com> | 2012-09-14 13:42:04 +0000 |
|---|---|---|
| committer | cassiopc <cassiopc@gmail.com> | 2012-09-14 13:42:04 +0000 |
| commit | e457938928ba589b16f12a2e6d38922dd94b2a51 (patch) | |
| tree | 0f2fdce96c2007db44d7d05bfe67ebcd7df706fd | |
| parent | ea316c1c9bc7e019491635cc3c7a8a4b0eaec2db (diff) | |
| parent | cdbf46a96d061b9f9709b4c769ed989f33952198 (diff) | |
| download | boca-e457938928ba589b16f12a2e6d38922dd94b2a51.tar.gz boca-e457938928ba589b16f12a2e6d38922dd94b2a51.zip | |
Merge branch 'master' of https://code.google.com/p/boca
| -rw-r--r-- | boca-1.5.1/src/fproblem.php | 3 | ||||
| -rwxr-xr-x | boca-1.5.1/src/private/autojudging.php | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | boca-1.5.1/tools/etc/icpc/createbocajail.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | boca-1.5.1/tools/etc/icpc/installboca.sh | 0 |
4 files changed, 3 insertions, 1 deletions
diff --git a/boca-1.5.1/src/fproblem.php b/boca-1.5.1/src/fproblem.php index bbf5758..3214a82 100644 --- a/boca-1.5.1/src/fproblem.php +++ b/boca-1.5.1/src/fproblem.php @@ -82,7 +82,7 @@ function DBGetProblemData($contestnumber, $problemnumber, $c=null) { $a = array(); for ($i=0;$i<$n;$i++) { $a[$i] = DBRow($r,$i); - + if(isset($_SESSION['locr'])) { $ds = DIRECTORY_SEPARATOR; if($ds=="") $ds = "/"; $nn = $a[$i]['number']; @@ -92,6 +92,7 @@ function DBGetProblemData($contestnumber, $problemnumber, $c=null) { if($a[$i]['descfilename'] != '') $a[$i]['descoid']=-1; } + } } return $a; } diff --git a/boca-1.5.1/src/private/autojudging.php b/boca-1.5.1/src/private/autojudging.php index 79c7079..e57d790 100755 --- a/boca-1.5.1/src/private/autojudging.php +++ b/boca-1.5.1/src/private/autojudging.php @@ -192,6 +192,7 @@ if(is_readable($cache . $ds . $run["inputoid"] . "." . $run["inputname"])) { cleardir($dir . $ds . "problemdata"); continue; } + if(isset($info['descfile'])) $descfile=trim(sanitizeText($info['descfile'])); $basename=trim(sanitizeText($info['basename'])); $fullname=trim(sanitizeText($info['fullname'])); diff --git a/boca-1.5.1/tools/etc/icpc/createbocajail.sh b/boca-1.5.1/tools/etc/icpc/createbocajail.sh index bd8bd5d..bd8bd5d 100644..100755 --- a/boca-1.5.1/tools/etc/icpc/createbocajail.sh +++ b/boca-1.5.1/tools/etc/icpc/createbocajail.sh diff --git a/boca-1.5.1/tools/etc/icpc/installboca.sh b/boca-1.5.1/tools/etc/icpc/installboca.sh index 8f35e74..8f35e74 100644..100755 --- a/boca-1.5.1/tools/etc/icpc/installboca.sh +++ b/boca-1.5.1/tools/etc/icpc/installboca.sh |