updated to better password hash: use crypt instead of md5
[e-DoKo.git] / include / functions.php
index af2b3e50629d9a02025aa6bab9fcb99d3d59b360..cb784575d783fc344077c3db9d8d78cbe1964433 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -30,42 +30,45 @@ function config_check()
 
   /* check if some variables are set in the config file, else set defaults */
   if(!isset($EmailName))
-    $EmailName="[DoKo] ";
+    $EmailName='[DoKo] ';
   if(isset($EMAIL_REPLY))
     {
-      ini_set("sendmail_from",$EMAIL_REPLY);
+      ini_set('sendmail_from',$EMAIL_REPLY);
     }
   if(!isset($ADMIN_NAME))
     {
       output_header();
-      echo "<h1>Setup not completed</h1>";
-      echo "You need to set \$ADMIN_NAME in config.php.";
+      echo '<h1>Setup not completed</h1>';
+      echo 'You need to set $ADMIN_NAME in config.php.';
       output_footer();
       exit();
     }
   if(!isset($ADMIN_EMAIL))
     {
       output_header();
-      echo "<h1>Setup not completed</h1>";
-      echo "You need to set \$ADMIN_EMAIL in config.php. ".
-       "If something goes wrong an email will be send to this address.";
+      echo '<h1>Setup not completed</h1>';
+      echo 'You need to set $ADMIN_EMAIL in config.php. '.
+       'If something goes wrong an email will be send to this address.';
       output_footer();
       exit();
     }
   if(!isset($DB_work))
     {
       output_header();
-      echo "<h1>Setup not completed</h1>";
-      echo "You need to set \$DB_work in config.php. ".
-       "If this is set to 1, the game will be suspended and one can work safely on the database.".
-       "The default should be 0 for the game to work.";
+      echo '<h1>Setup not completed</h1>';
+      echo 'You need to set $DB_work in config.php. '.
+       'If this is set to anything else than 0, the game will be suspended and one can work safely on the database. '.
+       'A message will be displayed that it will probably take about N minutes, with N being the number $DB_work is set to. '.
+       'The default should be 0 for the game to work.';
       output_footer();
       exit();
     }
   if($DB_work)
     {
       output_header();
-      echo "Working on the database...please check back later.";
+      echo '<div class="WIP">'.
+       _("Working on some aspect of e-DoKo... This will probably take max. $DB_work minutes. It could be over in a few seconds too though ;)").
+       '</div>';
       output_footer();
       exit();
     }
@@ -73,7 +76,35 @@ function config_check()
   return;
 }
 
-function mymail($uid,$subject,$message)
+/* define possible status for email subsjects */
+define("GAME_CANCELED",         0);
+define("GAME_CANCELED_POVERTY", 1);
+define("GAME_CANCELED_TIMEOUT", 2);
+define("GAME_YOUR_TURN",        3);
+define("GAME_READY",            4);
+define("GAME_POVERTY",          5);
+define("GAME_DPOVERTY",         6);
+define("GAME_OVER",             7);
+define("GAME_RECOVERY",         8);
+define("GAME_REMINDER",         9);
+define("GAME_NEW",             10);
+
+/* define possible status for showing cards */
+
+define("CARDS_EMPTY",       0); /* show player's hand*/
+define("CARDS_SHOW",        1); /* show player's hand*/
+define("CARDS_MYTURN",      2); /* show radiobuttons for cards that can be played*/
+define("CARDS_EXCHANGE",    3); /* do we need to return cards to our partner in poverty?*/
+define("CARDS_GAMEOVER_ME", 4); /* show all cards from everyone*/
+define("CARDS_GAMEOVER",    5); /* show all cards from everyone (looking at someone else's game)*/
+
+ /*   cards_status: SHOW      show our hand
+ *                 MYTURN    show radiobutton for cards that can be played
+ *                 EXCHANGE  do we need to return cards to our partner in poverty?
+ *                 GAMEOVER  show all cards from everyone
+ */
+
+function mymail($uid,$gameid=0,$type,$message)
 {
   global $EmailName,$WIKI;
 
@@ -81,7 +112,50 @@ function mymail($uid,$subject,$message)
   $send_now = 1;
 
   /* add standard header and footer */
-  $subject = "$EmailName".$subject;
+  $subject = "$EmailName ";
+  if($gameid)
+    $game = DB_format_gameid($gameid);
+  else
+    $game = '';
+
+  switch($type)
+    {
+    case GAME_CANCELED:
+      $subject.=sprintf(_("Game %s canceled"),$game);
+      break;
+    case GAME_CANCELED_POVERTY:
+      $subject.=sprintf(_("Game %s canceled (poverty not resolved)"),$game);
+      break;
+    case GAME_CANCELED_TIMEOUT:
+      $subject.=sprintf(_("Game %s canceled (timed out)"),$game);
+      break;
+    case GAME_YOUR_TURN:
+      $subject.=sprintf(_("A card has been played in game %s"),$game);
+      break;
+    case GAME_READY:
+      $subject.=sprintf(_("Ready, set, go... (game %s)"),$game);
+      break;
+    case GAME_POVERTY:
+      $subject.=sprintf(_("Poverty (game %s)"),$game);
+      break;
+    case GAME_DPOVERTY:
+      $subject.=sprintf(_("Double poverty (game %s)"),$game);
+      break;
+    case GAME_OVER:
+      $subject.=sprintf(_("Game over (game %s)"),$game);
+      break;
+    case GAME_RECOVERY:
+      $subject.=_("Recovery");
+      break;
+    case GAME_REMINDER:
+      $subject.=sprintf(_("Reminder: game %s it's your turn"),$game);
+      break;
+    case GAME_NEW:
+      $subject.=sprintf(_("You are invited to a game of DoKo (game %s)"),$game);
+      break;
+    default:
+      $subject.=sprintf(_("Problem with email, contact admin (errorcode %d)"),$gameid);
+    }
 
   /* standard goodbye */
   $footer  = "\nHave a nice day\n".
@@ -125,7 +199,7 @@ function mymail($uid,$subject,$message)
   else
     {
       /* store email in database */
-      DB_digest_insert_email($To,$message);
+      DB_digest_insert_email($To,$message,$type,$gameid);
     }
 }
 
