CLEANUP: GT,gametype,mygametype variable, make it translatable, some code cleanup

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

diff --git a/include/db.php b/include/db.php
index bd50189d69f8435784144621a9d5ccbe4b5e3cd1..23959080ba704661c98737f641344d947fb39567 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud <arun@nubati.net>

  *
  *   This file is part of e-DoKo.
  *
  *
  *   This file is part of e-DoKo.
  *


@@ -30,17 +30,13 @@ if(!isset($HOST))
 
 function DB_open()
 {
 
 function DB_open()
 {

-  $version_needed = 2;
+  $version_needed = 5;

 
   global $DB,$DB_user,$DB_host,$DB_database,$DB_password;
 
   global $DB,$DB_user,$DB_host,$DB_database,$DB_password;

-  $DB = @mysql_connect($DB_host,$DB_user, $DB_password);
-  if ( $DB )
+  $DB = new mysqli($DB_host,$DB_user, $DB_password, $DB_database);
+  if ( $DB->connect_errno )

     {
     {

-      mysql_select_db($DB_database) or die('Error: Could not select database');
-    }
-  else
-    {
-      echo mysql_errno() . ": " . mysql_error(). "\n";
+      echo "Failed to connect to Mysql ".$DB->connect_error." (".$DB->connect_errno.")\n";

       return -1;
     };
 
       return -1;
     };
 


@@ -54,19 +50,21 @@ function DB_open()
 function DB_close()
 {
   global $DB;
 function DB_close()
 {
   global $DB;

-  mysql_close($DB);
+  $DB->close();

   return;
 }
 
 function DB_quote_smart($value)
 {
   return;
 }
 
 function DB_quote_smart($value)
 {

+    global $DB;

     /* Stripslashes */
     if (get_magic_quotes_gpc()) {
         $value = stripslashes($value);
     }
     /* Quote if not a number or a numeric string */
     if (!is_numeric($value)) {
     /* Stripslashes */
     if (get_magic_quotes_gpc()) {
         $value = stripslashes($value);
     }
     /* Quote if not a number or a numeric string */
     if (!is_numeric($value)) {

-        $value = "'" . mysql_real_escape_string($value) . "'";
+        $value = "'" . $DB->real_escape_string($value) . "'";
+       $value = addcslashes($value, '%_');

     }
     return $value;
 }
     }
     return $value;
 }


@@ -86,38 +84,46 @@ function DB_test()
 /* use Mysql in the background */
 function DB_query($query)
 {
 /* use Mysql in the background */
 function DB_query($query)
 {

+  global $DB;

   /* debug/optimize the database
   $time = microtime();
   /* debug/optimize the database
   $time = microtime();

-  $return = mysql_query($query);
-  $time = $time - microtime();
+  $return = $DB->query($query);
+  $time = microtime() - $time;

 
 

-  if($time > 0.05) // this way we can find only the long ones
+  if($time > 0.15) // this way we can find only the long ones

   {
   {

-    $logfile=fopen('/tmp/DBlog.log','a+');
-    fwrite($logfile,"EXPLAIN $query ;\n");
-    fwrite($logfile,"time of above query: $time\n");
+    $logfile=fopen('DBlog.log','a+');
+    fwrite($logfile,"time of query: $time\n");
+    fwrite($logfile,wordwrap("  EXPLAIN $query ;\n", 60, "\n         "));
+
+    $result = "";
+    $queryresult  = mysql_query("EXPLAIN $query ;");
+    if( $queryresult )
+      while($row = DB_fetch_array($queryresult))
+        $result  .= "   |".implode("|",$row)."|\n";
+
+    fwrite($logfile,"$result \n\n");

     fclose($logfile);
   };
 
   return $return;
   */
 
     fclose($logfile);
   };
 
   return $return;
   */
 

-  return mysql_query($query);
+  return $DB->query($query);

 }
 
 function DB_fetch_array($result)
 {
 }
 
 function DB_fetch_array($result)
 {

-  return mysql_fetch_array($result,MYSQL_NUM);
+  if($result)
+    return $result->fetch_array(MYSQLI_NUM);
+  else
+    return NULL;

 }
 
 function DB_insert_id()
 {
 }
 
 function DB_insert_id()
 {

-  return mysql_insert_id();
-}
-
-function DB_num_rows($result)
-{
-  return mysql_num_rows($result);
+  global $DB;
+  return $DB->insert_id;

 }
 /* end Mysql functions */
 
 }
 /* end Mysql functions */
 


@@ -146,16 +152,6 @@ function DB_get_version()
   return $version[0];
 }
 
   return $version[0];
 }
 

