X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=output.php;h=89aedff9d802509517a1ba412e3a40b42716d779;hp=3ff04427f0e2c865a51a96805bb27675aa330c20;hb=35687ace49ce0b41b1380603513d1f04cd6b458f;hpb=a0b3efd697ed19fe2bf204868ab5920e4af5d467

diff --git a/output.php b/output.php
index 3ff0442..89aedff 100644
--- a/output.php
+++ b/output.php
@@ -14,22 +14,33 @@ function display_links($email,$password)
 
 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\" value=\"go to my user page\" />\n";
-  echo "</form>\n";
+  echo "<a href=\"index.php\"> go to my user page </a>";
+
+  return;
+}
+
+function output_user_settings($email,$password)
+{
+  global $PREF;
+
+  echo "<div class=\"useroptions\">\n";
+  echo "<h4> Settings </h4>\n";
+  echo "<a href=\"index.php?passwd=ask\">change password</a><br /";
+
+  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 "</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";
+  echo "TODO: figure out a better way to handle passwords <br />\n";
   ?>
         <form action="index.php" method="post">
           <fieldset>
@@ -47,7 +58,12 @@ function output_register()
               </tr><tr>
 	       <td><label for="Rtimezone">Timezone:</label></td>
                <td>
-                  <input type="text" id="Rtimezone" name="Rtimezone" size="4" maxsize="4" value="+1" />
+		  <select id="Rtimezone" name="Rtimezone" size="1">
+                     <option value="1">Berlin</option>
+                     <option value="-8">Berkeley</option>
+                     <option value="13">Wellington</option>
+		  </select>
+	         (If your timezone is not listed, just select whatever you want and email the admin your correct time zone.)
 	       </td>
               </tr><tr>
                <td colspan="2"> <input type="submit" value="register" /></td>
@@ -70,6 +86,7 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
   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";
@@ -125,7 +142,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
@@ -137,27 +163,25 @@ 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;
 }
 
-function display_link_card($card,$dir="english")
+function display_link_card($card,$dir="english",$type="card")
 {
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<input type=\"radio\" name=\"card\" value=\"".$card."\" /><img src=\"cards/".$dir."/".$card.".png\" alt=\"\" />\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 "<input type=\"radio\" name=\"card\" value=\"".$card."\" /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"\" />\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">
 
     do you want to play solo? 
@@ -175,7 +199,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\" />";
@@ -186,7 +210,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\" />";
@@ -197,7 +221,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\" />";
@@ -216,20 +240,36 @@ function check_for_sickness($me,$mycards)
   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\" /> ";
+  if( can_call(30,$me) )
+    echo " 30:".
+      " <input type=\"radio\" name=\"call30\" value=\"yes\" /> ";
+  if( can_call(0,$me) )
+    echo " 0:".
+      " <input type=\"radio\" name=\"call0\" value=\"yes\" /> ".
+      " no call:".
+      " <input type=\"radio\" name=\"call0\" value=\"no\" /> ";
+}
+
+
+function output_check_want_to_play($me)
 {
    ?>
  <form action="index.php" method="post">
    Do you want to play a game of DoKo?
    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";
@@ -238,12 +278,37 @@ function check_want_to_play($me)
   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>
-    <p> At the moment there are <?php echo "$pre";?> games that are being started and <?php echo"$game"; ?> games that are ongoing. 
-    <?php echo"$done";?> games have been completed on this server. </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>";
+?>
+
     <p> Please <a href="index.php?register">register</a>, in case you haven't done that yet  <br />
         or login with you email-address or name and password here:
     </p>
@@ -258,8 +323,8 @@ function output_home_page($pre,$game,$done)
                  <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>
-                <td></td>
+                <td> <input type="submit" class="submitbutton" name="login" value="login" /></td>
+                <td> <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" /></td>
               </tr>
              </table>
           </fieldset>
@@ -308,22 +373,28 @@ function output_header()
   </head>
 <body onload="high_last();">
 <div class="header">
-<h1> Welcome to E-Doko </h1>
+<h1> Welcome to E-Doko <sup style="color:#888;">(beta)</sup> </h1>
 </div>
 
 <?php
   return;
 }
 
-
-
 function output_footer()
 {
-  global $REV;
+  global $REV,$PREF;
 
   echo "<div class=\"footer\">\n";
-  echo "<p class=\"left\"> copyright 2006-2007 Arun Persaud</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 />".
+    "- 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; <br /><a href=\"http://svn.nubati.net/emaildoko/trunk/\">".
+    "http://svn.nubati.net/emaildoko/trunk/</a> <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 "\n";
   echo "</div>\n";
 
@@ -332,4 +403,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