@@ -495,6 +569,9 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
 
   if($debug)
     {
+      /* fix the hands; makes debugging easier; the following hands have lots of sicknesses,
+       * to make testing easier
+       */
       $r[ 0]=1;     $r[12]=47;   $r[24]=13;       $r[36]=37;
       $r[ 1]=2;     $r[13]=23;   $r[25]=14;      $r[37]=38;
       $r[ 2]=3;     $r[14]=27;   $r[26]=15;      $r[38]=39;
@@ -511,7 +588,7 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
   else
     {
       /* check if we can find a game were non of the player was involved and return
-       * cards insted
+       * cards instead
        */
       $userstr = "'".implode("','",array($useridA,$useridB,$useridC,$useridD))."'";
       $randomnumbers = DB_get_unused_randomnumbers($userstr);
@@ -856,12 +933,12 @@ function can_call($what,$hash)
        }
       else if ( 9 == ($NRcards + $offset))
        {
-         if( ($mincall>=0 && $mincall==120) )
+         if( ($mincall>=0 && $mincall<=120 && $what<=90 ) )
            return 2;
        }
       else if ( 9 < ($NRcards + $offset))
        {
-         if( ($mincall>=0 && $mincall==120) )
+         if( ($mincall>=0 && $mincall<=120 && $what<=90 ) )
            return 1;
        }
       else if ( 6 == ($NRcards + $offset))
@@ -900,7 +977,7 @@ function can_call($what,$hash)
   return 0;
 }
 
-function display_table ()
+function display_table_begin ()
 {
   global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
   global $RULES,$GAME,$gametype;
@@ -920,10 +997,59 @@ function display_table ()
                     "WHERE Hand.game_id='".$gameid."' ".
                     "ORDER BY position ASC");
 
