From 861ca8a5878d70549dae12b1ea84c5433e2372a6 Mon Sep 17 00:00:00 2001
From: cassiopc <cassiopc@gmail.com>
Date: Wed, 7 Nov 2012 16:25:18 +0100
Subject: inclusion of webcast file download option at admin/report

---
 boca-1.5.2/src/admin/report.php          |  6 +++-
 boca-1.5.2/src/scoretable.php            |  5 ++-
 boca-1.5.2/src/webcast/config.php        | 25 -------------
 boca-1.5.2/src/webcast/contest/index.php | 61 --------------------------------
 boca-1.5.2/src/webcast/runs/index.php    | 41 ---------------------
 boca-1.5.2/src/webcast/time/index.php    | 12 -------
 boca-1.5.2/src/webcast/version/index.php | 10 ------
 7 files changed, 9 insertions(+), 151 deletions(-)
 delete mode 100644 boca-1.5.2/src/webcast/config.php
 delete mode 100644 boca-1.5.2/src/webcast/contest/index.php
 delete mode 100644 boca-1.5.2/src/webcast/runs/index.php
 delete mode 100644 boca-1.5.2/src/webcast/time/index.php
 delete mode 100644 boca-1.5.2/src/webcast/version/index.php

(limited to 'boca-1.5.2/src')

diff --git a/boca-1.5.2/src/admin/report.php b/boca-1.5.2/src/admin/report.php
index bb1fc34..fe4b88d 100644
--- a/boca-1.5.2/src/admin/report.php
+++ b/boca-1.5.2/src/admin/report.php
@@ -15,7 +15,7 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ////////////////////////////////////////////////////////////////////////////////
-// Last modified 05/aug/2012 by cassio@ime.usp.br
+// Last modified 07/nov/2012 by cassio@ime.usp.br
 
 require 'header.php';
 
