X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=fafcf36ead8a07455f435be8d7f4bb4554b1bf1d;hp=31f9ba8e1c94ee4085e6d437fd21a0ac2681b551;hb=6437c15bdaac379a15d7e6392122f027d8254ec6;hpb=5973166a4b936e2f8e2d923bc6dcb8bc3db89d85

diff --git a/include/functions.php b/include/functions.php
index 31f9ba8..fafcf36 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,5 +1,5 @@
 <?php
-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
@@ -171,14 +171,14 @@ function compare_cards($a,$b,$game)
     case "normal":
     case "silent":
     case "trump":
-      if($RULES["schweinchen"]=="both" && $GAME["schweinchen"])
+      if($RULES['schweinchen']=='both' && $GAME['schweinchen-who'])
 	{
 	  if($a == 19 || $a == 20 )
 	    return 1;
 	  if($b == 19 || $b == 20 )
 	    return 0;
 	};
-      if($RULES["schweinchen"]=="second" && $GAME["schweinchen"]==3)
+      if($RULES['schweinchen']=='second' && $GAME['schweinchen-second'])
 	{
 	  if($a == 19 || $a == 20 )
 	    return 1;
@@ -328,9 +328,9 @@ function count_trump($cards)
       $trump++;
 
   /* normally foxes don't count as trump, so we substract them here
-   * in case someone has schweinchen, one or two of them should count as trump 
+   * in case someone has schweinchen, one or two of them should count as trump
    * though, so we need to add one trump for those cases */
-  
+
   /* subtract foxes */
   if( in_array("19",$cards))
     $trump--;
@@ -466,6 +466,7 @@ function set_gametype($gametype)
 {
   global $CARDS;
   global $RULES;
+  global $GAME;
 
   switch($gametype)
     {
@@ -488,6 +489,38 @@ function set_gametype($gametype)
 				     '17','18','19','20','21','22','23','24','25','26');
 	  $CARDS["hearts"]   = array('43','44','1','2','45','46','47','48');
 	}
+      /* do we need to reorder for Schweinchen? need to search for it because of special case for dullen above*/
+      if($RULES['schweinchen']=='both'&& $GAME['schweinchen-who'])
+	{
+	  /* find the fox and put them at the top of the stack */
+	  foreach(array('19','20') as $fox)
+	    {
+	      /* search for fox */
+	      $trump = $CARDS['trump'];
+	      $key = array_keys($trump, $fox);
+
+	      /* reorder */
+	      $foxa = array();
+	      $foxa[]=$trump[$key[0]];
+	      unset($trump[$key[0]]);
+	      $trump = array_merge($foxa,$trump);
+	      $CARDS['trump'] = $trump;
+	    }
+	}
+      else if( ($RULES['schweinchen']=='second' || $RULES['schweinchen']=='secondaftercall')
+	       && $GAME['schweinchen-who'])
+	{
+	  /* find the fox and put them at the top of the stack */
+	  $trump = $CARDS['trump'];
+	  $key = array_keys($trump, '19');
+
+	  /* reorder */
+	  $foxa = array();
+	  $foxa[]=$trump[$key[0]];
+	  unset($trump[$key[0]]);
+	  $trump = array_merge($foxa,$trump);
+	  $CARDS['trump'] = $trump;
+	}
       break;
     case "queen":
       $CARDS["trump"]    = array('3','4','5','6','7','8','9','10');
@@ -572,7 +605,7 @@ function sort_comp($a,$b)
 
   $ALL = array();
   $ALL = array_merge($CARDS["trump"],$CARDS["diamonds"],$CARDS["clubs"],
-		     $CARDS["hearts"],$CARDS["spades"],$CARDS["diamonds"]);
+		     $CARDS["hearts"],$CARDS["spades"]);
 
   return pos_array($a,$ALL)-pos_array($b,$ALL);
 }
