BUGFIX: extra "the" in message

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

diff --git a/include/functions.php b/include/functions.php
index d99f9c8732f5757aa14cfcc8ee5caba56104b790..3e21e6d3e4ebcc82253879b3cf237b38eff33654 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -72,11 +72,7 @@ function mymail($uid,$subject,$message)
       /* add standard header and footer */
       $subject = "$EmailName".$subject;
 
-      /* standard greeting */
-      $name    = DB_get_name('userid',$uid);
-      $header  = "Hello $name\n\n";
-
-      /* and standard goodbye */
+      /* standard goodbye */
       $footer  = "\nHave a nice day\n".
        "   your E-Doko service department\n\n".
        "-- \n".
@@ -85,7 +81,26 @@ function mymail($uid,$subject,$message)
        'help: http://wiki.nubati.net/EmailDoko   '.
        'bugs: http://wiki.nubati.net/EmailDokoIssues';
 
-      $To = DB_get_email('userid',$uid);
+      if(is_array($uid))
+       {
+         /* send email to more than one person */
+
+         $header  = "Hello all\n\n";
+
+         foreach($uid as $user)
+           {
+             $all[] = DB_get_email('userid',$user);
+           }
+         $To = implode(",",$all);
+       }
+      else
+       {
+         /* standard greeting */
+         $name    = DB_get_name('userid',$uid);
+         $header  = "Hello $name\n\n";
+
+         $To = DB_get_email('userid',$uid);
+       }
 
       sendmail($To,$subject,$header.$message.$footer);
     }
@@ -801,6 +816,7 @@ function display_table ()
       $call      = $r[5];
       $hash      = $r[7];
       $timezone  = $r[8];
+      $wins      = DB_get_number_of_tricks($gameid,$pos);
       date_default_timezone_set($defaulttimezone);
       $lastlogin = strtotime($r[6]);
       date_default_timezone_set($timezone);
@@ -924,6 +940,22 @@ function display_table ()
                             "last login: ".date("Y-m-d H:i:s",$lastlogin)."\">".
                             "<img src=\"pics/button/time-info.png\" class=\"tinybutton\" alt=\"time info\" />".
                             "</span>\n";
+
+      /* show how many tricks the person made */
+      switch($wins)
+       {
+       case 0:
+         echo "#tricks 0"; break;
+       case 1:
+         echo "#tricks 1"; break;
+       case 2:
+       case 3:
+       case 4:
+         echo "#tricks few"; break;
+       default:
+         echo "#tricks many"; break;
+       }
+
       echo "   </div>\n";
 
     }
@@ -942,7 +974,7 @@ function display_user_menu($id)
                     " LEFT JOIN Game On Hand.game_id=Game.id".
                     " WHERE Hand.user_id='$id'".
                     " AND ( Game.player='$id' OR ISNULL(Game.player) )".
-                    " AND Game.status<>'gameover'".
+                    " AND ( Game.status='pre' OR Game.status='play' )".
                     " ORDER BY Game.session" );
 
   $i=0;