BUGFIX: fixed some small typo/layout issues in the "game over" email

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

diff --git a/include/functions.php b/include/functions.php
index fafcf36ead8a07455f435be8d7f4bb4554b1bf1d..db7ccadb059a747f422dd7481f74151b341ae41f 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -177,14 +177,27 @@ function compare_cards($a,$b,$game)
            return 1;
          if($b == 19 || $b == 20 )
            return 0;
-       };
-      if($RULES['schweinchen']=='second' && $GAME['schweinchen-second'])
+       }
+      else if($RULES['schweinchen']=='second' && $GAME['schweinchen-second'])
        {
          if($a == 19 || $a == 20 )
            return 1;
          if($b == 19 || $b == 20 )
            return 0;
-       };
+       }
+      else if($RULES['schweinchen']=='secondaftercall' && $GAME['schweinchen-who'] && $GAME['schweinchen-second'] )
+       {
+         /* check if a call was made either by the player or his partner. If so activate Schweinchen rule. */
+         if(DB_get_call_by_hash($GAME['schweinchen-who']) || DB_get_partner_call_by_hash($GAME['schweinchen-who']) )
+           {
+             if($a == 19 || $a == 20 )
+               return 1;
+             if($b == 19 || $b == 20 )
+               return 0;
+           }
+         /* if not, do nothing and the foxes are just handeled as normal trump */
+       }
+       ;
     case "heart":
     case "spade":
     case "club":
@@ -844,14 +857,14 @@ function display_table ()
 }
 
 
-function display_user_menu()
+function display_user_menu($id)
 {
-  global $WIKI,$myid,$INDEX;
+  global $WIKI,$INDEX;
 
   $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
                     " LEFT JOIN Game On Hand.game_id=Game.id".
-                    " WHERE Hand.user_id='$myid'".
-                    " AND Game.player='$myid'".
+                    " WHERE Hand.user_id='$id'".
+                    " AND ( Game.player='$id' OR ISNULL(Game.player) )".
                     " AND Game.status<>'gameover'".
                     " ORDER BY Game.session" );
 
@@ -865,7 +878,8 @@ function display_user_menu()
        }
 
       $i++;
-      echo "<a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a><br />\n";
+      echo "<a href=\"".$INDEX."?action=game&amp;me=".$r[0].
+       "\">game ".DB_format_gameid($r[1])." </a><br />\n";
       if($i>4)
        {
          echo "...<br />\n";
@@ -996,7 +1010,9 @@ function format_score_table_ascii($score)
   if(sizeof($score)==0)
     return "";
 
-  //  if(sizeof($score)>5) $header.=   "                ...   \n";
+  /* truncate table if we have too many games */
+  $max = sizeof($score);
+  if($max>6) $output.=" (table truncated to last 6 games)\n";
 
   /* output header */
   foreach($score[0]['players'] as $id=>$points)
@@ -1004,18 +1020,16 @@ function format_score_table_ascii($score)
       $name = DB_get_name('userid',$id); /*TODO*/
       $output.= "  ".substr($name,0,2)."  |";
     }
-  $output.="  P   |\n ";
+  $output.="  P   |\n";
   $output.= "------+------+------+------+------+\n";
 
-  $max = sizeof($score);
+  /* output score for each game */
   $i=0;
-
-  if($i<$max-6) $output.="       ...\n";
-
   foreach($score as $game)
     {
       $i++;
       if($i-1<$max-6) continue;
+
       foreach($game['players'] as $id=>$points)
        $output.=str_pad($points,6," ",STR_PAD_LEFT)."|";
       $output.=str_pad($game['points'],4," ",STR_PAD_LEFT);
@@ -1041,7 +1055,7 @@ function format_score_table_html($score,$userid)
   $output = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead><tr>\n";
 
   /* output header */
-  $output.= "  <th> Nr </th>";
+  $output.= "  <th> No </th>";
   foreach($score[0]['players'] as $id=>$points)
     {
       $name = DB_get_name('userid',$id); /*TODO*/
@@ -1055,7 +1069,12 @@ function format_score_table_html($score,$userid)
       $i++;
       $output.=" <tr>";
       $userhash = DB_get_hash_from_gameid_and_userid($game['gameid'],$userid);
-      $output.="  <td> <a href=\"".$INDEX."?action=game&amp;me=".$userhash."\">$i</a></td>";
+      /* create link to old games only if you are logged in and its your game*/
+      if(isset($_SESSION['id']) && $_SESSION['id']==$userid)
+       $output.="  <td> <a href=\"".$INDEX."?action=game&amp;me=".$userhash."\">$i</a></td>";
+      else
+       $output.="  <td>$i</td>";
+
       foreach($game['players'] as $id=>$points)
        $output.="<td>".$points."</td>";
       $output.="<td>".$game['points'];
@@ -1071,6 +1090,30 @@ function format_score_table_html($score,$userid)
   return $output;
 }
 
+function createCache($content, $cacheFile)
+{
+  $fp = fopen($cacheFile,"w");
+  if($fp)
+    {
+      fwrite($fp,$content);
+      fclose($fp);
+    }
+  else
+    echo "WARNING: couldn't create cache file";
+
+  return;
+}
+
+function getCache($cacheFile, $expireTime)
+{
+  if( file_exists($cacheFile) &&
+      filemtime($cacheFile )>( time() - $expireTime ) )
+    {
+      return file_get_contents($cacheFile);
+    }
+
+  return false;
+}
 
 
 ?>