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')

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 8cfd459f7d9b80754d47a00d7f0d5c15f0e88b04 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Mon, 16 Oct 2017 23:00:53 +0100
Subject: forced transfer

---
 src/admin/transfer.php | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 src/admin/transfer.php

(limited to 'src/admin')

diff --git a/src/admin/transfer.php b/src/admin/transfer.php
new file mode 100644
index 0000000..718c33a
--- /dev/null
+++ b/src/admin/transfer.php
@@ -0,0 +1,75 @@
+<?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';
+
+$ds = DIRECTORY_SEPARATOR;
+if($ds=="") $ds = "/";
+
+$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");
+    
+    $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");
+    scoretransfer($fname . ".dat", $localsite);
+    
+    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);
+    
+    getMainXML($_SESSION["usertable"]["contestnumber"]);
+    
+    @unlink($destination . ".lck");
+  } else {
+    if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 180)
+      @unlink($destination . ".lck");
+  }
+}
+
+?>
-- 
cgit v1.2.3


From 9f80afacfda4fbcede275901c9027f29afc4c100 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Mon, 16 Oct 2017 23:05:03 +0100
Subject: more displaying

---
 src/admin/transfer.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/transfer.php b/src/admin/transfer.php
index 718c33a..20ea2e5 100644
--- a/src/admin/transfer.php
+++ b/src/admin/transfer.php
@@ -29,7 +29,8 @@ if(is_writable($remotedir)) {
 
     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) {
@@ -52,8 +53,9 @@ if(is_writable($remotedir)) {
     $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)
@@ -62,9 +64,9 @@ if(is_writable($remotedir)) {
       @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)
-- 
cgit v1.2.3


From 5e5c2e6050f77ab87cb00aff231599cfa78c4de9 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Mon, 16 Oct 2017 23:06:55 +0100
Subject: bfix

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

(limited to 'src/admin')

diff --git a/src/admin/transfer.php b/src/admin/transfer.php
index 20ea2e5..7f62326 100644
--- a/src/admin/transfer.php
+++ b/src/admin/transfer.php
@@ -30,7 +30,7 @@ if(is_writable($remotedir)) {
     if (($s = DBSiteInfo($_SESSION["usertable"]["contestnumber"],$_SESSION["usertable"]["usersitenumber"])) == null)
       ForceLoad("index.php");
     echo "<pre>\n";
-    echo "Building scores\n"
+    echo "Building scores\n";
     $level=$s["sitescorelevel"];
     $data0 = array();
     if($level>0) {
-- 
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')

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 c1e9a742ab8567fc7026a39ea95ae3e95400faf8 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 14:04:41 +0100
Subject: new features

---
 src/admin/misc.php     | 56 ++++++++++++++++++++++++++----------
 src/admin/transfer.php | 77 --------------------------------------------------
 2 files changed, 41 insertions(+), 92 deletions(-)
 delete mode 100644 src/admin/transfer.php

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 9872f12..3e5df80 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -27,28 +27,51 @@ require 'header.php';
         document.form1.confirmation.value='confirm';
       }
     }
+    function conf2() {
+      if (confirm("Confirm updating BOCA?")) {
+		  if (confirm("This operation will update your BOCA system. 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="Submit2" value="Transfer all" onClick="conf()"> &nbsp;
    <input type="submit" name="Submit3" value="Transfer scores"> &nbsp;
-   <input type="submit" name="Submit4" value="Update BOCA" onClick="conf()"> 
+   <input type="submit" name="Submit4" value="Update BOCA" onClick="conf2()"> 
   </center>
 </form>
 <?php
 $ds = DIRECTORY_SEPARATOR;
 if($ds=="") $ds = "/";
-
+$dotransfer=false;
+$doscore=false;
+$dotransferall=false;
 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) {
-
+  $dotransfer=true;
+  $doscore=true;
+}
+if (isset($_POST["Submit2"]) && $_POST["Submit2"] == "Transfer all") {
+  $dotransfer=true;
+  $dotransferall=true;
+  $doscore=true;
+}
+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";
+}
+$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($doscore) {
       if (($s = DBSiteInfo($_SESSION["usertable"]["contestnumber"],$_SESSION["usertable"]["usersitenumber"])) == null)
 	ForceLoad("index.php");
-      echo "<pre>\n";
+      echo "<br><pre>\n";
       echo "Building scores\n";
       $level=$s["sitescorelevel"];
       $data0 = array();
@@ -83,14 +106,17 @@ if (isset($_POST["Submit1"]) && $_POST["Submit1"] == "Transfer") {
 	@rename($fname . ".tmp",$destination);
       }
       @fclose($fp);
+    }
+    if($dotransfer) {
       echo "Processing other data\n";
-      getMainXML($_SESSION["usertable"]["contestnumber"]);
+      getMainXML($_SESSION["usertable"]["contestnumber"],10,$dotransferall);
       echo "</pre>\n";
-      @unlink($destination . ".lck");
-    } else {
-      if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 180)
-	@unlink($destination . ".lck");
     }
+    @unlink($destination . ".lck");
+  } 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";
   }
 }
 ?>
