Changeset 3 for branches/rsr.v5.1.dev/web/punbb/include/dblayer/common_db.php

Timestamp:

Nov 14, 2011, 11:17:15 PM (13 years ago)

Author:

dj3c1t

Message:

passage a Fluxbb 1.4.7

File:

• branches/rsr.v5.1.dev/web/punbb/include/dblayer/common_db.php (modified) (2 diffs)

branches/rsr.v5.1.dev/web/punbb/include/dblayer/common_db.php

@@ -1 +1 @@
 <?php
-/***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
-
-  This file is part of PunBB.
-
-  PunBB is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
-  or (at your option) any later version.
-
-  PunBB is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-  MA  02111-1307  USA
-
-************************************************************************/
-
+/**
+ * Copyright (C) 2008-2011 FluxBB
+ * based on code by Rickard Andersson copyright (C) 2002-2008 PunBB
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+ */
 
 // Make sure no one attempts to run this script "directly"
@@ -29 +12 @@
 
 
-//
-// Return current timestamp (with microseconds) as a float (used in dblayer)
-//
-if (defined('PUN_SHOW_QUERIES'))
-{
-        function get_microtime()
-        {
-                list($usec, $sec) = explode(' ', microtime());
-                return ((float)$usec + (float)$sec);
-        }
-}
-
-
 // Load the appropriate DB layer class
 switch ($db_type)
 {
         case 'mysql':
-                require PUN_ROOT.'include/dblayer/mysql.php';
+                require_once PUN_ROOT.'include/dblayer/mysql.php';
+                break;
+
+        case 'mysql_innodb':
+                require_once PUN_ROOT.'include/dblayer/mysql_innodb.php';
                 break;
 
         case 'mysqli':
-                require PUN_ROOT.'include/dblayer/mysqli.php';
+                require_once PUN_ROOT.'include/dblayer/mysqli.php';
+                break;
+
+        case 'mysqli_innodb':
+                require_once PUN_ROOT.'include/dblayer/mysqli_innodb.php';
                 break;
 
         case 'pgsql':
-                require PUN_ROOT.'include/dblayer/pgsql.php';
+                require_once PUN_ROOT.'include/dblayer/pgsql.php';
                 break;
 
         case 'sqlite':
-                require PUN_ROOT.'include/dblayer/sqlite.php';
+                require_once PUN_ROOT.'include/dblayer/sqlite.php';
                 break;
 
         default:
-                error('\''.$db_type.'\' n\'est pas un type de base de données valable. Veuillez vérifier vos paramÚtres de configuration dans config.php', __FILE__, __LINE__);
+                error('\''.$db_type.'\' is not a valid database type. Please check settings in config.php.', __FILE__, __LINE__);
                 break;
 }