X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=e58bae69b437e6bb81b01607e4c4dbe28d8d8bb3;hp=ef047be0f0983f169174417b78b240a810ca9d07;hb=15e85c12f9392246845f5c611f5faafe8660a9e2;hpb=8c5281010622386c1c57a8ee5eec18ed89dfb039

diff --git a/index.php b/index.php
index ef047be..e58bae6 100644
--- a/index.php
+++ b/index.php
@@ -9,6 +9,10 @@ include_once("output.php");      /* html output only */
 include_once("db.php");          /* database only */
 include_once("functions.php");   /* the rest */
 
+/* check if some variables are set in the config file, else set defaults */
+if(!isset($EmailName))
+     $EmailName="[DoKo] ";
+
 if(0)
 {
   output_header();
@@ -22,125 +26,180 @@ output_header();
 
 /* check if we want to start a new game */
 if(myisset("new"))
-  output_form_for_new_game();
-
+{
+  $names = DB_get_all_names();
+  output_form_for_new_game($names);
+}
 /*check if everything is ready to set up a new game */
 else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD" ))
-  {
-    $PlayerA = $_REQUEST["PlayerA"];
-    $PlayerB = $_REQUEST["PlayerB"];
-    $PlayerC = $_REQUEST["PlayerC"];
-    $PlayerD = $_REQUEST["PlayerD"];
-    
-    $EmailA  = DB_get_email_by_name($PlayerA);
-    $EmailB  = DB_get_email_by_name($PlayerB);
-    $EmailC  = DB_get_email_by_name($PlayerC);
-    $EmailD  = DB_get_email_by_name($PlayerD);
-    
-    if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
-      {
-	echo "couldn't find one of the names, please start a new game";
-	exit();
-      }
-    
-    $useridA  = DB_get_userid_by_name($PlayerA);
-    $useridB  = DB_get_userid_by_name($PlayerB);
-    $useridC  = DB_get_userid_by_name($PlayerC);
-    $useridD  = DB_get_userid_by_name($PlayerD);
-    
-    /* create random numbers */
-    $randomNR       = create_array_of_random_numbers();
-    $randomNRstring = join(":",$randomNR);
-    
-    /* create game */
-    $followup = NULL;
-    if(myisset("followup") )
-      {
-	$followup= $_REQUEST["followup"];
-	mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,'1','pre','$followup' ,NULL)");
-      }
-    else
-      mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,'1','pre', NULL ,NULL)");
-    $game_id = mysql_insert_id();
-    
-    /* create hash */
-    $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA);
-    $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB);
-    $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC);
-    $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD);
-    
-    /* create hands */
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
-		", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,'false','false',NULL)");
-    $hand_idA = mysql_insert_id();							       
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
-		", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,'false','false',NULL)");
-    $hand_idB = mysql_insert_id();							       
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
-		", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,'false','false',NULL)");
-    $hand_idC = mysql_insert_id();							       
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
-		", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,'false','false',NULL)");
-    $hand_idD = mysql_insert_id();
-    
-    /* save cards */
-    for($i=0;$i<12;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idA', '".$randomNR[$i]."', 'false')");
-    for($i=12;$i<24;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idB', '".$randomNR[$i]."', 'false')");
-    for($i=24;$i<36;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idC', '".$randomNR[$i]."', 'false')");
-    for($i=36;$i<48;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
-
-    /* send out email, TODO: check for error with email */
-    $message = "\n".
-      "you are invited to play a game of DoKo (that is to debug the program ;).\n".
-      "Place comments and bug reports here:\n".
-      "http://wiki.nubati.net/index.php?title=EmailDoko\n\n".
-      "The whole round would consist of the following players:\n".
-      "$PlayerA\n".
-      "$PlayerB\n".
-      "$PlayerC\n".
-      "$PlayerD\n\n".
-      "If you want to join this game, please follow this link:\n\n".
-      " ".$host."?me=";
-    
-    mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
-    mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
-    mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
-    mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
-
-    
-    echo "You started a new game. The emails have been sent out!";    
-  }    
-/* end set up a new game */
-
+{
+  $PlayerA = $_REQUEST["PlayerA"];
+  $PlayerB = $_REQUEST["PlayerB"];
+  $PlayerC = $_REQUEST["PlayerC"];
+  $PlayerD = $_REQUEST["PlayerD"];
+  
+  $EmailA  = DB_get_email_by_name($PlayerA);
+  $EmailB  = DB_get_email_by_name($PlayerB);
+  $EmailC  = DB_get_email_by_name($PlayerC);
+  $EmailD  = DB_get_email_by_name($PlayerD);
+  
+  if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
+    {
+      echo "couldn't find one of the names, please start a new game";
+      exit();
+    }
+  
+  $useridA  = DB_get_userid_by_name($PlayerA);
+  $useridB  = DB_get_userid_by_name($PlayerB);
+  $useridC  = DB_get_userid_by_name($PlayerC);
+  $useridD  = DB_get_userid_by_name($PlayerD);
+  
+  /* create random numbers */
+  $randomNR       = create_array_of_random_numbers();
+  $randomNRstring = join(":",$randomNR);
+  
+  /* create game */
+  $followup = NULL;
+  if(myisset("followup") )
+    {
+      $followup= $_REQUEST["followup"];
+      $session = DB_get_session_by_gameid($followup);
+      if($session)
+	mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,'1','pre','$session' ,NULL)");
+      else
+	{
+	  /* get max session */
+	  $max = DB_get_max_session();
+	  $max++;
+	  mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,'1','pre','$max' ,NULL)");
+	  mysql_query("UPDATE Game SET session='".$max."' WHERE id=".DB_quote_smart($followup));
+	}
+    }
+  else
+    mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,'1','pre', NULL ,NULL)");
+  $game_id = mysql_insert_id();
+  
+  /* create hash */
+  $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA);
+  $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB);
+  $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC);
+  $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD);
+  
+  /* create hands */
+  mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
+	      ", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,'false','false',NULL)");
+  $hand_idA = mysql_insert_id();							       
+  mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
+	      ", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,'false','false',NULL)");
+  $hand_idB = mysql_insert_id();							       
+  mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
+	      ", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,'false','false',NULL)");
+  $hand_idC = mysql_insert_id();							       
+  mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
+	      ", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,'false','false',NULL)");
+  $hand_idD = mysql_insert_id();
+  
+  /* save cards */
+  for($i=0;$i<12;$i++)
+    mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idA', '".$randomNR[$i]."', 'false')");
+  for($i=12;$i<24;$i++)
+    mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idB', '".$randomNR[$i]."', 'false')");
+  for($i=24;$i<36;$i++)
+    mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idC', '".$randomNR[$i]."', 'false')");
+  for($i=36;$i<48;$i++)
+    mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
+  
+  /* send out email, TODO: check for error with email */
+  $message = "\n".
+    "you are invited to play a game of DoKo (that is to debug the program ;).\n".
+    "Place comments and bug reports here:\n".
+    "http://wiki.nubati.net/index.php?title=EmailDoko\n\n".
+    "The whole round would consist of the following players:\n".
+    "$PlayerA\n".
+    "$PlayerB\n".
+    "$PlayerC\n".
+    "$PlayerD\n\n".
+    "If you want to join this game, please follow this link:\n\n".
+    " ".$host."?me=";
+  
+  mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
+  mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
+  mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
+  mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
+  
+  echo "You started a new game. The emails have been sent out!";    
+}    /* end set up a new game */
+else if(myisset("cancle","me"))
+{
+  $me = $_REQUEST["me"];
+  
+  /* test for valid ID */
+  $myid = DB_get_userid_by_hash($me);
+  if(!$myid)
+    {
+      echo "Can't find you in the database, please check the url.<br />\n";
+      echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+      exit();
+    }
+  
+  DB_update_user_timestamp($myid);
+  
+  /* get some information from the DB */
+  $gameid   = DB_get_gameid_by_hash($me);
+  $myname   = DB_get_name_by_hash($me);
+  $mystatus = DB_get_status_by_hash($me);
+  $mypos    = DB_get_pos_by_hash($me);
+  
+  /* check if game really is old enough */
+  $result = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+  $r = mysql_fetch_array($result,MYSQL_NUM);
+  if(time()-strtotime($r[0]) > 60*60*24*30)
+    {
+      $message = "Hello, \n\n".
+	"Game $gameid has been cancled since nothing happend for a while and $myname requested it.\n";
+      
+      $userids = DB_get_all_userid_by_gameid($gameid);
+      foreach($userids as $user)
+	{
+	  $To = DB_get_email_by_userid($user);
+	  mymail($To,$EmailName."game cancled (timed out)",$message);
+	}
+      
+      /* delete everything from the dB */
+      DB_cancel_game($me);
+      
+      echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
+    }
+  else
+    echo "<p>You need to wait longer before you can cancle a game...</p>\n";
+}
 else if(myisset("me"))
