X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=7b29a28fe311dbd12e27fd1e2af53d1a6250cc5d;hp=2e4c08392d051bf10a2e8c615dae162ec045c525;hb=98fcfc10d9f2ae7bc90713f47e809fa1f6eccf15;hpb=981c12ce5d5aaf606584a4ab59054316d2b6c6c2
diff --git a/include/functions.php b/include/functions.php
index 2e4c083..7b29a28 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,5 +1,5 @@
\n".
" \n";
- while($r = mysql_fetch_array($result,MYSQL_NUM))
+ while($r = DB_fetch_array($result))
{
$name = $r[0];
$pos = $r[1];
@@ -700,9 +734,13 @@ 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")
+ if( $RULES["schweinchen"]=="both" && $GAME["schweinchen-who"]==$hash )
+ echo " Schweinchen.
";
+
if($GT=="poverty" && $party=="re")
if($sickness=="poverty")
{
@@ -809,30 +847,34 @@ function display_table ()
function display_user_menu()
{
global $WIKI,$myid,$INDEX;
- echo "
\n";
return;
}
@@ -849,10 +891,10 @@ function generate_score_table($session)
/* get player id, names... from the first game */
$player = array();
- $result = mysql_query("SELECT User.id, User.fullname from Hand".
- " LEFT JOIN User On Hand.user_id=User.id".
- " WHERE Hand.game_id=".$gameids[0]);
- while( $r = mysql_fetch_array($result,MYSQL_NUM))
+ $result = DB_query("SELECT User.id, User.fullname from Hand".
+ " 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";
@@ -893,6 +935,8 @@ function generate_score_table($session)
function generate_global_score_table()
{
+ $return = array();
+
/* get all ids */
$gameids = DB_get_gameids_of_finished_games_by_session(0);
@@ -901,9 +945,9 @@ function generate_global_score_table()
/* get player id, names... from the User table */
$player = array();
- $result = mysql_query("SELECT User.id, User.fullname FROM User");
+ $result = DB_query("SELECT User.id, User.fullname FROM User");
- while( $r = mysql_fetch_array($result,MYSQL_NUM))
+ while( $r = DB_fetch_array($result))
$player[] = array( 'id' => $r[0], 'name'=> $r[1], 'points' => 0 ,'nr' => 0);
/* get points and generate table */
@@ -925,8 +969,7 @@ function generate_global_score_table()
$player[$key]['nr']+=1;
}
}
-
- echo "\n \n";
+
function cmp($a,$b)
{
if($a['nr']==0 ) return 1;
@@ -935,19 +978,20 @@ function generate_global_score_table()
$a=$a['points']/$a['nr'];
$b=$b['points']/$b['nr'];
- if ($a == $b)
+ if ($a == $b)
return 0;
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 $return;
}