X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=82b4bb6bbcde05c2fe2b74779d304b22d35062e5;hp=5267bfb4e42105c33005af56152707fb75e2cec8;hb=3951e6e5eb8e8960dad01e5acb14a9c83aca1dce;hpb=a4149c6703653b2d0d5f3da4277d7fe065048edd
diff --git a/include/functions.php b/include/functions.php
index 5267bfb..82b4bb6 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -734,7 +734,7 @@ function display_table ()
if(!$debug)
echo " $name \n";
else
- echo " $name\n";
+ echo " $name\n";
/* add hints for poverty, wedding, solo, etc */
if( $gametype != "solo")
@@ -847,45 +847,53 @@ function display_table ()
function display_user_menu()
{
global $WIKI,$myid,$INDEX;
- echo "
\n";
return;
}
function generate_score_table($session)
{
+ /* returns an array with N entries
+ * $score[$i]["gameid"] = gameid
+ * $score[$i]["players"] = array (id=>total points)
+ * $score[$i]["points"] = points for this game
+ * $score[$i]["solo"] = 1 or 0
+ */
+ $score = array();
+ $i=0;
+
/* get all ids */
$gameids = DB_get_gameids_of_finished_games_by_session($session);
if($gameids == NULL)
- return "";
-
- $output = "\n
\n \n";
-
+ return $score;
/* get player id, names... from the first game */
$player = array();
@@ -893,46 +901,38 @@ function generate_score_table($session)
" LEFT JOIN User On Hand.user_id=User.id".
" WHERE Hand.game_id=".$gameids[0]);
while( $r = DB_fetch_array($result))
- {
- $player[] = array( 'id' => $r[0], 'points' => 0 );
- $output.= " ".substr($r[1],0,2)." | \n";
- }
- $output.=" P | \n
\n";
+ $player[$r[0]] = 0;
/* get points and generate table */
foreach($gameids as $gameid)
{
- $output.=" \n";
-
$re_score = DB_get_score_by_gameid($gameid);
- foreach($player as $key=>$pl)
+ foreach($player as $id=>$points)
{
- $party = DB_get_party_by_gameid_and_userid($gameid,$pl['id']);
+ $party = DB_get_party_by_gameid_and_userid($gameid,$id);
if($party == "re")
if(DB_get_gametype_by_gameid($gameid)=="solo")
- $player[$key]['points'] += 3*$re_score;
+ $player[$id] += 3*$re_score;
else
- $player[$key]['points'] += $re_score;
+ $player[$id] += $re_score;
else if ($party == "contra")
- $player[$key]['points'] -= $re_score;
-
- $output.=" ".$player[$key]['points']." | \n";
+ $player[$id] -= $re_score;
}
- $output.=" ".abs($re_score);
+ $score[$i]['gameid'] = $gameid ;
+ $score[$i]['players'] = $player;
+ $score[$i]['points'] = abs($re_score);
+ $score[$i]['solo'] = (DB_get_gametype_by_gameid($gameid)=="solo");
- /* check for solo */
- if(DB_get_gametype_by_gameid($gameid)=="solo")
- $output.= " S";
- $output.=" | \n
\n";
+ $i++;
}
- $output.="
\n";
-
- return $output;
+ return $score;
}
function generate_global_score_table()
{
+ $return = array();
+
/* get all ids */
$gameids = DB_get_gameids_of_finished_games_by_session(0);
@@ -966,7 +966,6 @@ function generate_global_score_table()
}
}
- echo "\n \n";
function cmp($a,$b)
{
if($a['nr']==0 ) return 1;
@@ -980,16 +979,122 @@ function generate_global_score_table()
return ($a > $b) ? -1 : 1;
}
usort($player,"cmp");
+
foreach($player as $pl)
{
+ /* limit to players with at least 10 games */
if($pl['nr']>10)
- echo "
",$pl['name']," | ",round($pl['points']/$pl['nr'],3)," |
\n";
+ $return[] = array( $pl['name'], round($pl['points']/$pl['nr'],3) );
}
- echo "
\n";
+
+ return $return;
+}
+
+function format_score_table_ascii($score)
+{
+ $output="";
+ if(sizeof($score)==0)
+ return "";
+
+ // if(sizeof($score)>5) $header.= " ... \n";
+
+ /* output header */
+ foreach($score[0]['players'] as $id=>$points)
+ {
+ $name = DB_get_name('userid',$id); /*TODO*/
+ $output.= " ".substr($name,0,2)." |";
+ }
+ $output.=" P |\n ";
+ $output.= "------+------+------+------+------+\n";
+
+ $max = sizeof($score);
+ $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);
+
+ /* check for solo */
+ if($game['solo'])
+ $output.= " S|";
+ else
+ $output.= " |";
+
+ $output.="\n";
+ }
+ return $output;
+}
+
+function format_score_table_html($score,$userid)
+{
+ global $INDEX;
+
+ if(sizeof($score)==0)
+ return "";
+
+ $output = "\n
\n \n";
+
+ /* output header */
+ $output.= " No | ";
+ foreach($score[0]['players'] as $id=>$points)
+ {
+ $name = DB_get_name('userid',$id); /*TODO*/
+ $output.= " ".substr($name,0,2)." | ";
+ }
+ $output.="P | \n
\n\n\n";
+
+ $i=0;
+ foreach($score as $game)
+ {
+ $i++;
+ $output.=" ";
+ $userhash = DB_get_hash_from_gameid_and_userid($game['gameid'],$userid);
+ $output.=" $i | ";
+ foreach($game['players'] as $id=>$points)
+ $output.="".$points." | ";
+ $output.="".$game['points'];
+
+ /* check for solo */
+ if($game['solo'])
+ $output.= " S";
+ $output.=" |
\n";
+ }
+
+ $output.="\n
\n";
+
+ 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;
+}
?>