-  {
-    /* handle request from one specific player,
-     * the hash is set on a per game base
-     */
-    
-    $me = $_REQUEST["me"];
-
-    /* test for valid ID */
-    $myid = DB_get_userid_by_hash($me);
-    if(!$myid)
-      {
-	echo "Can't find you in the database, please check the url.<br />\n";
-	echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
-	exit();
-      }
-    
-    DB_update_user_timestamp($myid);
-
-    /* get some information from the DB */
-    $gameid   = DB_get_gameid_by_hash($me);
-    $myname   = DB_get_name_by_hash($me);
-    $mystatus = DB_get_status_by_hash($me);
-    $mypos    = DB_get_pos_by_hash($me);
-    
+{
+  /* handle request from one specific player,
+`  * the hash is set on a per game base
+   */
+  
+  $me = $_REQUEST["me"];
+  
+  /* test for valid ID */
+  $myid = DB_get_userid_by_hash($me);
+  if(!$myid)
+    {
+      echo "Can't find you in the database, please check the url.<br />\n";
+      echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+      exit();
+    }
+  
+  DB_update_user_timestamp($myid);
+  
+  /* get some information from the DB */
+  $gameid   = DB_get_gameid_by_hash($me);
+  $myname   = DB_get_name_by_hash($me);
+  $mystatus = DB_get_status_by_hash($me);
+  $mypos    = DB_get_pos_by_hash($me);
+  
+  echo "<p class=\"gamenumber\"> Game $gameid </p>\n";
+       
     switch($mystatus)
       {
       case 'start':
@@ -164,7 +223,7 @@ else if(myisset("me"))
 		foreach($userids as $user)
 		  {
 		    $To = DB_get_email_by_userid($user);
-		    mymail($To,"[DoKo] game cancled",$message);
+		    mymail($To,$EmailName."game cancled",$message);
 		  }
 		
 		/* delete everything from the dB */
@@ -295,7 +354,7 @@ else if(myisset("me"))
 		foreach($userids as $user)
 		  {
 		    $To = DB_get_email_by_userid($user);
-		    mymail($To,"[DoKo] game cancled",$message);
+		    mymail($To,$EmailName."game cancled",$message);
 		  }
 		
 		/* delete everything from the dB */
@@ -605,7 +664,7 @@ else if(myisset("me"))
 		    foreach($userids as $user)
 		      {
 			$To = DB_get_email_by_userid($user);
-			mymail($To,"[DoKo] game over",$message);
+			mymail($To,$EmailName."game over",$message);
 		      }
 		  }
 		
@@ -648,7 +707,7 @@ else if(myisset("me"))
 
 		    $message = "It's your turn  now.\n".
 		      "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ;
-		    mymail($email,"[DoKo-debug] a card has been played",$message);
+		    mymail($email,$EmailName."a card has been played",$message);
 		    
 		    if($debug)
 		      echo "DEBUG:<a href=\"index.php?me=".DB_get_hash_from_game_and_pos($gameid,$next).
@@ -667,7 +726,7 @@ else if(myisset("me"))
 	  }
 	
 	$mycards = DB_get_hand($me);
-	mysort($mycards,$gametype);
+	$mycards = mysort($mycards,$gametype);
 	echo "<div class=\"mycards\">\n";
 	
 	if($myturn && !myisset("card"))
@@ -762,25 +821,32 @@ else if(myisset("me"))
 	DB_update_user_timestamp($uid);
 
 	echo "<p>these are the games you are playing in:<br />\n";
-	$result = mysql_query("SELECT hash,game_id from Hand WHERE user_id='$uid' AND status<>'gameover'" );
+	$result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date from Hand".
+			      " LEFT JOIN Game On Hand.game_id=Game.id".
+			      " WHERE Hand.user_id='$uid' AND Game.status<>'gameover'" );
 	while( $r = mysql_fetch_array($result,MYSQL_NUM))
