X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=output.php;h=2540492939d0d1c113ca6f910b35d73d624bf6ec;hp=845281563615800795606c6e54cbd79de07c735b;hb=0c5b3eeca3006f61dd326a86e8989c52694d581b;hpb=046b683603f1c49460079595f819591b1918c9a2

diff --git a/output.php b/output.php
index 8452815..2540492 100644
--- a/output.php
+++ b/output.php
@@ -2,35 +2,25 @@
 
 /* functions which only ouput html  */
 
-function display_links($email,$password)
-{
-  global $wiki;
-  echo "<div class=\"bug\">\n".
-    "Report bugs in the <a href=\"". $wiki."\">wiki</a>.<hr />\n";
-  output_link_to_user_page($email,$password);
-  echo  "</div>\n";
-  return;
-}
-
-function output_link_to_user_page($email,$password)
-{
-  echo "<a href=\"index.php\"> go to my user page </a>";
-
-  return;
-}
-
-function output_user_settings($email,$password)
+function output_user_settings()
 {
   global $PREF;
 
   echo "<div class=\"useroptions\">\n";
   echo "<h4> Settings </h4>\n";
-  echo "<a href=\"index.php?passwd=ask\">change password</a><br /";
+  echo "<a href=\"index.php?passwd=ask\">Change password</a><br />";
 
+  echo "<h5> Card set </h5>\n";
   if( $PREF["cardset"] == "english" )
-    echo "<a href=\"index.php?setpref=germancards\">use german cards</a><br />";
+    echo "<a href=\"index.php?setpref=germancards\">Change to German cards</a><br />";
+  else
+    echo "<a href=\"index.php?setpref=englishcards\">Change to English cards</a> <br />";
+
+  echo "<h5> Email </h5>\n";
+  if( $PREF["email"] == "emailaddict" )
+    echo "<a href=\"index.php?setpref=emailnonaddict\">Change to non-addicted mode (emails for each move)</a><br />";
   else
-    echo "<a href=\"index.php?setpref=englishcards\">use english cards</a> <br />";
+    echo "<a href=\"index.php?setpref=emailaddict\">Change to addicted mode (minimal amount of emails)</a> <br />";
 
   echo "</div>\n";
 
@@ -42,17 +32,15 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
   global $RULES;
 
   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\" method=\"post\">\n";
   echo "  <input type=\"hidden\" name=\"PlayerA\" value=\"$playerA\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerB\" value=\"$playerB\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerC\" value=\"$playerC\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerD\" value=\"$playerD\" />\n";
   echo "  <input type=\"hidden\" name=\"dullen\"  value=\"".$RULES["dullen"]."\" />\n";
   echo "  <input type=\"hidden\" name=\"schweinchen\" value=\"".$RULES["schweinchen"]."\" />\n";
-  echo "  <input type=\"hidden\" name=\"call\" value=\"".$RULES["call"]."\" />\n";
+  echo "  <input type=\"hidden\" name=\"callrule\" value=\"".$RULES["call"]."\" />\n";
   echo "  <input type=\"hidden\" name=\"followup\" value=\"$oldgameid\" />\n";
   echo "  <input type=\"submit\" value=\"keep playing\" />\n";
-  echo "</form>\n";
 
   return;
 }
@@ -62,59 +50,67 @@ function output_form_for_new_game($names)
 ?>
     <h2> Players </h2>
     <p>Please select four players (or use the randomly pre-selected names)</p>
+    <p>Remember: you need to be one of the players ;) </p>
        <form action="index.php" method="post">
+
+   <div class="table">
+     <img src="pics/table.png" alt="table" />
 <?php
     /* ask for player names */
+    $i=0;
   foreach( array("PlayerA","PlayerB","PlayerC","PlayerD") as $player)