-  echo "<div class=\"table\">\n".
-    "  <img class=\"table\" src=\"pics/table.png\" alt=\"table\" />\n";
-  while($r = DB_fetch_array($result))
-    {
+  $row0 = DB_fetch_array($result);
+  $row1 = DB_fetch_array($result);
+  $row2 = DB_fetch_array($result);
+  $row3 = DB_fetch_array($result);
+
+  echo "<div class=\"table\">\n";
+  display_single_user($row1);
+  echo "\n<div class=\"middle\">\n";
+  display_single_user($row0,1); /* mark starting player in case re/contra is not set yet */
+  echo "  <img class=\"table\" src=\"pics/table.png\" alt=\"table\" />\n";
+  display_single_user($row2);
+
+  return;
+}
+function display_table_end ()
+{
+  global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
+  global $RULES,$GAME,$gametype;
+
+  $result = DB_query("SELECT  User.fullname as name,".
+                    "        Hand.position as position, ".
+                    "        User.id, ".
+                    "        Hand.party as party, ".
+                    "        Hand.sickness as sickness, ".
+                    "        Hand.point_call, ".
+                    "        User.last_login, ".
+                    "        Hand.hash,       ".
+                    "        User.timezone,    ".
+                    "        User.email       ".
+                    "FROM Hand ".
+                    "LEFT JOIN User ON User.id=Hand.user_id ".
+                    "WHERE Hand.game_id='".$gameid."' ".
+                    "ORDER BY position ASC");
+
+  $row0 = DB_fetch_array($result);
+  $row1 = DB_fetch_array($result);
+  $row2 = DB_fetch_array($result);
+  $row3 = DB_fetch_array($result);
+
+  echo "</div>\n";
+  display_single_user($row3);
+  echo "</div>\n";
+
+  return;
+}
+
+function display_single_user($r,$start=0)
+{
+  /* start=1, mark starting player, default=0, so the player on the left is not marked */
+
+  global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
+  global $RULES,$GAME,$gametype;
+
       $name  = $r[0];
       $pos   = $r[1];
       $user  = $r[2];
@@ -938,11 +1064,15 @@ function display_table ()
       $lastlogin = strtotime($r[6]);
       date_default_timezone_set($timezone);
       $timenow   = strtotime(date("Y-m-d H:i:s"));
-      $gravatar = "$name<br /><img class=\"gravatar\" title=\"$name\" src=\"http://www.gravatar.com/avatar/".md5(strtolower(trim($email)))."?d=identicon\" alt=\"$name's gravatar\" />";
-
+      $gravatar = "$name<br />\n       <img class=\"gravatar\" title=\"$name\" src=\"http://www.gravatar.com/avatar/".
+       md5(strtolower(trim($email)))."?d=identicon\" alt=\"$name's gravatar\" />";
 
       echo "  <div class=\"table".($pos-1)."\">\n";
 
+      /* mark starting player */
+      if($start && ! ($party=="re" || $party=="contra"))
+       echo '   <span class="start">'._('Starting Player')."</span> <br />\n";
+
       if($debug)
        echo "   <a href=\"".$INDEX."?action=game&amp;me=".$hash."\">";
       if($vacation = check_vacation($user))
@@ -957,7 +1087,7 @@ function display_table ()
       else
        echo "   $gravatar \n";
       if($debug)
-       echo"</a>\n";
+       echo"   </a>\n";
 
       /* add hints for poverty, wedding, solo, etc */
       if( $gametype != "solo")
@@ -971,12 +1101,15 @@ function display_table ()
            $cards    = DB_get_all_hand($userhash);
            $trumpNR  = count_trump($cards,'all');
            if($trumpNR)
-             echo "   <img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty - trump back\" title=\"poverty - trump back\" />";
+             echo "   <img src=\"pics/button/poverty_trump_button.png\" class=\"button\" ".
+               "alt=\"poverty - trump back\" title=\"poverty - trump back\" />\n";
            else
-             echo "   <img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty - no trump back\" title=\"poverty - no trump back\" />";
+             echo "   <img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" ".
+               "alt=\"poverty - no trump back\" title=\"poverty - no trump back\" />\n";
          }
        else
-         echo "   <img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty partner\" title=\"poverty partner\" />";
+         echo "   <img src=\"pics/button/poverty_partner_button.png\" class=\"button\" ".
+           "alt=\"poverty partner\" title=\"poverty partner\" />\n";
 
       if($GT=="dpoverty")
        if($party=="re")
@@ -986,12 +1119,15 @@ function display_table ()
              $cards    = DB_get_all_hand($userhash);
              $trumpNR  = count_trump($cards,'all');
              if($trumpNR)
-               echo "   <img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" title=\"poverty - trump back\" />";
+               echo "   <img src=\"pics/button/poverty_trump_button.png\" class=\"button\" ".
+                 "alt=\"poverty < trump back\" title=\"poverty - trump back\" />\n";
              else
-               echo "   <img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" title=\"poverty - no trump back\" />";
+               echo "   <img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" ".
+                 "alt=\"poverty <\" title=\"poverty - no trump back\" />\n";
            }
          else