diff --git a/src/admin/transfer.php b/src/admin/transfer.php
deleted file mode 100644
index 7f62326..0000000
--- a/src/admin/transfer.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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';
-
-$ds = DIRECTORY_SEPARATOR;
-if($ds=="") $ds = "/";
-
-$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");
-  }
-}
-
-?>
-- 
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')

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 33bbd9542b7197b7dce6d47670aba0192ebceed5 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 14:27:38 +0100
Subject: bf

---
 src/admin/site.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/admin')

diff --git a/src/admin/site.php b/src/admin/site.php
index 78852a0..e500f0c 100644
--- a/src/admin/site.php
+++ b/src/admin/site.php
@@ -23,6 +23,12 @@ if(($ct = DBContestInfo($_SESSION["usertable"]["contestnumber"])) == null)
 if($ct["contestlocalsite"]==$ct["contestmainsite"]) $main=true; else $main=false;
 
 if ($main) {
+  if(isset($_GET["Number"]) && is_numeric($_GET["Number"]) && $_GET["Number"]>0) {
+    $param = array();
+    $param['number'] = $_GET["Number"];
+    $n = DBNewSite($_SESSION["usertable"]["contestnumber"],$param);
+        ForceLoad("site.php?site=$n");    
+  }
   if(isset($_GET["new"]) && $_GET["new"]=="1") {
         $n = DBNewSite($_SESSION["usertable"]["contestnumber"]);
         ForceLoad("site.php?site=$n");
-- 
cgit v1.2.3


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

---
 src/admin/site.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/site.php b/src/admin/site.php
index e500f0c..986f57e 100644
--- a/src/admin/site.php
+++ b/src/admin/site.php
@@ -23,11 +23,11 @@ if(($ct = DBContestInfo($_SESSION["usertable"]["contestnumber"])) == null)
 if($ct["contestlocalsite"]==$ct["contestmainsite"]) $main=true; else $main=false;
 
 if ($main) {
-  if(isset($_GET["Number"]) && is_numeric($_GET["Number"]) && $_GET["Number"]>0) {
+  if(isset($_GET["Number"]) && isset($_GET["Go"]) && is_numeric($_GET["Number"]) && $_GET["Number"]>0) {
     $param = array();
     $param['number'] = $_GET["Number"];
-    $n = DBNewSite($_SESSION["usertable"]["contestnumber"],$param);
-        ForceLoad("site.php?site=$n");    
+    $n = DBNewSite($_SESSION["usertable"]["contestnumber"],null,$param);
+    ForceLoad("site.php?site=$n");
   }
   if(isset($_GET["new"]) && $_GET["new"]=="1") {
         $n = DBNewSite($_SESSION["usertable"]["contestnumber"]);
-- 
cgit v1.2.3


From 380285bd9dadbd9e8fc7f9217044560e1efa6981 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 14:36:44 +0100
Subject: bf

---
 src/admin/site.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/site.php b/src/admin/site.php
index 986f57e..dd88d1c 100644
--- a/src/admin/site.php
+++ b/src/admin/site.php
@@ -26,12 +26,18 @@ if ($main) {
   if(isset($_GET["Number"]) && isset($_GET["Go"]) && is_numeric($_GET["Number"]) && $_GET["Number"]>0) {
     $param = array();
     $param['number'] = $_GET["Number"];
-    $n = DBNewSite($_SESSION["usertable"]["contestnumber"],null,$param);
+    if(($n = DBNewSite($_SESSION["usertable"]["contestnumber"],null,$param)) === false) {
+      MSGError("Error creating site");
+      $n = 1;
+    }
     ForceLoad("site.php?site=$n");
   }
   if(isset($_GET["new"]) && $_GET["new"]=="1") {
-        $n = DBNewSite($_SESSION["usertable"]["contestnumber"]);
-        ForceLoad("site.php?site=$n");
+    if(($n = DBNewSite($_SESSION["usertable"]["contestnumber"])) === false) {
+      MSGError("Error creating site");
+      $n = 1;
+    }      
+    ForceLoad("site.php?site=$n");
   }
 }
 if (isset($_GET["site"]) && is_numeric($_GET["site"]))
-- 
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/admin/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/admin')

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


From 866d66f1d479e1fae4a0e22b09b231ff83cce08b Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Thu, 19 Oct 2017 14:54:09 +0100
Subject: bf

---
 src/admin/contest.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/admin')

diff --git a/src/admin/contest.php b/src/admin/contest.php
index d55361e..58df217 100644
--- a/src/admin/contest.php
+++ b/src/admin/contest.php
@@ -22,7 +22,9 @@ $contest=$_SESSION["usertable"]["contestnumber"];
 
 if(($ct = DBContestInfo($contest)) == null)
 	ForceLoad("$loc/index.php");
-if ($ct["contestlocalsite"]==$ct["contestmainsite"]) $main=true; else $main=false;
+$localsite=$ct["contestlocalsite"];
+$mainsite=$ct["contestmainsite"];
+if ($localsite == $mainsite) $main=true; else $main=false;
 
 if (isset($_POST["Submit3"]) && isset($_POST["penalty"]) && is_numeric($_POST["penalty"]) && 
     isset($_POST["maxfilesize"]) && isset($_POST["mainsite"]) && isset($_POST["name"]) && 
@@ -106,6 +108,10 @@ if (isset($_POST["Submit3"]) && isset($_POST["penalty"]) && is_numeric($_POST["p
 			DBGetFullProblemData($_SESSION["usertable"]["contestnumber"],true);
 		}
 	}
+	if(($ct = DBContestInfo($contest)) == null)
+	  ForceLoad("$loc/index.php");
+	if ($ct["contestlocalsite"]!=$localsite || $mainsite!=$ct["contestmainsite"])
+	  ForceLoad("$loc/index.php");
 	ForceLoad("contest.php");
 }
 ?>
-- 
cgit v1.2.3


From aea57cb508ccd1f7b543922eb3222f737c73e5ad Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Sat, 21 Oct 2017 18:12:01 +0100
Subject: update of boca

---
 src/admin/misc.php | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 3e4a4d8..8000841 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -39,7 +39,9 @@ require 'header.php';
    <input type="submit" name="Submit1" value="Transfer" onClick="conf()"> &nbsp;
    <input type="submit" name="Submit2" value="Transfer all" onClick="conf()"> &nbsp;
    <input type="submit" name="Submit3" value="Transfer scores"> &nbsp;
-   <input type="submit" name="Submit4" value="Update BOCA" onClick="conf2()"> 
+   <input type="submit" name="Submit4" value="Clear cache" onClick="conf()"> 
+   <input type="submit" name="Submit5" value="Full clear" onClick="conf2()"> 
+   <input type="submit" name="Submit6" value="Update BOCA" onClick="conf2()"> 
   </center>
 </form>
 <?php
@@ -60,8 +62,44 @@ if (isset($_POST["Submit2"]) && $_POST["Submit2"] == "Transfer all") {
 if (isset($_POST["Submit3"]) && $_POST["Submit3"] == "Transfer scores") {
   $doscore=true;
 }
-if (isset($_POST["Submit4"]) && $_POST["Submit4"] == "Update BOCA") {
-  echo "<pre>Not implemented</pre>\n";
+if (isset($_POST["Submit4"]) && $_POST["Submit4"] == "Clear cache") {
+  if(fixbocadir(dirname(__DIR__)))
+    echo "<pre>Done</pre>\n";
+  else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
+}
+if (isset($_POST["Submit4"]) && $_POST["Submit5"] == "Full clear") {
+  if(fixbocadir(dirname(__DIR__),true))
+    echo "<pre>Done</pre>\n";
+  else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
+}
+if (isset($_POST["Submit4"]) && $_POST["Submit6"] == "Update BOCA") {
+  require('..' . $ds . 'versionnum.php');
+  $curv = split('.',$BOCAVERSION);
+  $dir = dirname(__DIR__);
+  fixbocadir($dir);
+  $tmpfname = tempnam(sys_get_temp_dir());
+  if(($str = @file_get_contents('http://www.bombonera.org/updateboca.zip')) !== false) {
+    @file_put_contents($tmpfname, $str);
+    $t = mytime();
+    $zip = new ZipArchive;
+    if ($zip->open($tmpfname) === true) {
+      $zip->extractTo($dir . $ds . "private" . $ds . "newboca." . $t);
+      $zip->close();
+      require($dir . $ds . "private" . $ds . "newboca." . $t . $ds . 'versionnum.php');
+      $newv = split('.',$BOCAVERSION);
+      if($curv[0] != $newv[0] || $curv[1] != $newv[1])
+	echo "<pre>Cannot updated because of major version difference</pre>";
+      else {
+	if(updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t) === false)
+	  echo "<pre>Error updating BOCA</pre>\n";
+	else {
+	  echo "<pre>Updated to " . $BOCAVERSION . "\n</pre>\n";
+	}
+      }
+    } else {
+      echo "<pre>Downloaded file corrupted</pre>";
+    }
+  } else echo "<pre>Download error</pre>";
 }
 $privatedir = $_SESSION['locr'] . $ds . "private";
 $remotedir = $_SESSION['locr'] . $ds . "private" . $ds . "remotescores";
-- 
cgit v1.2.3


From 39af649d52ddb6da8f734841137412d2dcb5b7c8 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 10:52:02 +0100
Subject: bf and revert update

---
 src/admin/misc.php | 131 +++++++++++++++++++++++++++++------------------------
 1 file changed, 73 insertions(+), 58 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 8000841..eb4a86f 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -42,6 +42,7 @@ require 'header.php';
    <input type="submit" name="Submit4" value="Clear cache" onClick="conf()"> 
    <input type="submit" name="Submit5" value="Full clear" onClick="conf2()"> 
    <input type="submit" name="Submit6" value="Update BOCA" onClick="conf2()"> 
+   <input type="submit" name="Submit7" value="Revert Update" onClick="conf2()"> 
   </center>
 </form>
 <?php
@@ -67,12 +68,12 @@ if (isset($_POST["Submit4"]) && $_POST["Submit4"] == "Clear cache") {
     echo "<pre>Done</pre>\n";
   else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
 }
-if (isset($_POST["Submit4"]) && $_POST["Submit5"] == "Full clear") {
+if (isset($_POST["Submit5"]) && $_POST["Submit5"] == "Full clear") {
   if(fixbocadir(dirname(__DIR__),true))
     echo "<pre>Done</pre>\n";
   else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
 }
-if (isset($_POST["Submit4"]) && $_POST["Submit6"] == "Update BOCA") {
+if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
   require('..' . $ds . 'versionnum.php');
   $curv = split('.',$BOCAVERSION);
   $dir = dirname(__DIR__);
@@ -90,71 +91,85 @@ if (isset($_POST["Submit4"]) && $_POST["Submit6"] == "Update BOCA") {
       if($curv[0] != $newv[0] || $curv[1] != $newv[1])
 	echo "<pre>Cannot updated because of major version difference</pre>";
       else {
-	if(updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t) === false)
-	  echo "<pre>Error updating BOCA</pre>\n";
-	else {
-	  echo "<pre>Updated to " . $BOCAVERSION . "\n</pre>\n";
-	}
+	$q = updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t);
+	echo "<pre>" . $q . " files updated to " . $BOCAVERSION . "\n</pre>\n";
+	$str = @file_get_contents($dir . $ds . "private" . $ds . "updateboca.log");
+	@file_put_contents($dir . $ds . "private" . $ds . "updateboca.log",  $str . $t . "\n");
       }
     } else {
       echo "<pre>Downloaded file corrupted</pre>";
     }
   } else echo "<pre>Download error</pre>";
 }
-$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($doscore) {
-      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)
+if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
+  $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
+  $t = trim($str[count($str)-1]);
+  unset($str[count($str)-1]);
+  $str = implode("\n", $str);
+  $dir = dirname(__DIR__);
+  fixbocadir($dir);
+  echo "<pre>Reverting last update\n";
+  $q = revertupdatebocafile($dir, $t);
+  echo $q . " files reverted properly\n";
+  echo "</pre>";
+  @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
+}
+if($dotransfer || $doscore || $dotransferall) {
+  $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($doscore) {
+	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);
-      } else {
-	@rename($fname . ".tmp",$destination);
+	}
+	@fclose($fp);
+      }
+      if($dotransfer) {
+	echo "Processing other data\n";
+	getMainXML($_SESSION["usertable"]["contestnumber"],10,$dotransferall);
+	echo "</pre>\n";
       }
-      @fclose($fp);
-    }
-    if($dotransfer) {
-      echo "Processing other data\n";
-      getMainXML($_SESSION["usertable"]["contestnumber"],10,$dotransferall);
-      echo "</pre>\n";
-    }
-    @unlink($destination . ".lck");
-  } else {
-    if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 120)
       @unlink($destination . ".lck");
-    echo "<pre>Transfers locked by other process - try again soon</pre>\n";
+    } else {
+      if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 120)
+	@unlink($destination . ".lck");
+      echo "<pre>Transfers locked by other process - try again soon</pre>\n";
+    }
   }
 }
 ?>