-	  echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a><br />";
+	  {
+	    echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a>";
+	    if(time()-strtotime($r[2]) > 60*60*24*30)
+	       echo " The game has been running for over a month. Do you want to cancel it? <a href=\"$host?cancle=1&me=".$r[0]."\">yes</a> (clicking here is final and can't be restored)";
+	    echo "<br />";
+	  }
 	echo "</p>\n";
 
-	echo "<p>and these are your games that are already done:<br />\n";
+
+	echo "<p>and these are your games that are already done:<br />Game: \n";
 	$result = mysql_query("SELECT hash,game_id from Hand WHERE user_id='$uid' AND status='gameover'" );
 	while( $r = mysql_fetch_array($result,MYSQL_NUM))
-	  echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a><br />";
+	  echo "<a href=\"".$host."?me=".$r[0]."\">#".$r[1]." </a>, ";
 	echo "</p>\n";
 
 	$names = DB_get_all_names();
 	echo "<p>registered players:<br />\n";
 	foreach ($names as $name)
-	  echo "$name <br />\n";
+	  echo "$name, \n";
 	echo "</p>\n";
 
-	echo "<p>Want to start a new game? remember 4 names from the list above and visit ".
-	  "<a href=\"".$host."?new\">this page.</a></p>";
+	echo "<p>Want to start a new game? Visit <a href=\"".$host."?new\">this page.</a></p>";
       }
     else
       {