-           echo "   <img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" title=\"poverty partner\" />";
+           echo "   <img src=\"pics/button/poverty_partner_button.png\" class=\"button\" ".
+             "alt=\"poverty >\" title=\"poverty partner\" />\n";
        else
          if($sickness=="poverty"  || ($RULES['lowtrump']=='poverty' && $sickness=='lowtrump'))
            {
@@ -999,67 +1135,70 @@ function display_table ()
              $cards    = DB_get_all_hand($userhash);
              $trumpNR  = count_trump($cards,'all');
              if($trumpNR)
-               echo "   <img src=\"pics/button/poverty2_trump_button.png\" class=\"button\" alt=\"poverty2 < trump back\" title=\"poverty2 - trump back\"/>";
+               echo "   <img src=\"pics/button/poverty2_trump_button.png\" class=\"button\" ".
+                 "alt=\"poverty2 < trump back\" title=\"poverty2 - trump back\"/>\n";
              else
-               echo "   <img src=\"pics/button/poverty2_notrump_button.png\" class=\"button\" alt=\"poverty2 <\" title=\"poverty2 - no trump back\" />";
+               echo "   <img src=\"pics/button/poverty2_notrump_button.png\" class=\"button\" ".
+                 "alt=\"poverty2 <\" title=\"poverty2 - no trump back\" />\n";
            }
          else
-           echo "   <img src=\"pics/button/poverty2_partner_button.png\" class=\"button\" alt=\"poverty2 >\" title=\"poverty2 partner\" />";
+           echo "   <img src=\"pics/button/poverty2_partner_button.png\" class=\"button\" ".
+             "alt=\"poverty2 >\" title=\"poverty2 partner\" />\n";
 
       if($GT=="wedding" && $party=="re")
        if($sickness=="wedding")
-         echo "   <img src=\"pics/button/wedding_button.png\" class=\"button\" alt=\"wedding\" title=\"wedding\" />";
+         echo "   <img src=\"pics/button/wedding_button.png\" class=\"button\" alt=\"wedding\" title=\"wedding\" />\n";
        else
-         echo "   <img src=\"pics/button/wedding_partner_button.png\" class=\"button\" alt=\"wedding partner\" title=\"wedding partner\" />";
+         echo "   <img src=\"pics/button/wedding_partner_button.png\" class=\"button\" ".
+           "alt=\"wedding partner\" title=\"wedding partner\" />\n";
 
       if( (strpos($GT,"solo")!==false) && $party=="re")
        {
          if(strpos($GT,"queen")!==false)
-           echo "   <img src=\"pics/button/queensolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Queen solo\" />";
+           echo "   <img src=\"pics/button/queensolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Queen solo\" />\n";
          else if(strpos($GT,"jack")!==false)
-           echo "   <img src=\"pics/button/jacksolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Jack solo\" />";
+           echo "   <img src=\"pics/button/jacksolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Jack solo\" />\n";
          else if(strpos($GT,"club")!==false)
-           echo "   <img src=\"pics/button/clubsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Club solo\" />";
+           echo "   <img src=\"pics/button/clubsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Club solo\" />\n";
          else if(strpos($GT,"spade")!==false)
-           echo "   <img src=\"pics/button/spadesolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Spade solo\" />";
+           echo "   <img src=\"pics/button/spadesolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Spade solo\" />\n";
          else if(strpos($GT,"heart")!==false)
-           echo "   <img src=\"pics/button/heartsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Heart solo\" />";
+           echo "   <img src=\"pics/button/heartsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Heart solo\" />\n";
          else if(strpos($GT,"trumpless")!==false)
-           echo "   <img src=\"pics/button/notrumpsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Trumpless solo\" />";
+           echo "   <img src=\"pics/button/notrumpsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Trumpless solo\" />\n";
          else if(strpos($GT,"trump")!==false)
-           echo "   <img src=\"pics/button/trumpsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Trump solo\" />";
+           echo "   <img src=\"pics/button/trumpsolo_button.png\" class=\"button\" alt=\"$GT\" title=\"Trump solo\" />\n";
        }
 
       /* add point calls */
       if($call!=NULL)
        {
          if($party=="re")
-           echo "  <img src=\"pics/button/re_button.png\" class=\"button\" alt=\"re\" title=\"Re\" />";
+           echo "   <img src=\"pics/button/re_button.png\" class=\"button\" alt=\"re\" title=\"Re\" />\n";
          else
-           echo "  <img src=\"pics/button/contra_button.png\" class=\"button\" alt=\"contra\" title=\"Contra\" />";
+           echo "   <img src=\"pics/button/contra_button.png\" class=\"button\" alt=\"contra\" title=\"Contra\" />\n";
          switch($call)
            {
            case "0":
-             echo "   <img src=\"pics/button/0_button.png\" class=\"button\" alt=\"0\" title=\"Call 0\" />";
+             echo "   <img src=\"pics/button/0_button.png\" class=\"button\" alt=\"0\" title=\"Call 0\" />\n";
              break;
            case "30":
-             echo "   <img src=\"pics/button/30_button.png\" class=\"button\" alt=\"30\" title=\"Call 30\" />";
+             echo "   <img src=\"pics/button/30_button.png\" class=\"button\" alt=\"30\" title=\"Call 30\" />\n";
              break;
            case "60":
-             echo "   <img src=\"pics/button/60_button.png\" class=\"button\" alt=\"60\" title=\"Call 60\" />";
+             echo "   <img src=\"pics/button/60_button.png\" class=\"button\" alt=\"60\" title=\"Call 60\" />\n";
              break;
            case "90":
-             echo "   <img src=\"pics/button/90_button.png\" class=\"button\" alt=\"90\" title=\"Call 90\" />";
+             echo "   <img src=\"pics/button/90_button.png\" class=\"button\" alt=\"90\" title=\"Call 90\" />\n";
              break;
            }
        }
 