-- 
cgit v1.2.3


From f0652e3973b13c283db71fc40fdfaba813f035a9 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 10:57:01 +0100
Subject: bf

---
 src/admin/misc.php | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index eb4a86f..56743b5 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -39,13 +39,14 @@ require 'header.php';
    <input type="submit" name="Submit1" value="Transfer" onClick="conf()"> &nbsp;
    <input type="submit" name="Submit2" value="Transfer all" onClick="conf()"> &nbsp;
    <input type="submit" name="Submit3" value="Transfer scores"> &nbsp;
-   <input type="submit" name="Submit4" value="Clear cache" onClick="conf()"> 
-   <input type="submit" name="Submit5" value="Full clear" onClick="conf2()"> 
-   <input type="submit" name="Submit6" value="Update BOCA" onClick="conf2()"> 
+   <input type="submit" name="Submit4" value="Clear cache" onClick="conf()"> &nbsp; 
+   <input type="submit" name="Submit5" value="Full clear" onClick="conf2()">  &nbsp;
+   <input type="submit" name="Submit6" value="Update BOCA" onClick="conf2()">  &nbsp;
    <input type="submit" name="Submit7" value="Revert Update" onClick="conf2()"> 
   </center>
 </form>
 <?php
+if(isset($_POST['confirmation']) && $_POST['confirmation'] == 'confirm') {
 $ds = DIRECTORY_SEPARATOR;
 if($ds=="") $ds = "/";
 $dotransfer=false;
@@ -103,16 +104,20 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
 }
 if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
   $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
