From e186493a2bd8fef5fc0c7ad47edefbabddb6f0ab Mon Sep 17 00:00:00 2001
From: cassiopc <cassiopc@gmail.com>
Date: Thu, 23 Aug 2018 16:25:32 +0200
Subject: improvements of scripts and fixes about urls

---
 src/admin/export.php  | 2 +-
 src/admin/files.php   | 1 -
 src/admin/problem.php | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/admin')

diff --git a/src/admin/export.php b/src/admin/export.php
index 2682c94..10a595d 100644
--- a/src/admin/export.php
+++ b/src/admin/export.php
@@ -51,7 +51,7 @@ if(isset($_POST["Submit"]) || isset($_POST['Submit1'])) {
 		if(isset($_POST['nopassword']) && $_POST['nopassword']=='true')
 			echo $xml;
 		else
-			echo rawurlencode($_POST['challenge']) . " " . encryptData($xml,($_POST['password']));
+			echo myrawurlencode($_POST['challenge']) . " " . encryptData($xml,($_POST['password']));
 		exit;
 	}
 }
diff --git a/src/admin/files.php b/src/admin/files.php
index 16f0f2d..30ce320 100644
--- a/src/admin/files.php
+++ b/src/admin/files.php
@@ -59,7 +59,6 @@ for ($i=0; $i<count($run); $i++) {
 
   echo "  <td nowrap>" . dateconvsimple($run[$i]["timestamp"]) . "</td>\n";
   echo "  <td nowrap>" . $run[$i]["usernumber"] . " (" . $run[$i]["usersitenumber"] . ")</td>\n";
-  $if = rawurlencode($run[$i]["filename"]);
   if($run[$i]["status"]=="active") {
     echo "<td nowrap><a href=\"../filedownload.php?". filedownload($run[$i]["oid"],$run[$i]["filename"]) . "\">";
     echo $run[$i]["filename"] . "</a>";
diff --git a/src/admin/problem.php b/src/admin/problem.php
index a01bd35..33e887c 100644
--- a/src/admin/problem.php
+++ b/src/admin/problem.php
@@ -26,7 +26,7 @@ if(($ct = DBContestInfo($_SESSION["usertable"]["contestnumber"])) == null)
 if (isset($_GET["delete"]) && is_numeric($_GET["delete"]) && isset($_GET["input"])) {
 	$param = array();
 	$param['number']=$_GET["delete"];
-	$param['inputfilename']=$_GET["input"];
+	$param['inputfilename']=myrawurldecode($_GET["input"]);
 	if(!DBDeleteProblem ($_SESSION["usertable"]["contestnumber"], $param)) {
 		MSGError('Error deleting problem');
 		LogError('Error deleting problem');
@@ -262,11 +262,11 @@ for ($i=0; $i<count($prob); $i++) {
   echo " <tr>\n";
   if($prob[$i]["fake"]!='t') {
 	  if(strpos($prob[$i]["fullname"],"(DEL)") !== false) {
-		  echo "  <td nowrap><a href=\"javascript: conf3('problem.php?delete=" . $prob[$i]["number"] . "&input=" . rawurlencode($prob[$i]["inputfilename"]) . 
+		  echo "  <td nowrap><a href=\"javascript: conf3('problem.php?delete=" . $prob[$i]["number"] . "&input=" . myrawurlencode($prob[$i]["inputfilename"]) . 
 			  "')\">" . $prob[$i]["number"];
 		  echo "(deleted)";
 	  } else {
-		  echo "  <td nowrap><a href=\"javascript: conf2('problem.php?delete=" . $prob[$i]["number"] . "&input=" . rawurlencode($prob[$i]["inputfilename"]) . 
+		  echo "  <td nowrap><a href=\"javascript: conf2('problem.php?delete=" . $prob[$i]["number"] . "&input=" . myrawurlencode($prob[$i]["inputfilename"]) . 
 			  "')\">" . $prob[$i]["number"];
 	  }
 	  echo "</a></td>\n";
-- 
cgit v1.2.3