From 55caabc4e7f31b03a3e73fbd2b93afa5e3a986bc Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Thu, 16 Jun 2016 12:22:32 +1000
Subject: [PATCH] Database and some code changes for compatability with PHP7 /
 mysqli driver

---
 admin/index.php                             | 2 +-
 config.default.php                          | 2 +-
 include/limesurvey/admin/globalsettings.php | 2 +-
 include/limesurvey/common_functions.php     | 2 +-
 include/limesurvey/config.php               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index bbc7b1a6..c232f6be 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,4 +1,4 @@
- <?php
+<?php
  /**
  * Display an index of Admin tools
  *
diff --git a/config.default.php b/config.default.php
index da5f8685..2535aa0b 100644
--- a/config.default.php
+++ b/config.default.php
@@ -261,7 +261,7 @@ if (!defined('DB_USER')) define('DB_USER', 'quexs');
 if (!defined('DB_PASS')) define('DB_PASS', 'quexs');
 if (!defined('DB_HOST')) define('DB_HOST', 'localhost');
 if (!defined('DB_NAME')) define('DB_NAME', 'quexs');
-if (!defined('DB_TYPE')) define('DB_TYPE', 'mysqlt');
+if (!defined('DB_TYPE')) define('DB_TYPE', 'mysqli');
 
 /**
  * The prefix for the limesurvey database
diff --git a/include/limesurvey/admin/globalsettings.php b/include/limesurvey/admin/globalsettings.php
index 42f34a0a..687176c4 100644
--- a/include/limesurvey/admin/globalsettings.php
+++ b/include/limesurvey/admin/globalsettings.php
@@ -31,7 +31,7 @@ function injectglobalsettings()
     {
         foreach  ($dbvaluearray as $setting)
         {
-            global $$setting['stg_name'];
+            global ${$setting['stg_name']};
             if (isset($$setting['stg_name']))
             {
                 $$setting['stg_name']=$setting['stg_value'];
diff --git a/include/limesurvey/common_functions.php b/include/limesurvey/common_functions.php
index fdbf988c..f00f1432 100644
--- a/include/limesurvey/common_functions.php
+++ b/include/limesurvey/common_functions.php
@@ -6751,7 +6751,7 @@ function usedTokens($token)
     $utresult = true;
     $query = "SELECT tid, usesleft from {$dbprefix}tokens_$surveyid WHERE token=".db_quoteall($token);
 
-    $result=db_execute_assoc($query,null,true);
+    $result=db_execute_assoc($query,false,true);
     if ($result !== false) {
         $row=$result->FetchRow();
         if ($row['usesleft']>0) $utresult = false;
diff --git a/include/limesurvey/config.php b/include/limesurvey/config.php
index 681316a0..2b1bc7e8 100644
--- a/include/limesurvey/config.php
+++ b/include/limesurvey/config.php
@@ -31,7 +31,7 @@ require_once(dirname(__FILE__).'/../../config.inc.php');
 
 // Basic Setup
 
-$databasetype       =   'mysql';       // ADOdb database driver - valid values are mysql, mysqli, odbc_mssql, mssql_n, odbtp or postgres
+$databasetype       =   'mysqli';       // ADOdb database driver - valid values are mysql, mysqli, odbc_mssql, mssql_n, odbtp or postgres
                                        // mysql: Recommended driver for mysql
                                        // mysqli: Slightly faster driver for mysql - not on all server systems available
                                        // odbc_mssql: MSSQL driver using ODBC with MS SQL Server