diff --git a/README.md b/README.md index 7f47aee..ca8d8ae 100755 --- a/README.md +++ b/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¶ms=$2&lang=$3 last; + rewrite '^/p/([a-zA-Z]{1,})/(.*)$' /index.php?page=$1¶ms=$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. diff --git a/html/nging-rewrite.txt b/html/nging-rewrite.txt new file mode 100644 index 0000000..557713c --- /dev/null +++ b/html/nging-rewrite.txt @@ -0,0 +1,15 @@ +RewriteEngine On +RewriteBase / +RewriteRule ^p/([a-zA-Z]{1,})/(.*)-([a-z]{2})$ index\.php?page=$1¶ms=$2&lang=$3 [L] +RewriteRule ^p/([a-zA-Z]{1,})/(.*)$ index\.php?page=$1¶ms=$2 [L] +RewriteRule ^p/(.*)-([a-z]{2})$ index\.php?page=$1&lang=$2 [L] +RewriteRule ^p/(.*)$ index\.php?page=$1 [L] +RewriteRule ^([a-zA-Z]{1,})/doc-([a-z]{2})$ index\.php?doc=$1&lang=$2 [L] +RewriteRule ^([a-zA-Z]{1,})/doc$ index\.php?doc=$1 [L] +RewriteRule ^([a-zA-Z]{1,})/scores$ index\.php?scores=$1 [L] +RewriteRule ^([a-zA-Z]{1,})-([a-z]{2})$ index\.php?arena=$1&lang=$2 [L] +RewriteRule ^([a-zA-Z]{1,})$ index\.php?arena=$1 [L] +RewriteRule ^-([a-z]{2})$ index\.php?lang=$1 [L] +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^index.php$ index.php/ [L] \ No newline at end of file diff --git a/src/arenas/tron/TronGame.php b/src/arenas/tron/TronGame.php index 217298a..88ec16c 100755 --- a/src/arenas/tron/TronGame.php +++ b/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)) diff --git a/src/functions.php b/src/functions.php index da9153e..1e1c782 100755 --- a/src/functions.php +++ b/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))