X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=466b4ae34f631d7c6a08414ebbbdd079aa0943b9;hp=d09408cd43094b0c0e4ca00b5b460b2442297fbb;hb=b4b135a91ee29a31fde39fd6792fe680bf0324d8;hpb=567f0d615194566c629887a315cd864bbe84fde9

diff --git a/include/functions.php b/include/functions.php
index d09408c..466b4ae 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -608,21 +608,39 @@ function set_gametype($gametype)
 
 function mysort($cards,$gametype)
 {
-  usort ( $cards, "sort_comp" );
+  global $PREF;
+  if(isset($PREF['sorting']))
+    if($PREF['sorting']=='high-low')
+      usort ( $cards, 'sort_comp_high_low' );
+    else
+      usort ( $cards, 'sort_comp_low_high' );
+  else
+    usort ( $cards, 'sort_comp_high_low' );
   return $cards;
 }
 
-function sort_comp($a,$b)
+function sort_comp_high_low($a,$b)
 {
   global $CARDS;
 
   $ALL = array();
-  $ALL = array_merge($CARDS["trump"],$CARDS["diamonds"],$CARDS["clubs"],
-		     $CARDS["hearts"],$CARDS["spades"]);
+  $ALL = array_merge($CARDS['trump'],$CARDS['diamonds'],$CARDS['clubs'],
+		     $CARDS['hearts'],$CARDS['spades']);
 
   return pos_array($a,$ALL)-pos_array($b,$ALL);
 }
 
+function sort_comp_low_high($a,$b)
+{
+  global $CARDS;
+
+  $ALL = array();
+  $ALL = array_merge($CARDS['trump'],$CARDS['diamonds'],$CARDS['clubs'],
+		     $CARDS['hearts'],$CARDS['spades']);
+
+  return -pos_array($a,$ALL)+pos_array($b,$ALL);
+}
+
 function can_call($what,$hash)
 {
   global $RULES;
@@ -857,20 +875,14 @@ function display_table ()
 }
 
 
-function display_user_menu()
+function display_user_menu($id)
 {
   global $WIKI,$INDEX;
 
-  /* get the id we are looking for */
-  if(isset($_SESSION['id']))
-     $myid = $_SESSION['id'];
-  else
-    return;
-
   $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' OR ISNULL(Game.player) )".
+		     " WHERE Hand.user_id='$id'".
+		     " AND ( Game.player='$id' OR ISNULL(Game.player) )".
 		     " AND Game.status<>'gameover'".
 		     " ORDER BY Game.session" );
 
@@ -884,7 +896,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";
@@ -1015,7 +1028,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)
@@ -1023,18 +1038,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);
@@ -1057,22 +1070,22 @@ function format_score_table_html($score,$userid)
   if(sizeof($score)==0)
     return "";
 
-  $output = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead><tr>\n";
+  $output = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead>\n  <tr>\n";
 
   /* output header */
-  $output.= "  <th> No </th>";
+  $output.= "   <th> No </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";
+  $output.="<th>P</th>\n  </tr>\n </thead>\n <tbody>\n";
 
   $i=0;
   foreach($score as $game)
     {
       $i++;
-      $output.=" <tr>";
+      $output.="  <tr>";
       $userhash = DB_get_hash_from_gameid_and_userid($game['gameid'],$userid);
       /* create link to old games only if you are logged in and its your game*/
       if(isset($_SESSION['id']) && $_SESSION['id']==$userid)
@@ -1090,7 +1103,7 @@ function format_score_table_html($score,$userid)
       $output.="</td></tr>\n";
     }
 
-  $output.="</tbody>\n</table></div>\n";
+  $output.=" </tbody>\n</table>\n</div>\n";
 
   return $output;
 }