X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=c2a644b59516a7177744b178418d8dff5e87e24d;hp=1d1a71ffd8a4fe5e061af850e4fb55ef27eb87bc;hb=f11c2bcac54384c4154324e4c72a2b62af35995c;hpb=75d3974143dbaa3601317f767d77ed1c3cc13e9b

diff --git a/include/output.php b/include/output.php
index 1d1a71f..c2a644b 100644
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -26,6 +26,21 @@ if(!isset($HOST))
 
 /* functions which only ouput html  */
 
+function autoversion($file)
+{
+  /* changes the file name of e.g. css/style.css to css/style.<md5>.css/js
+   * this way the browser can cache the file and will reload it if the file changed
+   * needs to have .htaccess set up correctly to link back to css/style.css */
+
+  /* only use it for file that have an absolut path */
+  if(!file_exists(dirname($_SERVER['SCRIPT_FILENAME']). '/' . $file))
+    return $file;
+
+  $md5 = md5_file(dirname($_SERVER['SCRIPT_FILENAME']). '/' . $file);
+  return preg_replace('{\\.([^./]+)$}', ".$md5.\$1", $file);
+}
+
+
 function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
   global $RULES;
@@ -53,48 +68,80 @@ function output_form_for_new_game($names)
 			 * after we selected them to make sure that each name
 			 * only shows up once
 			 */
+
+  /* delete players name, since he will be on position D anyway */
+  unset($copy_names[array_search($_SESSION["name"],$copy_names)]);
+  srand((float) microtime() * 10000000);
+
+
   echo '  <form action="index.php?action=new" method="post">';
   echo '    <h2> '._('Select players (Remember: you need to be one of the players)').' </h2>';
-  echo '   <div class="table">';
-  echo '     <img class="table" src="pics/table.png" alt="table" />';
 
-  /* ask player for names */
+  echo '   <div class="table">';
 
-  $i=0;
+  echo  "     <div class=\"table1\">\n";
+  $randkey = array_rand($copy_names);
+  $rand = $copy_names[$randkey];
+  /* delete this name from the list of possible names */
+  unset($copy_names[$randkey]);
+  echo "       <select name=\"PlayerB\" size=\"1\">  \n";
+  foreach($names as $name)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
 
-  /* delete players name, since he will be on position D anyway */
-  unset($copy_names[array_search($_SESSION["name"],$copy_names)]);
+  echo '   <div class="middle">';
 
-  srand((float) microtime() * 10000000);
-  foreach( array("PlayerA","PlayerB","PlayerC","PlayerD") as $player)
+  $randkey = array_rand($copy_names);
+  $rand = $copy_names[$randkey];
+  /* delete this name from the list of possible names */
+  unset($copy_names[$randkey]);
+  echo  "     <div class=\"table0\">\n";
+  echo "       <select name=\"PlayerA\" size=\"1\">  \n";
+  foreach($names as $name)
     {
-      /* pick 3 names at random and put the players name on position D*/
-      if($i<3)
-	{
-	  $randkey = array_rand($copy_names);
-	  $rand = $copy_names[$randkey];
-	  /* delete this name from the list of possible names */
-	  unset($copy_names[$randkey]);
-	}
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
       else
-	{
-	  $rand = $_SESSION["name"];
-	}
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
 
-      echo  "     <div class=\"table".$i."\">\n";
-      $i++;
-      echo "       <select name=\"$player\" size=\"1\">  \n";
-      foreach($names as $name)
-	{
-	  if($name==$rand)
-	    {
-	      echo "         <option selected=\"selected\">$name</option>\n";
-	    }
-	  else
-	    echo "         <option>$name</option>\n";
-	}
-      echo "       </select>\n     </div>\n";
+  echo '     <img class="table" src="pics/table.png" alt="table" />';
+  $randkey = array_rand($copy_names);
+  $rand = $copy_names[$randkey];
+  /* delete this name from the list of possible names */
+  unset($copy_names[$randkey]);
+  echo  "     <div class=\"table2\">\n";
+  echo "       <select name=\"PlayerC\" size=\"1\">  \n";
+  foreach($names as $name)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
+
+  echo '   </div>';
+  $rand = $_SESSION["name"];
+  echo  "     <div class=\"table3\">\n";
+  $i++;
+  echo "       <select name=\"PlayerD\" size=\"1\">  \n";
+  foreach($names as $name)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
     }
+  echo "       </select>\n     </div>\n";
+
+  /* ask player for names */
 
     echo '    </div>';
     echo '';
@@ -378,13 +425,13 @@ function output_header()
      <meta charset="utf-8" />
      <meta name="viewport" content="width=device-width; initial-scale=1.0;" />
      <link rel="shortcut icon" href="pics/edoko-favicon.png" />
-     <link rel="stylesheet" href="css/normalize.css?v=1" />
-     <link rel="stylesheet" href="css/standard.css?v=38" />
-     <link rel="stylesheet" href="css/dateinput.css?v=1"/>
-     <script type="text/javascript" src="include/jquery.js"> </script>
-     <script type="text/javascript" src="include/jquery.tablesorter.js"></script>
-     <script type="text/javascript" src="include/jquery.tools.min.js"></script>
-     <script type="text/javascript" src="include/game.js"> </script>
+     <link rel="stylesheet" href="<?php echo autoversion("css/normalize.css"); ?>" />
+     <link rel="stylesheet" href="<?php echo autoversion("css/standard.css"); ?>" />
+     <link rel="stylesheet" href="<?php echo autoversion("css/dateinput.css"); ?>"/>
+     <script type="text/javascript" src="<?php echo autoversion("js/jquery.js"); ?>"> </script>
+     <script type="text/javascript" src="<?php echo autoversion("js/jquery.tablesorter.js"); ?>"></script>
+     <script type="text/javascript" src="<?php echo autoversion("js/jquery.tools.min.js"); ?>"></script>
+     <script type="text/javascript" src="<?php echo autoversion("js/game.js"); ?>"> </script>
      <script type="text/javascript">
      </script>
   </head>
@@ -406,7 +453,7 @@ function output_footer()
 
   echo "</div>\n\n";
   echo "<footer>\n";
-  echo "  <p class=\"left\"> copyright 2006-2011 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n".
+  echo "  <p class=\"left\"> copyright 2006-2012 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <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";
@@ -646,6 +693,19 @@ function output_exchanged_cards()
   $show=1;
   for($mypos=1;$mypos<5;$mypos++)
     {
+      /* output comments */
+      if($mypos==2)
+	{
+	  /* display all comments on the top right (card1)*/
+	  $comments = DB_get_pre_comment($gameid);
+	  /* display card */
+	  echo "      <div class=\"card1\">\n";
+	  /* display comments */
+	  foreach( $comments as $comment )
+	    echo "        <span class=\"comment\">".$comment[1].": ".$comment[0]."</span>\n";
+	  echo "      </div>\n"; /* end div card */
+	}
+
       $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
       if($usersick!=NULL ||
 	 $mypos==$povertypos1 || $mypos==$partnerpos1 ||