From d8f2907fb00b701f91e6e98d33c4e6c0dd0619a5 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Mon, 16 Oct 2017 22:34:48 +0100
Subject: bug fixes

---
 src/admin/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/admin/header.php')

diff --git a/src/admin/header.php b/src/admin/header.php
index 1677469..d2cf43f 100644
--- a/src/admin/header.php
+++ b/src/admin/header.php
@@ -71,7 +71,7 @@ if(!isset($_POST['noflush'])) {
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=problem.php>Problems</a></td>\n";
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=language.php>Languages</a></td>\n";
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=answer.php>Answers</a></td>\n";
-	//	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=export.php>Export</a></td>\n";
+	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=transfer.php>Transfer</a></td>\n";
 //echo " </tr></table><hr><table border=0 width=\"100%\" align=center><tr>\n";
 	echo " </tr><tr>\n";
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=task.php>Tasks</a></td>\n";
-- 
cgit v1.2.3


From 0fb7637e5b9fff24a7265a27308ea795ec8e3f38 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 13:44:08 +0100
Subject: new options to admin

---
 src/admin/header.php |  4 +--
 src/admin/misc.php   | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 src/admin/misc.php

(limited to 'src/admin/header.php')

diff --git a/src/admin/header.php b/src/admin/header.php
index d2cf43f..5a01c93 100644
--- a/src/admin/header.php
+++ b/src/admin/header.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 21/jul/2012 by cassio@ime.usp.br
+// Last modified 19/oct/2017 by cassio@ime.usp.br
 
 ob_start();
 header ("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -71,7 +71,7 @@ if(!isset($_POST['noflush'])) {
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=problem.php>Problems</a></td>\n";
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=language.php>Languages</a></td>\n";
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=answer.php>Answers</a></td>\n";
-	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=transfer.php>Transfer</a></td>\n";
+	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=misc.php>Misc</a></td>\n";
 //echo " </tr></table><hr><table border=0 width=\"100%\" align=center><tr>\n";
 	echo " </tr><tr>\n";
 	echo "  <td align=center><a class=menu style=\"font-weight:bold\" href=task.php>Tasks</a></td>\n";
diff --git a/src/admin/misc.php b/src/admin/misc.php
new file mode 100644
index 0000000..9872f12
--- /dev/null
+++ b/src/admin/misc.php
@@ -0,0 +1,98 @@
+<?php
+////////////////////////////////////////////////////////////////////////////////
+//BOCA Online Contest Administrator
+//    Copyright (C) 2003-2013 by BOCA System (bocasystem@gmail.com)
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//    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 updated 16/oct/2017 by cassio@ime.usp.br
+require 'header.php';
+?>
+<br>
+<form name="form1" enctype="multipart/form-data" method="post" action="misc.php">
+  <input type=hidden name="confirmation" value="noconfirm" />
+  <script language="javascript" type="text/javascript">
+    function conf() {
+      if (confirm("Confirm?")) {
+        document.form1.confirmation.value='confirm';
+      }
+    }
+   </script>
+   <center>
+   <input type="submit" name="Submit1" value="Transfer" onClick="conf()"> &nbsp;
+   <input type="submit" name="Submit2" value="Transfer one-way" onClick="conf()"> &nbsp;
+   <input type="submit" name="Submit3" value="Transfer scores"> &nbsp;
+   <input type="submit" name="Submit4" value="Update BOCA" onClick="conf()"> 
+  </center>
+</form>
+<?php
+$ds = DIRECTORY_SEPARATOR;
+if($ds=="") $ds = "/";
+
+if (isset($_POST["Submit1"]) && $_POST["Submit1"] == "Transfer") {
+  $privatedir = $_SESSION['locr'] . $ds . "private";
+  $remotedir = $_SESSION['locr'] . $ds . "private" . $ds . "remotescores";
+  $destination = $remotedir . $ds ."scores.zip";
+  if(is_writable($remotedir)) {
+    if(($fp = @fopen($destination . ".lck",'x')) !== false) {
+
+      if (($s = DBSiteInfo($_SESSION["usertable"]["contestnumber"],$_SESSION["usertable"]["usersitenumber"])) == null)
+	ForceLoad("index.php");
+      echo "<pre>\n";
+      echo "Building scores\n";
+      $level=$s["sitescorelevel"];
+      $data0 = array();
+      if($level>0) {
+	list($score,$data0) = DBScoreSite($_SESSION["usertable"]["contestnumber"], 
+					  $_SESSION["usertable"]["usersitenumber"], 0, -1);
+      }
+      $ct=DBGetActiveContest();
+      $localsite=$ct['contestlocalsite'];
+      $fname = $privatedir . $ds . "score_localsite_" . $localsite . "_x"; // . md5($_SERVER['HTTP_HOST']);
+      @file_put_contents($fname . ".tmp",base64_encode(serialize($data0)));
+      @rename($fname . ".tmp",$fname . ".dat");
+      
+      $data0 = array();
+      if($level>0) {
+	list($score,$data0) = DBScoreSite($_SESSION["usertable"]["contestnumber"], 
+					  $_SESSION["usertable"]["usersitenumber"], 1, -1);
+      }
+      $ct=DBGetActiveContest();
+      $localsite=$ct['contestlocalsite'];
+      $fname = $remotedir . $ds . "score_site" . $localsite . "_" . $localsite . "_x"; // . md5($_SERVER['HTTP_HOST']);
+      @file_put_contents($fname . ".tmp",base64_encode(serialize($data0)));
+      @rename($fname . ".tmp",$fname . ".dat");
+      echo "Transferring scores\n";
+      scoretransfer($fname . ".dat", $localsite);
+      echo "Saving scores\n";
+      if(@create_zip($remotedir,glob($remotedir . '/*.dat'),$fname . ".tmp") != 1) {
+	LOGError("Cannot create score zip file");
+	if(@create_zip($remotedir,array(),$fname . ".tmp") == 1)
+	  @rename($fname . ".tmp",$destination);
+      } else {
+	@rename($fname . ".tmp",$destination);
+      }
+      @fclose($fp);
+      echo "Processing other data\n";
+      getMainXML($_SESSION["usertable"]["contestnumber"]);
+      echo "</pre>\n";
+      @unlink($destination . ".lck");
+    } else {
+      if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 180)
+	@unlink($destination . ".lck");
+    }
+  }
+}
+?>
+</body>
+</html>
-- 
cgit v1.2.3


From f387e0cdaa0a90a5520b1e7cff3a4f667fdd6828 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 14:19:47 +0100
Subject: choice of site number

---
 src/admin/header.php |  2 +-
 src/admin/misc.php   |  6 +++---
 src/admin/site.php   | 14 +++++++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src/admin/header.php')

diff --git a/src/admin/header.php b/src/admin/header.php
index 5a01c93..4c4435d 100644
--- a/src/admin/header.php
+++ b/src/admin/header.php
@@ -53,7 +53,7 @@ if($_SESSION["usertable"]["usertype"] != "admin") {
 }
 
 if(!isset($_POST['noflush'])) {
-	echo "</head><body><table border=1 width=\"100%\">\n";
+	echo "</head><body id=\"body\" style=\"overflow:hidden;\"><table border=1 width=\"100%\">\n";
 	echo "<tr><td nowrap bgcolor=\"eeee00\" align=center>";
 	echo "<img src=\"../images/smallballoontransp.png\" alt=\"\">";
 	echo "<font color=\"#000000\">BOCA</font>";
diff --git a/src/admin/misc.php b/src/admin/misc.php
index 3e5df80..3e4a4d8 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -61,7 +61,7 @@ if (isset($_POST["Submit3"]) && $_POST["Submit3"] == "Transfer scores") {
   $doscore=true;
 }
 if (isset($_POST["Submit4"]) && $_POST["Submit4"] == "Update BOCA") {
-  echo "<br><pre>Not implemented</pre>\n";
+  echo "<pre>Not implemented</pre>\n";
 }
 $privatedir = $_SESSION['locr'] . $ds . "private";
 $remotedir = $_SESSION['locr'] . $ds . "private" . $ds . "remotescores";
@@ -71,7 +71,7 @@ if(is_writable($remotedir)) {
     if($doscore) {
       if (($s = DBSiteInfo($_SESSION["usertable"]["contestnumber"],$_SESSION["usertable"]["usersitenumber"])) == null)
 	ForceLoad("index.php");
-      echo "<br><pre>\n";
+      echo "<pre>\n";
       echo "Building scores\n";
       $level=$s["sitescorelevel"];
       $data0 = array();
@@ -116,7 +116,7 @@ if(is_writable($remotedir)) {
   } else {
     if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 120)
       @unlink($destination . ".lck");
-    echo "<br><pre>Transfers locked by other process - try again soon</pre>\n";
+    echo "<pre>Transfers locked by other process - try again soon</pre>\n";
   }
 }
 ?>
diff --git a/src/admin/site.php b/src/admin/site.php
index 84241f3..78852a0 100644
--- a/src/admin/site.php
+++ b/src/admin/site.php
@@ -282,7 +282,7 @@ if ($main && isset($_FILES["importfile"]) && isset($_POST["Submit"]) && $_POST["
       }
     }
     function newsite() {
-      document.location='site.php?new=1';
+      document.getElementById('normal').style.display = "block";
     }
     function sitech(n) {
       if(n==null) {
@@ -599,7 +599,15 @@ if($main) {
   </center>
 		<?php } ?>
 </form>
-
-
+<div id="normal">
+<div id="popupnew">
+<form action="site.php" id="formnew" method="get" name="formnew">
+<h2>Choose site number</h2>
+<input id="new" name="Number" placeholder="new" type="text">
+<input type="submit" name="Go" value="Go">
+</form>
+</div>
+</div>
+    
 </body>
 </html>
-- 
cgit v1.2.3


From 8a64aefe0438c8afd626eba89c113ed14d88e2d6 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 14:41:24 +0100
Subject: bf

---
 src/Css.php          | 1 -
 src/admin/header.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/admin/header.php')

diff --git a/src/Css.php b/src/Css.php
index 663b1a1..94d774a 100644
--- a/src/Css.php
+++ b/src/Css.php
@@ -39,7 +39,6 @@ position:fixed;
 background-color:#313131;
 overflow:auto
 }
-
 DIV.menu {background-color:<?php echo $corfundo?>; layer-background-color:<?php echo $corfundo?>}
 DIV.menudown {background-color:<?php echo $cormenu?>; border-bottom:1px solid white; border-right:1px solid white;border-top:2px solid #555555;border-left:1px solid #555555}
 DIV.fname {background-color:<?php echo $corfundo2?>; layer-background-color:<?php echo $corfundo2?>; position:absolute; visibility:hidden; border:0; left:0px; top:0px; height:19px; z-index:100;}
diff --git a/src/admin/header.php b/src/admin/header.php
index 4c4435d..6002b18 100644
--- a/src/admin/header.php
+++ b/src/admin/header.php
@@ -53,7 +53,7 @@ if($_SESSION["usertable"]["usertype"] != "admin") {
 }
 
 if(!isset($_POST['noflush'])) {
-	echo "</head><body id=\"body\" style=\"overflow:hidden;\"><table border=1 width=\"100%\">\n";
+	echo "</head><body id=\"body\"><table border=1 width=\"100%\">\n";
 	echo "<tr><td nowrap bgcolor=\"eeee00\" align=center>";
 	echo "<img src=\"../images/smallballoontransp.png\" alt=\"\">";
 	echo "<font color=\"#000000\">BOCA</font>";
-- 
cgit v1.2.3