X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=689a8ceeb161c98c235ffea3221f58876c2f1b8f;hp=6208038dce9bfb09ddb3fef18139418394938b40;hb=51312acc9682902810edee454471aae1ce59d80c;hpb=320ebe96e21e08d5fad1a4ccbef241d5defd92bc

diff --git a/index.php b/index.php
index 6208038..689a8ce 100644
--- a/index.php
+++ b/index.php
@@ -37,6 +37,8 @@
 </div>
 
 <?php
+/* end header */
+
 error_reporting(E_ALL);
 
 include_once("config.php");     
@@ -45,26 +47,11 @@ include_once("db.php");
 
 DB_open();
 
-/* end header */
-
 /*****************  M A I N **************************/
 
 /* check if we want to start a new game */
 if(isset($_REQUEST["new"]))
-  {
-?>
-    <p>Please add 4 names, please make sure that the names are correct! </p>
-       <form action="index.php" method="post">
-   Name:  <input name="PlayerA" type="text" size="10" maxlength="20" /> 
-   Name:  <input name="PlayerB" type="text" size="10" maxlength="20" /> 
-   Name:  <input name="PlayerC" type="text" size="10" maxlength="20" /> 
-   Name:  <input name="PlayerD" type="text" size="10" maxlength="20" /> 
-
-   <input type="submit" value="start game" />
- </form>
-<?php
-  } 
-/* end start a new game */
+     output_form_for_new_game();
 
 /*check if everything is ready to set up a new game */
 else if( isset($_REQUEST["PlayerA"]) && 
@@ -108,7 +95,7 @@ else if( isset($_REQUEST["PlayerA"]) &&
       mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', NULL, NULL,'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);
@@ -138,7 +125,7 @@ else if( isset($_REQUEST["PlayerA"]) &&
     for($i=36;$i<48;$i++)
       mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
 
-    /* send out email, check for error with email */
+    /* 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".
@@ -167,22 +154,22 @@ else if(isset($_REQUEST["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.";
-	 exit();
+	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);
-
-    /* get game id */
-    $gameid = DB_get_gameid_by_hash($me);
     
     switch($mystatus)
       {
@@ -190,7 +177,6 @@ else if(isset($_REQUEST["me"]))
 	check_want_to_play($me);
 	DB_set_hand_status_by_hash($me,'init');
 	break;
-	
       case 'init':
 	if( !isset($_REQUEST["in"]) || !isset($_REQUEST["update"]))
 	  {
@@ -201,8 +187,8 @@ else if(isset($_REQUEST["me"]))
 	  {
 	    if($_REQUEST["in"] == "no")
 	      {
-		echo "TODO: email everyone that the game has been canceld<br />";
-		 /*something like
+		echo "TODO: email everyone that the game has been canceled.<br />";
+		 /*something like need to modify for DB backend
 		 for($i=0;$i<4;$i++)
  		   {
  		     $message = "Hello ".$player[$hash[$i]]["name"].",\n\n".
@@ -210,6 +196,7 @@ else if(isset($_REQUEST["me"]))
  		     mymail($player[$hash[$i]]["email"],"[DoKo-Debug] the game has been canceled",$message); 
  		   }
 		 */
+		/* delete everything from the dB */
 		DB_cancel_game($me);
 	      }
 	    else
@@ -292,17 +279,17 @@ else if(isset($_REQUEST["me"]))
 
 	break;
       case 'play':
-      case 'gameover': /* gameover and play, so that the tricks are visible for both */
+      case 'gameover': /*both entries here,  so that the tricks are visible for both in case of 'play' there is a break later that skips the last part*/
 	display_news();
 	display_status();
 
-	$gamestatus =DB_get_game_status_by_gameid($gameid);
+	$gamestatus = DB_get_game_status_by_gameid($gameid);
 	if($gamestatus == 'pre')
 	  {
 	    echo "you need to wait for the others... <br />";
 	    break;
 	  }
-	/* get trick ids */
+	/* get everythin relevant to display the tricks */
 	$result = mysql_query("SELECT Hand_Card.card_id as card,".
 			      "       User.fullname as name,".
 			      "       Hand.position as position,".
@@ -325,17 +312,17 @@ else if(isset($_REQUEST["me"]))
 	$lasttrick = DB_get_max_trickid($gameid);
 	
 	$play = array(); /* needed to calculate winner later  */
-	$seq=1;          
-	$pos=0;
+	$seq  = 1;          
+	$pos  = 0;
 	
 	echo "\n<ul class=\"oldtrick\">\n";
 	echo "  <li> Hello $myname!   History: </li>\n";
 	
 	while($r = mysql_fetch_array($result,MYSQL_NUM))
 	  {
-	    $seq   = $r[3];
-	    $pos   = $r[2];
-	    $trick = $r[5];
+	    $seq     = $r[3];
+	    $pos     = $r[2];
+	    $trick   = $r[5];
 	    $comment = $r[6];
 	    
 	    if($trick!=$lasttrick && $seq==1)
@@ -350,7 +337,7 @@ else if(isset($_REQUEST["me"]))
 		/* start of a last trick? */
 		echo "  <li onclick=\"hl('$trickNR');\"><a href=\"#\">Current Trick</a>\n".
 		  "    <div class=\"table\" id=\"trick".$trickNR."\">\n".
-		  "      <img class=\"table\" src=\"pics/table".($pos-1).".png\" alt=\"table\" />";
+		  "      <img class=\"table\" src=\"pics/table".($pos-1).".png\" alt=\"table\" />\n";
 	      }
 	    
 	    /* display card */
@@ -382,7 +369,8 @@ else if(isset($_REQUEST["me"]))
 		echo "    </div>\n  </li>\n";  /* end div table, end li table */
 	      }
 	  }
-	if($seq!=4) 
+
+	if($seq!=4 && $trickNR>1) 
 	  echo "    </div>\n  </li>\n";  /* end div table, end li table */
 	
 	echo "</ul>\n";
@@ -473,7 +461,14 @@ else if(isset($_REQUEST["me"]))
 		      }
 		    if($next==5) $next=1;
 
-		    echo "TODO: email next player at pos $next <br />";
+		    /* email next player */
+		    $next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
+		    $email     = DB_get_email_by_hash($next_hash);
+
+		    $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);
+
 		    if($debug)
 		      echo "DEBUG:<a href=\"index.php?me=".DB_get_hash_from_game_and_pos($gameid,$next).
 			"\"> next player </a> <br />\n";
@@ -548,8 +543,10 @@ else if(isset($_REQUEST["me"]))
       }
     exit();
   } 