-  $t = trim($str[count($str)-1]);
-  unset($str[count($str)-1]);
-  $str = implode("\n", $str);
-  $dir = dirname(__DIR__);
-  fixbocadir($dir);
-  echo "<pre>Reverting last update\n";
-  $q = revertupdatebocafile($dir, $t);
-  echo $q . " files reverted properly\n";
-  echo "</pre>";
-  @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
+  if(count($str) >= 1) {
+    $t = trim($str[count($str)-1]);
+    unset($str[count($str)-1]);
+    $str = implode("\n", $str);
+    $dir = dirname(__DIR__);
+    fixbocadir($dir);
+    echo "<pre>Reverting last update\n";
+    $q = revertupdatebocafile($dir, $t);
+    echo $q . " files reverted properly\n";
+    echo "</pre>";
+    @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
+  } else {
+    echo "<pre>No updates to revert</pre>\n";
+  }
 }
 if($dotransfer || $doscore || $dotransferall) {
   $privatedir = $_SESSION['locr'] . $ds . "private";
@@ -172,6 +177,7 @@ if($dotransfer || $doscore || $dotransferall) {
     }
   }
 }
+}
 ?>
 </body>
 </html>
-- 
cgit v1.2.3


From de77e892f314c4113c08ca5515a16d2e1c4a9eb4 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 11:01:12 +0100
Subject: bf

