diff options
| author | Cassio de Campos <cassiopc@gmail.com> | 2017-11-01 15:01:05 +0000 |
|---|---|---|
| committer | Cassio de Campos <cassiopc@gmail.com> | 2017-11-01 15:01:05 +0000 |
| commit | a2335d0700e47811cb424cc58bf7aed4a06096d5 (patch) | |
| tree | b1596f3687ecb628084e291b5ea46f20d439e94e | |
| parent | 202408f9f0194c66e6ebd2ccfd30892baaaaac48 (diff) | |
| parent | 368037d4a4839d7ba701ca76b387ed18a9fa7cf3 (diff) | |
| download | boca-a2335d0700e47811cb424cc58bf7aed4a06096d5.tar.gz boca-a2335d0700e47811cb424cc58bf7aed4a06096d5.zip | |
Merge branch 'devel'
| -rw-r--r-- | src/.htaccess | 2 | ||||
| -rw-r--r-- | src/fextdata.php | 6 | ||||
| -rw-r--r-- | src/frun.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/.htaccess b/src/.htaccess index dbafa30..7c89b5b 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -1,5 +1,5 @@ php_flag output_buffering on -php_value memory_limit 256M +php_value memory_limit 1024M php_value post_max_size 128M php_flag magic_quotes_gpc off php_value upload_max_filesize 128M diff --git a/src/fextdata.php b/src/fextdata.php index ade78e8..1046f29 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -144,7 +144,7 @@ function scoretransfer($putname, $localsite, $timeo=20) { @rename($file, $privatedir . $ds . 'remotescores' . $ds . $bn); } $zip->close(); - LOGError("scoretransfer: download OK"); + LOGInfo("scoretransfer: download OK"); $logstr .= "download OK from $siteurl\n"; } else { $logstr .= "reading failed from $siteurl (zip open error)\n"; @@ -193,7 +193,7 @@ function scoretransfer($putname, $localsite, $timeo=20) { $logstr .= "timeout at full upload to $siteurl\n"; } else { if(strpos($s,'SCORE UPLOADED OK') !== false) { - LOGError("scoretransfer: upload OK"); + LOGInfo("scoretransfer: upload OK"); $logstr .= "upload of score to $siteurl OK\n"; } else { LOGError("scoretransfer: upload failed (" . $s . ")"); @@ -232,7 +232,7 @@ function scoretransfer($putname, $localsite, $timeo=20) { continue; } else { if(strpos($s,'SCORE UPLOADED OK') !== false) { - LOGError("scoretransfer: upload full OK"); + LOGInfo("scoretransfer: upload full OK"); $logstr .= "upload of full score to $siteurl OK\n"; } else { diff --git a/src/frun.php b/src/frun.php index 5977fdf..f9b9c23 100644 --- a/src/frun.php +++ b/src/frun.php @@ -913,8 +913,8 @@ function DBNewRun($param,$c=null) { "autostdout=$oid1, autostderr=$oid2 " . "where runnumber=$runnumber and contestnumber=$contest and runsitenumber=$site", "DBNewRun(update run)"); - if(is_numeric($oldoid1)) DB_lo_unlink($c,$oldoid1); - if(is_numeric($oldoid2)) DB_lo_unlink($c,$oldoid2); + if(isset($oldoid1) && is_numeric($oldoid1)) DB_lo_unlink($c,$oldoid1); + if(isset($oldoid2) && is_numeric($oldoid2)) DB_lo_unlink($c,$oldoid2); } if($cw) DBExec($c, "commit work", "DBNewRun(commit-update)"); } |