Skip to content

Commit

Permalink
Fixed issue #5506: Importing a survey with quotas failes
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11196 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Oct 18, 2011
1 parent 7ddd8ce commit 39bfa00
Show file tree
Hide file tree
Showing 5 changed files with 125 additions and 113 deletions.
25 changes: 3 additions & 22 deletions application/controllers/admin/tokens.php
View file
Expand Up @@ -45,25 +45,6 @@ function index($surveyid)
show_error("no permissions"); // TODO Replace
}

//if ($enableLdap)
//{
// require_once(dirname(__FILE__).'/../config-ldap.php');
//}
/*if (!isset($order)) {$order=preg_replace('/[^_ a-z0-9-]/i', '', returnglobal('order'));}
if (!isset($limit)) {$limit=(int)returnglobal('limit');}
if ($limit==0) $limit=50;
if (!isset($start)) {$start=(int)returnglobal('start');}
if (!isset($searchstring)) {$searchstring=returnglobal('searchstring');}
if (!isset($tokenid)) {$tokenid=returnglobal('tid');}
if (!isset($tokenids)) {$tokenids=returnglobal('tids');}
if (!isset($gtokenid)) {$gtokenid=returnglobal('gtid');}
if (!isset($gtokenids)) {$gtokenids=returnglobal('gtids');}
if (!isset($starttokenid)) {$starttokenid=sanitize_int(returnglobal('last_tid'));}*/

//include_once("login_check.php");
//include_once("database.php");

//$js_admin_includes[]='scripts/tokens.js';
self::_js_admin_includes(base_url()."scripts/admin/tokens.js");

$this->load->helper("surveytranslator");
Expand Down Expand Up @@ -1164,9 +1145,9 @@ function remind($surveyid)

}

if (isset($starttokenid)) {$tokenoutput .= " (".$clang->gT("From Token ID").": {$starttokenid})";}
if (isset($tokenid)) {$tokenoutput .= " (".$clang->gT("Sending to Token ID").": {$tokenid})";}
if (isset($tokenids)) {$tokenoutput .= " (".$clang->gT("Sending to Token IDs").": ".implode("|", $tokenids).")";}
if (isset($starttokenid)) {$tokenoutput .= " (".$clang->gT("From token ID").": {$starttokenid})";}
if (isset($tokenid)) {$tokenoutput .= " (".$clang->gT("Sending to token ID").": {$tokenid})";}
if (isset($tokenids)) {$tokenoutput .= " (".$clang->gT("Sending to token IDs").": ".implode("|", $tokenids).")";}

if (isset($_POST['bypassbademails']) && $_POST['bypassbademails'] == 'Y')
{
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/admin/import_helper.php
View file
Expand Up @@ -3851,7 +3851,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
}

// Import survey_url_parameters ----------------------------------------------
if(isset($xml->quota_languagesettings))
if(isset($xml->survey_url_parameters))
{
//$tablename=$dbprefix.'quota_languagesettings';
$CI->load->model('survey_url_parameters_model');
Expand Down
66 changes: 38 additions & 28 deletions application/models/quota_languagesettings_model.php
View file
@@ -1,33 +1,43 @@
<?php if ( ! defined('BASEPATH')) die('No direct script access allowed');

class Quota_languagesettings_model extends CI_Model {

function getAllRecords($condition=FALSE)
{
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_languagesettings');

return $data;
}

function getSomeRecords($fields,$condition=FALSE)
{
foreach ($fields as $field)
{
$this->db->select($field);
}
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_languagesettings');

return $data;
}

function getAllRecords($condition=FALSE)
{
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_languagesettings');

return $data;
}

function getSomeRecords($fields,$condition=FALSE)
{
foreach ($fields as $field)
{
$this->db->select($field);
}
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_languagesettings');

return $data;
}

/**
* Inserts record(s) to the quota_languagesettings table
*
* @param array $data Records to insert
*/
function insertRecords($data)
{
return $this->db->insert('quota_languagesettings',$data);
}

}
66 changes: 38 additions & 28 deletions application/models/quota_members_model.php
View file
@@ -1,33 +1,43 @@
<?php if ( ! defined('BASEPATH')) die('No direct script access allowed');

class Quota_members_model extends CI_Model {

function getAllRecords($condition=FALSE)
{
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_members');

return $data;
}

function getSomeRecords($fields,$condition=FALSE)
{
foreach ($fields as $field)
{
$this->db->select($field);
}
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_members');

return $data;
}

function getAllRecords($condition=FALSE)
{
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_members');

return $data;
}

function getSomeRecords($fields,$condition=FALSE)
{
foreach ($fields as $field)
{
$this->db->select($field);
}
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota_members');

return $data;
}

/**
* Inserts record(s) to the quota_members table
*
* @param array $data Records to insert
*/
function insertRecords($data)
{
return $this->db->insert('quota_members',$data);
}

}
79 changes: 45 additions & 34 deletions application/models/quota_model.php
View file
Expand Up @@ -2,33 +2,33 @@

class Quota_model extends CI_Model {

function getAllRecords($condition=FALSE)
{
if ($condition != FALSE)
{
$this->db->where($condition);
}
function getAllRecords($condition=FALSE)
{
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota');
$data = $this->db->get('quota');

return $data;
}
return $data;
}

function getSomeRecords($fields,$condition=FALSE)
{
foreach ($fields as $field)
{
$this->db->select($field);
}
if ($condition != FALSE)
{
$this->db->where($condition);
}
function getSomeRecords($fields,$condition=FALSE)
{
foreach ($fields as $field)
{
$this->db->select($field);
}
if ($condition != FALSE)
{
$this->db->where($condition);
}

$data = $this->db->get('quota');
$data = $this->db->get('quota');

return $data;
}
return $data;
}

function deleteQuota($condition=false,$recursive=true)
{
Expand All @@ -51,17 +51,28 @@ function deleteQuota($condition=false,$recursive=true)
$this->db->delete('quota');
}

function getQuotaInformation($surveyid,$language,$quotaid)
{
//Used by getQuotaInformation helper
function getQuotaInformation($surveyid,$language,$quotaid)
{
//Used by getQuotaInformation helper
$query = "SELECT * FROM ".$this->db->dbprefix('quota').", ".$this->db->dbprefix('quota_languagesettings')."
WHERE ".$this->db->dbprefix('quota').".id = ".$this->db->dbprefix('quota_languagesettings').".quotals_quota_id
AND sid='".$surveyid."'
AND quotals_language='".$language."'";
if ($quotaid != 'all')
{
$query .= " AND id=$quotaid";
}
return $this->db->query($query);
}
WHERE ".$this->db->dbprefix('quota').".id = ".$this->db->dbprefix('quota_languagesettings').".quotals_quota_id
AND sid='".$surveyid."'
AND quotals_language='".$language."'";
if ($quotaid != 'all')
{
$query .= " AND id=$quotaid";
}
return $this->db->query($query);
}

/**
* Inserts record(s) to the quota table
*
* @param array $data Records to insert
*/
function insertRecords($data)
{
return $this->db->insert('quota',$data);
}

}

0 comments on commit 39bfa00

Please sign in to comment.