-  {
-    srand((float) microtime() * 10000000);
-    $randkey = array_rand($names);
-    $rand = $names[$randkey];
-    echo "    Name:  <select name=\"$player\" size=\"1\" />  \n";
-    foreach($names as $name)
     {
-      if($name==$rand)
+      srand((float) microtime() * 10000000);
+      $randkey = array_rand($names);
+      $rand = $names[$randkey];
+      echo  "<div class=\"table".$i."\">\n";
+      $i++;
+      echo "    Name:  \n  <select name=\"$player\" size=\"1\" />  \n";
+      foreach($names as $name)
 	{
-	  echo "     <option selected=\"selected\">$name</option>\n";
+	  if($name==$rand)
+	    {
+	      echo "     <option selected=\"selected\">$name</option>\n";
+	    }
+	  else
+	    echo "     <option>$name</option>\n";
 	}
-      else
-	echo "     <option>$name</option>\n";
+      echo "  </select>\n</div>\n";
     }
-    echo "  </select>\n";
-   }
-?>   
-   <h2> Rules </h2> 
+?>
+    </div>
+   <h2 class="rules"> Rules </h2>
       <p> Some areas are grayed out which means that the rule is not implemented yet and therefore cannot be selected </p>
-      <p> ten of hearts: 
+      <p> Ten of hearts:
          <ul>
          <li> <input type="radio" name="dullen" value="none" /> just normal non-trump  </li>
          <li> <input type="radio" name="dullen" value="firstwins" /> first ten of hearts wins the trick </li>
          <li> <input type="radio" name="dullen" value="secondwins" checked="checked" /> second ten of hearts wins the trick </li>
          </ul>
       </p>
-      <p> schweinchen (both foxes), only in normal games or silent solos: 
+      <p> Schweinchen (both foxes), only in normal games or silent solos:
         <ul>
         <li> <input type="radio" name="schweinchen" value="none" checked="checked" /> none </li>
-        <li> <input type="radio" name="schweinchen" value="both" /> 
+        <li> <input type="radio" name="schweinchen" value="both" />
               both become highest trump (automatic call at beginning of the game)
         </li>
-        <li> <input type="radio" name="schweinchen" value="second" /> 
+        <li> <input type="radio" name="schweinchen" value="second" />
               first one normal, second one becomes highest (call during the game) </li>
-        <li> <input type="radio" name="schweinchen" value="secondaftercall"  disabled="disabled" /> 
+        <li> <input type="radio" name="schweinchen" value="secondaftercall"  disabled="disabled" />
       second one become highest only in case re/contra was announced (not working yet)
         </li>
         </ul>
       </p>
-      <p> Call Re/Contra, etc.: 
+      <p> Call Re/Contra, etc.:
         <ul>
-           <li><input type="radio" name="call" value="1st-own-card" checked="checked" />
+           <li><input type="radio" name="callrule" value="1st-own-card" checked="checked" />
                 Can call re/contra on the first <strong>own</strong> card played, 90 on the second, etc.</li>
-           <li><input type="radio" name="call" value="5th-card" /> 
+           <li><input type="radio" name="callrule" value="5th-card" />
                 Can call re/contra until 5th card is played, 90 until 9th card is played, etc.</li>
-           <li><input type="radio" name="call" value="9-cards"  /> 
+           <li><input type="radio" name="callrule" value="9-cards"  />
                 Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</li>
         </ul>
-      </p>      
+      </p>
    <input type="submit" value="start game" />
  </form>
 <?php
