X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=output.php;h=39f67b06c7ddc1d430918fc1d0f2bd68a693f94f;hp=ec827c75766982beb6d6ccfea82aacf6e703ecfd;hb=9732aef914603924915bde24684f322843ead085;hpb=d4a85c497c76daa0c5d6481ffe2239590bf0c401

diff --git a/output.php b/output.php
index ec827c7..39f67b0 100644
--- a/output.php
+++ b/output.php
@@ -2,102 +2,45 @@
 
 /* functions which only ouput html  */
 
-function display_links($email,$password)
+function output_user_settings()
 {
-  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 "<div class=\"over\">\n";
-  echo "<form action=\"index.php\" method=\"post\">\n";
-  echo "  <input type=\"hidden\" name=\"email\" value=\"".$email."\" />\n";
-  echo "  <input type=\"hidden\" name=\"password\" value=\"".$password."\" />\n";
-  echo "  <input type=\"submit\" class=\"submitbutton\" value=\"go to my user page\" />\n";
-  echo "</form>\n";
-  echo "</div>\n";
-  
-  return;
-}
+  global $PREF;
 
-function output_user_settings($email,$password)
-{
   echo "<div class=\"useroptions\">\n";
   echo "<h4> Settings </h4>\n";
-  echo "<form action=\"index.php\" method=\"post\">\n";
-  echo "  <input type=\"hidden\" name=\"email\" value=\"".$email."\" />\n";
-  echo "  <input type=\"hidden\" name=\"password\" value=\"".$password."\" />\n";
-  echo "  <input type=\"submit\" class=\"submitbutton\" name=\"passwd\" value=\"change password\" /> <br />\n";
-  echo "</form>\n";
-  echo "<form action=\"index.php\" method=\"post\">\n";
-  echo "  <input type=\"hidden\" name=\"email\" value=\"".$email."\" />\n";
-  echo "  <input type=\"hidden\" name=\"password\" value=\"".$password."\" />\n";
-  echo "  <input type=\"hidden\" name=\"setpref\"  value=\"englishcards\" />\n";
-  echo "  <input type=\"submit\" class=\"submitbutton\" value=\"use english cards\" /> <br />\n";
-  echo "</form>\n";
-  echo "<form action=\"index.php\" method=\"post\">\n";
-  echo "  <input type=\"hidden\" name=\"email\" value=\"".$email."\" />\n";
-  echo "  <input type=\"hidden\" name=\"password\" value=\"".$password."\" />\n";
-  echo "  <input type=\"hidden\" name=\"setpref\"  value=\"germancards\" />\n";
-  echo "  <input type=\"submit\" class=\"submitbutton\" value=\"use german cards\" /> <br />\n";
-  echo "</form>\n";
+  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 />";
+  else
+    echo "<a href=\"index.php?setpref=englishcards\">use english cards</a> <br />";
+
+  echo "<h5> Email </h5>\n";
+  if( $PREF["email"] == "emailaddict" )
+    echo "<a href=\"index.php?setpref=emailnonaddict\">I'm not addicted (emails for each move)</a><br />";
+  else
+    echo "<a href=\"index.php?setpref=emailaddict\">Addicted (minimal amount of emails)</a> <br />";
+
   echo "</div>\n";
-  return;
-}
 
-function output_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 passwords <br />\n";
-  ?>
-        <form action="index.php" method="post">
-          <fieldset>
-            <legend>Register</legend>
-             <table>
-              <tr>
-               <td><label for="Rfullname">Full name:</label></td>
-	       <td><input type="text" id="Rfullname" name="Rfullname" size="20" maxsize="30" /> </td>
-              </tr><tr>
-               <td><label for="Remail">Email:</label></td>
-	       <td><input type="text" id="Remail" name="Remail" size="20" maxsize="30" /></td>
-              </tr><tr>
-	       <td><label for="Rpassword">Password(will be displayed in cleartext on the next page):</label></td>
-               <td><input type="password" id="Rpassword" name="Rpassword" size="20" maxsize="30" /></td>
-              </tr><tr>
-	       <td><label for="Rtimezone">Timezone:</label></td>
-               <td>
-                  <input type="text" id="Rtimezone" name="Rtimezone" size="4" maxsize="4" value="+1" />
-	       </td>
-              </tr><tr>
-               <td colspan="2"> <input type="submit" value="register" /></td>
-             </table>
-          </fieldset>
-        </form>
-<?php
   return;
