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/globals.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index cb7c419..4c387fc 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -284,8 +284,8 @@ function mytime() {
 function mymtime() {
   return microtime(true);
 }
-function myunique() {
-  return ((int)(100*microtime(true))) % 100000000;
+function myunique($val=0) {
+  return (((int)(100*microtime(true))) % 10000000)*100 + ($val % 100);
 }
 //retorna data e hora atuais
 function now () {
-- 
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 +++++++++++++++++++++++++--
 src/globals.php    | 87 +++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 108 insertions(+), 23 deletions(-)

(limited to 'src/globals.php')

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";
diff --git a/src/globals.php b/src/globals.php
index 4c387fc..851b135 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -40,8 +40,69 @@ function filedownload($oid,$fname,$msg='') {
 	if($msg != '') $str .= "&msg=" . rawurlencode($msg);
 	return $str;
 }
+function dirrec($dir, $func, $dirPermissions, $filePermissions, $avoid=array()) {
+  $ds = DIRECTORY_SEPARATOR;
+  if($ds=="") $ds = "/";
+  $dp = opendir($dir);
+  while($file = readdir($dp)) {
+    if (($file == ".") || ($file == "..") || $file in_array($avoid))
+      continue;
+    $fullPath = $dir . $ds . $file;
+    if(is_dir($fullPath)) {
+      $func($fullPath, $dirPermissions);
+      dirrec($fullPath, $func, $dirPermissions, $filePermissions);
+    } else {
+      $func($fullPath, $filePermissions);
+    }
+  }
+  closedir($dp);
+}
 
-function cleardir($dir,$cddir=true,$secure=false) {
+function fixbocadir($dir,$full=false) {
+	if(is_dir($dir)) {
+	  $ds = DIRECTORY_SEPARATOR;
+	  if($ds=="") $ds = "/";
+	  $u = posix_getpwuid(fileowner($dir));
+	  $un = $u['name'];
+	  $ug = $u['gid'];
+	  if(@file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n") === false) return false;
+	  if(@touch($dir . $ds . 'private' . $ds . 'remotescores' . $ds . 'otherservers') === false) return false;
+	  if($full)
+	    $d = array('problemtmp','runtmp','scoretmp','remotescores','remotescoresfull','comp','logexternal','runslog');
+	  else
+	    $d = array('problemtmp','runtmp','scoretmp');
+	  foreach($d as $a) cleardir($a,true,true,false);
+	  dirrec($dir, chown, $un, $un);
+	  dirrec($dir, chgrp, $ug, $ug);
+	  dirrec($dir, chmod, "0755", "0644", array('private'));
+	  dirrec($dir . $ds . 'private', chmod, "0750", "0640");
+	  return true;
+	} else {
+	  return false;
+	}	
+}
+function updatebocafile($dirboca, $dirz, $t) {
+  $ok = true;
+  if(is_dir($dirz)) {
+    $ds = DIRECTORY_SEPARATOR;
+    if($ds=="") $ds = "/";
+    $d = @opendir($dirz);
+    while (($file = @readdir($d)) !== false) {
+      if($file != '.' && $file != '..')
+	if(updatebocafile($dirboca . $ds . $file, $dirz . $ds . $file, $t) === false) $ok=false;
+    }
+    @closedir($d);
+    @cleardir($dirz);
+  } else {
+    if(is_file($dirboca)) {
+      copy($dirboca, $dirboca . '.' . $t . '.old');
+      chmod($dirboca . '.' . $t . '.old', "0400");
+    }
+    if(rename($dirz, $dirboca) === false) $ok=false;
+  }
+  return $ok;
+}
+function cleardir($dir,$cddir=true,$secure=true,$removedir=true) {
 	if(is_dir($dir)) {
 		$ds = DIRECTORY_SEPARATOR;
 		if($ds=="") $ds = "/";
@@ -51,26 +112,12 @@ function cleardir($dir,$cddir=true,$secure=false) {
 		}
 		$d = @opendir($dir);
 		while (($file = @readdir($d)) !== false) {
-			if(!is_dir($dir . $ds . $file)) {
-				if($secure)
-					file_put_contents($dir . $ds . $file,str_repeat('XXXXXXXXXX',10000));
-				@unlink($dir . $ds . $file);
-			}
-			else {
-				if($file != '.' && $file != '..') {
-					$cdir1 = $dir . $ds . $file;
-					$d1 = @opendir($cdir1);
-					while (($file1 = @readdir($d1)) !== false)
-						if(!is_dir($cdir1 . $ds . $file1)) {
-							if($secure)
-								file_put_contents($cdir1 . $ds . $file1,str_repeat('XXXXXXXXXX',10000));
-							@unlink($cdir1 . $ds . $file1);
-						}
-					@rmdir($cdir1);
-				}
-			}
+		  if($file != '.' && $file != '..')
+		    cleardir($dir . $ds . $file, false, $secure, true);
 		}
-		@rmdir($dir);
+		@closedir($d);
+		if($removedir)
+		  @rmdir($dir);
 	} else {
 		if($secure)
 			file_put_contents($dir,str_repeat('XXXXXXXXXX',10000));
-- 
cgit v1.2.3


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

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

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 851b135..eee3b72 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -45,7 +45,7 @@ function dirrec($dir, $func, $dirPermissions, $filePermissions, $avoid=array())
   if($ds=="") $ds = "/";
   $dp = opendir($dir);
   while($file = readdir($dp)) {
-    if (($file == ".") || ($file == "..") || $file in_array($avoid))
+    if (($file == ".") || ($file == "..") || in_array($file,$avoid))
       continue;
     $fullPath = $dir . $ds . $file;
     if(is_dir($fullPath)) {
-- 
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 +++++++++++++++++++++++++++++------------------------
 src/globals.php    |  30 ++++++++++--
 2 files changed, 99 insertions(+), 62 deletions(-)

(limited to 'src/globals.php')

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";
+    }
   }
 }
 ?>
diff --git a/src/globals.php b/src/globals.php
index eee3b72..9caf474 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -82,23 +82,45 @@ function fixbocadir($dir,$full=false) {
 	}	
 }
 function updatebocafile($dirboca, $dirz, $t) {
-  $ok = true;
+  $ok = 0;
   if(is_dir($dirz)) {
     $ds = DIRECTORY_SEPARATOR;
     if($ds=="") $ds = "/";
     $d = @opendir($dirz);
     while (($file = @readdir($d)) !== false) {
       if($file != '.' && $file != '..')
-	if(updatebocafile($dirboca . $ds . $file, $dirz . $ds . $file, $t) === false) $ok=false;
+	$ok = $ok + updatebocafile($dirboca . $ds . $file, $dirz . $ds . $file, $t);
     }
     @closedir($d);
     @cleardir($dirz);
   } else {
     if(is_file($dirboca)) {
       copy($dirboca, $dirboca . '.' . $t . '.old');
-      chmod($dirboca . '.' . $t . '.old', "0400");
+    } else {
+      file_put_contents($dirboca . '.' . $t . '.old', "");
+    }
+    @chmod($dirboca . '.' . $t . '.old', "0000");
+    if(rename($dirz, $dirboca) === false) $ok=1;
+  }
+  return $ok;
+}
+function revertupdatebocafile($dirboca, $t) {
+  $ok = 0;
+  if(is_dir($dirboca)) {
+    $ds = DIRECTORY_SEPARATOR;
+    if($ds=="") $ds = "/";
+    $d = @opendir($dirboca);
+    while (($file = @readdir($d)) !== false) {
+      if($file != '.' && $file != '..')
+	$ok = $ok + revertupdatebocafile($dirboca . $ds . $file, $t);
+    }
+    @closedir($d);
+  } else {
+    if(is_file($dirboca) && substr($dirboca, strlen($dirboca)-strlen('.' . $t . '.old')) == '.' . $t . '.old') {
+      @chmod($dirboca, "0600");
+      if(@copy($dirboca, substr($dirboca, 0, strlen($dirboca)-strlen('.' . $t . '.old'))) === true) $ok=1;
+      @chmod($dirboca, "0000");
     }
-    if(rename($dirz, $dirboca) === false) $ok=false;
   }
   return $ok;
 }
-- 
cgit v1.2.3


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

---
 src/globals.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 9caf474..06d1fbf 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -74,8 +74,8 @@ function fixbocadir($dir,$full=false) {
 	  foreach($d as $a) cleardir($a,true,true,false);
 	  dirrec($dir, chown, $un, $un);
 	  dirrec($dir, chgrp, $ug, $ug);
-	  dirrec($dir, chmod, "0755", "0644", array('private'));
-	  dirrec($dir . $ds . 'private', chmod, "0750", "0640");
+	  dirrec($dir, chmod, 0755, 0644, array('private'));
+	  dirrec($dir . $ds . 'private', chmod, 0750, 0640);
 	  return true;
 	} else {
 	  return false;
@@ -99,7 +99,7 @@ function updatebocafile($dirboca, $dirz, $t) {
     } else {
       file_put_contents($dirboca . '.' . $t . '.old', "");
     }
-    @chmod($dirboca . '.' . $t . '.old', "0000");
+    @chmod($dirboca . '.' . $t . '.old', 0000);
     if(rename($dirz, $dirboca) === false) $ok=1;
   }
   return $ok;
@@ -117,9 +117,9 @@ function revertupdatebocafile($dirboca, $t) {
     @closedir($d);
   } else {
     if(is_file($dirboca) && substr($dirboca, strlen($dirboca)-strlen('.' . $t . '.old')) == '.' . $t . '.old') {
-      @chmod($dirboca, "0600");
+      @chmod($dirboca, 0600);
       if(@copy($dirboca, substr($dirboca, 0, strlen($dirboca)-strlen('.' . $t . '.old'))) === true) $ok=1;
-      @chmod($dirboca, "0000");
+      @chmod($dirboca, 0000);
     }
   }
   return $ok;
-- 
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 +-
 src/globals.php    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/globals.php')

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();
diff --git a/src/globals.php b/src/globals.php
index 06d1fbf..bc18249 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -65,8 +65,8 @@ function fixbocadir($dir,$full=false) {
 	  $u = posix_getpwuid(fileowner($dir));
 	  $un = $u['name'];
 	  $ug = $u['gid'];
-	  if(@file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n") === false) return false;
-	  if(@touch($dir . $ds . 'private' . $ds . 'remotescores' . $ds . 'otherservers') === false) return false;
+	  @file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n");
+	  @touch($dir . $ds . 'private' . $ds . 'remotescores' . $ds . 'otherservers');
 	  if($full)
 	    $d = array('problemtmp','runtmp','scoretmp','remotescores','remotescoresfull','comp','logexternal','runslog');
 	  else
@@ -76,6 +76,7 @@ function fixbocadir($dir,$full=false) {
 	  dirrec($dir, chgrp, $ug, $ug);
 	  dirrec($dir, chmod, 0755, 0644, array('private'));
 	  dirrec($dir . $ds . 'private', chmod, 0750, 0640);
+	  if(@file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n") === false) return false;
 	  return true;
 	} else {
 	  return false;
-- 
cgit v1.2.3


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

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

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index bc18249..fbbdff2 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -101,7 +101,7 @@ function updatebocafile($dirboca, $dirz, $t) {
       file_put_contents($dirboca . '.' . $t . '.old', "");
     }
     @chmod($dirboca . '.' . $t . '.old', 0000);
-    if(rename($dirz, $dirboca) === false) $ok=1;
+    if(rename($dirz, $dirboca) === true) $ok=1;
   }
   return $ok;
 }
-- 
cgit v1.2.3


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

---
 src/globals.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index fbbdff2..5f66881 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -45,12 +45,19 @@ function dirrec($dir, $func, $dirPermissions, $filePermissions, $avoid=array())
   if($ds=="") $ds = "/";
   $dp = opendir($dir);
   while($file = readdir($dp)) {
-    if (($file == ".") || ($file == "..") || in_array($file,$avoid))
+    if (($file == ".") || ($file == ".."))
       continue;
+    $cont = false;
+    for($i = 0; $i < count($avoid); $i++)
+      if(substr($file, 0, strlen($avoid[$i])) = $avoid[$i]) {
+	$cont = true;
+	break;
+      }
+    if($cont) continue;
     $fullPath = $dir . $ds . $file;
     if(is_dir($fullPath)) {
       $func($fullPath, $dirPermissions);
-      dirrec($fullPath, $func, $dirPermissions, $filePermissions);
+      dirrec($fullPath, $func, $dirPermissions, $filePermissions, $avoid);
     } else {
       $func($fullPath, $filePermissions);
     }
@@ -74,8 +81,8 @@ function fixbocadir($dir,$full=false) {
 	  foreach($d as $a) cleardir($a,true,true,false);
 	  dirrec($dir, chown, $un, $un);
 	  dirrec($dir, chgrp, $ug, $ug);
-	  dirrec($dir, chmod, 0755, 0644, array('private'));
-	  dirrec($dir . $ds . 'private', chmod, 0750, 0640);
+	  dirrec($dir, chmod, 0755, 0644, array('private', 'old.'));
+	  dirrec($dir . $ds . 'private', chmod, 0750, 0640, array('old.'));
 	  if(@file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n") === false) return false;
 	  return true;
 	} else {
@@ -96,11 +103,11 @@ function updatebocafile($dirboca, $dirz, $t) {
     @cleardir($dirz);
   } else {
     if(is_file($dirboca)) {
-      copy($dirboca, $dirboca . '.' . $t . '.old');
+      copy($dirboca, 'old.' . $t . '.' . $dirboca);
     } else {
-      file_put_contents($dirboca . '.' . $t . '.old', "");
+      file_put_contents('old.' . $t . '.' . $dirboca, "");
     }
-    @chmod($dirboca . '.' . $t . '.old', 0000);
+    @chmod('old.' . $t . '.' . $dirboca, 0000);
     if(rename($dirz, $dirboca) === true) $ok=1;
   }
   return $ok;
@@ -117,9 +124,9 @@ function revertupdatebocafile($dirboca, $t) {
     }
     @closedir($d);
   } else {
-    if(is_file($dirboca) && substr($dirboca, strlen($dirboca)-strlen('.' . $t . '.old')) == '.' . $t . '.old') {
+    if(is_file($dirboca) && substr($dirboca, 0, strlen('old.' . $t . '.')) == 'old.' . $t . '.') {
       @chmod($dirboca, 0600);
-      if(@copy($dirboca, substr($dirboca, 0, strlen($dirboca)-strlen('.' . $t . '.old'))) === true) $ok=1;
+      if(@copy($dirboca, substr($dirboca, strlen('old.' . $t . '.' .))) === true) $ok=1;
       @chmod($dirboca, 0000);
     }
   }
-- 
cgit v1.2.3


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

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

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 5f66881..7d8586d 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -126,7 +126,7 @@ function revertupdatebocafile($dirboca, $t) {
   } else {
     if(is_file($dirboca) && substr($dirboca, 0, strlen('old.' . $t . '.')) == 'old.' . $t . '.') {
       @chmod($dirboca, 0600);
-      if(@copy($dirboca, substr($dirboca, strlen('old.' . $t . '.' .))) === true) $ok=1;
+      if(@copy($dirboca, substr($dirboca, strlen('old.' . $t . '.'))) === true) $ok=1;
       @chmod($dirboca, 0000);
     }
   }
-- 
cgit v1.2.3


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

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

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 7d8586d..e3603a7 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -49,7 +49,7 @@ function dirrec($dir, $func, $dirPermissions, $filePermissions, $avoid=array())
       continue;
     $cont = false;
     for($i = 0; $i < count($avoid); $i++)
-      if(substr($file, 0, strlen($avoid[$i])) = $avoid[$i]) {
+      if(substr($file, 0, strlen($avoid[$i])) == $avoid[$i]) {
 	$cont = true;
 	break;
       }
-- 
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 +
 src/globals.php    | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/globals.php')

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>";
diff --git a/src/globals.php b/src/globals.php
index e3603a7..9a223e4 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -81,8 +81,8 @@ function fixbocadir($dir,$full=false) {
 	  foreach($d as $a) cleardir($a,true,true,false);
 	  dirrec($dir, chown, $un, $un);
 	  dirrec($dir, chgrp, $ug, $ug);
-	  dirrec($dir, chmod, 0755, 0644, array('private', 'old.'));
-	  dirrec($dir . $ds . 'private', chmod, 0750, 0640, array('old.'));
+	  dirrec($dir, chmod, 0755, 0644, array('private', '.oldboca'));
+	  dirrec($dir . $ds . 'private', chmod, 0750, 0640, array('.oldboca'));
 	  if(@file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n") === false) return false;
 	  return true;
 	} else {
@@ -103,11 +103,11 @@ function updatebocafile($dirboca, $dirz, $t) {
     @cleardir($dirz);
   } else {
     if(is_file($dirboca)) {
-      copy($dirboca, 'old.' . $t . '.' . $dirboca);
+      copy($dirboca, $dirboca . '.' . $t . '.oldboca');
     } else {
-      file_put_contents('old.' . $t . '.' . $dirboca, "");
+      file_put_contents($dirboca . '.' . $t . '.oldboca', "");
     }
-    @chmod('old.' . $t . '.' . $dirboca, 0000);
+    @chmod($dirboca . '.' . $t . '.oldboca', 0000);
     if(rename($dirz, $dirboca) === true) $ok=1;
   }
   return $ok;
@@ -124,9 +124,9 @@ function revertupdatebocafile($dirboca, $t) {
     }
     @closedir($d);
   } else {
-    if(is_file($dirboca) && substr($dirboca, 0, strlen('old.' . $t . '.')) == 'old.' . $t . '.') {
+    if(is_file($dirboca) && substr($dirboca, strlen($dirboca) - strlen('.' . $t . '.oldboca')) == '.' . $t . '.oldboca') {
       @chmod($dirboca, 0600);
-      if(@copy($dirboca, substr($dirboca, strlen('old.' . $t . '.'))) === true) $ok=1;
+      if(@copy($dirboca, substr($dirboca, 0, strlen($dirboca) - strlen('.' . $t . '.oldboca'))) === true) $ok=1;
       @chmod($dirboca, 0000);
     }
   }
-- 
cgit v1.2.3


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

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

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 9a223e4..0af5662 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -49,7 +49,7 @@ function dirrec($dir, $func, $dirPermissions, $filePermissions, $avoid=array())
       continue;
     $cont = false;
     for($i = 0; $i < count($avoid); $i++)
-      if(substr($file, 0, strlen($avoid[$i])) == $avoid[$i]) {
+      if(substr($file, strlen($file)-strlen($avoid[$i])) == $avoid[$i]) {
 	$cont = true;
 	break;
       }
-- 
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 +++---
 src/fextdata.php             | 35 +++++++++++++++++++++++++++------
 src/globals.php              | 46 ++++++++++++++++++++++----------------------
 src/private/score.sep        | 42 ++++++++++++++++++----------------------
 src/private/score.sep.sample | 23 ++++++++++++++++++++++
 src/scoretable.php           | 28 +++++++++++++--------------
 6 files changed, 110 insertions(+), 70 deletions(-)
 create mode 100644 src/private/score.sep.sample

(limited to 'src/globals.php')

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");
diff --git a/src/fextdata.php b/src/fextdata.php
index 468c2d3..49fc8fb 100644
--- a/src/fextdata.php
+++ b/src/fextdata.php
@@ -30,16 +30,21 @@ function makeurlhttps($siteurl) {
 function scoretransfer($putname, $localsite, $timeo=5) {
   $ds = DIRECTORY_SEPARATOR;
   if($ds=="") $ds = "/";
+  $logstr='';
 
   if(is_readable('/etc/boca.conf')) {
     $pif=parse_ini_file('/etc/boca.conf');
     $bocaproxy = @trim($pif['proxy']);
-    if($bocaproxy != "" && substr($bocaproxy,0,6) != 'tcp://')
+    if($bocaproxy != "" && substr($bocaproxy,0,6) != 'tcp://') {
       $bocaproxy = 'tcp://' . $bocaproxy;
+      $logstr .= "proxy configuration found\n";
+    }
     $bocaproxylogin = @trim($pif['proxylogin']);
     $bocaproxypass = @trim($pif['proxypassword']);
-    if($bocaproxylogin != "")
+    if($bocaproxylogin != "") {
+      $logstr .= "proxy authentication found\n";
       $bocaproxypass = base64_encode($bocaproxylogin . ":" . $bocaproxypass);
+    }
   } else {
     $bocaproxy = "";
     $bocaproxypass = "";
@@ -72,12 +77,14 @@ function scoretransfer($putname, $localsite, $timeo=5) {
     if(strpos($siteurl,'#') !== false) continue;
     LOGError("scoretransfer: found site $siteurl");
     $siteurl = makeurlhttps($siteurl);
+    $logstr .= "Found site $siteurl to share info\n";
     //		LOGError("url=" .$siteurl . "index.php?getsessionid=1");
     $opts = array();
     $opts['http']['timeout'] = $timeo;
     $context = stream_context_create($opts);		  
     if(($sess = @file_get_contents($siteurl . "index.php?getsessionid=1", 0, $context))===false) {
       LOGError("scoretransfer: timeout at get session id for $siteurl");
+      $logstr .= "timeout at get-session-id for $siteurl\n";
       continue;
     }
     //		LOGError("sess=$sess pass=" . trim($sitedata[2]) . " hash=" .  myhash(trim($sitedata[2])));
@@ -104,12 +111,14 @@ function scoretransfer($putname, $localsite, $timeo=5) {
     }
     if($ok===false) {
       LOGError("scoretransfer: timeout at login for $siteurl");
+      $logstr .= "timeout at login for $siteurl\n";
       continue;
     }
     //		LOGError("ok=" . $ok);
     if(substr($ok,strlen($ok)-strlen('TRANSFER OK'),strlen('TRANSFER OK')) == 'TRANSFER OK') {
       if(($res = @file_get_contents($siteurl . "scoretable.php?remote=-42", 0, $context))===false) {
 	LOGError("scoretransfer: timeout at get score for $siteurl");
+	$logstr .= "timeout at get-score for $siteurl\n";
 	continue;
       }
       @file_put_contents($privatedir . $ds . 'remotescores' . $ds . 'tmp.zip', $res);
@@ -130,16 +139,20 @@ function scoretransfer($putname, $localsite, $timeo=5) {
 	  }
 	  $zip->close();
 	  LOGError("scoretransfer: download OK");
+	  $logstr .= "download OK from $siteurl\n";
 	} else {
+	  $logstr .= "reading failed from $siteurl (zip open error)\n";
 	  LOGError("scoretransfer: download failed (2)");
 	}
 	cleardir($privatedir . $ds . 'remotescores' . $ds . 'tmp');
 	@unlink($privatedir . $ds . 'remotescores' . $ds . 'tmp.zip');
       } else {
 	LOGError("scoretransfer: download failed (3)");
+	$logstr .= "download failed from $siteurl (file error)\n";
       }
     } else {
       LOGError("scoretransfer: download failed (1)");
+      $logstr .= "download failed from $siteurl (connection establishing error)\n";
     }
 
     if(is_readable($putname)) {
@@ -168,11 +181,15 @@ function scoretransfer($putname, $localsite, $timeo=5) {
       }
       if($s===false) {
 	LOGError("scoretransfer: timeout at upload for $siteurl");
+	$logstr .= "timeout at full upload to $siteurl\n";
       } else {			  
-	if(strpos($s,'SCORE UPLOADED OK') !== false)
+	if(strpos($s,'SCORE UPLOADED OK') !== false) {
 	  LOGError("scoretransfer: upload OK");
-	else
+	  $logstr .= "upload of score to $siteurl OK\n";
+	} else {
 	  LOGError("scoretransfer: upload failed (" . $s . ")");
+	  $logstr .= "upload of score to $siteurl failed (" . $s . ")\n";
+	}
       }
     }
     if(is_readable($superlfile)) {
@@ -200,15 +217,21 @@ function scoretransfer($putname, $localsite, $timeo=5) {
       }
       if($s===false) {
 	LOGError("scoretransfer: timeout at full upload for $siteurl");
+	$logstr .= "timeout at full upload to $siteurl\n";
 	continue;
       } else {
-	if(strpos($s,'SCORE UPLOADED OK') !== false)
+	if(strpos($s,'SCORE UPLOADED OK') !== false) {
 	  LOGError("scoretransfer: upload full OK");
-	else
+	  $logstr .= 'upload of full score to $siteurl OK\n';
+	}
+	else {
 	  LOGError("scoretransfer: upload full failed (" . $s . ")");
+	  $logstr .= 'upload of full score to $siteurl failed (' . $s . ')';
+	}
       }
     }
   }
+  return $logstr;
 }
 
 
diff --git a/src/globals.php b/src/globals.php
index 0af5662..952533e 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -40,29 +40,31 @@ function filedownload($oid,$fname,$msg='') {
 	if($msg != '') $str .= "&msg=" . rawurlencode($msg);
 	return $str;
 }
-function dirrec($dir, $func, $dirPermissions, $filePermissions, $avoid=array()) {
+function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=array()) {
   $ds = DIRECTORY_SEPARATOR;
   if($ds=="") $ds = "/";
-  $dp = opendir($dir);
-  while($file = readdir($dp)) {
-    if (($file == ".") || ($file == ".."))
-      continue;
-    $cont = false;
-    for($i = 0; $i < count($avoid); $i++)
-      if(substr($file, strlen($file)-strlen($avoid[$i])) == $avoid[$i]) {
-	$cont = true;
-	break;
-      }
-    if($cont) continue;
-    $fullPath = $dir . $ds . $file;
-    if(is_dir($fullPath)) {
-      $func($fullPath, $dirPermissions);
-      dirrec($fullPath, $func, $dirPermissions, $filePermissions, $avoid);
-    } else {
-      $func($fullPath, $filePermissions);
+  chown($dir, $user);
+  chgrp($dir, $group);
+  if(is_dir($dir)) {
+    chmod($dir, $dirPermissions);
+    if(($dp = opendir($dir)) === false) return;
+    while($file = readdir($dp)) {
+      if (($file == ".") || ($file == ".."))
+	continue;
+      $cont = false;
+      for($i = 0; $i < count($avoid); $i++)
+	if(substr($file, strlen($file)-strlen($avoid[$i])) == $avoid[$i]) {
+	  $cont = true;
+	  break;
+	}
+      if($cont) continue;
+      $fullPath = $dir . $ds . $file;
+      dirrec($fullPath, $user, $group, $dirPermissions, $filePermissions, $avoid);
     }
+    closedir($dp);
+  } else {
+      chmod($dir, $filePermissions);
   }
-  closedir($dp);
 }
 
 function fixbocadir($dir,$full=false) {
@@ -79,10 +81,8 @@ function fixbocadir($dir,$full=false) {
 	  else
 	    $d = array('problemtmp','runtmp','scoretmp');
 	  foreach($d as $a) cleardir($a,true,true,false);
-	  dirrec($dir, chown, $un, $un);
-	  dirrec($dir, chgrp, $ug, $ug);
-	  dirrec($dir, chmod, 0755, 0644, array('private', '.oldboca'));
-	  dirrec($dir . $ds . 'private', chmod, 0750, 0640, array('.oldboca'));
+	  dirrec($dir, $un, $ug, 0755, 0644, array('private', '.oldboca'));
+	  dirrec($dir . $ds . 'private', $un, $ug, 0750, 0640, array('.oldboca'));
 	  if(@file_put_contents($dir . $ds . 'private' . $ds . '.htaccess', "Deny from all\n") === false) return false;
 	  return true;
 	} else {
diff --git a/src/private/score.sep b/src/private/score.sep
index fb45aae..b4798d9 100644
--- a/src/private/score.sep
+++ b/src/private/score.sep
@@ -1,23 +1,19 @@
-General 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 100 9999
-Site_1 1 
-Site_2 2
-Site_3 3
-Site_4 4
-Site_5 5
-Site_6 6
-Site_7 7
-Site_8 8
-Site_9 9
-Site_10 10 
-Site_11 11
-Site_12 12
-Site_13 13
-Site_14 14
-Site_15 15
-Site_16 16
-Site_17 17
-Site_18 18
-Site_19 19
-Site_20 20 
-Site_100 100
-Site_9999 9999
+Global 101 102 103 104 105 106 107 108 109 110 121 122 123 124
+Caribbean 110 121 123
+MexicoCA 104 109 122 124
+NorthRegion 102 103
+SouthRegion 105 106 107 108
+Argentina 105
+Bolivia 106
+Brasil 101
+Chile 107
+Colombia 102
+CostaRica 122
+Cuba 110
+ElSalvador 124
+Mexico 109
+Panama 104
+Peru 108
+PuertoRico 123
+RepDominicana 121
+Venezuela 103
diff --git a/src/private/score.sep.sample b/src/private/score.sep.sample
new file mode 100644
index 0000000..fb45aae
--- /dev/null
+++ b/src/private/score.sep.sample
@@ -0,0 +1,23 @@
+General 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 100 9999
+Site_1 1 
+Site_2 2
+Site_3 3
+Site_4 4
+Site_5 5
+Site_6 6
+Site_7 7
+Site_8 8
+Site_9 9
+Site_10 10 
+Site_11 11
+Site_12 12
+Site_13 13
+Site_14 14
+Site_15 15
+Site_16 16
+Site_17 17
+Site_18 18
+Site_19 19
+Site_20 20 
+Site_100 100
+Site_9999 9999
diff --git a/src/scoretable.php b/src/scoretable.php
index 3d69ba5..33c421f 100644
--- a/src/scoretable.php
+++ b/src/scoretable.php
@@ -47,7 +47,7 @@ if(isset($_GET["clock"]) && $_GET["clock"]==1) {
 	else echo "0";
 	exit;
 }
-if(isset($_GET['remote']) && is_numeric($_GET['remote'])) {
+if(isset($_GET['remote'])) {
 	ob_start();
 	header ("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");
 	header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -59,13 +59,13 @@ if(isset($_GET['remote']) && is_numeric($_GET['remote'])) {
 
 	if (isset($_SESSION["usertable"])) {
         $tmp = DBUserInfo($_SESSION["usertable"]["contestnumber"],
-						  $_SESSION["usertable"]["usersitenumber"], $_SESSION["usertable"]["usernumber"]);
+			  $_SESSION["usertable"]["usersitenumber"], $_SESSION["usertable"]["usernumber"]);
 		$_SESSION["usertable"]['usersessionextra'] = $tmp['usersessionextra'];
 	} else {
 		IntrusionNotify("scoretable1");
         ForceLoad("index.php");
 	}
-	if(!isset($_SESSION['usertable']['usertype']) || ($_SESSION["usertable"]["usertype"] != "score" && $_SESSION["usertable"]["usertype"] != "site")) {
+	if(!isset($_SESSION['usertable']['usertype']) || $_SESSION["usertable"]["usertype"] != "site") {
 		IntrusionNotify("scoretable2");
         ForceLoad("index.php");
 	}
@@ -83,7 +83,7 @@ $scoredelay["score"] = 60;
 $scoredelay["team"] = 30;
 $scoredelay["judge"] = 20;
 $scoredelay["staff"] = 30;
-$actualdelay = 60;
+$actualdelay = 30;
 if(isset($scoredelay[$_SESSION["usertable"]["usertype"]])) $actualdelay = $scoredelay[$_SESSION["usertable"]["usertype"]];
 $ds = DIRECTORY_SEPARATOR;
 if($ds=="") $ds = "/";
@@ -99,7 +99,7 @@ if(file_exists($scoretmp)) {
 	}
 }
 
-if($_SESSION["usertable"]["usertype"]=='score' || $_SESSION["usertable"]["usertype"]=='admin' || (isset($_GET["remote"]) && is_numeric($_GET["remote"]))) {
+if(isset($_GET["remote"])) {
   $privatedir = $_SESSION['locr'] . $ds . "private";
   $remotedir = $_SESSION['locr'] . $ds . "private" . $ds . "remotescores";
   $destination = $remotedir . $ds ."scores.zip";
@@ -132,7 +132,7 @@ if($_SESSION["usertable"]["usertype"]=='score' || $_SESSION["usertable"]["userty
 		$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);
+		//scoretransfer($fname . ".dat", $localsite);
 		
 		if(@create_zip($remotedir,glob($remotedir . '/*.dat'),$fname . ".tmp") != 1) {
 			LOGError("Cannot create score zip file");
@@ -152,10 +152,7 @@ if($_SESSION["usertable"]["usertype"]=='score' || $_SESSION["usertable"]["userty
 	  }
 	}
   }
-}
-
-if(isset($_GET["remote"])) {
-	if(is_numeric($_GET["remote"])) {
+  if(is_numeric($_GET["remote"])) {
 		if($_GET["remote"]==-42) {
 			echo file_get_contents($destination);
 		} else {
@@ -166,15 +163,16 @@ if(isset($_GET["remote"])) {
 			$score = array();
 			if($level>0) {
 				list($score,$data0) = DBScoreSite($_SESSION["usertable"]["contestnumber"], 
-												  $_SESSION["usertable"]["usersitenumber"], 1, -1, $_GET["remote"]);
+								  $_SESSION["usertable"]["usersitenumber"], 1, -1, $_GET["remote"]);
 			}
 			echo base64_encode(serialize($score));
 		}
-	} else {
-		echo base64_encode(serialize(array()));
-	}
-	exit;
+  } else {
+    echo base64_encode(serialize(array()));
+  }
+  exit;
 }
+
 if(!$redo) {
 	$conf=globalconf();
 	if($conf['doenc'])
-- 
cgit v1.2.3


From c49b9ac202bf823f4ff332cc0fa8e55601e8b93c Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:14:50 +0100
Subject: verb

---
 src/globals.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 952533e..d49a3c7 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -43,10 +43,10 @@ function filedownload($oid,$fname,$msg='') {
 function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=array()) {
   $ds = DIRECTORY_SEPARATOR;
   if($ds=="") $ds = "/";
-  chown($dir, $user);
-  chgrp($dir, $group);
+  if(chown($dir, $user) === false) echo "cannot chown $dir\n";
+  if(chgrp($dir, $group) === false) echo "cannot chgrp $dir\n";
   if(is_dir($dir)) {
-    chmod($dir, $dirPermissions);
+    if(chmod($dir, $dirPermissions) === false) echo "cannot chmod $dir\n";
     if(($dp = opendir($dir)) === false) return;
     while($file = readdir($dp)) {
       if (($file == ".") || ($file == ".."))
@@ -63,7 +63,7 @@ function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=a
     }
     closedir($dp);
   } else {
-      chmod($dir, $filePermissions);
+    if(chmod($dir, $filePermissions)=== false) echo "cannot chmod $dir\n";
   }
 }
 
-- 
cgit v1.2.3


From 6d1514ca2435ccd650baf73ed9900b9aaf88f43b Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:22:12 +0100
Subject: ren

---
 src/globals.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index d49a3c7..6c51f41 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -43,8 +43,11 @@ function filedownload($oid,$fname,$msg='') {
 function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=array()) {
   $ds = DIRECTORY_SEPARATOR;
   if($ds=="") $ds = "/";
-  if(chown($dir, $user) === false) echo "cannot chown $dir\n";
-  if(chgrp($dir, $group) === false) echo "cannot chgrp $dir\n";
+  $t = myunique();
+  rename($dir, $dir . '.tmp' . $t);
+  rename($dir . '.tmp' . $t, $dir);
+  //if(chown($dir, $user) === false) echo "cannot chown $dir\n";
+  //if(chgrp($dir, $group) === false) echo "cannot chgrp $dir\n";
   if(is_dir($dir)) {
     if(chmod($dir, $dirPermissions) === false) echo "cannot chmod $dir\n";
     if(($dp = opendir($dir)) === false) return;
-- 
cgit v1.2.3


From 21a525f1261bff14f65305c1b5e595a707d9f8c1 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:25:41 +0100
Subject: chown issues

---
 src/globals.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 6c51f41..e23e5ab 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -43,12 +43,9 @@ function filedownload($oid,$fname,$msg='') {
 function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=array()) {
   $ds = DIRECTORY_SEPARATOR;
   if($ds=="") $ds = "/";
-  $t = myunique();
-  rename($dir, $dir . '.tmp' . $t);
-  rename($dir . '.tmp' . $t, $dir);
-  //if(chown($dir, $user) === false) echo "cannot chown $dir\n";
-  //if(chgrp($dir, $group) === false) echo "cannot chgrp $dir\n";
   if(is_dir($dir)) {
+    if(chown($dir, $user) === false) echo "cannot chown $dir\n";
+    if(chgrp($dir, $group) === false) echo "cannot chgrp $dir\n";
     if(chmod($dir, $dirPermissions) === false) echo "cannot chmod $dir\n";
     if(($dp = opendir($dir)) === false) return;
     while($file = readdir($dp)) {
@@ -66,6 +63,9 @@ function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=a
     }
     closedir($dp);
   } else {
+    $t = myunique();
+    copy($dir, $dir . '.tmp' . $t);
+    rename($dir . '.tmp' . $t, $dir);
     if(chmod($dir, $filePermissions)=== false) echo "cannot chmod $dir\n";
   }
 }
-- 
cgit v1.2.3


From 227fd174b2b9f85f665c226b7e436c0a30c60c31 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:30:21 +0100
Subject: chown issues

---
 src/globals.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index e23e5ab..b958328 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -44,8 +44,11 @@ function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=a
   $ds = DIRECTORY_SEPARATOR;
   if($ds=="") $ds = "/";
   if(is_dir($dir)) {
-    if(chown($dir, $user) === false) echo "cannot chown $dir\n";
-    if(chgrp($dir, $group) === false) echo "cannot chgrp $dir\n";
+    $u = posix_getpwuid(fileowner($dir));
+    $un = $u['name'];
+    $ug = $u['gid'];
+    if($un != $user) echo "user of $dir must be fixed!!\n";
+    if($ug != $group) echo "group of $dir must be fixed!!\n";
     if(chmod($dir, $dirPermissions) === false) echo "cannot chmod $dir\n";
     if(($dp = opendir($dir)) === false) return;
     while($file = readdir($dp)) {
@@ -63,10 +66,12 @@ function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=a
     }
     closedir($dp);
   } else {
-    $t = myunique();
-    copy($dir, $dir . '.tmp' . $t);
-    rename($dir . '.tmp' . $t, $dir);
-    if(chmod($dir, $filePermissions)=== false) echo "cannot chmod $dir\n";
+    if(!is_link($dir)) {
+      $t = myunique();
+      copy($dir, $dir . '.tmp' . $t);
+      rename($dir . '.tmp' . $t, $dir);
+      if(chmod($dir, $filePermissions)=== false) echo "cannot chmod $dir\n";
+    }
   }
 }
 
-- 
cgit v1.2.3


From a98c69de0d7a357ea73c07ca14acacc53ec0a1d6 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Tue, 24 Oct 2017 15:39:37 +0100
Subject: verbose

---
 src/globals.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index b958328..b4f754e 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -49,8 +49,8 @@ function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=a
     $ug = $u['gid'];
     if($un != $user) echo "user of $dir must be fixed!!\n";
     if($ug != $group) echo "group of $dir must be fixed!!\n";
-    if(chmod($dir, $dirPermissions) === false) echo "cannot chmod $dir\n";
-    if(($dp = opendir($dir)) === false) return;
+    if(@chmod($dir, $dirPermissions) === false) echo "cannot chmod $dir\n";
+    if(($dp = @opendir($dir)) === false) return;
     while($file = readdir($dp)) {
       if (($file == ".") || ($file == ".."))
 	continue;
@@ -68,9 +68,9 @@ function dirrec($dir, $user, $group, $dirPermissions, $filePermissions, $avoid=a
   } else {
     if(!is_link($dir)) {
       $t = myunique();
-      copy($dir, $dir . '.tmp' . $t);
-      rename($dir . '.tmp' . $t, $dir);
-      if(chmod($dir, $filePermissions)=== false) echo "cannot chmod $dir\n";
+      @copy($dir, $dir . '.tmp' . $t);
+      @rename($dir . '.tmp' . $t, $dir);
+      if(@chmod($dir, $filePermissions)=== false) echo "cannot chmod $dir\n";
     }
   }
 }
-- 
cgit v1.2.3