---
 src/admin/misc.php | 87 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 38 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 56743b5..9bbd417 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -75,48 +75,59 @@ if (isset($_POST["Submit5"]) && $_POST["Submit5"] == "Full clear") {
   else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
 }
 if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
-  require('..' . $ds . 'versionnum.php');
-  $curv = split('.',$BOCAVERSION);
-  $dir = dirname(__DIR__);
-  fixbocadir($dir);
-  $tmpfname = tempnam(sys_get_temp_dir());
-  if(($str = @file_get_contents('http://www.bombonera.org/updateboca.zip')) !== false) {
-    @file_put_contents($tmpfname, $str);
-    $t = mytime();
-    $zip = new ZipArchive;
-    if ($zip->open($tmpfname) === true) {
-      $zip->extractTo($dir . $ds . "private" . $ds . "newboca." . $t);
-      $zip->close();
-      require($dir . $ds . "private" . $ds . "newboca." . $t . $ds . 'versionnum.php');
-      $newv = split('.',$BOCAVERSION);
-      if($curv[0] != $newv[0] || $curv[1] != $newv[1])
-	echo "<pre>Cannot updated because of major version difference</pre>";
-      else {
-	$q = updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t);
-	echo "<pre>" . $q . " files updated to " . $BOCAVERSION . "\n</pre>\n";
-	$str = @file_get_contents($dir . $ds . "private" . $ds . "updateboca.log");
-	@file_put_contents($dir . $ds . "private" . $ds . "updateboca.log",  $str . $t . "\n");
+  if(!is_readable($dir . $ds . "private" . $ds . "updateboca.log")) @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", "");
+  if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
+    require('..' . $ds . 'versionnum.php');
+    $curv = split('.',$BOCAVERSION);
+    $dir = dirname(__DIR__);
+    fixbocadir($dir);
+    $tmpfname = tempnam(sys_get_temp_dir());
+    if(($str = @file_get_contents('http://www.bombonera.org/updateboca.zip')) !== false) {
+      @file_put_contents($tmpfname, $str);
+      $t = mytime();
+      $zip = new ZipArchive;
+      if ($zip->open($tmpfname) === true) {
+	$zip->extractTo($dir . $ds . "private" . $ds . "newboca." . $t);
+	$zip->close();
+	require($dir . $ds . "private" . $ds . "newboca." . $t . $ds . 'versionnum.php');
+	$newv = split('.',$BOCAVERSION);
+	if($curv[0] != $newv[0] || $curv[1] != $newv[1])
+	  echo "<pre>Cannot updated because of major version difference</pre>";
+	else {
+	  $q = updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t);
+	  echo "<pre>" . $q . " files updated to " . $BOCAVERSION . "\n</pre>\n";
+	  $str = @file_get_contents($dir . $ds . "private" . $ds . "updateboca.log");
+	  @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log",  $str . $t . "\n");
+	}
+      } else {
+	echo "<pre>Downloaded file corrupted</pre>";
       }
-    } else {
-      echo "<pre>Downloaded file corrupted</pre>";
-    }
-  } else echo "<pre>Download error</pre>";
+    } else echo "<pre>Download error</pre>";
+  } else {
+    echo "<pre>Cannot update log file\n</pre>";
+  }
 }
 if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
