", $fieldsarray); } - elseif (SendEmailMessage($sendmessage, $msgsubject, $to, $from, $sitename,$ishtml,getBounceEmail($surveyid),null,$customheaders)) + elseif (SendEmailMessage($sendmessage, $msgsubject, $to, $from, Yii::app()->getConfig('sitename'),$ishtml,getBounceEmail($surveyid),null,$customheaders)) { // Put date into remindersent $today = date_shift(date("Y-m-d H:i:s"), "Y-m-d H:i", $timeadjust); - $udequery = "UPDATE ".db_table_name("tokens_{$surveyid}")."\n" + $udequery = "UPDATE {{tokens_$surveyid}}\n" ."SET remindersent='$today',remindercount = remindercount+1 WHERE tid={$emrow['tid']}"; // - $uderesult = $connect->Execute($udequery) or safe_die ("Could not update tokens
$udequery
".$connect->ErrorMsg()); + $uderesult = Yii::app()->db->createCommand($udequery)->execute(); //orig: $tokenoutput .= "({$emrow['tid']})[".$clang->gT("Reminder sent to:")." {$emrow['firstname']} {$emrow['lastname']}]
\n"; $tokenoutput .= "({$emrow['tid']}) [".$clang->gT("Reminder sent to:")." {$emrow['firstname']} {$emrow['lastname']} ($to)]
\n"; } @@ -1402,8 +1424,11 @@ function remind($surveyid) ."
\n"; } //$tokenoutput .= "\n"; - echo $tokenoutput; - } + $this->controller->_getAdminHeader(); + $this->controller->render('/admin/token/tokenbar', $data); + echo $tokenoutput; + $this->controller->_getAdminFooter("http://docs.limesurvey.org", $this->controller->lang->gT("LimeSurvey online manual")); + } } /** @@ -1411,33 +1436,704 @@ function remind($surveyid) */ function exportdialog($surveyid) { + $clang = $this->controller->lang; $surveyid = sanitize_int($surveyid); if (bHasSurveyPermission($surveyid, 'tokens','export') )//EXPORT FEATURE SUBMITTED BY PIETERJAN HEYSE { - $this->load->helper("database"); - if ($this->input->post('submit')) + if (!empty($_POST['submit'])) { - $this->load->helper("export"); + Yii::app()->loadHelper("export"); tokens_export($surveyid); } - $langquery = "SELECT language FROM ".$this->db->dbprefix("tokens_$surveyid")." group by language"; - $langresult = db_execute_assoc($langquery); - $data['resultr'] = $langresult->row_array(); + $langquery = "SELECT language FROM {{tokens_$surveyid}} group by language"; + $langresult = Yii::app()->db->createCommand($langquery)->query(); + $data['resultr'] = $langresult->read(); - $data['clang']=$this->limesurvey_lang; + $data['clang']=$this->controller->lang; $thissurvey=getSurveyInfo($surveyid); $data['thissurvey']=$thissurvey; - $data['imageurl'] = $this->config->item('imageurl'); + $data['imageurl'] = Yii::app()->getConfig('imageurl'); $data['surveyid']=$surveyid; - self::_getAdminHeader(); - $this->load->view("admin/token/tokenbar",$data); - $this->load->view("admin/token/exportdialog",$data); - self::_getAdminFooter("http://docs.limesurvey.org", $this->limesurvey_lang->gT("LimeSurvey online manual")); + $this->controller->_getAdminHeader(); + $this->controller->render("/admin/token/tokenbar",$data); + $this->controller->render("/admin/token/exportdialog",$data); + $this->controller->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); } } + /** + * Performs a ldap import + * + * @access public + * @param int $surveyid + * @return void + */ + public function importldap($surveyid) + { + $surveyid = (int) $surveyid; + $clang = $this->controller->lang; + + Yii::app()->loadConfig('ldap'); + Yii::app()->loadHelper('ldap'); + + $tokenoutput = ''; + if (!bHasSurveyPermission($surveyid, 'tokens', 'create')) + show_error('access denied'); + + if (empty($_POST['submit'])) + { + $tokenoutput .= "\t\n"; + $tokenoutput .= self::formldap(null, $surveyid); + $tokenoutput .= "\n"; + } + else + { + $ldap_queries = Yii::app()->getConfig('ldap_queries'); + $ldap_server = Yii::app()->getConfig('ldap_server'); + + $duplicatelist=array(); + $invalidemaillist=array(); + $tokenoutput .= "\t
\n$buffer
\n".htmlspecialchars($connect->ErrorMsg())."
$iq\n"); + } + } // End for each entry + } // End foreach responseGroup + } // End of if resnum >= 1 + + if ($xz != 0) + { + $tokenoutput .= "".$clang->gT("Success")."
\n"; + } + else + { + $tokenoutput .= "".$clang->gT("Failed")."
\n"; + } + $message = "$resultnum ".$clang->gT("Results from LDAP Query").".
\n"; + $message .= "$xv ".$clang->gT("Records met minumum requirements").".
\n"; + $message .= "$xz ".$clang->gT("Records imported").".
\n"; + $message .= "$xy ".$clang->gT("Duplicate records removed"); + $message .= " [".$clang->gT("List")."]"; + $message .= ""; + $message .= "
\n"; + $message .= sprintf($clang->gT("%s records with invalid email address removed"),$invalidemailcount); + $message .= " [".$clang->gT("List")."]"; + $message .= ""; + $message .= "
\n"; + $tokenoutput .= "$message
\n"; + } + else { + $errormessage="".$clang->gT("Error").": ".$clang->gT("Can't bind to the LDAP directory")."\n"; + $tokenoutput .= self::formldap($errormessage, $surveyid); + } + @ldap_close($ds); + } + else { + $errormessage="".$clang->gT("Error").": ".$clang->gT("Can't connect to the LDAP directory")."\n"; + $tokenoutput .= self::formldap($errormessage, $surveyid); + } + } + + $this->controller->_getAdminHeader(); + $this->controller->render('/admin/token/tokenbar', array('thissurvey' => getSurveyInfo($surveyid), 'imageurl' => Yii::app()->getConfig('imageurl'), 'clang' => $clang, 'surveyid' => $surveyid)); + echo $tokenoutput; + $this->controller->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); + } + + /** + * Ldap submission form + */ + function formldap($error=null, $surveyid) + { + $ldap_queries = Yii::app()->getConfig('ldap_queries'); + $clang = $this->controller->lang; + + $tokenoutput = ''; + if ($error) {$tokenoutput .= $error . "
\n";} + + if (!function_exists('ldap_connect')) + { + $tokenoutput .= '
';
+ $tokenoutput .= $clang->gT('Sorry, but the LDAP module is missing in your PHP configuration.');
+ $tokenoutput .= '
';
+ }
+
+ elseif (! isset($ldap_queries) || ! is_array($ldap_queries) || count($ldap_queries) == 0) {
+ $tokenoutput .= '
';
+ $tokenoutput .= $clang->gT('LDAP is disabled or no LDAP query defined.');
+ $tokenoutput .= '
';
+ }
+ else {
+ $tokenoutput .= "
\n";
+
+ $the_path = Yii::app()->getConfig('tempdir');
+
+ $the_file_name = $_FILES['the_file']['name'];
+ $the_file = $_FILES['the_file']['tmp_name'];
+ $the_full_file_path = $the_path."/".$the_file_name;
+
+ if (!@move_uploaded_file($the_file, $the_full_file_path))
+ {
+ $errormessage="
\n"; + $xz = 0; $recordcount = 0; $xv = 0; + // This allows to read file with MAC line endings too + @ini_set('auto_detect_line_endings', true); + // open it and trim the ednings + $tokenlistarray = file($the_full_file_path); + $baselanguage=GetBaseLanguageFromSurveyID($surveyid); + if (!isset($tokenlistarray)) + { + $tokenoutput .= "
\n"; + } + if (!isset($_POST['filterduplicatefields']) || (isset($_POST['filterduplicatefields']) && count($_POST['filterduplicatefields'])==0)) + { + $filterduplicatefields=array('firstname','lastname','email'); + } else { + $filterduplicatefields=$_POST['filterduplicatefields']; + } + $separator = returnglobal('separator'); + foreach ($tokenlistarray as $buffer) + { + $buffer=@mb_convert_encoding($buffer,"UTF-8",$uploadcharset); + $firstname = ""; $lastname = ""; $email = ""; $emailstatus="OK"; $token = ""; $language=""; $attribute1=""; $attribute2=""; //Clear out values from the last path, in case the next line is missing a value + if ($recordcount==0) + { + // Pick apart the first line + $buffer=removeBOM($buffer); + $allowedfieldnames=array('firstname','lastname','email','emailstatus','token','language', 'validfrom', 'validuntil', 'usesleft'); + $allowedfieldnames=array_merge($attrfieldnames,$allowedfieldnames); + + switch ($separator) { + case 'comma': + $separator = ','; + break; + case 'semicolon': + $separator = ';'; + break; + default: + $comma = substr_count($buffer,','); + $semicolon = substr_count($buffer,';'); + if ($semicolon>$comma) $separator = ';'; else $separator = ','; + } + $firstline = convertCSVRowToArray($buffer,$separator,'"'); + $firstline=array_map('trim',$firstline); + $ignoredcolumns=array(); + //now check the first line for invalid fields + foreach ($firstline as $index=>$fieldname) + { + $firstline[$index] = preg_replace("/(.*) <[^,]*>$/","$1",$fieldname); + $fieldname = $firstline[$index]; + if (!in_array($fieldname,$allowedfieldnames)) + { + $ignoredcolumns[]=$fieldname; + } + } + if (!in_array('firstname',$firstline) || !in_array('lastname',$firstline) || !in_array('email',$firstline)) + { + $tokenoutput .= "
"; + $recordcount=count($tokenlistarray); + break; + } + + } + else + { + + $line = convertCSVRowToArray($buffer,$separator,'"'); + + if (count($firstline)!=count($line)) + { + $invalidformatlist[]=$recordcount; + $recordcount++; + continue; + } + $writearray=array_combine($firstline,$line); + + //kick out ignored columns + foreach ($ignoredcolumns as $column) + { + unset($writearray[$column]); + } + $dupfound=false; + $invalidemail=false; + + if ($filterduplicatetoken!=false) + { + $dupquery = "SELECT tid from {{tokens_$surveyid}} where 1=1"; + foreach($filterduplicatefields as $field) + { + if (isset($writearray[$field])) { + $dupquery.=' and '.db_quote_id($field).' = '.db_quoteall($writearray[$field]); + } + } + $dupresult = Yii::app()->db->createCommand($dupquery)->query(); + if ( $dupresult->getRowCount() > 0) + { + $dupfound = true; + $duplicatelist[]=$writearray['firstname']." ".$writearray['lastname']." (".$writearray['email'].")"; + } + } + + + $writearray['email'] = trim($writearray['email']); + + //treat blank emails + if ($filterblankemail && $writearray['email']=='') + { + $invalidemail=true; + $invalidemaillist[]=$line[0]." ".$line[1]." ( )"; + } + if ($writearray['email']!='') + { + $aEmailAddresses=explode(';',$writearray['email']); + foreach ($aEmailAddresses as $sEmailaddress) + { + if (!validate_email($sEmailaddress)) + { + $invalidemail=true; + $invalidemaillist[]=$line[0]." ".$line[1]." (".$line[2].")"; + } + } + } + + if (!isset($writearray['token'])) { + $writearray['token'] = ''; + } else { + $writearray['token'] = sanitize_token($writearray['token']); + } + + if (!$dupfound && !$invalidemail) + { + if (!isset($writearray['emailstatus']) || $writearray['emailstatus']=='') $writearray['emailstatus'] = "OK"; + if (!isset($writearray['language']) || $writearray['language'] == "") $writearray['language'] = $baselanguage; + if (isset($writearray['validfrom']) && trim($writearray['validfrom']=='')){ unset($writearray['validfrom']);} + if (isset($writearray['validuntil']) && trim($writearray['validuntil']=='')){ unset($writearray['validuntil']);} + + // sanitize it before writing into table + $sanitizedArray = array_map('db_quoteall',array_values($writearray)); + + $iq = "INSERT INTO {{tokens_$surveyid}} \n" + . "(".implode(',',array_keys($writearray)).") \n" + . "VALUES (".implode(",",$sanitizedArray).")"; + $ir = Yii::app()->db->createCommand($iq)->execute(); + + if (!$ir) + { + $duplicatelist[]=$writearray['firstname']." ".$writearray['lastname']." (".$writearray['email'].")"; + } else { + $xz++; + } + } + $xv++; + } + $recordcount++; + } + $recordcount = $recordcount-1; + if ($xz != 0) + { + $tokenoutput .= "
\n"; + } else { + $tokenoutput .= "
".$clang->gT("Error")."
".$clang->gT("Upload file not found. Check your permissions and path ({$the_full_file_path}) for the upload directory")."
\n"; + $tokenoutput .= self::form_upload_csv(null, $encodingsarray, $clang, $surveyid); + } + else + { + $tokenoutput .= "".$clang->gT("Uploaded CSV file successfully")."
\n"; + $xz = 0; $recordcount = 0; $xv = 0; + // This allows to read file with MAC line endings too + @ini_set('auto_detect_line_endings', true); + // open it and trim the ednings + $tokenlistarray = file($the_full_file_path); + $baselanguage=GetBaseLanguageFromSurveyID($surveyid); + if (!isset($tokenlistarray)) + { + $tokenoutput .= "
".$clang->gT("Failed to open the uploaded file!")."
\n"; + } + if (!isset($_POST['filterduplicatefields']) || (isset($_POST['filterduplicatefields']) && count($_POST['filterduplicatefields'])==0)) + { + $filterduplicatefields=array('firstname','lastname','email'); + } else { + $filterduplicatefields=$_POST['filterduplicatefields']; + } + $separator = returnglobal('separator'); + foreach ($tokenlistarray as $buffer) + { + $buffer=@mb_convert_encoding($buffer,"UTF-8",$uploadcharset); + $firstname = ""; $lastname = ""; $email = ""; $emailstatus="OK"; $token = ""; $language=""; $attribute1=""; $attribute2=""; //Clear out values from the last path, in case the next line is missing a value + if ($recordcount==0) + { + // Pick apart the first line + $buffer=removeBOM($buffer); + $allowedfieldnames=array('firstname','lastname','email','emailstatus','token','language', 'validfrom', 'validuntil', 'usesleft'); + $allowedfieldnames=array_merge($attrfieldnames,$allowedfieldnames); + + switch ($separator) { + case 'comma': + $separator = ','; + break; + case 'semicolon': + $separator = ';'; + break; + default: + $comma = substr_count($buffer,','); + $semicolon = substr_count($buffer,';'); + if ($semicolon>$comma) $separator = ';'; else $separator = ','; + } + $firstline = convertCSVRowToArray($buffer,$separator,'"'); + $firstline=array_map('trim',$firstline); + $ignoredcolumns=array(); + //now check the first line for invalid fields + foreach ($firstline as $index=>$fieldname) + { + $firstline[$index] = preg_replace("/(.*) <[^,]*>$/","$1",$fieldname); + $fieldname = $firstline[$index]; + if (!in_array($fieldname,$allowedfieldnames)) + { + $ignoredcolumns[]=$fieldname; + } + } + if (!in_array('firstname',$firstline) || !in_array('lastname',$firstline) || !in_array('email',$firstline)) + { + $tokenoutput .= "
".$clang->gT("Error: Your uploaded file is missing one or more of the mandatory columns: 'firstname', 'lastname' or 'email'")."
"; + $recordcount=count($tokenlistarray); + break; + } + + } + else + { + + $line = convertCSVRowToArray($buffer,$separator,'"'); + + if (count($firstline)!=count($line)) + { + $invalidformatlist[]=$recordcount; + $recordcount++; + continue; + } + $writearray=array_combine($firstline,$line); + + //kick out ignored columns + foreach ($ignoredcolumns as $column) + { + unset($writearray[$column]); + } + $dupfound=false; + $invalidemail=false; + + if ($filterduplicatetoken!=false) + { + $dupquery = "SELECT tid from {{tokens_$surveyid}} where 1=1"; + foreach($filterduplicatefields as $field) + { + if (isset($writearray[$field])) { + $dupquery.=' and '.db_quote_id($field).' = '.db_quoteall($writearray[$field]); + } + } + $dupresult = Yii::app()->db->createCommand($dupquery)->query(); + if ( $dupresult->getRowCount() > 0) + { + $dupfound = true; + $duplicatelist[]=$writearray['firstname']." ".$writearray['lastname']." (".$writearray['email'].")"; + } + } + + + $writearray['email'] = trim($writearray['email']); + + //treat blank emails + if ($filterblankemail && $writearray['email']=='') + { + $invalidemail=true; + $invalidemaillist[]=$line[0]." ".$line[1]." ( )"; + } + if ($writearray['email']!='') + { + $aEmailAddresses=explode(';',$writearray['email']); + foreach ($aEmailAddresses as $sEmailaddress) + { + if (!validate_email($sEmailaddress)) + { + $invalidemail=true; + $invalidemaillist[]=$line[0]." ".$line[1]." (".$line[2].")"; + } + } + } + + if (!isset($writearray['token'])) { + $writearray['token'] = ''; + } else { + $writearray['token'] = sanitize_token($writearray['token']); + } + + if (!$dupfound && !$invalidemail) + { + if (!isset($writearray['emailstatus']) || $writearray['emailstatus']=='') $writearray['emailstatus'] = "OK"; + if (!isset($writearray['language']) || $writearray['language'] == "") $writearray['language'] = $baselanguage; + if (isset($writearray['validfrom']) && trim($writearray['validfrom']=='')){ unset($writearray['validfrom']);} + if (isset($writearray['validuntil']) && trim($writearray['validuntil']=='')){ unset($writearray['validuntil']);} + + // sanitize it before writing into table + $sanitizedArray = array_map('db_quoteall',array_values($writearray)); + + $iq = "INSERT INTO {{tokens_$surveyid}} \n" + . "(".implode(',',array_keys($writearray)).") \n" + . "VALUES (".implode(",",$sanitizedArray).")"; + $ir = Yii::app()->db->createCommand($iq)->execute(); + + if (!$ir) + { + $duplicatelist[]=$writearray['firstname']." ".$writearray['lastname']." (".$writearray['email'].")"; + } else { + $xz++; + } + } + $xv++; + } + $recordcount++; + } + $recordcount = $recordcount-1; + if ($xz != 0) + { + $tokenoutput .= "
".$clang->gT("Successfully created token entries")."
\n"; + } else { + $tokenoutput .= "
".$clang->gT("Failed to create token entries")."
\n";
+ }
+ $message = '- '.sprintf($clang->gT("%s records in CSV"),$recordcount)." \n"; + $message .= '
- '.sprintf($clang->gT("%s records met minumum requirements"),$xv)." \n"; + $message .= '
- '.sprintf($clang->gT("%s records imported"),$xz)."
".$clang->gT('Warnings')."
- ";
+ if (count($duplicatelist)>0)
+ {
+ $message .= '
- '.sprintf($clang->gT("%s duplicate records removed"),count($duplicatelist)); + $message .= " [".$clang->gT("List")."]"; + $message .= ""; + $message .= " \n"; + } + + if (count($invalidformatlist)>0) + { + $message .= '
- '.sprintf($clang->gT("%s lines had a mismatching number of fields."),count($invalidformatlist));
+ $message .= " [".$clang->gT("List")."]";
+ $message .= "\n";
+ }
+ else
+ {
+ $tokenoutput = self::form_upload_csv(null, $encodingsarray, $clang, $surveyid);
+ $tokenoutput .= "\n";
+ }
+
+ $this->controller->_getAdminHeader();
+ $this->controller->render('/admin/token/tokenbar', array('thissurvey' => getSurveyInfo($surveyid), 'imageurl' => Yii::app()->getConfig('imageurl'), 'clang' => $clang, 'surveyid' => $surveyid));
+ echo $tokenoutput;
+ $this->controller->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
+ }
+
+ function form_upload_csv($error = null, $encodingsarray = array(), $clang = null, $surveyid)
+ {
+ $tokenoutput = '';
+ if ($error) {$tokenoutput .= $error . "
\n";} + asort($encodingsarray); + $charsetsout=''; + foreach ($encodingsarray as $charset=>$title) + { + $charsetsout.=""; + if ($separator == 'comma') $selected = " selected = 'selected'"; else $selected = ''; + $separatorout .= ""; + if ($separator == 'semicolon') $selected = " selected = 'selected'"; else $selected = ''; + $separatorout .= ""; + $tokenoutput .= "\n\n"; + return $tokenoutput; + } /** * Generate tokens */ @@ -1549,15 +2245,14 @@ function kill($surveyid) function bouncesettings($surveyid) { $surveyid = sanitize_int($surveyid); - $clang = $this->limesurvey_lang; - $data['clang']=$this->limesurvey_lang; + $clang = $this->controller->lang; + $data['clang']=$clang; $data['thissurvey'] = $data['settings']=getSurveyInfo($surveyid); - $data['imageurl'] = $this->config->item('imageurl'); + $data['imageurl'] = Yii::app()->getConfig('imageurl'); $data['surveyid']=$surveyid; - if($this->input->post()) + if(!empty($_POST)) { - $_POST = $this->input->post(); @$fieldvalue = array("bounceprocessing"=>$_POST['bounceprocessing'], "bounce_email"=>$_POST['bounce_email'], ); @@ -1571,21 +2266,23 @@ function bouncesettings($surveyid) $fieldvalue['bounceaccounthost']=$_POST['bounceaccounthost']; } - $where = "sid = $surveyid"; - $this->load->helper("database"); - db_execute_assoc($this->db->update_string('surveys', $fieldvalue, $where)); + $survey = Survey::model()->findByAttributes(array('sid' => $surveyid)); + foreach ($fieldvalue as $k => $v) + $survey->$k = $v; + $survey->save(); + //$connect->AutoExecute("{$dbprefix}surveys", $fieldvalue, 2,"sid=$surveyid",get_magic_quotes_gpc()); - self::_getAdminHeader(); - $this->load->view("admin/token/tokenbar",$data); - self::_showMessageBox($clang->gT("Bounce settings"),$clang->gT("Bounce settings have been saved."),"successheader"); - self::_getAdminFooter("http://docs.limesurvey.org", $this->limesurvey_lang->gT("LimeSurvey online manual")); + $this->controller->_getAdminHeader(); + $this->controller->render("/admin/token/tokenbar",$data); + $this->controller->_showMessageBox($clang->gT("Bounce settings"),$clang->gT("Bounce settings have been saved."),"successheader"); + $this->controller->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); } else { - self::_getAdminHeader(); - $this->load->view("admin/token/tokenbar",$data); - $this->load->view("admin/token/bounce",$data); - self::_getAdminFooter("http://docs.limesurvey.org", $this->limesurvey_lang->gT("LimeSurvey online manual")); + $this->controller->_getAdminHeader(); + $this->controller->render("/admin/token/tokenbar",$data); + $this->controller->render("/admin/token/bounce",$data); + $this->controller->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); } } diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php index 109641c8be4..13c5d8674c2 100644 --- a/application/helpers/admin/import_helper.php +++ b/application/helpers/admin/import_helper.php @@ -307,7 +307,7 @@ function CSVImportGroup($sFullFilepath, $newsid) $lsiresult=Yii::app()->db->createCommand($lsainsert)->query(); $results['labelsets']++; // Get the new insert id for the labels inside this labelset - $newlid=Yii::app()->db->getgetLastInsertID(); //$connect->Insert_ID("{$dbprefix}labelsets",'lid'); + $newlid=Yii::app()->db->getgetLastInsertID(); //$connect->Insert_ID("{{labelsets}}",'lid'); if ($labelsarray) { $count=0; @@ -444,7 +444,7 @@ function CSVImportGroup($sFullFilepath, $newsid) //GET NEW GID .... if is not done before and we count a group if a new gid is required if ($newgid == 0) { - $newgid = Yii::apps()->db->getgetLastInsertID(); //$connect->Insert_ID("{$dbprefix}groups",'gid'); + $newgid = Yii::apps()->db->getgetLastInsertID(); //$connect->Insert_ID("{{groups}}",'gid'); $countgroups++; } } @@ -535,7 +535,7 @@ function CSVImportGroup($sFullFilepath, $newsid) } else { - $aQIDReplacements[$oldqid]=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID("{$dbprefix}questions",'qid'); + $aQIDReplacements[$oldqid]=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID("{{questions}}",'qid'); $saveqid=$aQIDReplacements[$oldqid]; } $qtypes = getqtypelist("" ,"array"); @@ -574,7 +574,7 @@ function CSVImportGroup($sFullFilepath, $newsid) $qres = Yii::app()->db->createCommand($qinsert)->query() or safe_die ($clang->gT("Error").": Failed to insert question
\n$qinsert
\n"); if ($fieldname=='') { - $aSQIDReplacements[$labelrow['code'].'_'.$saveqid]=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}questions","qid"); + $aSQIDReplacements[$labelrow['code'].'_'.$saveqid]=$CI->db->insert_id(); //$connect->Insert_ID("{{questions}}","qid"); } } } @@ -661,7 +661,7 @@ function CSVImportGroup($sFullFilepath, $newsid) $qres = Yii::app()->db->createCommand()->insert('{{questions}}', $questionrowdata); if (!isset($questionrowdata['qid'])) { - $aSQIDReplacements[$answerrowdata['code'].$answerrowdata['qid']]=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID("{$dbprefix}questions","qid"); + $aSQIDReplacements[$answerrowdata['code'].$answerrowdata['qid']]=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID("{{questions}}","qid"); } $results['subquestions']++; @@ -723,7 +723,7 @@ function CSVImportGroup($sFullFilepath, $newsid) unset($qarowdata["qaid"]); - //$tablename="{$dbprefix}question_attributes"; + //$tablename="{{question_attributes}}"; //$qainsert=$connect->GetInsertSQL($tablename,$qarowdata); $result = Yii::app()->db->createCommand()->insert('{{question_attributes}}', $qarowdata); if ($result!==false) $results['question_attributes']++; @@ -1123,10 +1123,8 @@ function XMLImportGroup($sFullFilepath, $newsid) */ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) { - $CI =& get_instance(); - $CI->load->helper('database'); - $clang = $CI->limesurvey_lang; - $dbprefix = $CI->db->dbprefix; + $clang = Yii::app()->lang; + $aLIDReplacements=array(); $aQIDReplacements=array(); // this array will have the "new qid" for the questions, the key will be the "old qid" $aSQIDReplacements=array(); @@ -1347,11 +1345,11 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) unset($labelsetrowdata['lid']); $newvalues=array_values($labelsetrowdata); //$newvalues=array_map(array(&$connect, "qstr"),$newvalues); // quote everything accordingly - $lsainsert = "INSERT INTO {$dbprefix}labelsets (".implode(',',array_keys($labelsetrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix + $lsainsert = "INSERT INTO {{labelsets}} (".implode(',',array_keys($labelsetrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix $lsiresult=Yii::app()->db->createCommand($lsainsert)->query(); // Get the new insert id for the labels inside this labelset - $newlid=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}labelsets",'lid'); + $newlid=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID("{{labelsets}}",'lid'); if ($labelsarray) { $count=0; @@ -1376,7 +1374,7 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) $newvalues=array_values($labelrowdata); //$newvalues=array_map(array(&$connect, "qstr"),$newvalues); // quote everything accordingly - $lainsert = "INSERT INTO {$dbprefix}labels (".implode(',',array_keys($labelrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix + $lainsert = "INSERT INTO {{labels}} (".implode(',',array_keys($labelrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix $liresult=Yii::app()->db->createCommand($lainsert)->query(); $results['labels']++; } @@ -1386,7 +1384,7 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) //CHECK FOR DUPLICATE LABELSETS $thisset=""; $query2 = "SELECT code, title, sortorder, language, assessment_value - FROM {$dbprefix}labels + FROM {{labels}} WHERE lid=".$newlid." ORDER BY language, sortorder, code"; $result2 = Yii::app()->db->createCommand($query2)->query() or safe_die("Died querying labelset $lid
$query2
"); @@ -1412,9 +1410,9 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) { //There is a matching labelset. So, we will delete this one and refer //to the matched one. - $query = "DELETE FROM {$dbprefix}labels WHERE lid=$newlid"; + $query = "DELETE FROM {{labels}} WHERE lid=$newlid"; $result=Yii::app()->db->createCommand($query)->query() or safe_die("Couldn't delete labels
$query
"); - $query = "DELETE FROM {$dbprefix}labelsets WHERE lid=$newlid"; + $query = "DELETE FROM {{labelsets}} WHERE lid=$newlid"; $result=Yii::app()->db->createCommand($query)->query() or safe_die("Couldn't delete labelset
$query
"); $newlid=$lsmatch; } @@ -1471,7 +1469,6 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) } else { - db_switchIDInsert('questions',true); $questionrowdata['qid'] = $newqid; } @@ -1511,19 +1508,14 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) $newvalues=array_values($questionrowdata); $newvalues=array_map(array(&$connect, "qstr"),$newvalues); // quote everything accordingly - $qinsert = "INSERT INTO {$dbprefix}questions (".implode(',',array_keys($questionrowdata)).") VALUES (".implode(',',$newvalues).")"; + $qinsert = "INSERT INTO {{questions}} (".implode(',',array_keys($questionrowdata)).") VALUES (".implode(',',$newvalues).")"; $qres = Yii::app()->db->createCommand($qinsert)->query() or safe_die("Error: Failed to insert question
\n$qinsert
\n"); // set the newqid only if is not set if (!isset($newqid)) { - $newqid=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}questions","qid"); + $newqid=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID("{{questions}}","qid"); } - else - { - db_switchIDInsert('questions',false); - } - } $qtypes = getqtypelist("" ,"array"); $results['answers']=0; @@ -1551,7 +1543,6 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) if (isset($aSQIDReplacements[$labelrow['code']])){ $fieldname='qid,'; $data=$aSQIDReplacements[$labelrow['code']].','; - db_switchIDInsert('questions',true); } else{ $fieldname='' ; @@ -1563,11 +1554,7 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) $qres = Yii::app()->db->createCommand($qinsert)->query() or safe_die ("Error: Failed to insert subquestion
\n$qinsert
\n".$connect->ErrorMsg()); if ($fieldname=='') { - $aSQIDReplacements[$labelrow['code']]=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}questions","qid"); - } - else - { - db_switchIDInsert('questions',false); + $aSQIDReplacements[$labelrow['code']]=$CI->db->insert_id(); //$connect->Insert_ID("{{questions}}","qid"); } } @@ -1624,7 +1611,10 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) //$query=$connect->GetInsertSQL($dbprefix.'defaultvalues',$insertdata); - $qres = $CI->defaultvalues_model->insertRecords($insertdata) or safe_die("Error: Failed to insert defaultvalue
\n"); + $dvalue = new Defaultvalues; + foreach ($insertdata as $k => $v) + $dvalue->$k = $v; + $qres = $dvalue->save(); } // translate internal links @@ -1637,7 +1627,6 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) $questionrowdata=array(); if (isset($aSQIDReplacements[$answerrowdata['code'].$answerrowdata['qid']])){ $questionrowdata['qid']=$aSQIDReplacements[$answerrowdata['code'].$answerrowdata['qid']]; - db_switchIDInsert('questions',true); } $questionrowdata['parent_qid']=$answerrowdata['qid']; $questionrowdata['sid']=$newsid; @@ -1651,14 +1640,13 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) //$tablename=$dbprefix.'questions'; //$query=$connect->GetInsertSQL($tablename,$questionrowdata); - $qres = $CI->questions_model->insertRecords($questionrowdata) or safe_die("Error: Failed to insert question
\n"); + $question = new Questions; + foreach ($questionrowdata as $k => $v) + $question->$k = $v; + $qres = $question->save(); if (!isset($questionrowdata['qid'])) { - $aSQIDReplacements[$answerrowdata['code'].$answerrowdata['qid']]=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}questions","qid"); - } - else - { - db_switchIDInsert('questions',false); + $aSQIDReplacements[$answerrowdata['code'].$answerrowdata['qid']]=$CI->db->insert_id(); //$connect->Insert_ID("{{questions}}","qid"); } $results['subquestions']++; // also convert default values subquestions for multiple choice @@ -1682,7 +1670,10 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) //$tablename=$dbprefix.'answers'; //$query=$connect->GetInsertSQL($tablename,$answerrowdata); - $ares = $CI->answers_model->insertRecords($answerrowdata) or safe_die("Error: Failed to insert answer
\n"); + $answer = new Answers; + foreach ($answerrowdata as $k => $v) + $answer->$k = $v; + $ares = $answer->save(); $results['answers']++; } } @@ -1700,10 +1691,13 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) $qarowdata["qid"]=$newqid; unset($qarowdata["qaid"]); - //$tablename="{$dbprefix}question_attributes"; + //$tablename="{{question_attributes}}"; //$qainsert=$connect->GetInsertSQL($tablename,$qarowdata); - $result=$CI->question_attributes_model->insertRecords($qarowdata) or safe_die ("Couldn't insert question_attribute
"); + $attr = new Question_attributes; + foreach ($qarowdata as $k => $v) + $attr->$k = $v; + $result = $attr->save(); $results['question_attributes']++; } @@ -1727,11 +1721,7 @@ function CSVImportQuestion($sFullFilepath, $newsid, $newgid) */ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) { - $CI =& get_instance(); - $CI->load->helper('database'); - $clang = $CI->limesurvey_lang; - $dbprefix = $CI->db->dbprefix; - + $clang = Yii::app()->lang; $aLanguagesSupported = array(); // this array will keep all the languages supported for the survey $sBaseLanguage = GetBaseLanguageFromSurveyID($newsid); @@ -1809,19 +1799,18 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) if (isset($aQIDReplacements[$oldqid])) { $insertdata['qid']=$aQIDReplacements[$oldqid]; - db_switchIDInsert('questions',true); } //$query=$connect->GetInsertSQL($tablename,$insertdata); - $result = $CI->questions_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert data
\n"); + + $ques = new Questions; + foreach ($insertdata as $k => $v) + $ques->$k = $v; + $result = $ques->save(); if (!isset($aQIDReplacements[$oldqid])) { - $newqid=$CI->db->insert_id(); //$connect->Insert_ID($tablename,"qid"); // save this for later + $newqid=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID($tablename,"qid"); // save this for later $aQIDReplacements[$oldqid]=$newqid; // add old and new qid to the mapping array } - else - { - db_switchIDInsert('questions',false); - } } // Import subquestions -------------------------------------------------------------- @@ -1848,20 +1837,18 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) } if (isset($aQIDReplacements[$oldsqid])){ $insertdata['qid']=$aQIDReplacements[$oldsqid]; - db_switchIDInsert('questions',true); } //$query=$connect->GetInsertSQL($tablename,$insertdata); - $result = $CI->questions_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert data
\n"); - $newsqid=$CI->db->insert_id(); //$connect->Insert_ID($tablename,"qid"); // save this for later + $ques = new Questions; + foreach ($insertdata as $k => $v) + $ques->$k = $v; + $result = $ques->save(); + $newsqid=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID($tablename,"qid"); // save this for later if (!isset($insertdata['qid'])) { $aQIDReplacements[$oldsqid]=$newsqid; // add old and new qid to the mapping array } - else - { - db_switchIDInsert('questions',false); - } $results['subquestions']++; } } @@ -1882,7 +1869,10 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) // now translate any links //$query=$connect->GetInsertSQL($tablename,$insertdata); - $result=$CI->answers_model->insertRecords($insertdata) or safe_die ($clang->gT("Error").": Failed to insert data
\n"); + $answers = new Answers; + foreach ($insertdata as $k => $v) + $answers->$k = $v; + $result = $answers->save(); $results['answers']++; } } @@ -1909,12 +1899,18 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) foreach ($importlanguages as $sLanguage) { $insertdata['language']=$sLanguage; - $result=$CI->question_attributes_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert question_attributes
"); + $attributes = new Question_attributes; + foreach ($insertdata as $k => $v) + $attributes->$k = $v; + $result = $attributes->save(); } } else { - $result=$CI->question_attributes_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert question_attributes
\n"); + $attributes = new Question_attributes; + foreach ($insertdata as $k => $v) + $attributes->$k = $v; + $result = $attributes->save(); } $results['question_attributes']++; } @@ -1939,7 +1935,10 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) // now translate any links //$query=$connect->GetInsertSQL($tablename,$insertdata); - $result=$CI->defaultvalues_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert data
\n"); + $default = new Defaultvalues; + foreach ($insertdata as $k => $v) + $default->$k = $v; + $result = $default->save(); $results['defaultvalues']++; } } @@ -2053,7 +2052,7 @@ function CSVImportLabelset($sFullFilepath, $options) $results['labelsets']++; // Get the new insert id for the labels inside this labelset - $newlid=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}labelsets",'lid'); + $newlid=$CI->db->insert_id(); //$connect->Insert_ID("{{labelsets}}",'lid'); if ($labelsarray) { $count=0; @@ -2145,9 +2144,7 @@ function CSVImportLabelset($sFullFilepath, $options) */ function XMLImportLabelsets($sFullFilepath, $options) { - $CI =& get_instance(); - $CI->load->helper('database'); - $clang = $CI->limesurvey_lang; + $clang = Yii::app()->lang; $xml = simplexml_load_file($sFullFilepath); if ($xml->LimeSurveyDocType!='Label set') safe_die('This is not a valid LimeSurvey label set structure XML file.'); $iDBVersion = (int) $xml->DBVersion; @@ -2156,7 +2153,6 @@ function XMLImportLabelsets($sFullFilepath, $options) $results['labelsets']=0; $results['labels']=0; $results['warnings']=array(); - $dbprefix = $CI->db->dbprefix; // Import labels table =================================================================================== @@ -2176,10 +2172,10 @@ function XMLImportLabelsets($sFullFilepath, $options) // Insert the new question //$query=$connect->GetInsertSQL($tablename,$insertdata); - $result = $CI->labelsets_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert data
"); + $result = Yii::app()->db->createCommand()->insert('{{labelsets}}', $insertdata); $results['labelsets']++; - $newlsid=$CI->db->insert_id(); //$connect->Insert_ID($tablename,"lid"); // save this for later + $newlsid=Yii::app()->db->getLastInsertID(); //$connect->Insert_ID($tablename,"lid"); // save this for later $aLSIDReplacements[$oldlsid]=$newlsid; // add old and new lsid to the mapping array } @@ -2198,7 +2194,7 @@ function XMLImportLabelsets($sFullFilepath, $options) //$query=$connect->GetInsertSQL($tablename,$insertdata); - $result = $CI->labels_model->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert data
"); + $result = Yii::app()->db->createCommand()->insert('{{labels}}', $insertdata); $results['labels']++; } @@ -2213,7 +2209,7 @@ function XMLImportLabelsets($sFullFilepath, $options) FROM {{labels}} WHERE lid=".$newlid." ORDER BY language, sortorder, code"; - $result2 = Yii::app()->db->createCommand($query2)->query() or safe_die("Died querying labelset $lid
"); + $result2 = Yii::app()->db->createCommand($query2)->query(); foreach($result2->readAll() as $row2) { $row2 = array_values($row2); @@ -2237,10 +2233,11 @@ function XMLImportLabelsets($sFullFilepath, $options) //There is a matching labelset. So, we will delete this one and refer //to the matched one. $query = "DELETE FROM {{labels}} WHERE lid=$newlid"; - $result=Yii::app()->db->createCommand($query)->query() or safe_die("Couldn't delete labels
$query
"); - $results['labels']=$results['labels']-$CI->db->affected_rows(); + $result=Yii::app()->db->createCommand($query)->execute(); + $results['labels']=$results['labels']-$result; $query = "DELETE FROM {{labelsets}} WHERE lid=$newlid"; - $result=Yii::app()->db->createCommand($query)->query() or safe_die("Couldn't delete labelset
$query
"); + $result=Yii::app()->db->createCommand($query)->query(); + $results['labelsets']--; $newlid=$lsmatch; $results['warnings'][]=$clang->gT("Label set was not imported because the same label set already exists.")." ".sprintf($clang->gT("Existing LID: %s"),$newlid); @@ -2794,7 +2791,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= WHERE lid=".$newlid." ORDER BY language, sortorder, code"; $result2 = Yii::app()->db->createCommand($query2)->query() or safe_die("Died querying labelset $lid
$query2
".$connect->ErrorMsg()); - + foreach($result2->readAll() as $row2) { $row2 = array_values($row2); @@ -2879,12 +2876,11 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= $gres = Groups::model()->insertRecords($grouprowdata) or safe_die($clang->gT('Error').": Failed to insert group
\
\n"); if (isset($grouprowdata['gid'])) db_switchIDInsert('groups',false); - //GET NEW GID if (!isset($grouprowdata['gid'])) { $aGIDReplacements[$oldgid]=Yii::app()->db->createCommand('Select LAST_INSERT_ID()')->query()->read(); //$connect->Insert_ID("{$dbprefix}groups",'gid'); $aGIDReplacements[$oldgid]=$aGIDReplacements[$oldgid]['LAST_INSERT_ID()']; - } + } } // Fix sortorder of the groups - if users removed groups manually from the csv file there would be gaps fixSortOrderGroups($newsid); @@ -2973,7 +2969,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= // Now we will fix up old label sets where they are used as answers if (((isset($oldlid1) && isset($aLIDReplacements[$oldlid1])) || (isset($oldlid2) && isset($aLIDReplacements[$oldlid2]))) && ($qtypes[$questionrowdata['type']]['answerscales']>0 || $qtypes[$questionrowdata['type']]['subquestions']>1)) { - + $query="select * from {{labels}} where lid={$aLIDReplacements[$oldlid1]} and language='{$questionrowdata['language']}'"; $oldlabelsresult=Yii::app()->db->createCommand($query)->query(); foreach($oldlabelsresult->readAll() as $labelrow) @@ -3003,7 +2999,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= $qres = Yii::app()->db->createCommand($qinsert)->query() or safe_die ($clang->gT("Error").": Failed to insert question
\n$qinsert
\n"); if ($fieldname=='') { - $aSQIDReplacements[$labelrow['code'].'_'.$saveqid]=$CI->db->insert_id(); //$connect->Insert_ID("{$dbprefix}questions","qid"); + $aSQIDReplacements[$labelrow['code'].'_'.$saveqid]=$CI->db->insert_id(); //$connect->Insert_ID("{{questions}}","qid"); } } } @@ -3061,10 +3057,10 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= } // Convert default values for single select questions $query1 = 'select type,gid from {{questions}} where qid='.$answerrowdata["qid"]; - + $resultquery1 = Yii::app()->db->createCommand($query1)->query(); $questiontemp=$resultquery1->read(); //$connect->GetRow('select type,gid from '.$CI->db->dbprefix.'questions where qid='.$answerrowdata["qid"]);) - + $oldquestion['newtype']=$questiontemp['type']; $oldquestion['gid']=$questiontemp['gid']; if ($answerrowdata['default_value']=='Y' && ($oldquestion['newtype']=='L' || $oldquestion['newtype']=='O' || $oldquestion['newtype']=='!')) @@ -3159,7 +3155,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= $newvalues=array_values($qarowdata); $newvalues=array_map(array(&$connect, "qstr"),$newvalues); // quote everything accordingly - + $qainsert = "INSERT INTO {{question_attributes}} (".implode(',',array_keys($qarowdata)).") VALUES (".implode(',',$newvalues).")"; $result=Yii::app()->db->createCommand($qainsert)->execute(); // no safe_die since some LimeSurvey version export duplicate question attributes - these are just ignored if ($result>0) {$importresults['question_attributes']++;} @@ -3563,7 +3559,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe db_switchIDInsert('questions',true); } - + $result = Questions::model()->insertRecords($insertdata) or safe_die($clang->gT("Error").": Failed to insert data
"); if (!isset($aQIDReplacements[$oldqid])) { @@ -3913,7 +3909,7 @@ function GetNewSurveyID($oldsid) $query = "SELECT sid FROM {{surveys}} WHERE sid=$oldsid"; $res = Yii::app()->db->createCommand($query)->query(); - $isresult = $res->read(); //$connect->GetOne("SELECT sid FROM {$dbprefix}surveys WHERE sid=$oldsid");) + $isresult = $res->read(); //$connect->GetOne("SELECT sid FROM {{surveys}} WHERE sid=$oldsid");) //if (!is_null($isresult)) if($res->count() > 0) diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php index 61c230cd23c..5da85f2271d 100644 --- a/application/helpers/common_helper.php +++ b/application/helpers/common_helper.php @@ -2992,7 +2992,10 @@ function GetBaseLanguageFromSurveyID($surveyid) if (!isset($cache[$surveyid])) { $condition = array('sid' => $surveyid);//"sid=$surveyid"; + $surveylanguage = Survey::model()->findByPk($surveyid);//("SELECT language FROM ".db_table_name('surveys')." WHERE sid=$surveyid";) + if (is_null($surveylanguage)) + die(var_dump(debug_backtrace())); $surveylanguage = $surveylanguage->attributes; //Checked) if (!isset($surveylanguage['language']) || is_null($surveylanguage)) @@ -5853,8 +5856,6 @@ function getTokenData($surveyid, $token) */ function sGetTemplatePath($sTemplateName) { - $CI = &get_instance(); - if (isStandardTemplate($sTemplateName)) { return Yii::app()->getConfig("standardtemplaterootdir").'/'.$sTemplateName; @@ -7918,14 +7919,12 @@ function getlabelsets($languages=null) // Returns a list with label sets // if the $languages paramter is provided then only labelset containing all of the languages in the paramter are provided { - $CI =& get_instance(); - $CI->load->helper('database'); - $clang = $CI->limesurvey_lang; + $clang = Yii::app()->lang; if ($languages){ $languages=sanitize_languagecodeS($languages); $languagesarray=explode(' ',trim($languages)); } - $query = "SELECT ".$CI->db->dbprefix."labelsets.lid as lid, label_name FROM ".$CI->db->dbprefix."labelsets"; + $query = "SELECT {{labelsets}}.lid as lid, label_name FROM {{labelsets}}"; if ($languages){ $query .=" where "; foreach ($languagesarray as $item) @@ -7935,9 +7934,9 @@ function getlabelsets($languages=null) $query .=" 1=1 "; } $query .=" order by label_name"; - $result = db_execute_assoc($query) or safe_die ("Couldn't get list of label sets
$query
"); //Checked + $result = Yii::app()->db->createCommand($query)->query(); //Checked $labelsets=array(); - foreach ($result->result_array() as $row) + foreach ($result->readAll() as $row) { $labelsets[] = array($row['lid'], $row['label_name']); } @@ -7948,14 +7947,13 @@ function getHeader($meta = false) { global $embedded; - $CI =& get_instance(); $surveyid = Yii::app()->getConfig('sid'); - $CI->load->helper('surveytranslator'); + Yii::app()->loadHelper('surveytranslator'); $clang = $CI->limesurvey_lang; - if ($CI->session->userdata('s_lang')) + if (!empty(Yii::app()->session['s_lang'])) { - $surveylanguage= $CI->session->userdata('s_lang'); + $surveylanguage= Yii::app()->session['s_lang']; } elseif (isset($surveyid) && $surveyid) { @@ -7974,14 +7972,14 @@ function getHeader($meta = false) if (substr($jsinclude,0,4) == 'http') $js_header .= "\n"; else - $js_header .= "\n"; + $js_header .= "\n"; } } if(Yii::app()->getConfig("css_admin_includes")) { foreach (Yii::app()->getConfig("css_admin_includes") as $cssinclude) { - $css_header .= "\n"; + $css_header .= "baseUrl.$cssinclude."\" />\n"; } } @@ -8531,4 +8529,29 @@ function checkgroupfordisplay($gid,$anonymized,$surveyid) } } +function db_quote_id($id) +{ + // WE DONT HAVE nor USE other thing that alfanumeric characters in the field names + // $quote = $connect->nameQuote; + // return $quote.str_replace($quote,$quote.$quote,$id).$quote; + + switch (Yii::app()->db->createCommand($id)) + { + case "mysqli" : + case "mysql" : + return "`".$id."`"; + break; + case "mssql_n" : + case "mssql" : + case "mssqlnative" : + case "odbc_mssql" : + return "[".$id."]"; + break; + case "postgre": + return "\"".$id."\""; + break; + default: + return "`".$id."`"; + } +} // Closing PHP tag intentionally omitted - yes, it is okay diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php index ee4c1c7784b..ba63f1a7208 100644 --- a/application/helpers/database_helper.php +++ b/application/helpers/database_helper.php @@ -117,32 +117,6 @@ function &db_select_column($sql) * @param mixed $id Fieldname to be quoted */ -function db_quote_id($id) -{ - // WE DONT HAVE nor USE other thing that alfanumeric characters in the field names - // $quote = $connect->nameQuote; - // return $quote.str_replace($quote,$quote.$quote,$id).$quote; - - switch (get_instance()->db->platform()) - { - case "mysqli" : - case "mysql" : - return "`".$id."`"; - break; - case "mssql_n" : - case "mssql" : - case "mssqlnative" : - case "odbc_mssql" : - return "[".$id."]"; - break; - case "postgre": - return "\"".$id."\""; - break; - default: - return "`".$id."`"; - } -} - function db_random() { $CI = &get_instance(); diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php index 3df8049224b..ed1b19e1d34 100644 --- a/application/helpers/export_helper.php +++ b/application/helpers/export_helper.php @@ -1830,11 +1830,8 @@ function tokens_export($surveyid) header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); header("Pragma: cache"); - $CI =& get_instance(); - $dbprefix = $CI->db->dbprefix; - $_POST = $CI->input->post(); - - $bquery = "SELECT * FROM ".$CI->db->dbprefix("tokens_$surveyid").' where 1=1'; + $bquery = "SELECT * FROM {{tokens_$surveyid}} where 1=1"; + $databasetype = Yii::app()->db->getDriverName(); if (trim($_POST['filteremail'])!='') { if ($databasetype=='odbc_mssql' || $databasetype=='odbtp' || $databasetype=='mssql_n' || $connect->databaseType == 'mssqlnative') @@ -1855,12 +1852,12 @@ function tokens_export($surveyid) $bquery .= " and completed='N'"; if ($thissurvey['anonymized']=='N') { - $bquery .=" and token not in (select token from ".db_table_name("survey_$surveyid")." group by token)"; + $bquery .=" and token not in (select token from {{survey_$surveyid}} group by token)"; } } if ($_POST['tokenstatus']==3 && $thissurvey['anonymized']=='N') { - $bquery .= " and completed='N' and token in (select token from ".db_table_name("survey_$surveyid")." group by token)"; + $bquery .= " and completed='N' and token in (select token from {{survey_$surveyid}} group by token)"; } if ($_POST['invitationstatus']==1) @@ -1887,8 +1884,8 @@ function tokens_export($surveyid) } $bquery .= " ORDER BY tid"; - $bresult = db_execute_assoc($bquery) or die ("$bquery
".htmlspecialchars($connect->ErrorMsg())); - $bfieldcount=$bresult->num_rows(); + $bresult = Yii::app()->db->createCommand($bquery)->query(); + $bfieldcount=$bresult->getRowCount(); // Export UTF8 WITH BOM $tokenoutput = chr(hexdec('EF')).chr(hexdec('BB')).chr(hexdec('BF')); $tokenoutput .= "tid,firstname,lastname,email,emailstatus,token,language,validfrom,validuntil,invited,reminded,remindercount,completed,usesleft"; @@ -1901,7 +1898,10 @@ function tokens_export($surveyid) $tokenoutput .=" <".str_replace(","," ",$attrfielddescr[$attr_name]).">"; } $tokenoutput .="\n"; - foreach($bresult->result_array() as $brow) + + Yii::import('application.libraries.Date_Time_Converter', true); + + foreach($bresult->readAll() as $brow) { if (trim($brow['validfrom']!='')) diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php index 465ac545ac2..a9d5a1be029 100644 --- a/application/helpers/replacements_helper.php +++ b/application/helpers/replacements_helper.php @@ -15,8 +15,6 @@ */ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSrc='Unspecified', $anonymized=false, $questionNum=NULL, $registerdata=array()) { - $CI =& get_instance(); - /* global $clienttoken,$token,$sitename,$move,$showXquestions,$showqnumcode,$questioncode,$register_errormsg; global $s_lang,$errormsg,$saved_id, $totalBoilerplatequestions, $relativeurl, $languagechanger,$captchapath,$loadname; @@ -62,7 +60,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr 'totalBoilerplatequestions', 'totalquestions', ); - + $varsPassed = array(); foreach($allowedvars as $var) @@ -81,12 +79,12 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr // extract($redata); // creates variables for each of the keys in the array // Local over-rides in case not set above - if (!isset($showgroupinfo)) { $showgroupinfo = $CI->config->config['showgroupinfo']; } - if (!isset($showqnumcode)) { $showqnumcode = $CI->config->config['showqnumcode']; } + if (!isset($showgroupinfo)) { $showgroupinfo = Yii::app()->getConfig('showgroupinfo'); } + if (!isset($showqnumcode)) { $showqnumcode = Yii::app()->getConfig('showqnumcode'); } $_surveyid = (isset($surveyid) ? $surveyid : 0); if (!isset($totalBoilerplatequestions)) { $totalBoilerplatequestions = 0; } - if (!isset($showXquestions)) { $showXquestions = $CI->config->config['showXquestions']; } - if (!isset($relativeurl)) { $relativeurl = $CI->config->item("relativeurl"); } + if (!isset($showXquestions)) { $showXquestions = Yii::app()->getConfig('showXquestions'); } + if (!isset($relativeurl)) { $relativeurl = Yii::app()->getConfig("relativeurl"); } if (!isset($s_lang)) { $s_lang = (isset($_SESSION['s_lang']) ? $_SESSION['s_lang'] : 'en'); } if (!isset($captchapath)) { $captchapath = ''; } @@ -94,11 +92,11 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr { $line = file_get_contents($line); } - - $clang = ($CI->limesurvey_lang) ? $CI->limesurvey_lang : $registerdata['clang']; - - $CI->load->helper('surveytranslator'); + + $clang = Yii::app()->lang; + + Yii::app()->loadHelper('surveytranslator'); $questiondetails = array('sid' => 0, 'gid' => 0, 'qid' => 0, 'aid' =>0); if(isset($question) && isset($question['sgq'])) $questiondetails=getsidgidqidaidtype($question['sgq']); //Gets an array containing SID, GID, QID, AID and Question Type) @@ -113,7 +111,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr } else { - $templatename=$CI->config->item('defaulttemplate'); + $templatename=Yii::app()->getConfig('defaulttemplate'); } $templatename=validate_templatedir($templatename); if(!isset($templatedir)) $templatedir = sGetTemplatePath($templatename); @@ -122,7 +120,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr if (stripos ($line,"")) { $line=str_ireplace("", - "\n" + "\n" .use_firebug() ."\t", $line); } @@ -140,7 +138,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr { $surveyformat .= " page-odd"; } - + if (isset($thissurvey['allowjumps']) && $thissurvey['allowjumps']=="Y" && $surveyformat!="allinone" && (isset($_SESSION['step']) && $_SESSION['step']>0)){ $surveyformat .= " withindex"; } @@ -301,8 +299,8 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr { $dateformatdetails=getDateFormatData($thissurvey['surveyls_dateformat']); $items = array($thissurvey['expiry'],"Y-m-d"); - $CI->load->library('Date_Time_Converter',$items); - $datetimeobj = $CI->date_time_converter ; + Yii::import('application.libraries.Date_Time_Converter', true); + $datetimeobj = new Date_Time_Converter($items) ; $_dateoutput=$datetimeobj->convert($dateformatdetails['phpdate']); } else @@ -412,7 +410,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr } else { - $helpicon=$CI->config->item('imageurl')."/help.gif"; + $helpicon=Yii::app()->getConfig('imageurl')."/help.gif"; } } $_questionhelp = "".$help; @@ -433,7 +431,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr if (isset($thissurvey['active']) and $thissurvey['active'] == "N") { - $_restart= "createUrl("survey/sid/$surveyid/newtest/Y"); if (isset($s_lang) && $s_lang!='') $_restart.="/lang/".$s_lang; $_restart.="'>".$clang->gT("Restart this Survey").""; } @@ -444,7 +442,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr if (!empty($restart_token)) $restart_extra .= "/token/".urlencode($restart_token); else $restart_extra = "/newtest/Y"; if (!empty($_GET['lang'])) $restart_extra .= "/lang/".returnglobal('lang'); - $_restart = "".$clang->gT("Restart this Survey").""; + $_restart = "".$clang->gT("Restart this Survey").""; } else { @@ -501,7 +499,7 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr $_saveform .= "' />