X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fdb.php;h=3be949468495aa373c2da51c051ee10e66d2bbb7;hp=1f02169f91cc589a408c6f3e0b4ad42e7801e3f3;hb=34745273b4e8935b4423a0db050dcd75bc672209;hpb=5d1647f138763213a32e3e1ba426e3f86157f018

diff --git a/include/db.php b/include/db.php
index 1f02169..3be9494 100644
--- 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,17 +30,13 @@ if(!isset($HOST))
 
 function DB_open()
 {
-  $version_needed = 4;
+  $version_needed = 5;
 
   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;
     };
 
@@ -54,19 +50,21 @@ function DB_open()
 function DB_close()
 {
   global $DB;
-  mysql_close($DB);
+  $DB->close();
   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)) {
-        $value = "'" . mysql_real_escape_string($value) . "'";
+        $value = "'" . $DB->real_escape_string($value) . "'";
+	$value = addcslashes($value, '%_');
     }
     return $value;
 }
@@ -86,9 +84,10 @@ function DB_test()
 /* use Mysql in the background */
 function DB_query($query)
 {
+  global $DB;
   /* debug/optimize the database
   $time = microtime();
-  $return = mysql_query($query);
+  $return = $DB->query($query);
   $time = $time - microtime();
 
   if($time > 0.05) // this way we can find only the long ones
@@ -102,22 +101,18 @@ function DB_query($query)
   return $return;
   */
 
-  return mysql_query($query);
+  return $DB->query($query);
 }
 
 function DB_fetch_array($result)
 {
-  return mysql_fetch_array($result,MYSQL_NUM);
+  return $result->fetch_array(MYSQLI_NUM);
 }
 
 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 */
 
@@ -812,9 +807,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 +943,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)