-  $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
-  if(count($str) >= 1) {
-    $t = trim($str[count($str)-1]);
-    unset($str[count($str)-1]);
-    $str = implode("\n", $str);
-    $dir = dirname(__DIR__);
-    fixbocadir($dir);
-    echo "<pre>Reverting last update\n";
-    $q = revertupdatebocafile($dir, $t);
-    echo $q . " files reverted properly\n";
-    echo "</pre>";
-    @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
+  if(!is_readable($dir . $ds . "private" . $ds . "updateboca.log")) @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", "");
+  if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
+    $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
+    if(count($str) >= 1) {
+      $t = trim($str[count($str)-1]);
+      unset($str[count($str)-1]);
+      $str = implode("\n", $str);
+      $dir = dirname(__DIR__);
+      fixbocadir($dir);
+      echo "<pre>Reverting last update\n";
+      $q = revertupdatebocafile($dir, $t);
+      echo $q . " files reverted properly\n";
+      echo "</pre>";
+      fixbocadir($dir);
+      @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
+    } else {
+      echo "<pre>No updates to revert</pre>\n";
+    }
   } else {
-    echo "<pre>No updates to revert</pre>\n";
+    echo "<pre>Cannot update log file\n</pre>";
   }
 }
 if($dotransfer || $doscore || $dotransferall) {
-- 
cgit v1.2.3


From 9ab9d0e7f9bf4d6d0b3e4943163a6c0a79e262ab Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 11:02:49 +0100
Subject: bf

---
 src/admin/misc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 9bbd417..fdd2198 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -75,11 +75,11 @@ if (isset($_POST["Submit5"]) && $_POST["Submit5"] == "Full clear") {
   else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
 }
 if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
+  $dir = dirname(__DIR__);
   if(!is_readable($dir . $ds . "private" . $ds . "updateboca.log")) @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", "");
   if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
     require('..' . $ds . 'versionnum.php');
     $curv = split('.',$BOCAVERSION);
-    $dir = dirname(__DIR__);
     fixbocadir($dir);
     $tmpfname = tempnam(sys_get_temp_dir());
     if(($str = @file_get_contents('http://www.bombonera.org/updateboca.zip')) !== false) {
@@ -108,6 +108,7 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
   }
 }
 if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
+  $dir = dirname(__DIR__);
   if(!is_readable($dir . $ds . "private" . $ds . "updateboca.log")) @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", "");
   if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
     $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
@@ -115,7 +116,6 @@ if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
       $t = trim($str[count($str)-1]);
       unset($str[count($str)-1]);
       $str = implode("\n", $str);
-      $dir = dirname(__DIR__);
       fixbocadir($dir);
       echo "<pre>Reverting last update\n";
       $q = revertupdatebocafile($dir, $t);
-- 
cgit v1.2.3


From 6ccec604532d851a556ef1f682c30ee60bbb208e Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 11:08:32 +0100
Subject: bf

---
 src/admin/misc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index fdd2198..d72910d 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -79,7 +79,7 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
   if(!is_readable($dir . $ds . "private" . $ds . "updateboca.log")) @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", "");
   if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
     require('..' . $ds . 'versionnum.php');
