X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=20ca7faf5e7d609df4bfecc261d002fe4869428c;hp=4a38ed8c9bde2ba498a86c0266c7aab1d9afe85c;hb=4d12bf8c86b466aff0ba2252ecb42830478a1a8a;hpb=e70edfecc1252420ceb06f55a97e1f14f76a767a

diff --git a/index.php b/index.php
index 4a38ed8..20ca7fa 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,7 @@
   <head>
      <title>e-Doko</title>
      <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
-     <link rel="stylesheet" type="text/css" href="standard.css" />	
+     <link rel="stylesheet" type="text/css" href="css/standard.css" />	
      <script type="text/javascript">
        function hl(num) {
          if(document.getElementById){
@@ -37,33 +37,22 @@
 </div>
 
 <?php
+/* end header */
+
 error_reporting(E_ALL);
-     
-include_once("functions.php");
-include_once("db.php");
 
-DB_open();
+include_once("config.php");     
+include_once("output.php");      /* html output only */
+include_once("db.php");          /* database only */
+include_once("functions.php");   /* the rest */
 
-/* end header */
+DB_open();
 
 /*****************  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"]) && 
@@ -107,7 +96,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);
@@ -137,7 +126,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".
@@ -166,22 +155,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)
       {
@@ -189,7 +178,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"]))
 	  {
@@ -200,8 +188,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".
@@ -209,6 +197,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
@@ -232,7 +221,7 @@ else if(isset($_REQUEST["me"]))
 	break;
 	
       case 'check':
-	echo "no checking at the moment... you need to play a normal game";
+	echo "no checking at the moment... you need to play a normal game. At the moment you need to reload this page to finish the setup.";
 	if(!isset($_REQUEST["solo"])    || 
 	   !isset($_REQUEST["wedding"]) ||
 	   !isset($_REQUEST["poverty"]) ||
@@ -291,28 +280,56 @@ else if(isset($_REQUEST["me"]))
 
 	break;
       case 'play':
-      case 'gameover': /* gameover and play, so that the tricks are visible for both */
-	display_news();
+      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 local time */
+	echo "<div class=\"time\">\n Local times:<table>";
+	$users = array();
+	$users = DB_get_all_userid_by_gameid($gameid);
+	foreach($users as $user)
+	  {
+	    $offset = DB_get_user_timezone($user);
+	    $zone = return_timezone($offset);
+	    date_default_timezone_set($zone);
+	    $name = DB_get_name_by_userid($user);
+	    
+	    echo "<tr> <td>$name</td> <td>".date("Y-m-d H:i:s")."</td></tr>\n";
+	  };
+	echo "</table>\n</div>\n";
 	display_status();
 
-	$gamestatus =DB_get_game_status_by_gameid($gameid);
+	/* display links to other games */
+	echo "<div class=\"over\">\n";
+	$result = mysql_query("SELECT email,password from User WHERE id='$myid'" );
+	$r = mysql_fetch_array($result,MYSQL_NUM);
+	echo "<form action=\"index.php\" method=\"post\">\n";
+	echo "  <input type=\"hidden\" name=\"email\" value=\"".$r[0]."\" />\n";
+	echo "  <input type=\"hidden\" name=\"password\" value=\"".$r[1]."\" />\n";
+	echo "  <input type=\"submit\" value=\"go to my user page\" />\n";
+	echo "</form>\n";
+	echo "</div>\n";
+
+	display_news();
+
+	$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,".
 			      "       Play.sequence as sequence, ".
 			      "       Hand.hash     as hash,     ".
-			      "       Trick.id ".
+			      "       Trick.id, ".
+			      "       Comment.comment ".
 			      "FROM Trick ".
 			      "LEFT JOIN Play ON Trick.id=Play.trick_id ".
 			      "LEFT JOIN Hand_Card ON Play.hand_card_id=Hand_Card.id ".
 			      "LEFT JOIN Hand ON Hand_Card.hand_id=Hand.id ".
 			      "LEFT JOIN User ON User.id=Hand.user_id ".
+			      "LEFT JOIN Comment ON Play.id=Comment.play_id ".
 			      "WHERE Trick.game_id='".$gameid."' ".
 			      "ORDER BY Trick.id,sequence ASC");
 	
@@ -322,17 +339,18 @@ 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)
 	      {
@@ -346,7 +364,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 */
@@ -354,8 +372,7 @@ else if(isset($_REQUEST["me"]))
 	    
 	    $play[$pos]=$r[0];
 	    
-	    $comment=0;
-	    if($comment)
+	    if($comment!="")
 	      echo "        <span class=\"comment\">";
 	    else
 	      echo "        <span>";
@@ -364,7 +381,7 @@ else if(isset($_REQUEST["me"]))
 	    echo $r[1];
 	    
 	    /* check for comment */
-	    if($comment)
+	    if($comment!="")
 	      echo "<span>".$comment."</span>";
 	    echo "</span>\n        ";
 	    
@@ -379,7 +396,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";
@@ -402,10 +420,6 @@ else if(isset($_REQUEST["me"]))
 	else
 	  $myturn = 0;
 
-	if(isset($_REQUEST["comment"]))
-	  {
-	
-	  }  
 	/* do we want to play a card? */
 	if(isset($_REQUEST["card"]) && $myturn)
 	  {
@@ -428,7 +442,14 @@ else if(isset($_REQUEST["me"]))
 		$trickid  = $a[0];
 		$sequence = $a[1];
 		
-		DB_play_card($trickid,$handcardid,$sequence);
+		$playid = DB_play_card($trickid,$handcardid,$sequence);
+
+		/*check for coment */
+		if(isset($_REQUEST["comment"]))
+		  {
+		    DB_insert_comment($_REQUEST["comment"],$playid,$myid);
+		  };  
+
 		echo "<div class=\"card\">";
 		echo " you played  <br />";
 		display_card($card);
@@ -467,7 +488,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";
@@ -527,7 +555,7 @@ else if(isset($_REQUEST["me"]))
 	    $names = DB_get_all_names_by_gameid($gameid);
 	    
 	    echo "Do you want to continue playing?(This will start a new game, with the next person as dealer.)\n";
-	    echo "<form action=\"index.php\" methog=\"post\">\n";
+	    echo "<form action=\"index.php\" method=\"post\">\n";
 	    echo "  <input type=\"hidden\" name=\"PlayerA\" value=\"".($names[1])."\" />\n";
 	    echo "  <input type=\"hidden\" name=\"PlayerB\" value=\"".($names[2])."\" />\n";
 	    echo "  <input type=\"hidden\" name=\"PlayerC\" value=\"".($names[3])."\" />\n";
@@ -542,14 +570,20 @@ 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 */
+    $email     = $_REQUEST["email"];
+    $password  = $_REQUEST["password"];
+
+    if(strlen($password)!=32)
+      $password = md5($password);
+
     $ok=1;
-    $uid = DB_get_userid_by_email($_REQUEST["email"]);
+    $uid = DB_get_userid_by_email_and_password($email,$password);
     if(!$uid)
       $ok=0;
-    if(!DB_get_userid_by_passwd(md5($_REQUEST["password"])))
-      $ok=0;
 
     if($ok)
       {
@@ -560,15 +594,14 @@ else if(isset($_REQUEST["me"]))
 	$zone = return_timezone($offset);
 	date_default_timezone_set($zone);
 
-	echo "ok. your logged in, now what? :) <br />last login: ";
-	echo date("r",$unixtime)."<br />";
+	echo "last login: ".date("r",$unixtime)."<br />";
 
 	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'" );
 	while( $r = mysql_fetch_array($result,MYSQL_NUM))
-	  echo "<a href=\"http://doko.nubati.net/database/index.php?me=".$r[0]."\">game #".$r[1]." </a><br />";
+	  echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a><br />";
 	echo "</p>\n";
 
 	$names = DB_get_all_names();
@@ -577,7 +610,7 @@ else if(isset($_REQUEST["me"]))
 	  echo "$name <br />\n";
 	echo "</p>\n";
 	echo "<p>Want to start a new game? remember 4 names from the list above and visit ".
-	  "<a href=\"http://doko.nubati.net/database/index.php?new\">this page.</a></p>";
+	  "<a href=\"".$host."?new\">this page.</a></p>";
       }
     else
       {
@@ -585,8 +618,10 @@ else if(isset($_REQUEST["me"]))
       }
     exit();
   }
+/* page for registration */
 else if(isset($_REQUEST["register"]) )
   {
+    echo "IMPORTANT: passwords are going over the net as clear text, so pick an easy password. No need to pick anything complicated here ;)<br /><br />";
     echo "TODO: convert timezone into a menu<br />\n";
     echo "TODO: figure out a way to handle passwrods <br />\n";
 ?>
@@ -615,6 +650,7 @@ else if(isset($_REQUEST["register"]) )
         </form>
 <?php
   }
+/* new user wants to register */
 else if(isset($_REQUEST["Rfullname"]) && 
 	isset($_REQUEST["Remail"]   ) && 
 	isset($_REQUEST["Rpassword"]) && 
@@ -644,30 +680,10 @@ 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:
-        <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>
-              </tr><tr>
-               <td><label for="password">Password:</label></td><td><input type="password" id="password" name="password" size="20" maxsize="30" /></td>
-              </tr><tr>
-               <td> <input type="submit" value="login" /></td>
-             </table>
-          </fieldset>
-        </form>
- 
-    </p>
-
-
-<?php
+    home_page();
   }
 ?>
 </body>
