X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=bbd16af4360565291484c42d6734f585908e578d;hp=6d7deb7e69f3e08c5d87ac04d92a74e121324a1e;hb=11882439a450641bf0d4dd048775d0bdfb592642;hpb=5aa7d5dd2d0b487188fef191c6e5ef38f13e38f7

diff --git a/include/output.php b/include/output.php
index 6d7deb7..bbd16af 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,31 +7,6 @@ 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;
@@ -54,13 +29,11 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 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?action=new" 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;
@@ -69,65 +42,108 @@ function output_form_for_new_game($names)
       srand((float) microtime() * 10000000);
       $randkey = array_rand($names);
       $rand = $names[$randkey];
-      echo  "<div class=\"table".$i."\">\n";
+      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)
 	    {
-	      echo "     <option selected=\"selected\">$name</option>\n";
+	      echo "         <option selected=\"selected\">$name</option>\n";
 	    }
 	  else
-	    echo "     <option>$name</option>\n";
+	    echo "         <option>$name</option>\n";
 	}
-      echo "  </select>\n</div>\n";
+      echo "       </select>\n     </div>\n";
     }
 ?>
     </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>
-         <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:
-        <ul>
+      <p> Ten of hearts: </p>
+      <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> Schweinchen (both foxes), only in normal games or silent solos: </p>
+      <ul>
         <li> <input type="radio" name="schweinchen" value="none" checked="checked" /> none </li>
         <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" />
-              first one normal, second one becomes highest (call during the game) </li>
-        <li> <input type="radio" name="schweinchen" value="secondaftercall"  disabled="disabled" />
-      second one become highest only in case re/contra was announced (not working yet)
+             first one normal, second one becomes highest (call during the game) </li>
+        <li> <input type="radio" name="schweinchen" value="secondaftercall" />
+             second one become highest only in case re/contra was announced
         </li>
-        </ul>
-      </p>
-      <p> Call Re/Contra, etc.:
-        <ul>
-           <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="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="callrule" value="9-cards"  />
-                Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</li>
-        </ul>
-      </p>
+      </ul>
+      <p> Call Re/Contra, etc.: </p>
+      <ul>
+         <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="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="callrule" value="9-cards"  />
+              Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</li>
+      </ul>
    <input type="submit" value="start game" />
  </form>
 <?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, ...
    * convert even cards to the matching odd value */
 
-  if( $card/2 - (int)($card/2) == 0.5)
+  if( $card/2 - (int)($card/2) == 0.5 || $card == 0)
     echo "<img src=\"cards/".$dir."/".$card.".png\"  alt=\"".DB_get_card_name($card)."\" />\n";
   else
     echo "<img src=\"cards/".$dir."/".($card-1).".png\"  alt=\"".DB_get_card_name($card-1)."\" />\n";
@@ -226,7 +242,6 @@ function output_form_calls($me)
       " <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
 }
 
-
 function output_check_want_to_play($me)
 {
    ?>
@@ -243,64 +258,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="index.php?action=register">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?action=login" 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;
@@ -313,35 +270,12 @@ 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/standard001.css" />
-     <script type="text/javascript">
-       function hl(num) {
-         if(document.getElementById){
-	   var i;
-	   for(i=1;i<14;i++){
-	     if(document.getElementById("trick"+i))
-	       document.getElementById("trick"+i).style.display = 'none';
-	   }
-	   document.getElementById("trick"+num).style.display = 'block';
-	 }
-       }
-       function high_last(){
-	 if(document.getElementById){
-	   var i;
-	   for(i=13;i>0;i--) {
-	     if(document.getElementById("trick"+i))
-	       {
-		 hl(i);
-		 break;
-	       }
-	   }
-	 }
-       }
-     </script>
+     <link rel="stylesheet" type="text/css" href="css/standard016.css" />
+     <script type="text/javascript" src="include/game.js"> </script>
   </head>
 <body onload="high_last();">
 <div class="header">
-<h1> Welcome to E-Doko <sup style="color:#888;">(beta)</sup> </h1>
+<h1> Welcome to E-Doko </h1>
 </div>
 <?php
 
@@ -359,7 +293,7 @@ function output_footer()
     "  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".
+ 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.\"".
@@ -376,15 +310,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?action=logout\">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 */
@@ -396,11 +335,37 @@ function output_status()
        $unixtime = strtotime($time);
        date_default_timezone_set($zone);
 
-       echo "<div class=\"lastlogin\">last login: ".date("r",$unixtime)."</div>\n";
-     };
+       echo "<div class=\"lastlogin\"><span>last login: ".date("r",$unixtime)."</span></div>\n";
+     }
+   else
+     {
+       echo "\n<div class=\"status\">\n";
+       echo "<a href=\"".$INDEX."\">login</a>\n";
+       echo "</div>\n";
+     }
   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)
 {
@@ -433,4 +398,18 @@ function output_password_recovery($email,$password)
 
 <?php
 }
+
+function output_user_notes($userid,$gameid,$userstatus)
+{
+  echo "<div class=\"notes\"> Personal notes: <br />\n";
+  $notes = DB_get_notes_by_userid_and_gameid($userid,$gameid);
+  foreach($notes as $note)
+    echo "$note <hr />\n";
+  if($userstatus!='gameover')
+    echo "<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+  echo "</div> \n";
+
+  return;
+}
+
 ?>
\ No newline at end of file