X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=db.php;h=4b18d9c526f23e411ffbcec7b98a06dfb1c7c57b;hp=7f47c66e3068936fe0ad3b04c94f34994478cd0e;hb=92a2164d4f1d5367b9325a8d65089abe79ee653b;hpb=11bc256437ae08976ca1b65fcab39f9e326c760f

diff --git a/db.php b/db.php
index 7f47c66..4b18d9c 100644
--- a/db.php
+++ b/db.php
@@ -6,9 +6,9 @@
 
 function DB_open()
 {
-  global $DB;
-  if ( $DB = mysql_connect('mysql.nubati.net','doko', '$DoKo#.') )
-    mysql_select_db('dokodb') or die('Could not select database'); 
+  global $DB,$DB_user,$DB_host,$DB_database,$DB_password;
+  if ( $DB = mysql_connect($DB_host,$DB_user, $DB_password) )
+    mysql_select_db($DB_database) or die('Could not select database'); 
   else
     die (mysql_error());
   
@@ -59,6 +59,17 @@ function DB_get_email_by_name($name)
     return "";
 }
 
+function DB_get_email_by_hash($hash)
+{
+  $result = mysql_query("SELECT User.email FROM User LEFT JOIN Hand ON Hand.user_id=User.id WHERE Hand.hash=".DB_quote_smart($hash)."");
+  $r      = mysql_fetch_array($result,MYSQL_NUM);
+  
+  if($r)
+    return $r[0];
+  else
+    return "";
+}
+
 function DB_get_userid_by_name($name)
 {
   $result = mysql_query("SELECT id FROM User WHERE fullname=".DB_quote_smart($name));
@@ -89,6 +100,16 @@ function DB_get_userid_by_email($email)
   else
     return 0;
 }
+function DB_get_userid_by_email_and_password($email,$password)
+{
+  $result = mysql_query("SELECT id FROM User WHERE email=".DB_quote_smart($email)." AND password=".DB_quote_smart($password));
+  $r      = mysql_fetch_array($result,MYSQL_NUM);
+  
+  if($r)
+    return $r[0];
+  else
+    return 0;
+}
 
 function DB_get_handid_by_hash($hash)
 {
@@ -134,6 +155,17 @@ function DB_get_name_by_hash($hash)
     return "";
 }
 
+function DB_get_name_by_userid($id)
+{
+  $result = mysql_query("SELECT fullname FROM User  WHERE id=".DB_quote_smart($id));
+  $r      = mysql_fetch_array($result,MYSQL_NUM);
+  
+  if($r)
+    return $r[0];
+  else
+    return "";
+}
+
 function DB_get_status_by_hash($hash)
 {
   $result = mysql_query("SELECT status FROM Hand WHERE hash=".DB_quote_smart($hash));
@@ -256,7 +288,7 @@ function DB_set_solo_by_hash($me,$solo)
   return;
 }
 
-function DB_set_sickness_by_hash($me,$sickness)
+function DB_set_sickness_by_hash($hash,$sickness)
 {
   mysql_query("UPDATE Hand SET sickness=".DB_quote_smart($sickness)." WHERE hash=".DB_quote_smart($hash));
   return;
@@ -264,11 +296,14 @@ function DB_set_sickness_by_hash($me,$sickness)
 
 function DB_get_current_trickid($gameid)
 {
+  $trickid  = NULL;
+  $sequence = NULL;
+
   $result = mysql_query("SELECT Trick.id,MAX(Play.sequence) FROM Play ".
 			"LEFT JOIN Trick ON Play.trick_id=Trick.id ".
 			"WHERE Trick.game_id=".DB_quote_smart($gameid)." ".
 			"GROUP BY Trick.id");
-  while(  $r = mysql_fetch_array($result,MYSQL_NUM) )
+  while( $r = mysql_fetch_array($result,MYSQL_NUM) )
     {
       $trickid  = $r[0];
       $sequence = $r[1];