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/site.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

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/site.php')

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/site.php')

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/site.php')

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