@@ -54,6 +54,10 @@ if (isset($_GET)) {
 		"'ICPC File','width=800,height=600,scrollbars=yes,toolbar=yes,menubar=yes,".
 		"resizable=yes')\">ICPC File</a><br />\n";
 
+      echo " <a href=\"#\" class=menu style=\"font-weight:bold\" onClick=\"window.open('report/webcast.php', ".
+		"'Webcast File','width=800,height=600,scrollbars=yes,toolbar=yes,menubar=yes,".
+		"resizable=yes')\">Webcast File</a><br />\n";
+
       echo " <a href=\"#\" class=menu style=\"font-weight:bold\" onClick=\"window.open('report/stat.php', ".
 		"'Problem Statistics','width=800,height=600,scrollbars=yes,toolbar=yes,menubar=yes,".
 		"resizable=yes')\">Statistics</a><br />\n";
diff --git a/boca-1.5.2/src/scoretable.php b/boca-1.5.2/src/scoretable.php
index bc6cf47..ef11ee6 100644
--- a/boca-1.5.2/src/scoretable.php
+++ b/boca-1.5.2/src/scoretable.php
@@ -18,7 +18,10 @@
 //Last updated 02/nov/2012 by cassio@ime.usp.br
 require_once("db.php");
 
-$locr=$_SESSION["locr"];
+if(isset($_SESSION["locr"]))
+	$locr=$_SESSION["locr"];
+else
+	$locr='.';
 
 if(isset($_GET["clock"]) && $_GET["clock"]==1) {
 	ob_start();
diff --git a/boca-1.5.2/src/webcast/config.php b/boca-1.5.2/src/webcast/config.php
deleted file mode 100644
index 2a4ba7e..0000000
--- a/boca-1.5.2/src/webcast/config.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$loc = $locr = "..";
-require_once("$locr/globals.php");
-require_once("$locr/db.php");
-if(!ValidSession()) {
-	InvalidSession("webcast/index.php");
-        ForceLoad("$loc/index.php");
-}
-if($_SESSION["usertable"]["usertype"] != "admin" && $_SESSION["usertable"]["usertype"] != "score") {
-	IntrusionNotify("webcast/index.php");
-	ForceLoad("$loc/index.php");
-}
-
-$contest = $_SESSION["usertable"]["contestnumber"];
-$site = $_SESSION["usertable"]["usersitenumber"];
-
-if(($ct =  DBSiteInfo($contest, $site)) == null)
-	ForceLoad("../index.php");
-
-if(isset($_GET['full']) && $_GET['full'] > 0 && $_SESSION["usertable"]["usertype"] == "admin")
-	$freezeTime = $ct['siteduration'];
-else
-	$freezeTime = $ct['sitelastmilescore'];
-
-?>
diff --git a/boca-1.5.2/src/webcast/contest/index.php b/boca-1.5.2/src/webcast/contest/index.php
deleted file mode 100644
index 3efc719..0000000
--- a/boca-1.5.2/src/webcast/contest/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-require '../../db.php';
-require '../config.php';
-
-header('Content-type: text/plain; encoding=utf-8');
-
-$ct = DBContestInfo($contest);
-
-echo
-	$ct['contestname'] . "\n";
-
-echo 
-	$ct['contestduration']/60 . '' .
-	$ct['contestlastmileanswer']/60 . '' .
-	$ct['contestlastmilescore']/60 . '' .
-	$ct['contestpenalty']/60 . "\n";
-
-$c = DBConnect();
-
-$r = DBExec($c,
-	'SELECT problemnumber FROM problemtable' .
-	' WHERE contestnumber = ' . $contest .
-	' AND problemnumber > 0');
-
-$numProblems = DBnlines($r);
-
-$r = DBExec($c,
-	'SELECT username, userfullname FROM usertable' .
-	' WHERE contestnumber = ' . $contest .
-	' AND userenabled = \'t\' AND usersitenumber = ' . $site .
-	' AND usertype = \'team\'');
-
-$numTeams = DBnlines($r);
-
-echo 
-	$numTeams . '' .
-	$numProblems . "\n";
-
-for ($i = 0; $i < $numTeams; $i++) {
-	$a = DBRow($r, $i);
-	$teamID = $a['username'];
-	if(isset($a['usershortname']))
-		$teamName = $a['usershortname'];
-	else
-		$teamName = $a['userfullname'];
-	if(isset($a['usershortinstitution']))
-		$teamUni = $a['usershortinstitution'];
-	else
-		$teamUni = $teamName;
-
-	echo
-		$teamID . '' .
-		$teamUni . '' .
-		$teamName . "\n";
-}
-
-echo '1' . '' . '1' . "\n";
-echo $numProblems . '' . 'Y' . "\n";
-
-?>
diff --git a/boca-1.5.2/src/webcast/runs/index.php b/boca-1.5.2/src/webcast/runs/index.php
deleted file mode 100644
index e28567e..0000000
--- a/boca-1.5.2/src/webcast/runs/index.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-require '../../db.php';
-require '../config.php';
-
-header('Content-type: text/plain; encoding=utf-8');
-
-$s = DBSiteInfo($contest, $site);
-
-$run = DBAllRunsInSites($contest, $site, 'run');
-
-$numRuns = count($run);
-
-for ($i = 0; $i < $numRuns; $i++) {
-	$u = DBUserInfo($contest, $site, $run[$i]['user']);
-
-	$runID = $run[$i]['number'];
-	$runTime = dateconvminutes($run[$i]['timestamp']);
-	$runTeam = $u['username'];
-	$runProblem = $run[$i]['problem'];
-
-	if ($runTime > $freezeTime) {
-		continue;
-	}
-
-	echo
-		$runID . '' .
-		$runTime . '' .
-		$runTeam . '' .
-		$runProblem . '';
-
-	if ($run[$i]['yes']=='t') {
-		echo 'Y' . "\n";
-	} else if ($run[$i]['answer'] == 'Not answered yet') {
-		echo '?' . "\n";
-	} else {
-		echo 'N' . "\n";
-	};
-}
-
-?>
diff --git a/boca-1.5.2/src/webcast/time/index.php b/boca-1.5.2/src/webcast/time/index.php
deleted file mode 100644
index 061c81f..0000000
--- a/boca-1.5.2/src/webcast/time/index.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require '../../db.php';
-require '../config.php';
-
-header('Content-type: text/plain; encoding=utf-8');
-
-$s = DBSiteInfo($contest, $site);
-
-echo $s['currenttime'];
-
-?>
diff --git a/boca-1.5.2/src/webcast/version/index.php b/boca-1.5.2/src/webcast/version/index.php
deleted file mode 100644
index 4d474a2..0000000
--- a/boca-1.5.2/src/webcast/version/index.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-require '../../db.php';
-require '../config.php';
-
-header('Content-type: text/plain; encoding=utf-8');
-
-echo '1.0' . "\n";
-
-?>
-- 
cgit v1.2.3