Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Database and some code changes for compatability with PHP7 / mysqli driver

Browse Source
This commit is contained in:
Adam Zammit
2016-06-16 12:22:32 +10:00
parent d683756015
commit 55caabc4e7
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/index.php
View File

@@ -1,4 +1,4 @@
<?php <?php
/** /**
* Display an index of Admin tools * Display an index of Admin tools
* *

2
config.default.php
View File

@@ -261,7 +261,7 @@ if (!defined('DB_USER')) define('DB_USER', 'quexs');
if (!defined('DB_PASS')) define('DB_PASS', 'quexs'); if (!defined('DB_PASS')) define('DB_PASS', 'quexs');
if (!defined('DB_HOST')) define('DB_HOST', 'localhost'); if (!defined('DB_HOST')) define('DB_HOST', 'localhost');
if (!defined('DB_NAME')) define('DB_NAME', 'quexs'); 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 * The prefix for the limesurvey database

2
include/limesurvey/admin/globalsettings.php
View File

@@ -31,7 +31,7 @@ function injectglobalsettings()
{ {
foreach ($dbvaluearray as $setting) foreach ($dbvaluearray as $setting)
{ {
global $$setting['stg_name']; global ${$setting['stg_name']};
if (isset($$setting['stg_name'])) if (isset($$setting['stg_name']))
{ {
$$setting['stg_name']=$setting['stg_value']; $$setting['stg_name']=$setting['stg_value'];

2
include/limesurvey/common_functions.php
View File

@@ -6751,7 +6751,7 @@ function usedTokens($token)
$utresult = true; $utresult = true;
$query = "SELECT tid, usesleft from {$dbprefix}tokens_$surveyid WHERE token=".db_quoteall($token); $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) { if ($result !== false) {
$row=$result->FetchRow(); $row=$result->FetchRow();
if ($row['usesleft']>0) $utresult = false; if ($row['usesleft']>0) $utresult = false;

2
include/limesurvey/config.php
View File

@@ -31,7 +31,7 @@ require_once(dirname(__FILE__).'/../../config.inc.php');
// Basic Setup // 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 // mysql: Recommended driver for mysql
// mysqli: Slightly faster driver for mysql - not on all server systems available // mysqli: Slightly faster driver for mysql - not on all server systems available
// odbc_mssql: MSSQL driver using ODBC with MS SQL Server // odbc_mssql: MSSQL driver using ODBC with MS SQL Server