-    $curv = split('.',$BOCAVERSION);
+    $curv = explode('.',$BOCAVERSION);
     fixbocadir($dir);
     $tmpfname = tempnam(sys_get_temp_dir());
     if(($str = @file_get_contents('http://www.bombonera.org/updateboca.zip')) !== false) {
@@ -90,7 +90,7 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
 	$zip->extractTo($dir . $ds . "private" . $ds . "newboca." . $t);
 	$zip->close();
 	require($dir . $ds . "private" . $ds . "newboca." . $t . $ds . 'versionnum.php');
-	$newv = split('.',$BOCAVERSION);
+	$newv = explode('.',$BOCAVERSION);
 	if($curv[0] != $newv[0] || $curv[1] != $newv[1])
 	  echo "<pre>Cannot updated because of major version difference</pre>";
 	else {
-- 
cgit v1.2.3


From 2af9e4d517347fda50a84487c1bccdd17a1762a3 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 11:20:28 +0100
Subject: bf

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

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index d72910d..c5621e5 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -81,7 +81,7 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
     require('..' . $ds . 'versionnum.php');
     $curv = explode('.',$BOCAVERSION);
     fixbocadir($dir);
-    $tmpfname = tempnam(sys_get_temp_dir());
+    $tmpfname = $dir . $ds . "private" . $ds . 'newboca.zip';
     if(($str = @file_get_contents('http://www.bombonera.org/updateboca.zip')) !== false) {
       @file_put_contents($tmpfname, $str);
       $t = mytime();
-- 
cgit v1.2.3


From 356bcace52668ede23a87fa8318bce6ef4bb9a04 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 11:48:37 +0100
Subject: bf

---
 src/admin/misc.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index c5621e5..602ca7a 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -102,6 +102,7 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
       } else {
 	echo "<pre>Downloaded file corrupted</pre>";
       }
+      @unlink($tmpfname);
     } else echo "<pre>Download error</pre>";
   } else {
     echo "<pre>Cannot update log file\n</pre>";
-- 
cgit v1.2.3


From fe8e4f3c32d66436261e4b8b4f5b4a76bd77ac9d Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 14:11:42 +0100
Subject: visual change

---
 src/admin/misc.php | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 602ca7a..4264a47 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -29,7 +29,7 @@ require 'header.php';
     }
     function conf2() {
       if (confirm("Confirm updating BOCA?")) {
-		  if (confirm("This operation will update your BOCA system. Confirm?")) {
+		  if (confirm("This operation may perform considerable changes to your BOCA system. Confirm?")) {
 			  document.form1.confirmation.value='confirm';
 		  }
       }
@@ -45,6 +45,10 @@ require 'header.php';
    <input type="submit" name="Submit7" value="Revert Update" onClick="conf2()"> 
   </center>
 </form>
+<br>
+<pre>
+OPERATION LOG DISPLAYS BELOW:
+
 <?php
 if(isset($_POST['confirmation']) && $_POST['confirmation'] == 'confirm') {
 $ds = DIRECTORY_SEPARATOR;
@@ -66,13 +70,13 @@ if (isset($_POST["Submit3"]) && $_POST["Submit3"] == "Transfer scores") {
 }
 if (isset($_POST["Submit4"]) && $_POST["Submit4"] == "Clear cache") {
   if(fixbocadir(dirname(__DIR__)))
-    echo "<pre>Done</pre>\n";
-  else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
+    echo "Done\n";
+  else echo "Error (likely permission/ownership issues)\n";
 }
 if (isset($_POST["Submit5"]) && $_POST["Submit5"] == "Full clear") {
   if(fixbocadir(dirname(__DIR__),true))
-    echo "<pre>Done</pre>\n";
-  else echo "<pre>Error (likely permission/ownership issues)</pre>\n";
+    echo "Done\n";
+  else echo "Error (likely permission/ownership issues)\n";
 }
 if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
   $dir = dirname(__DIR__);
@@ -92,20 +96,20 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
 	require($dir . $ds . "private" . $ds . "newboca." . $t . $ds . 'versionnum.php');
 	$newv = explode('.',$BOCAVERSION);
 	if($curv[0] != $newv[0] || $curv[1] != $newv[1])
-	  echo "<pre>Cannot updated because of major version difference</pre>";
+	  echo "Cannot updated because of major version difference\n";
 	else {
 	  $q = updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t);
-	  echo "<pre>" . $q . " files updated to " . $BOCAVERSION . "\n</pre>\n";
+	  echo "" . $q . " files updated to " . $BOCAVERSION . "\n\n";
 	  $str = @file_get_contents($dir . $ds . "private" . $ds . "updateboca.log");
 	  @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log",  $str . $t . "\n");
 	}
       } else {
-	echo "<pre>Downloaded file corrupted</pre>";
+	echo "Downloaded file corrupted\n";
       }
       @unlink($tmpfname);
-    } else echo "<pre>Download error</pre>";
+    } else echo "Download error\n";
   } else {
-    echo "<pre>Cannot update log file\n</pre>";
+    echo "Cannot update log file\n";
   }
 }
 if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
@@ -118,17 +122,16 @@ if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
       unset($str[count($str)-1]);
       $str = implode("\n", $str);
       fixbocadir($dir);
-      echo "<pre>Reverting last update\n";
+      echo "Reverting last update\n";
       $q = revertupdatebocafile($dir, $t);
       echo $q . " files reverted properly\n";
