From ddaacde5efcbc46cd73960755df9fa3973ede9c0 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 09:42:31 +0200 Subject: [PATCH 1/7] gitignore --- .gitignore | 1 + countBattles.txt | 2 +- src/PHPMailer | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b7f691a..7b0f02e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Thumbs.db .swp.* src/config.php src/countBattles.txt +google9782eeb032983424.html diff --git a/countBattles.txt b/countBattles.txt index bbff031..b8d1607 100644 --- a/countBattles.txt +++ b/countBattles.txt @@ -1 +1 @@ -867 \ No newline at end of file +1255 \ No newline at end of file diff --git a/src/PHPMailer b/src/PHPMailer index 7c8b786..c2bde34 160000 --- a/src/PHPMailer +++ b/src/PHPMailer @@ -1 +1 @@ -Subproject commit 7c8b786228bb9e1561ff60a2d6f7f6ce91be6fee +Subproject commit c2bde34e58caa500b8fb2f7e14fc9765596cdf6d From a2f20c383b8f34e9797e9c13ab98a73254fe6dbd Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 10:06:46 +0200 Subject: [PATCH 2/7] ELO --- src/PHPMailer | 2 +- src/functions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PHPMailer b/src/PHPMailer index c2bde34..7c8b786 160000 --- a/src/PHPMailer +++ b/src/PHPMailer @@ -1 +1 @@ -Subproject commit c2bde34e58caa500b8fb2f7e14fc9765596cdf6d +Subproject commit 7c8b786228bb9e1561ff60a2d6f7f6ce91be6fee diff --git a/src/functions.php b/src/functions.php index 3e20f51..ae8bdbe 100644 --- a/src/functions.php +++ b/src/functions.php @@ -180,7 +180,7 @@ function get_battles_history($game){ function ELO_get_podium($arena){ global $lnMysql; $podium=array(); - $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".$arena."' AND active='1' ORDER BY ELO DESC, name"); + $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,8)."' AND active='1' ORDER BY ELO DESC, name"); while($r = mysqli_fetch_row($rs)){ $podium[]=array( 'id' => $r[0], From 88dcd568108b3a8372e1e1d781a9dd9032f24759 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 10:12:10 +0200 Subject: [PATCH 3/7] ELO --- src/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions.php b/src/functions.php index ae8bdbe..3e20f51 100644 --- a/src/functions.php +++ b/src/functions.php @@ -180,7 +180,7 @@ function get_battles_history($game){ function ELO_get_podium($arena){ global $lnMysql; $podium=array(); - $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,8)."' AND active='1' ORDER BY ELO DESC, name"); + $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".$arena."' AND active='1' ORDER BY ELO DESC, name"); while($r = mysqli_fetch_row($rs)){ $podium[]=array( 'id' => $r[0], From e839a5320d5117b9269974365720d2180b0c702e Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 11:07:52 +0200 Subject: [PATCH 4/7] debug --- src/functions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/functions.php b/src/functions.php index 3e20f51..091f826 100644 --- a/src/functions.php +++ b/src/functions.php @@ -180,6 +180,7 @@ function get_battles_history($game){ function ELO_get_podium($arena){ global $lnMysql; $podium=array(); + echo "SELECT id,name,description,ELO FROM bots WHERE game='".$arena."' AND active='1' ORDER BY ELO DESC, name"; $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".$arena."' AND active='1' ORDER BY ELO DESC, name"); while($r = mysqli_fetch_row($rs)){ $podium[]=array( From 741e3f1b30b53ed86bcb88966789665da86140ca Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 11:09:16 +0200 Subject: [PATCH 5/7] debug --- src/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions.php b/src/functions.php index 091f826..6ae4e2c 100644 --- a/src/functions.php +++ b/src/functions.php @@ -180,8 +180,8 @@ function get_battles_history($game){ function ELO_get_podium($arena){ global $lnMysql; $podium=array(); - echo "SELECT id,name,description,ELO FROM bots WHERE game='".$arena."' AND active='1' ORDER BY ELO DESC, name"; - $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".$arena."' AND active='1' ORDER BY ELO DESC, name"); + echo "SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,8)."' AND active='1' ORDER BY ELO DESC, name"; + $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,8)."' AND active='1' ORDER BY ELO DESC, name"); while($r = mysqli_fetch_row($rs)){ $podium[]=array( 'id' => $r[0], From 6e404391b9ca696b202d5e5e58070eb5285ad0e2 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 11:10:04 +0200 Subject: [PATCH 6/7] debug --- src/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions.php b/src/functions.php index 6ae4e2c..ec02a8a 100644 --- a/src/functions.php +++ b/src/functions.php @@ -180,8 +180,8 @@ function get_battles_history($game){ function ELO_get_podium($arena){ global $lnMysql; $podium=array(); - echo "SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,8)."' AND active='1' ORDER BY ELO DESC, name"; - $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,8)."' AND active='1' ORDER BY ELO DESC, name"); + echo "SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,10)."' AND active='1' ORDER BY ELO DESC, name"; + $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,10)."' AND active='1' ORDER BY ELO DESC, name"); while($r = mysqli_fetch_row($rs)){ $podium[]=array( 'id' => $r[0], From 95149f3750b4a7435332048402d299110009b1ef Mon Sep 17 00:00:00 2001 From: Gnieark Date: Fri, 10 Jun 2016 11:10:26 +0200 Subject: [PATCH 7/7] debug --- src/functions.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/functions.php b/src/functions.php index ec02a8a..17f6830 100644 --- a/src/functions.php +++ b/src/functions.php @@ -180,7 +180,6 @@ function get_battles_history($game){ function ELO_get_podium($arena){ global $lnMysql; $podium=array(); - echo "SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,10)."' AND active='1' ORDER BY ELO DESC, name"; $rs=mysqli_query($lnMysql,"SELECT id,name,description,ELO FROM bots WHERE game='".substr($arena,0,10)."' AND active='1' ORDER BY ELO DESC, name"); while($r = mysqli_fetch_row($rs)){ $podium[]=array(