@@ -122,7 +118,7 @@ function output_form_for_new_game($names)
 
 function display_card($card,$dir="english")
 {
-  /* cards are only availabl for the odd values, e.g. 1.png, 3.png, ... 
+  /* cards are only availabl for the odd values, e.g. 1.png, 3.png, ...
    * convert even cards to the matching odd value */
 
   if( $card/2 - (int)($card/2) == 0.5)
@@ -145,9 +141,9 @@ function display_link_card($card,$dir="english",$type="card")
 function output_check_for_sickness($me,$mycards)
 {
  ?>
-  <form action="index.php" method="post">
+  <div class="sickness"> Thanks for joining the game...<br />
 
-    do you want to play solo? 
+    do you want to play solo?
     <select name="solo" size="1">
       <option selected="selected">No</option>
       <option>trumpless</option>
@@ -157,11 +153,11 @@ function output_check_for_sickness($me,$mycards)
       <option>club</option>
       <option>spade</option>
       <option>heart</option>
-    </select>     
+    </select>
     <br />
 
- <?php   
-      
+ <?php
+
   echo "Wedding?";
   if(check_wedding($mycards))
      {
@@ -198,7 +194,7 @@ function output_check_for_sickness($me,$mycards)
    echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
    echo "<input type=\"submit\" value=\"count me in\" />\n";
 
-   echo "</form>\n";
+   echo "</div>\n";
 
   return;
 }
@@ -207,72 +203,74 @@ function output_form_calls($me)
 {
   if( can_call(120,$me) )
     echo " re/contra (120):".
-      " <input type=\"radio\" name=\"call120\" value=\"yes\" /> <br />";
+      " <input type=\"radio\" name=\"call\" value=\"120\" /> <br />";
   if( can_call(90,$me) )
     echo " 90:".
-      " <input type=\"radio\" name=\"call90\" value=\"yes\" /> <br />";
+      " <input type=\"radio\" name=\"call\" value=\"90\" /> <br />";
   if( can_call(60,$me) )
     echo " 60:".
-      " <input type=\"radio\" name=\"call60\" value=\"yes\" /> ";
+      " <input type=\"radio\" name=\"call\" value=\"60\" /> <br />";
   if( can_call(30,$me) )
     echo " 30:".
-      " <input type=\"radio\" name=\"call30\" value=\"yes\" /> ";
+      " <input type=\"radio\" name=\"call\" value=\"30\" /> <br />";
   if( can_call(0,$me) )
     echo " 0:".
-      " <input type=\"radio\" name=\"call0\" value=\"yes\" /> ".
+      " <input type=\"radio\" name=\"call\" value=\"0\" /> <br />".
       " no call:".
-      " <input type=\"radio\" name=\"call0\" value=\"no\" /> ";
+      " <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
 }
 
 
 function output_check_want_to_play($me)
 {
    ?>
- <form action="index.php" method="post">
-   Do you want to play a game of DoKo?
+ <div class="joingame">
+   Do you want to play a game of DoKo? <br />
    yes<input type="radio" name="in" value="yes" />
    no<input type="radio" name="in" value="no" /> <br />
-<?php   
+<?php
   echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
   echo "\n";
-  echo "<input type=\"submit\" value=\"count me in\" />\n";
-  echo " </form>\n";
+  echo "<input type=\"submit\" value=\"submit\" />\n";
+  echo " </div>\n";
 
   return;
 }
 
 function output_home_page($pre,$game,$done,$avgtime)
 {
-?>
-    <p> If you want to play a game of Doppelkopf, you found the right place ;) </p>
-<?php
-    if($pre == 0)
-      echo "<p> At the moment there are no games that are being started ";
-    else if($pre==1)
-      echo "<p> At the moment there is one games that is being started ";
-    else
-      echo "<p> At the moment there are $pre games that are being started ";
-
-    echo "and ";
-
-    if($game==0)
-      echo "zero games that are ongoing. ";
-    else if($game==1)	
-      echo "one game that is ongoing. ";
-    else 
-      echo "$game games that are ongoing. ";
-
-    echo "<br />\n";
-
-    if($done==0)
-      echo "No game has been completed on this server. </p>";
-    else if($done==1)
-      echo "One game has been completed on this server. </p>";
-    else
-      echo "$done games have been completed on this server. Average time of a game: $avgtime days</p>";
+  global $WIKI;
+  
+  echo"<p> If you want to play a game of Doppelkopf, you found the right place ;)".
+    " For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>";
+  
+  if($pre == 0)
+    echo "<p> At the moment there are no games that are being started ";
+  else if($pre==1)
+    echo "<p> At the moment there is one games that is being started ";
+  else
+    echo "<p> At the moment there are $pre games that are being started ";
+  
+  echo "and ";
+  
+  if($game==0)
+    echo "zero games that are ongoing. ";
+  else if($game==1)
+    echo "one game that is ongoing. ";
+  else
+    echo "$game games that are ongoing. ";
+  
+  echo "<br />\n";
+  
+  if($done==0)
+    echo "No game has been completed on this server. </p>";
+  else if($done==1)
+    echo "One game has been completed on this server. </p>";
+  else
+    echo "$done games have been completed on this server. Average time of a game: $avgtime days</p>";
 ?>
 
-    <p> Please <a href="register.php">register</a>, in case you haven't done that yet  <br />
+    <p> Please <a href="./register.php">register</a>, in case you have not done that yet  <br />
         or login with you email-address or name and password here:
     </p>
         <form action="index.php" method="post">
@@ -308,12 +306,13 @@ function output_header()
   <head>
      <title>e-Doko</title>
      <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
-     <link rel="stylesheet" type="text/css" href="css/standard.css" />	
+     <link rel="shortcut icon" type="image/x-icon" href="pics/edoko-favicon.png" />
+     <link rel="stylesheet" type="text/css" href="css/standard.css" />
      <script type="text/javascript">
        function hl(num) {
          if(document.getElementById){
 	   var i;
-	   for(i=1;i<13;i++){
+	   for(i=1;i<14;i++){
 	     if(document.getElementById("trick"+i))
 	       document.getElementById("trick"+i).style.display = 'none';
 	   }
@@ -323,7 +322,7 @@ function output_header()
        function high_last(){
 	 if(document.getElementById){
 	   var i;
-	   for(i=12;i>0;i--) {
+	   for(i=13;i>0;i--) {
 	     if(document.getElementById("trick"+i))
 	       {
 		 hl(i);
@@ -338,8 +337,9 @@ function output_header()
 <div class="header">
 <h1> Welcome to E-Doko <sup style="color:#888;">(beta)</sup> </h1>
 </div>
-
 <?php
+
+  echo "<div class=\"main\">";
   return;
 }
 
@@ -347,17 +347,18 @@ function output_footer()
 {
   global $REV,$PREF;
 
+  echo "</div>\n\n";
   echo "<div class=\"footer\">\n";
-  echo "<p class=\"left\"> copyright 2006-2007 Arun Persaud <br />\n".
-    "Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />".
-    "- ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />".
-    "a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n";
- echo "<p class=\"right\"> See the latest changes <a href=\"http://nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=summary\">".
-    "via git </a> <br />or download the source via <br />'git clone http://nubati.net/git/e-DoKo.git' <br />".
-    "<a href=\"http://www.dreamhost.com/green.cgi\">".
-    "<img  border=\"0\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
-    "src=\"https://secure.newdream.net/green1.gif\" height=\"32\" width=\"100\" /></a>".
-    "</p> \n";
+  echo "  <p class=\"left\"> copyright 2006-2008 Arun Persaud, Lance Thornton <br />\n".
+    "  Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n".
+    "  - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n".
+    "  a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n";
+ echo "  <p class=\"right\"> See the latest changes <a href=\"http://nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=summary\">\n".
+    "  via git </a> <br />or download the source via <br />\n'git clone http://nubati.net/git/e-DoKo.git' <br />\n".
+    "  <a href=\"http://www.dreamhost.com/green.cgi\">\n".
+    "  <img  border=\"0\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
+    "src=\"https://secure.newdream.net/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
+    "  </p> \n";
   echo "\n";
   echo "</div>\n";
 
@@ -367,13 +368,30 @@ function output_footer()
   return;
 }
 
-function output_status($name)
+function output_status()
 {
-  echo "<div class=\"status\">\n";
-  echo $name;
-  echo " <a href=\"index.php?logout=1\">logout</a>\n";
-  echo "</div>";
+  global $defaulttimezone;
+   if(isset($_SESSION["name"]))
+     {
+       $name = $_SESSION["name"];
+
+       /* logout info */
+       echo "\n<div class=\"status\">";
+       echo $name;
+       echo " <a href=\"index.php?logout=1\">logout</a>";
+       echo "</div>\n";
+
+       /* last logon time */
+       $myid  = DB_get_userid("name",$name);
+       $zone  = DB_get_user_timezone($myid);
 
+       $time     = DB_get_user_timestamp($myid);
+       date_default_timezone_set($defaulttimezone);
+       $unixtime = strtotime($time);
+       date_default_timezone_set($zone);
+
+       echo "<div class=\"lastlogin\">last login: ".date("r",$unixtime)."</div>\n";
+     };
   return;
 }
 
@@ -386,7 +404,7 @@ function output_password_recovery($email,$password)
   echo "  <input type=\"hidden\" name=\"email\" value=\"".$email."\" />\n";
   echo "  <input type=\"hidden\" name=\"password\" value=\"".$password."\" />\n";
   echo "  <input type=\"hidden\" name=\"passwd\"  value=\"set\" />\n";
-?>    
+?>
      <fieldset>
        <legend>Password recovery</legend>
         <table>