BUGFIX: rewrote poverty, should fix lots of bugs

[e-DoKo.git] / include / output.php

diff --git a/include/output.php b/include/output.php
index 38356ddb46035d62e9ecbabae2293259283ed055..8779ad81b29d5b9b8c2e49ecba158619405448f9 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
 <?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))
  * 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  */
 
 
 /* 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;
 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)
 {
 ?>
 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">
 
    <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;
 <?php
     /* ask for player names */
     $i=0;


@@ -71,7 +44,7 @@ function output_form_for_new_game($names)
       $rand = $names[$randkey];
       echo  "<div class=\"table".$i."\">\n";
       $i++;
       $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)
       foreach($names as $name)
        {
          if($name==$rand)


@@ -85,6 +58,7 @@ function output_form_for_new_game($names)
     }
 ?>
     </div>
     }
 ?>
     </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:
    <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:


@@ -254,7 +228,7 @@ 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" />
      <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" />
+     <link rel="stylesheet" type="text/css" href="css/standard002.css" />

      <script type="text/javascript">
        function hl(num) {
          if(document.getElementById){
      <script type="text/javascript">
        function hl(num) {
          if(document.getElementById){


@@ -269,7 +243,7 @@ function output_header()
        function high_last(){
         if(document.getElementById){
           var i;
        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);
             if(document.getElementById("trick"+i))
               {
                 hl(i);


@@ -342,6 +316,28 @@ function output_status()
   return;
 }
 
   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)
 {
 
 function output_password_recovery($email,$password)
 {