-      echo "    <br />\n";
-      echo "    <span title=\"local time: ".date("Y-m-d H:i:s",$timenow).  " ".
-                            "last login: ".date("Y-m-d H:i:s",$lastlogin)."\">".
-                            "<img src=\"pics/button/time-info.png\" class=\"tinybutton\" alt=\"time info\" />".
-                            "</span>\n";
+      echo "   <img src=\"pics/button/time-info.png\" class=\"button\" alt=\"time info\" ".
+       "title=\"local time: ".date("Y-m-d H:i:s",$timenow).  " ".
+       "last login: ".date("Y-m-d H:i:s",$lastlogin)."\" />";
 
+      echo "   <br /><span class=\"numberoftricks\">";
       /* show how many tricks the person made */
       switch($wins)
        {
@@ -1074,49 +1213,56 @@ function display_table ()
        default:
          echo "#tricks many"; break;
        }
-
-      echo "   </div>\n";
-
-    }
-  echo  "</div>\n"; /* end output table */
-
-
-  return;
+      echo "</span>\n";
+      echo "  </div>\n";
 }
 
 
-function display_user_menu($id)
+function display_user_menu($id, $skiphash=NULL)
 {
   global $WIKI,$INDEX;
 
-  $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='$id'".
-                    " AND ( Game.player='$id' OR ISNULL(Game.player) )".
-                    " AND ( Game.status='pre' OR Game.status='play' )".
-                    " ORDER BY Game.session" );
+  if($skiphash)
+    $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='$id'".
+                      " AND Hand.hash!='$skiphash'".
+                      " AND ( Game.player='$id' OR ISNULL(Game.player) )".
+                      " AND ( Game.status='pre' OR Game.status='play' )".
+                      " ORDER BY Game.session" );
+  else
+    $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='$id'".
+                      " AND ( Game.player='$id' OR ISNULL(Game.player) )".
+                      " AND ( Game.status='pre' OR Game.status='play' )".
+                      " ORDER BY Game.session" );
 
   $i=0;
   while( $r = DB_fetch_array($result))
     {
       if($i==0)
        {
-         echo "<div class=\"usermenu\">\n";
-         echo _('It\'s your turn in these games').":<br />\n";
+         echo "\n<div class=\"usermenu\">\n  ";
+         echo _('It\'s your turn in these games').":\n";
+       }
+      else
+       {
+         echo ", ";
        }
 
       $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].
+       "\"> ".DB_format_gameid($r[1])." </a>\n";
       if($i>4)
        {
-         echo "...<br />\n";
+         echo ",  ...\n";
          break;
        }
     }
 
   if($i)
-    echo  "</div>\n";
+    echo  "</div>\n\n";
   return;
 }
 
@@ -1131,28 +1277,33 @@ function generate_score_table($session)
   $score = array();
   $i=0;
 
-  /* get all ids */
+  /* get all ids, scores and gametypes */
   $gameids = DB_get_gameids_of_finished_games_by_session($session);
 
   if($gameids == NULL)
     return $score;
 
-  /* get player id, names... from the first game */
   $player = array();