-}					   
+}
 
 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=\"followup\" value=\"$oldgameid\" />\n";
   echo "  <input type=\"submit\" value=\"keep playing\" />\n";
-  echo "</form>\n";
 
   return;
 }
@@ -108,13 +51,19 @@ function output_form_for_new_game($names)
     <h2> Players </h2>
     <p>Please select four players (or use the randomly pre-selected names)</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  "<span class=\"table".$i."\">";
+    $i++;
     echo "    Name:  <select name=\"$player\" size=\"1\" />  \n";
     foreach($names as $name)
     {
@@ -125,10 +74,11 @@ function output_form_for_new_game($names)
       else
 	echo "     <option>$name</option>\n";
     }
-    echo "  </select>\n";
+    echo "  </select></span>\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: 
          <ul>
@@ -150,7 +100,16 @@ function output_form_for_new_game($names)
         </li>
         </ul>
       </p>
-      
+      <p> Call Re/Contra, etc.: 
+        <ul>
+           <li><input type="radio" name="call" 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" /> 
+                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"  /> 
+                Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</li>
+        </ul>
+      </p>      
    <input type="submit" value="start game" />
  </form>
 <?php
@@ -162,9 +121,9 @@ function display_card($card,$dir="english")
    * convert even cards to the matching odd value */
 
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<img src=\"cards/".$dir."/".$card.".png\"  alt=\"".card_to_name($card)."\" />\n";
+    echo "<img src=\"cards/".$dir."/".$card.".png\"  alt=\"".DB_get_card_name($card)."\" />\n";
   else
-    echo "<img src=\"cards/".$dir."/".($card-1).".png\"  alt=\"".card_to_name($card-1)."\" />\n";
+    echo "<img src=\"cards/".$dir."/".($card-1).".png\"  alt=\"".DB_get_card_name($card-1)."\" />\n";
 
   return;
 }
@@ -172,18 +131,16 @@ function display_card($card,$dir="english")
 function display_link_card($card,$dir="english",$type="card")
 {
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<div class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".$card.".png\" alt=\"\" /></div>\n";
+    echo "<div class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".$card.".png\" alt=\"".DB_get_card_name($card)."\" /></div>\n";
   else
-    echo "<div class=\"cardinput\" ><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"\" /></div>\n";
+    echo "<div class=\"cardinput\" ><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"".DB_get_card_name($card-1)."\" /></div>\n";
   return;
 }
 