+/* user status page */ 
  else if(isset($_REQUEST["email"]) && isset($_REQUEST["password"]))
   {
+    /* test id and password, should really be done in one step */
     $ok=1;
     $uid = DB_get_userid_by_email($_REQUEST["email"]);
     if(!$uid)
@@ -591,6 +588,7 @@ else if(isset($_REQUEST["me"]))
       }
     exit();
   }
+/* page for registration */
 else if(isset($_REQUEST["register"]) )
   {
     echo "TODO: convert timezone into a menu<br />\n";
@@ -621,6 +619,7 @@ else if(isset($_REQUEST["register"]) )
         </form>
 <?php
   }
+/* new user wants to register */
 else if(isset($_REQUEST["Rfullname"]) && 
 	isset($_REQUEST["Remail"]   ) && 
 	isset($_REQUEST["Rpassword"]) && 
@@ -650,27 +649,28 @@ else if(isset($_REQUEST["Rfullname"]) &&
 	      echo " something went wrong";
 	  }
   }
+/* default login page */
 else
   { /* no new game, not in a game */
 ?>
     <p> If you want to play a game of Doppelkopf, you found the right place ;) </p>
     <p> Please <a href="index.php?register">register</a>, in case you haven't done yet  <br />
         or login with you email-address or name and password here:
+    </p>
         <form action="index.php" method="post">
           <fieldset>
             <legend>Login</legend>
              <table>
               <tr>
-               <td><label for="email">Email:</label></td><td><input type="text" id="email" name="email" size="20" maxsize="30" /> </td>
+               <td><label for="email">Email:</label></td><td><input type="text" id="email" name="email" size="20" maxlength="30" /> </td>
               </tr><tr>
-               <td><label for="password">Password:</label></td><td><input type="password" id="password" name="password" size="20" maxsize="30" /></td>
+               <td><label for="password">Password:</label></td><td><input type="password" id="password" name="password" size="20" maxlength="30" /></td>
               </tr><tr>
                <td> <input type="submit" value="login" /></td>
              </table>
           </fieldset>
         </form>
- 
-    </p>
+
 
 
 <?php