@@ -664,6 +697,7 @@ function can_call($what,$hash)
 function display_table ()
 {
   global $gameid, $GT, $debug,$INDEX,$defaulttimezone;
+  global $RULES,$GAME,$gametype;
 
   $result = DB_query("SELECT  User.fullname as name,".
 		     "        Hand.position as position, ".
@@ -700,11 +734,11 @@ function display_table ()
       if(!$debug)
 	echo "   $name \n";
       else
-	echo "   <a href=\"".$INDEX."?action=game&me=".$hash."\">$name</a>\n";
+	echo "   <a href=\"".$INDEX."?action=game&amp;me=".$hash."\">$name</a>\n";
 
       /* add hints for poverty, wedding, solo, etc */
       if( $gametype != "solo")
-	if($GAME["schweinchen"] && $RULES["schweinchen"]=="both" && $GAME["schweinchen-who"]==$hash)
+	if( $RULES["schweinchen"]=="both" && $GAME["schweinchen-who"]==$hash )
 	  echo " Schweinchen. <br />";
 
       if($GT=="poverty" && $party=="re")
@@ -813,8 +847,6 @@ function display_table ()
 function display_user_menu()
 {
   global $WIKI,$myid,$INDEX;
-  echo "<div class=\"usermenu\">\n".
-    "<a href=\"".$INDEX."\"> Go to my user page </a>";
 
   $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
 		     " LEFT JOIN Game On Hand.game_id=Game.id".
@@ -822,36 +854,46 @@ function display_user_menu()
 		     " AND Game.player='$myid'".
 		     " AND Game.status<>'gameover'".
 		     " ORDER BY Game.session" );
-  if(DB_num_rows($result))
-      echo "<hr />It's your turn in these games:<br />\n";
 
+  $i=0;
   while( $r = DB_fetch_array($result))
     {
-      echo "<a href=\"".$INDEX."?action=game&me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a><br />\n";
-    }
-
-  echo "<hr /> <a href=\"".$INDEX."?action=new\">Start a new game</a>\n";
-
-  echo "<hr /> <a href=\"".$INDEX."?action=prefs\">Change settings</a>\n";
+      if($i==0)
+	{
+	  echo "<div class=\"usermenu\">\n";
+	  echo "It's your turn in these games:<br />\n";
+	}
 
-  echo "<hr /> <a href=\"".$INDEX."?action=stats\">Statistics</a>\n";
+      $i++;
+      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";
+	  break;
+	}
+    }
 
-  echo
-    "<hr />Report bugs in the <a href=\"".$WIKI."\">wiki</a>\n";
-  echo  "</div>\n";
+  if($i)
+    echo  "</div>\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 = "<div class=\"scoretable\">\n<table class=\"score\">\n <tr>\n";
-
+    return $score;
 
   /* get player id, names... from the first game */
   $player = array();
@@ -859,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.= "  <td> ".substr($r[1],0,2)." </td>\n";
-    }
-  $output.="  <td>P</td>\n </tr>\n";
+    $player[$r[0]] = 0;
 
   /* get points and generate table */
   foreach($gameids as $gameid)
     {
-      $output.=" <tr>\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.="  <td>".$player[$key]['points']."</td>\n";
+	    $player[$id] -= $re_score;
 	}
-      $output.="  <td>".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.="</td>\n </tr>\n";
+      $i++;
     }
 
-  $output.="</table></div>\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);
 
@@ -931,8 +965,7 @@ function generate_global_score_table()
 	    $player[$key]['nr']+=1;
 	}
     }
-  
-  echo "<table>\n <tr>\n";
+
   function cmp($a,$b)
   {
     if($a['nr']==0 ) return 1;
@@ -941,19 +974,101 @@ 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 "  <tr><td>",$pl['name'],"</td><td>",round($pl['points']/$pl['nr'],3),"</td></tr>\n";
+	$return[] = array( $pl['name'], round($pl['points']/$pl['nr'],3) );
     }
-  echo "</table>\n";
-    
-  return;
+
+  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 = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead><tr>\n";
+
+  /* output header */
+  $output.= "  <th> Nr </th>";
+  foreach($score[0]['players'] as $id=>$points)
+    {
+      $name = DB_get_name('userid',$id); /*TODO*/
+      $output.= "<th> ".substr($name,0,2)." </th>";
+    }
+  $output.="<th>P</th>\n </tr>\n</thead>\n<tbody>\n";
+
+  $i=0;
+  foreach($score as $game)
+    {
+      $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>";
+      foreach($game['players'] as $id=>$points)
+	$output.="<td>".$points."</td>";
+      $output.="<td>".$game['points'];
+
+      /* check for solo */
+      if($game['solo'])
+	$output.= " S";
+      $output.="</td></tr>\n";
+    }
+
+  $output.="</tbody>\n</table></div>\n";
+
+  return $output;
 }