Merge branch 'master' of http://nubati.net/git/e-DoKo

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

diff --git a/include/functions.php b/include/functions.php
index fafcf36ead8a07455f435be8d7f4bb4554b1bf1d..82b4bb6bbcde05c2fe2b74779d304b22d35062e5 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -851,7 +851,7 @@ function display_user_menu()
   $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'".
+                    " AND ( Game.player='$myid' OR ISNULL(Game.player) )".
                     " AND Game.status<>'gameover'".
                     " ORDER BY Game.session" );
 
@@ -1041,7 +1041,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*/
@@ -1071,6 +1071,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;
+}
 
 
 ?>