-function DB_get_passwd_by_name($name)
-{
-  $r = DB_query_array("SELECT password FROM User WHERE fullname=".DB_quote_smart($name)."");
-
-  if($r)
-    return $r[0];
-  else
-    return "";
-}
-

 function DB_get_passwd_by_userid($id)
 {
   $r = DB_query_array("SELECT password FROM User WHERE id=".DB_quote_smart($id)."");
 function DB_get_passwd_by_userid($id)
 {
   $r = DB_query_array("SELECT password FROM User WHERE id=".DB_quote_smart($id)."");


@@ -570,13 +566,31 @@ function DB_get_user_timezone($userid)
     return "Europe/London";
 }
 
     return "Europe/London";
 }
 

-function DB_insert_comment($comment,$playid,$userid)
+function DB_insert_comment($comment,$playid,$gameid,$userid)

 {
 {

-  DB_query("INSERT INTO Comment VALUES (NULL,NULL,NULL,$userid,$playid, ".DB_quote_smart($comment).")");
+  DB_query("INSERT INTO Comment VALUES (NULL,NULL,NULL,$userid,$playid,$gameid, ".DB_quote_smart($comment).")");

 
   return;
 }
 
 
   return;
 }
 

+function DB_get_pre_comment($gameid)
+{
+  $r = DB_query_array_all("SELECT comment, User.fullname FROM Comment".
+                         " LEFT JOIN User ON User.id=user_id".
+                         " WHERE play_id=-1".
+                         " AND game_id=$gameid ");
+  return $r;
+}
+
+function DB_get_pre_comment_call($gameid)
+{
+  $r = DB_query_array_all("SELECT comment, User.fullname FROM Comment".
+                         " LEFT JOIN User ON User.id=user_id".
+                         " WHERE play_id=-2".
+                         " AND game_id=$gameid ");
+  return $r;
+}
+

 function DB_insert_note($comment,$gameid,$userid)
 {
   DB_query("INSERT INTO Notes VALUES (NULL,NULL,NULL,$userid,$gameid, ".DB_quote_smart($comment).")");
 function DB_insert_note($comment,$gameid,$userid)
 {
   DB_query("INSERT INTO Notes VALUES (NULL,NULL,NULL,$userid,$gameid, ".DB_quote_smart($comment).")");


@@ -754,6 +768,18 @@ function DB_get_party_by_gameid_and_userid($gameid,$userid)
     return NULL;
 }
 
     return NULL;
 }
 

+function DB_get_party_by_session_and_userid($session,$userid)
+{
+  /* used in score table by index. gameids are sorted by date, so we need to sort here too! */
+  $r = DB_query_array_all("SELECT party FROM Hand".
+                         " LEFT JOIN Game ON Game.id = Hand.game_id".
+                         " WHERE Game.session=".DB_quote_smart($session).
+                         "  AND user_id=".DB_quote_smart($userid)."".
+                         "  AND Game.status='gameover' ".
+                         " ORDER BY Game.create_date ASC");
+  return $r;
+}
+

 function DB_set_party_by_hash($hash,$party)
 {
   DB_query("UPDATE Hand SET party=".DB_quote_smart($party)." WHERE hash=".DB_quote_smart($hash));
 function DB_set_party_by_hash($hash,$party)
 {
   DB_query("UPDATE Hand SET party=".DB_quote_smart($party)." WHERE hash=".DB_quote_smart($hash));


@@ -776,15 +802,14 @@ function DB_get_PREF($myid)
 
   /* get all preferences */
   $r = DB_query('SELECT pref_key, value FROM User_Prefs'.
 
   /* get all preferences */
   $r = DB_query('SELECT pref_key, value FROM User_Prefs'.

-                     " WHERE user_id='$myid' " );
+               " WHERE user_id=".DB_quote_smart($myid) );

   while($pref = DB_fetch_array($r) )
     {
       switch($pref[0])
        {
        case 'cardset':
   while($pref = DB_fetch_array($r) )
     {
       switch($pref[0])
        {
        case 'cardset':

-         /* licence only valid until then */
-         if($pref[1]=='altenburg' && (time()-strtotime( '2012-12-31 23:59:59')<0) )
-           $PREF['cardset']='altenburg';
+         if($pref[1])
+           $PREF['cardset'] = $pref[1];

          break;
 
        case 'email':
          break;
 
        case 'email':


@@ -833,7 +858,7 @@ function DB_get_PREF($myid)
          break;
        }
     }
          break;
        }
     }

-  $_SESSION['language'] =  $PREF['language'];
+

   return $PREF;
 }
 
   return $PREF;
 }
 