-  $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]);
+  $player_party = array();
+
+  /* get player id from the first game */
+  $result = DB_query("SELECT user_id from Hand".
+                    " WHERE Hand.game_id=".$gameids[0][0]);
   while( $r = DB_fetch_array($result))
     $player[$r[0]] = 0;
 
+  /* get party of players for each game in the session */
+  foreach($player as $id=>$points)
+    $player_party[$id]=DB_get_party_by_session_and_userid($session,$id);
+
   /* get points and generate table */
   foreach($gameids as $gameid)
     {
-      $re_score = DB_get_score_by_gameid($gameid);
-      $gametype = DB_get_gametype_by_gameid($gameid);
+      $re_score = $gameid[1];
+      $gametype = $gameid[2];
       foreach($player as $id=>$points)
        {
-         $party = DB_get_party_by_gameid_and_userid($gameid,$id);
+         $party = $player_party[$id][$i][0];
          if($party == "re")
            if($gametype=="solo")
              $player[$id] += 3*$re_score;
@@ -1161,7 +1312,7 @@ function generate_score_table($session)
          else if ($party == "contra")
            $player[$id] -= $re_score;
        }
-      $score[$i]['gameid']  = $gameid ;
+      $score[$i]['gameid']  = $gameid[0] ;
       $score[$i]['players'] = $player;
       $score[$i]['points']  = abs($re_score);
       $score[$i]['solo']    = ($gametype=="solo");
@@ -1176,14 +1327,14 @@ function generate_global_score_table()
 {
   $return = array();
 
-  /* get all ids */
+  /* get all ids, scores and gametypes */
   $gameids = DB_get_gameids_of_finished_games_by_session(0);
 
   if($gameids == NULL)
     return '';
 
-  /* get player id, names... from the User table */
   $player = array();
+  /* get player id, names... from the User table */
   $result = DB_query('SELECT User.id, User.fullname FROM User');
 
   /* save information in an array */
@@ -1194,15 +1345,15 @@ function generate_global_score_table()
   /* get points and generate table */
   foreach($gameids as $gameid)
     {
-      $re_score = DB_get_score_by_gameid($gameid);
-      $gametype = DB_get_gametype_by_gameid($gameid);
+      $re_score = $gameid[1];
+      $gametype = $gameid[2];
 
       /* get players involved in this game */
-      $result = DB_query('SELECT user_id FROM Hand WHERE game_id='.DB_quote_smart($gameid));
+      $result = DB_query('SELECT user_id FROM Hand WHERE game_id='.DB_quote_smart($gameid[0]));
       while($r = DB_fetch_array($result))
        {
          $id = $r[0];
-         $party = DB_get_party_by_gameid_and_userid($gameid,$id);
+         $party = DB_get_party_by_gameid_and_userid($gameid[0],$id);
          if($party == 're')
            if($gametype=='solo')
              $player[$id]['points'] += 3*$re_score;
@@ -1499,4 +1650,53 @@ function get_user_token($userid)
   return $token;
 }
 
+function verify_password($email, $password)
+{
+  /* verify password, if old password has length 32 assume it's an old md5, else use new password scheme */
+  /* return 0 if verified, else return error code
+   *        1 can't find email
+   *        2 can't calculate correct hash
+   *        3 misc error
+   */
+
+  /* check user email by getting his id */
+  $userid = DB_get_userid('email',$email);
+  if(!$userid)
+    return 1;
+
+  /* test for temporary passwords, only valid for one date (tested in the DB) */
+  $tmppasswd = md5($password);
+  if(DB_check_recovery_passwords($tmppasswd,$email))
+    return 0;
+
+  /* get saved password */
+  $existingpassword =  DB_get_passwd_by_userid($userid);
+
+  if(strlen($existingpassword)==32) /* old password type */
+    {
+      if ($existingpassword == md5($password))
+       {
+         /* update password to new crypt version */
+         // create a password hash using the crypt function, need php 5.3 for this
+         // create and random salt
+         $salt = substr(str_replace('+', '.', base64_encode(sha1(microtime(true), true))), 0, 22);
+         // hash incoming password using 12 rounds of blowfish
+         $hash = crypt($password, '$2y$12$' . $salt);
+         if(strlen($hash)>13)
+           DB_query("UPDATE User SET password='$hash' where id='$userid'");
+         else
+           return 2;
+
+         return 0;
+       }
+    }
+  else
+    {
+      if ($existingpassword == crypt($password, $existingpassword))
+       return 0;
+    };
+
+  return 3;
+}
+
 ?>