-      echo "</pre>";
       fixbocadir($dir);
       @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
     } else {
-      echo "<pre>No updates to revert</pre>\n";
+      echo "No updates to revert\n";
     }
   } else {
-    echo "<pre>Cannot update log file\n</pre>";
+    echo "Cannot update log file\n";
   }
 }
 if($dotransfer || $doscore || $dotransferall) {
@@ -140,7 +143,6 @@ if($dotransfer || $doscore || $dotransferall) {
       if($doscore) {
 	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();
@@ -179,17 +181,17 @@ if($dotransfer || $doscore || $dotransferall) {
       if($dotransfer) {
 	echo "Processing other data\n";
 	getMainXML($_SESSION["usertable"]["contestnumber"],10,$dotransferall);
-	echo "</pre>\n";
       }
       @unlink($destination . ".lck");
     } else {
       if(file_exists($destination . ".lck") && filemtime($destination . ".lck") < time() - 120)
 	@unlink($destination . ".lck");
-      echo "<pre>Transfers locked by other process - try again soon</pre>\n";
+      echo "Transfers locked by other process - try again soon\n";
     }
   }
 }
 }
 ?>
+</pre>
 </body>
 </html>
-- 
cgit v1.2.3


From 618cb71ee7d196afe6fbf5ba82308e8afea24a20 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:10:55 +0100
Subject: bug fixes

---
 src/admin/misc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 4264a47..6eae53a 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -45,7 +45,6 @@ require 'header.php';
    <input type="submit" name="Submit7" value="Revert Update" onClick="conf2()"> 
   </center>
 </form>
-<br>
 <pre>
 OPERATION LOG DISPLAYS BELOW:
 
@@ -98,8 +97,9 @@ if (isset($_POST["Submit6"]) && $_POST["Submit6"] == "Update BOCA") {
 	if($curv[0] != $newv[0] || $curv[1] != $newv[1])
 	  echo "Cannot updated because of major version difference\n";
 	else {
+	  echo "Updating\n";
 	  $q = updatebocafile($dir, $dir . $ds . "private" . $ds . "newboca." . $t, $t);
-	  echo "" . $q . " files updated to " . $BOCAVERSION . "\n\n";
+	  echo $q . " files updated to " . $BOCAVERSION . "\n\n";
 	  $str = @file_get_contents($dir . $ds . "private" . $ds . "updateboca.log");
 	  @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log",  $str . $t . "\n");
 	}
@@ -167,7 +167,7 @@ if($dotransfer || $doscore || $dotransferall) {
 	@file_put_contents($fname . ".tmp",base64_encode(serialize($data0)));
 	@rename($fname . ".tmp",$fname . ".dat");
 	echo "Transferring scores\n";
-	scoretransfer($fname . ".dat", $localsite);
+	echo scoretransfer($fname . ".dat", $localsite);
 	echo "Saving scores\n";
 	if(@create_zip($remotedir,glob($remotedir . '/*.dat'),$fname . ".tmp") != 1) {
 	  LOGError("Cannot create score zip file");
-- 
cgit v1.2.3


From aec60f7111a508888eb3925236dbb8b856e29639 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:47:27 +0100
Subject: clean empty lines from updatelog

---
 src/admin/misc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index 6eae53a..c1727f1 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -118,8 +118,8 @@ if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
   if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
     $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
     if(count($str) >= 1) {
-      $t = trim($str[count($str)-1]);
-      unset($str[count($str)-1]);
+      while(count($str) >= 1 && ($t = trim($str[count($str)-1]))=='')
+	unset($str[count($str)-1]);
       $str = implode("\n", $str);
       fixbocadir($dir);
       echo "Reverting last update\n";
-- 
cgit v1.2.3


From 3cf96cfb89c4084be6117864b684dc68190103cd Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:51:33 +0100
Subject: bf

---
 src/admin/misc.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/misc.php b/src/admin/misc.php
index c1727f1..7a4bd89 100644
--- a/src/admin/misc.php
+++ b/src/admin/misc.php
@@ -118,14 +118,16 @@ if (isset($_POST["Submit7"]) && $_POST["Submit7"] == "Revert Update") {
   if(is_writable($dir . $ds . "private" . $ds . "updateboca.log")) {
     $str = @file($dir . $ds . "private" . $ds . "updateboca.log");
     if(count($str) >= 1) {
-      while(count($str) >= 1 && ($t = trim($str[count($str)-1]))=='')
-	unset($str[count($str)-1]);
+      $t = trim($str[count($str)-1]);
+      unset($str[count($str)-1]);
       $str = implode("\n", $str);
       fixbocadir($dir);
-      echo "Reverting last update\n";
-      $q = revertupdatebocafile($dir, $t);
-      echo $q . " files reverted properly\n";
-      fixbocadir($dir);
+      if($t != '') {
+	echo "Reverting last update\n";
+	$q = revertupdatebocafile($dir, $t);
+	echo $q . " files reverted properly\n";
+	fixbocadir($dir);
+      }
       @file_put_contents($dir . $ds . "private" . $ds . "updateboca.log", $str);
     } else {
       echo "No updates to revert\n";
-- 
cgit v1.2.3