X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=a0b9df3c698b0b573726b3727c8c02392891fe3e;hp=16376031c8d94a6f61f1e6de92ab405d97a9138e;hb=932a309e7db3043fd22bd497a1f50b0ba09d112f;hpb=09515348107d9aab7823a12d31b082a2ebb75555

diff --git a/include/output.php b/include/output.php
index 1637603..a0b9df3 100644
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
@@ -7,35 +7,11 @@ if(!isset($HOST))
 
 /* functions which only ouput html  */
 
-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 "<h5> Card set </h5>\n";
-  if( $PREF["cardset"] == "english" )
-    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=emailaddict\">Change to addicted mode (minimal amount of emails)</a> <br />";
-
-  echo "</div>\n";
-
-  return;
-}
-
 function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
   global $RULES;
 
+  echo "<div class=\"message\">\n<form action=\"index.php?action=new\" method=\"post\">\n";
   echo "Do you want to continue playing?(This will start a new game, with the next person as dealer.)\n";
   echo "  <input type=\"hidden\" name=\"PlayerA\" value=\"$playerA\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerB\" value=\"$playerB\" />\n";
@@ -46,20 +22,18 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
   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</div>";
   return;
 }
 
 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">
+  <form action="index.php?action=new" method="post">
+    <h2> Select players (Remember: you need to be one of the players) </h2>
 
    <div class="table">
-     <img src="pics/table.png" alt="table" />
+     <img class="table" src="pics/table.png" alt="table" />
 <?php
     /* ask for player names */
     $i=0;
@@ -70,7 +44,7 @@ function output_form_for_new_game($names)
       $rand = $names[$randkey];
       echo  "<div class=\"table".$i."\">\n";
       $i++;
-      echo "    Name:  \n  <select name=\"$player\" size=\"1\" />  \n";
+      echo "    <select name=\"$player\" size=\"1\" />  \n";
       foreach($names as $name)
 	{
 	  if($name==$rand)
@@ -84,6 +58,7 @@ function output_form_for_new_game($names)
     }
 ?>
     </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:
@@ -121,6 +96,51 @@ function output_form_for_new_game($names)
 <?php
 }
 
+function output_table($data,$caption="",$class="")
+{
+  if($class!="")
+    $HTML  = "\n<table class=\"$class\">\n";
+  else
+    $HTML  = "\n<table>\n";
+ 
+  $i=0;
+  
+  if($caption!="")
+    $HTML .= "  <caption> $caption </caption>\n";
+
+  foreach($data as $record)
+    {
+      if(!$i)
+	$HTML .= "  <thead>\n  <tr>\n";
+      else
+	{
+	  if($i==1) $HTML .= "  <tbody>\n";
+	  if($i % 2)
+	    $HTML .= "  <tr class=\"odd\">   ";
+	  else
+	    $HTML .= "  <tr class=\"even\">  ";
+	}
+      foreach($record as $point)
+	{
+	  if($i)
+	    $HTML .= "    <td>$point</td> ";
+	  else
+	    $HTML .= "    <th>$point</th> ";
+	}
+
+      if(!$i)
+	$HTML .= "  </tr>\n  </thead>\n";
+      else
+	{
+	  $HTML .= "  </tr>\n";
+	}
+      $i++;
+    }
+  $HTML .= "  </tbody>\n</table>\n";
+
+  return $HTML;
+}
+
 function display_card($card,$dir="english")
 {
   /* cards are only availabl for the odd values, e.g. 1.png, 3.png, ...
@@ -225,7 +245,6 @@ function output_form_calls($me)
       " <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
 }
 
-
 function output_check_want_to_play($me)
 {
    ?>
@@ -242,64 +261,6 @@ function output_check_want_to_play($me)
   return;
 }
 
-function output_home_page($pre,$game,$done,$avgtime)
-{
-  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 have not done that 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" maxlength="30" /> </td>
-              </tr><tr>
-                 <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" class="submitbutton" name="login" value="login" /></td>
-                <td> <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" /></td>
-              </tr>
-             </table>
-          </fieldset>
-        </form>
-
-<?php
- return;
-}
-
 function output_header()
 {
    global $REV;
@@ -312,8 +273,9 @@ function output_header()
      <title>e-Doko</title>
      <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
      <link rel="shortcut icon" type="image/x-icon" href="pics/edoko-favicon.png" />
-     <link rel="stylesheet" type="text/css" href="css/standard.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard005.css" />
      <script type="text/javascript">
+       var current=0;
        function hl(num) {
          if(document.getElementById){
 	   var i;
@@ -322,20 +284,32 @@ function output_header()
 	       document.getElementById("trick"+i).style.display = 'none';
 	   }
 	   document.getElementById("trick"+num).style.display = 'block';
+	   current=num;
 	 }
        }
        function high_last(){
 	 if(document.getElementById){
 	   var i;
-	   for(i=13;i>0;i--) {
+	   for(i=13;i>=0;i--) {
 	     if(document.getElementById("trick"+i))
 	       {
 		 hl(i);
+		 current=i;
 		 break;
 	       }
 	   }
 	 }
        }
+       function hl_next()
+	 {
+	   if(document.getElementById("trick"+(current+1)))
+	     hl(current+1);
+	 }
+       function hl_prev()
+	 {
+	   if(document.getElementById("trick"+(current-1)))
+	     hl(current-1);
+	 }
      </script>
   </head>
 <body onload="high_last();">
@@ -375,15 +349,20 @@ function output_footer()
 
 function output_status()
 {
-  global $defaulttimezone;
+  global $defaulttimezone,$INDEX,$WIKI;
    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 "\n<div class=\"status\">\n";
+       echo $name,"\n";
+       echo " | <a href=\"".$INDEX."\"> mypage </a>\n";
+       echo " | <a href=\"".$INDEX."?action=prefs\">settings</a>\n";
+       echo " | <a href=\"".$INDEX."?action=new\">new game</a>\n";
+       echo " | <a href=\"".$INDEX."?action=stats\">statistics</a>\n";
+       echo " | <a href=\"".$WIKI."\">wiki</a>\n";
+       echo " |&nbsp;&nbsp;&nbsp; <a href=\"".$INDEX."?action=logout\">logout</a>\n";
        echo "</div>\n";
 
        /* last logon time */
@@ -400,6 +379,28 @@ function output_status()
   return;
 }
 
+function output_select_timezone($name,$timezone="")
+{
+  $Tzone = array ( "Europe/London"     => "London",
+		   "Europe/Berlin"     => "Berlin",
+		   "America/Vancouver" => "Berkeley",
+		   "Pacific/Auckland"  => "Wellington" );
+
+  echo "  <select id=\"$name\" name=\"$name\" size=\"1\">\n";
+
+  foreach($Tzone as $zone=>$city)
+    {
+      if($timezone==$zone)
+	echo "   <option value=\"$zone\" selected=\"selected\">$city</option>\n";
+      else
+	echo "   <option value=\"$zone\">$city</option>\n";
+    }
+  echo "  </select>\n";
+
+  return;
+}
+
+
 
 function output_password_recovery($email,$password)
 {