BUGFIX: fixed previous commit about sending mail in utf-8

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

diff --git a/include/db.php b/include/db.php
index 0523fea4b675e3093dcc8ce0c3ef264b523d8504..f683beba29402686e4e93a057139cd63787b0bd3 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 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.
  *
@@ -30,7 +30,7 @@ if(!isset($HOST))
 
 function DB_open()
 {
-  $version_needed = 3;
+  $version_needed = 5;
 
   global $DB,$DB_user,$DB_host,$DB_database,$DB_password;
   $DB = @mysql_connect($DB_host,$DB_user, $DB_password);
@@ -812,9 +812,6 @@ function DB_get_PREF($myid)
       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';
          break;
 
        case 'email':
@@ -951,6 +948,12 @@ function DB_set_recovery_password($user,$newpw)
   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)
@@ -1242,9 +1245,12 @@ function DB_get_number_of_tricks($gameid,$position)
   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;
 }
 
@@ -1263,7 +1269,7 @@ function DB_get_digest_message_by_email($email)
 {
   $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;