@@ -841,7 +866,7 @@ function DB_get_RULES($gameid)
 {
   $r = DB_query_array("SELECT * FROM Rulesets".
                      " LEFT JOIN Game ON Game.ruleset=Rulesets.id ".
 {
   $r = DB_query_array("SELECT * FROM Rulesets".
                      " LEFT JOIN Game ON Game.ruleset=Rulesets.id ".

-                     " WHERE Game.id='$gameid'" );
+                     " WHERE Game.id=".DB_quote_smart($gameid) );

 
   $RULES['dullen']      = $r[2];
   $RULES['schweinchen'] = $r[3];
 
   $RULES['dullen']      = $r[2];
   $RULES['schweinchen'] = $r[3];


@@ -855,7 +880,7 @@ function DB_get_email_pref_by_hash($hash)
 {
   $r = DB_query_array("SELECT value FROM Hand".
                      " LEFT JOIN User_Prefs ON Hand.user_id=User_Prefs.user_id".
 {
   $r = DB_query_array("SELECT value FROM Hand".
                      " LEFT JOIN User_Prefs ON Hand.user_id=User_Prefs.user_id".

-                     " WHERE hash='$hash' AND pref_key='email'" );
+                     " WHERE hash=".DB_quote_smart($hash)." AND pref_key='email'" );

   if($r)
     {
       if($r[0]=="emailaddict")
   if($r)
     {
       if($r[0]=="emailaddict")


@@ -870,7 +895,7 @@ function DB_get_email_pref_by_hash($hash)
 function DB_get_email_pref_by_uid($uid)
 {
   $r = DB_query_array("SELECT value FROM User_Prefs ".
 function DB_get_email_pref_by_uid($uid)
 {
   $r = DB_query_array("SELECT value FROM User_Prefs ".

-                     " WHERE user_id='$uid' AND pref_key='email'" );
+                     " WHERE user_id=".DB_quote_smart($uid)." AND pref_key='email'" );

   if($r)
     {
       if($r[0]=="emailaddict")
   if($r)
     {
       if($r[0]=="emailaddict")


@@ -905,7 +930,7 @@ function DB_get_unused_randomnumbers($userstr)
 function DB_get_number_of_passwords_recovery($user)
 {
   $r = DB_query_array("SELECT COUNT(*) FROM Recovery ".
 function DB_get_number_of_passwords_recovery($user)
 {
   $r = DB_query_array("SELECT COUNT(*) FROM Recovery ".

-                     "  WHERE user_id=$user ".
+                     "  WHERE user_id=".DB_quote_smart($user).

                      "  AND DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= create_date".
                      "  GROUP BY user_id " );
   if($r)
                      "  AND DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= create_date".
                      "  GROUP BY user_id " );
   if($r)


@@ -921,12 +946,18 @@ function DB_set_recovery_password($user,$newpw)
   return;
 }
 
   return;
 }
 

+function DB_delete_recovery_passwords($userid)
+{
+  DB_query("DELETE FROM Recovery WHERE user_id=".DB_quote_smart($userid));
+  return;
+}
+

 function DB_get_card_name($card)
 {
   if($card==0)
     return 'backside';
 
 function DB_get_card_name($card)
 {
   if($card==0)
     return 'backside';
 

-  $r = DB_query_array("SELECT strength,suite FROM Card WHERE id='$card'");
+  $r = DB_query_array("SELECT strength,suite FROM Card WHERE id=".DB_quote_smart($card));

 
   if($r)
     return $r[0]." of ".$r[1];
 
   if($r)
     return $r[0]." of ".$r[1];


@@ -936,21 +967,22 @@ function DB_get_card_name($card)
 
 function DB_get_current_playid($gameid)
 {
 
 function DB_get_current_playid($gameid)
 {

+  /* return playid or -1 for pre-game phase */

   $trick = DB_get_max_trickid($gameid);
 
   $trick = DB_get_max_trickid($gameid);
 

-  if(!$trick) return NULL;
+  if(!$trick) return -1;

 
 

-  $r = DB_query_array("SELECT id FROM Play WHERE trick_id='$trick' ORDER BY create_date DESC LIMIT 1");
+  $r = DB_query_array("SELECT id FROM Play WHERE trick_id=".DB_quote_smart($trick)." ORDER BY create_date DESC LIMIT 1");

 
   if($r)
     return $r[0];
 
 
   if($r)
     return $r[0];
 

-  return "";
+  return -1;

 }
 
 function DB_get_call_by_hash($hash)
 {
 }
 
 function DB_get_call_by_hash($hash)
 {

-  $r = DB_query_array("SELECT point_call FROM Hand WHERE hash='$hash'");
+  $r = DB_query_array("SELECT point_call FROM Hand WHERE hash=".DB_quote_smart($hash));

 
   if($r)
     return $r[0];
 
   if($r)
     return $r[0];


@@ -964,7 +996,7 @@ function DB_get_partner_call_by_hash($hash)
 
   if($partner)
     {
 
   if($partner)
     {

-      $r = DB_query_array("SELECT point_call FROM Hand WHERE hash='$partner'");
+      $r = DB_query_array("SELECT point_call FROM Hand WHERE hash=".DB_quote_smart($partner));

 
       if($r)
        return $r[0];
 
       if($r)
        return $r[0];


@@ -978,7 +1010,8 @@ function DB_get_partner_hash_by_hash($hash)
   $gameid = DB_get_gameid_by_hash($hash);
   $party  = DB_get_party_by_hash($hash);
 
   $gameid = DB_get_gameid_by_hash($hash);
   $party  = DB_get_party_by_hash($hash);
 

-  $r = DB_query_array("SELECT hash FROM Hand WHERE game_id='$gameid' AND party='$party' AND hash<>'$hash'");
+  $r = DB_query_array("SELECT hash FROM Hand WHERE game_id=".DB_quote_smart($gameid).
+                     " AND party=".DB_quote_smart($party)." AND hash<>".DB_quote_smart($hash));

 
   if($r)
     return $r[0];
 
   if($r)
     return $r[0];


@@ -989,22 +1022,22 @@ function DB_get_partner_hash_by_hash($hash)
 function DB_format_gameid($gameid)
 {
   /* get session and create date */
 function DB_format_gameid($gameid)
 {
   /* get session and create date */

-  $r = DB_query_array("SELECT session, create_date FROM Game WHERE id='$gameid' ");
+  $r = DB_query_array("SELECT session, create_date FROM Game WHERE id=".DB_quote_smart($gameid));

   $session = $r[0];
   $date    = $r[1];
 
   /* get number of game */
   $r = DB_query_array("SELECT SUM(TIME_TO_SEC(TIMEDIFF(create_date, '$date'))<=0) ".
                      " FROM Game".
   $session = $r[0];
   $date    = $r[1];
 
   /* get number of game */
   $r = DB_query_array("SELECT SUM(TIME_TO_SEC(TIMEDIFF(create_date, '$date'))<=0) ".
                      " FROM Game".

-                     " WHERE session='$session' ");
+                     " WHERE session=".DB_quote_smart($session));

   return $session.'.'.$r[0];
 }
 
 function DB_get_reminder($user,$gameid)
 {
   $r = DB_query_array("SELECT COUNT(*) FROM Reminder ".
   return $session.'.'.$r[0];
 }
 
 function DB_get_reminder($user,$gameid)
 {
   $r = DB_query_array("SELECT COUNT(*) FROM Reminder ".

-                     "  WHERE user_id=$user ".
-                     "  AND game_id=$gameid ".
+                     "  WHERE user_id=".DB_quote_smart($user).
+                     "  AND game_id=".DB_quote_smart($gameid).

                      "  AND DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= create_date".
                      "  GROUP BY user_id " );
   if($r)
                      "  AND DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= create_date".
                      "  GROUP BY user_id " );
   if($r)


@@ -1032,54 +1065,30 @@ function DB_is_session_active($session)
     return -1;
 }
 
     return -1;
 }
 

-function DB_get_score_by_gameid($gameid)
-{
-  /* returns the points of a game from the point of the re parth (<0 if they lost) */
-  $queryresult = DB_query("SELECT COUNT(*),party FROM Score ".
-                         "  WHERE game_id=$gameid ".
-                         "  GROUP BY party ");
-  $re     = 0;
-  $contra = 0;
-
-  while($r = DB_fetch_array($queryresult) )
-    {
-      if($r[1] == "re")
-       $re += $r[0];
-      else if ($r[1] == "contra")
-       $contra += $r[0];
-    };
-
-  return ($re - $contra);
-}
-

 function DB_get_gameids_of_finished_games_by_session($session)
 {
   $ids = array ();
 
   if($session==0) /* return all games */
 function DB_get_gameids_of_finished_games_by_session($session)
 {
   $ids = array ();
 
   if($session==0) /* return all games */

-    $queryresult = DB_query("SELECT id FROM Game ".
-                           " WHERE status='gameover' ".
-                           " ORDER BY create_date ASC");
+    $queryresult = DB_query_array_all("SELECT Game.id,SUM(IF(STRCMP(Score.party,'re'),-1,1)),Game.type FROM Game ".
+                                 " LEFT JOIN Score on game_id=Game.id".
+                                 " WHERE status='gameover' ".
+                                 " GROUP BY Game.id");

   else   /* return games in a session */
   else   /* return games in a session */

-    $queryresult = DB_query("SELECT id FROM Game ".
-                           "  WHERE session=$session ".
-                           "   AND status='gameover' ".
-                           " ORDER BY create_date ASC");
-
-  $i=0;
-  while($r = DB_fetch_array($queryresult) )
-    {
-      $ids[$i] = $r[0];
-      $i++;
-    }
+    $queryresult = DB_query_array_all("SELECT Game.id,SUM(IF(STRCMP(Score.party,'re'),-1,1)),Game.type FROM Game ".
+                                     " LEFT JOIN Score on game_id=Game.id".
+                                     " WHERE session=".DB_quote_smart($session).
+                                     " AND status='gameover' ".
+                                     " GROUP BY Game.id".
+                                     " ORDER BY Game.create_date ASC");

 
 

-  return $ids;
+  return $queryresult;

 }
 
 function DB_get_card_value_by_cardid($id)
 {
   $r = DB_query_array("SELECT points FROM Card ".
 }
 
 function DB_get_card_value_by_cardid($id)
 {
   $r = DB_query_array("SELECT points FROM Card ".

-                     "  WHERE id=$id ");
+                     "  WHERE id=".DB_quote_smart($id));

 
   if($r)
     return $r[0];
 
   if($r)
     return $r[0];


@@ -1235,9 +1244,12 @@ function DB_get_number_of_tricks($gameid,$position)
   return $r[0];
 }
 
   return $r[0];
 }
 

-function DB_digest_insert_email($To,$message)
+function DB_digest_insert_email($To,$message,$type,$gameid)

 {
 {

-  DB_query("INSERT INTO digest_email VALUES (NULL,".DB_quote_smart($To).",NULL,".DB_quote_smart($message).")");
+  if($type == GAME_YOUR_TURN)
+    DB_query("INSERT INTO digest_email VALUES (NULL,".DB_quote_smart($To).",NULL,'your_turn',$gameid,".DB_quote_smart($message).")");
+  else
+    DB_query("INSERT INTO digest_email VALUES (NULL,".DB_quote_smart($To).",NULL,'misc',NULL,".DB_quote_smart($message).")");

   return;
 }
 
   return;
 }
 


@@ -1256,7 +1268,7 @@ function DB_get_digest_message_by_email($email)
 {
   $messages = array();
 
 {
   $messages = array();
 

-  $result = DB_query("SELECT id,content FROM digest_email Where email='$email'");
+  $result = DB_query("SELECT id,content,type,game_id FROM digest_email Where email='$email'");

   while($r = DB_fetch_array($result))
     $messages[]=$r;
 
   while($r = DB_fetch_array($result))
     $messages[]=$r;