-function check_for_sickness($me,$mycards)
+function output_check_for_sickness($me,$mycards)
 {
  ?>
-  <p> Solo will work, but the first player will not change. Nothing else implemented. </p>	 	  
-
-  <form action="index.php" method="post">
+  <div class="sickness"> Thanks for joining the game...<br />
 
     do you want to play solo? 
     <select name="solo" size="1">
@@ -200,7 +157,7 @@ function check_for_sickness($me,$mycards)
 
  <?php   
       
-  echo "wedding?";
+  echo "Wedding?";
   if(check_wedding($mycards))
      {
        echo " yes<input type=\"radio\" name=\"wedding\" value=\"yes\" checked=\"checked\" />";
@@ -211,7 +168,7 @@ function check_for_sickness($me,$mycards)
        echo " no <input type=\"hidden\" name=\"wedding\" value=\"no\" /> <br />\n";
      };
 
-  echo "do you have poverty?";
+  echo "Do you have poverty?";
   if(count_trump($mycards)<4)
     {
       echo " yes<input type=\"radio\" name=\"poverty\" value=\"yes\" checked=\"checked\" />";
@@ -222,7 +179,7 @@ function check_for_sickness($me,$mycards)
       echo " no <input type=\"hidden\" name=\"poverty\" value=\"no\" /> <br />\n";
     };
 
-   echo "do you have too many nines?";
+   echo "Do you have too many nines?";
   if(count_nines($mycards)>4)
      {
        echo " yes<input type=\"radio\" name=\"nines\" value=\"yes\" checked=\"checked\" />";
@@ -236,34 +193,50 @@ function 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;
 }
 
-function check_want_to_play($me)
+function output_form_calls($me)
+{
+  if( can_call(120,$me) )
+    echo " re/contra (120):".
+      " <input type=\"radio\" name=\"call120\" value=\"yes\" /> <br />";
+  if( can_call(90,$me) )
+    echo " 90:".
+      " <input type=\"radio\" name=\"call90\" value=\"yes\" /> <br />";
+  if( can_call(60,$me) )
+    echo " 60:".
+      " <input type=\"radio\" name=\"call60\" value=\"yes\" /> <br />";
+  if( can_call(30,$me) )
+    echo " 30:".
+      " <input type=\"radio\" name=\"call30\" value=\"yes\" /> <br />";
+  if( can_call(0,$me) )
+    echo " 0:".
+      " <input type=\"radio\" name=\"call0\" value=\"yes\" /> <br />".
+      " no call:".
+      " <input type=\"radio\" name=\"call0\" 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   
-/*
-   Do you want to get an email for every card played or only if it your move?
-   every card<input type="radio" name="update" value="card" />
-   only on my turn<input type="radio" name="update" value="turn" /> <br />
-*/
   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)
+function output_home_page($pre,$game,$done,$avgtime)
 {
 ?>
     <p> If you want to play a game of Doppelkopf, you found the right place ;) </p>
@@ -275,24 +248,26 @@ function output_home_page($pre,$game,$done)
     else
       echo "<p> At the moment there are $pre games that are being started ";
 
-    echo "and";
+    echo "and ";
 
     if($game==0)
-      echo " zero games that are ongoing. ";
+      echo "zero games that are ongoing. ";
     else if($game==1)	
-      echo " one game that is ongoing. ";
+      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. </p>";
+      echo "$done games have been completed on this server. Average time of a game: $avgtime days</p>";
 ?>
 
-    <p> Please <a href="index.php?register">register</a>, in case you haven't done that yet  <br />
+    <p> Please <a href="register.php">register</a>, in case you haven't done that yet  <br />
         or login with you email-address or name and password here:
     </p>
         <form action="index.php" method="post">
@@ -333,7 +308,7 @@ function output_header()
        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';
 	   }
@@ -343,7 +318,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);
@@ -358,24 +333,27 @@ function output_header()
 <div class="header">
 <h1> Welcome to E-Doko <sup style="color:#888;">(beta)</sup> </h1>
 </div>
-
+<div class="main">
 <?php
   return;
 }
 
-
-
 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 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\"> Revision: $REV; <a href=\"http://svn.nubati.net/emaildoko/trunk/\">".
-    "http://svn.nubati.net/emaildoko/trunk/</a></p> \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 />\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";
 
@@ -384,4 +362,47 @@ function output_footer()
 
   return;
 }
+
+function output_status($name)
+{
+  echo "<div class=\"status\">\n";
+  echo $name;
+  echo " <a href=\"index.php?logout=1\">logout</a>\n";
+  echo "</div>";
+
+  return;
+}
+
+
+function output_password_recovery($email,$password)
+{
+?>
+   <form action="index.php" method="post">
+<?php
+  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>
+         <tr>
+            <td><label for="email">Old password:</label></td>
+            <td><input type="password" id="password0" name="password0" size="20" maxlength="30" /> </td>
+         </tr><tr>
+            <td><label for="password">New password:</label></td>
+            <td><input type="password" id="password1" name="password1" size="20" maxlength="30" /></td>
+         </tr><tr>
+            <td><label for="password">Retype:</label></td>
+            <td><input type="password" id="password2" name="password2" size="20" maxlength="30" /></td>
+         </tr><tr>
+           <td></td>
+           <td> <input type="submit" class="submitbutton" name="passwd" value="set" /></td>
+         </tr>
+        </table>
+     </fieldset>
+   </form>
+
+<?php
+}
 ?>
\ No newline at end of file