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

Updating to Limesurvey 1.9.1+ revision 11132 (part one)

Browse Source
This commit is contained in:
azammitdcarf
2011-10-10 01:24:38 +00:00
parent 1786cf689b
commit 11c5f3e1df
61 changed files with 1978 additions and 2317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/limesurvey/classes/adodb/contrib/toxmlrpc.inc.php
View File

@@ -17,7 +17,7 @@
/**
* Include the main libraries
*/
require_once('xmlrpc.inc');
@require_once('xmlrpc.inc') OR die();
if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
/**

3
include/limesurvey/classes/adodb/datadict/datadict-firebird.inc.php
View File

@@ -10,6 +10,9 @@
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_firebird extends ADODB_DataDict {
var $databaseType = 'firebird';

2
include/limesurvey/classes/adodb/drivers/adodb-pdo_mssql.inc.php
View File

@@ -1,6 +1,6 @@
<?php
if (!defined('ADODB_DIR')) die();
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.

4
include/limesurvey/classes/adodb/drivers/adodb-pdo_mysql.inc.php
View File

@@ -1,6 +1,6 @@
<?php
if (!defined('ADODB_DIR')) die();
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
@@ -110,7 +110,7 @@ class ADODB_pdo_mysql extends ADODB_pdo {
$false = false;
return $false;
}
$retarr = array();
while (!$rs->EOF){
$fld = new ADOFieldObject();

2
include/limesurvey/classes/adodb/drivers/adodb-pdo_oci.inc.php
View File

@@ -1,6 +1,6 @@
<?php
if (!defined('ADODB_DIR')) die();
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.

24
include/limesurvey/classes/adodb/drivers/adodb-pdo_pgsql.inc.php
View File

@@ -8,13 +8,13 @@
Set tabs to 8.
*/
if (!defined('ADODB_DIR')) die();
class ADODB_pdo_pgsql extends ADODB_pdo {
var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
union
'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
union
select viewname,'V' from pg_views where viewname not like 'pg\_%'";
//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
var $isoDates = true; // accepts dates in ISO format
@@ -22,16 +22,16 @@ class ADODB_pdo_pgsql extends ADODB_pdo {
var $sysTimeStamp = "CURRENT_TIMESTAMP";
var $blobEncodeType = 'C';
var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum
FROM pg_class c, pg_attribute a,pg_type t
FROM pg_class c, pg_attribute a,pg_type t
WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
// used when schema defined
var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
and c.relnamespace=n.oid and n.nspname='%s'
and a.attname not like '....%%' AND a.attnum > 0
and c.relnamespace=n.oid and n.nspname='%s'
and a.attname not like '....%%' AND a.attnum > 0
AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
// get primary key etc -- from Freek Dijkstra
@@ -87,7 +87,7 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
if ($info['version'] >= 7.3) {
$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
and schemaname not in ( 'pg_catalog','information_schema')
union
union
select viewname,'V' from pg_views where viewname not like 'pg\_%' and schemaname not in ( 'pg_catalog','information_schema') ";
}
if ($mask) {
@@ -95,13 +95,13 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
$mask = $this->qstr(strtolower($mask));
if ($info['version']>=7.3)
$this->metaTablesSQL = "
select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
union
select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
union
select viewname,'V' from pg_views where viewname like $mask and schemaname not in ( 'pg_catalog','information_schema') ";
else
$this->metaTablesSQL = "
select tablename,'T' from pg_tables where tablename like $mask
union
select tablename,'T' from pg_tables where tablename like $mask
union
select viewname,'V' from pg_views where viewname like $mask";
}
$ret = ADOConnection::MetaTables($ttype,$showSchema);

1
include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlite.inc.php
View File

@@ -13,6 +13,7 @@
And also Sid Dunayer [sdunayer#interserv.com] for extensive fixes.
*/
if (!defined('ADODB_DIR')) die();
class ADODB_pdo_sqlite extends ADODB_pdo {
var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table'";
var $sysDate = 'current_date';

3
include/limesurvey/classes/adodb/drivers/adodb-sybase_ase.inc.php
View File

@@ -10,6 +10,7 @@
Contributed by Interakt Online. Thx Cristian MARIN cristic#interaktonline.com
*/
if (!defined('ADODB_DIR')) die();
require_once ADODB_DIR."/drivers/adodb-sybase.inc.php";
@@ -116,4 +117,4 @@ class adorecordset_sybase_ase extends ADORecordset_sybase {
}
}
?>
?>

2
include/limesurvey/classes/adodb/session/adodb-encrypt-secret.php
View File

@@ -13,7 +13,7 @@
@define('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');
if (!is_dir(HORDE_BASE)) {
trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), E_USER_ERROR);
// trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), E_USER_ERROR);
return 0;
}