Merge pull request #100 from gnieark/dev

Dev

README.md

@@ -19,6 +19,20 @@ I'd better like you to help me to improve [bot's Arena](https://botsarena.tinad.
 * Apache/tomcat document root starts at ./html
 * copy src/config.php.empty to src/config.php
 
+Apache RewriteRules are given on the file html/.htaccess
+
+For nginx in server directive:
+
+        rewrite '^/([a-zA-Z]{1,})/doc-([a-z]{2})$' /index.php?doc=$1&lang=$2 last;
+        rewrite '^/p/([a-zA-Z]{1,})/(.*)-([a-z]{2})$' /index.php?page=$1&params=$2&lang=$3 last;
+        rewrite '^/p/([a-zA-Z]{1,})/(.*)$' /index.php?page=$1&params=$2 last;
+        rewrite '^/p/(.*)-([a-z]{2})$' /index.php?page=$1&lang=$2 last;
+        rewrite '^/p/(.*)$' index.php?page=$1 last;
+        rewrite '^/([a-zA-Z]{1,})/scores$' /index.php?scores=$1 last;
+        rewrite '^/([a-zA-Z]{1,})-([a-z]{2})$' /index.php?arena=$1&lang=$2 last;
+        rewrite '^/([a-zA-Z]{1,})/doc$' /index.php?doc=$1 last;
+        rewrite '^/([a-zA-Z]{1,})$' /index.php?arena=$1 last;
+        
 # License
 Bot's Arena , Website for Artificials intelligences duels.
 

countBattles.txt

@@ -1 +1 @@
-1836
+1845

html/testBotScripts/tron.html

@@ -73,7 +73,7 @@ function createPlayerForm(index){
   divForm.appendChild(select);
   
   //url 
-  var inputUrl = createElem("input", {"id","botUrl" + index, "type": "text", "value":"jljfhglfsghf", "placeholder":"http://Bot.url" });
+  var inputUrl = createElem("input", {"id":"botUrl" + index, "type": "text", "value":"", "placeholder":"http://Bot.url" });
   divForm.appendChild(inputUrl);
   
   

src/DUEL.php

@@ -31,16 +31,6 @@ class DUEL{
   }
 }
 
-  
-
-
-
-
-
-
-
-
-
 class ELO
 {
   public $rank = 1500; //default rank

src/act.php

@@ -100,7 +100,6 @@ switch($_POST['act']){
 	}     
     }
     
-
     break;
     
   case "editBot":
@@ -193,10 +192,7 @@ switch($_POST['act']){
             error(500,"Mailer Error: " . $mail->ErrorInfo);
         } else {
             //echo "Message sent!";
-        }     
+        }       
-
-	  
-    
     }
     break;
     

src/arenas/tron/Coords.php

@@ -12,18 +12,13 @@ class Coords{
       error_log("a bot out of limits");
       return false;
     }
-  
     $this->x = $x;
     $this->y = $y;
-    
-
   }
 
   public function __toString(){
     return $this->x.",".$this->y;
-    
   }
-  
   public function addDirection(Direction $dir){
     return new Coords(
       $this->x + $dir->deltaX,

src/arenas/tron/TronGame.php

@@ -105,7 +105,8 @@ class TronGame
 	curl_setopt($ch[$i], CURLOPT_SSL_VERIFYHOST, false);
 	curl_setopt($ch[$i], CURLOPT_SSL_VERIFYPEER, false);
 	curl_setopt($ch[$i], CURLOPT_POSTFIELDS, $data_string);                                                                  
-	curl_setopt($ch[$i], CURLOPT_RETURNTRANSFER, true);                                                                      
+	curl_setopt($ch[$i], CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch[$i], CURLOPT_CONNECTTIMEOUT, 10);
 	curl_setopt($ch[$i], CURLOPT_HTTPHEADER, array(                                                                          
 	    'Content-Type: application/json',                                                                                
 	    'Content-Length: ' . strlen($data_string))                                                                       

src/arenas/tron/js.js

@@ -35,9 +35,12 @@ function changeSelect(number,botId){
     }
 }
 function show_bot_panel(number){
+  
+	var botsColor = ['cyan','darkmagenta','darkred','darkslategrey','deeppink','dodgerblue','goldenrod','grey','indigo','lightgreen','mediumslateblue','midnightblue'];
+
         //configurePlayers
         var fieldset = createElem('fieldset',{'class':'botFormulaire'});
-        var legend = createElem('legend',{});
+        var legend = createElem('legend',{"style": "color: " + botsColor[number] +'; font-weight: bold;'});
         legend.innerHTML = 'bot ' + number;
         fieldset.appendChild(legend);
         var p=createElem('p');

src/arenas/tron/style.css

@@ -6,5 +6,5 @@
 #configurePlayers{width: 100%;}
 #configurePlayers fieldset{display: block; width: 100px; float:left;}
 #logs{display:block;padding-left:10px; height: 200px; overflow-y: scroll;}
-#logs p em {color: grey; font-size: 70%; test-transform:italic;}
+#logs p em {color: grey; font-size: 70%; font-style:italic;}
-code{font-family: monospace;}
+code{font-family: monospace;}

src/functions.php

@@ -271,6 +271,7 @@ function save_battle($game,$bot1,$bot2,$result,$nameOrIds = 'name'){
         '1')
         ON DUPLICATE KEY UPDATE ".$field." = ".$field." + 1;   
       ");        
+      
 }
 function get_unique_id(){
     //increment the number 
@@ -344,7 +345,8 @@ function get_IA_Response($iaUrl,$postParams){
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);                                                                  
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);                                                                      
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); 
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
     curl_setopt($ch, CURLOPT_HTTPHEADER, array(                                                                          
         'Content-Type: application/json',                                                                                
         'Content-Length: ' . strlen($data_string))