Skip to content

Commit

Permalink
Dev Removing dbExecuteAssoc
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Jan 14, 2018
1 parent 48f367c commit a452cf0
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 189 deletions.
146 changes: 58 additions & 88 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -434,15 +434,12 @@ protected function isCompatible(CDbTableSchema $base, CDbTableSchema $old, $chec
public function editdata($subaction, $id, $surveyid)
{

$surveyid = sanitize_int($surveyid);
$surveyid = (int) $surveyid;
$oSurvey = Survey::model()->findByPk($surveyid);
$id = sanitize_int($id);
$id = (int) $id;
$aViewUrls = array();
$survey = Survey::model()->findByPk($surveyid);
$sDataEntryLanguage = $survey->language;

if (Permission::model()->hasSurveyPermission($surveyid, 'responses', 'update')) {
$surveytable = $survey->responsesTableName;
$sDataEntryLanguage = $oSurvey->language;
$aData = [];
$aData['display']['menu_bars']['browse'] = gT("Data entry");

Expand All @@ -453,7 +450,7 @@ public function editdata($subaction, $id, $surveyid)
$fnames = [];
$fnames['completed'] = array('fieldname'=>"completed", 'question'=>gT("Completed"), 'type'=>'completed');

$fnames = array_merge($fnames, createFieldMap($survey, 'full', false, false, $sDataEntryLanguage));
$fnames = array_merge($fnames, createFieldMap($oSurvey, 'full', false, false, $sDataEntryLanguage));
// Fix private if disallowed to view token
if (!Permission::model()->hasSurveyPermission($surveyid, 'tokens', 'read')) {
unset($fnames['token']);
Expand All @@ -463,9 +460,8 @@ public function editdata($subaction, $id, $surveyid)
//SHOW INDIVIDUAL RECORD
$results = array();
if ($subaction == "edit" && Permission::model()->hasSurveyPermission($surveyid, 'responses', 'update')) {
$idquery = "SELECT * FROM $surveytable WHERE id=$id";
$idresult = dbExecuteAssoc($idquery) or safeDie("Couldn't get individual record<br />$idquery<br />");
foreach ($idresult->readAll() as $idrow) {
$idresult = Response::model($surveyid)->findByPk($id);
foreach ($idresult as $idrow) {
$results[] = $idrow;
}
} elseif ($subaction == "editsaved" && Permission::model()->hasSurveyPermission($surveyid, 'responses', 'update')) {
Expand Down Expand Up @@ -495,7 +491,7 @@ public function editdata($subaction, $id, $surveyid)
$responses[$svrow['fieldname']] = $svrow['value'];
} // while

$fieldmap = createFieldMap($survey, 'full', false, false, $survey->language);
$fieldmap = createFieldMap($oSurvey, 'full', false, false, $oSurvey->language);
$results1 = array();
foreach ($fieldmap as $fm) {
if (isset($responses[$fm['fieldname']])) {
Expand Down Expand Up @@ -559,7 +555,7 @@ public function editdata($subaction, $id, $surveyid)
switch ($fname['type']) {
case "completed":
// First compute the submitdate
if ($survey->anonymized == "Y") {
if ($oSurvey->anonymized == "Y") {
// In case of anonymized responses survey with no datestamp
// then the the answer submitdate gets a conventional timestamp
// 1st Jan 1980
Expand Down Expand Up @@ -1235,15 +1231,14 @@ public function delete()
$surveytable = $survey->responsesTableName;
$aData['thissurvey'] = getSurveyInfo($surveyid);

$delquery = "DELETE FROM $surveytable WHERE id=$id";
Yii::app()->loadHelper('database');

$beforeDataEntryDelete = new PluginEvent('beforeDataEntryDelete');
$beforeDataEntryDelete->set('iSurveyID', $surveyid);
$beforeDataEntryDelete->set('iResponseID', $id);
App()->getPluginManager()->dispatchEvent($beforeDataEntryDelete);

dbExecuteAssoc($delquery) or safeDie("Couldn't delete record $id<br />\n");
Response::model($surveyid)->findByPk($id)->delete(true);

$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
Expand Down Expand Up @@ -1290,7 +1285,7 @@ public function update()

$thissurvey = getSurveyInfo($surveyid);
$updateqr = "UPDATE $surveytable SET \n";

$aFieldAttributes=[];
foreach ($fieldmap as $irow) {
$fieldname = $irow['fieldname'];
if ($fieldname == 'id') {
Expand All @@ -1305,7 +1300,7 @@ public function update()
$thisvalue = 0;
} elseif ($irow['type'] == Question::QT_D_DATE) {
if ($thisvalue == "") {
$updateqr .= App()->db->quoteColumnName($fieldname)." = NULL, \n";
$aFieldAttributes[$fieldname] = NULL;
} else {
$qidattributes = QuestionAttribute::model()->getQuestionAttributes($irow['qid']);
$dateformatdetails = getDateFormatDataForQID($qidattributes, $thissurvey);
Expand All @@ -1318,33 +1313,33 @@ public function update()
}
//need to check if library get initialized with new value of constructor or not.

$updateqr .= App()->db->quoteColumnName($fieldname)." = '{$dateoutput}', \n";
$aFieldAttributes[$fieldname] = $dateoutput;
}
} elseif (($irow['type'] == Question::QT_N_NUMERICAL || $irow['type'] == Question::QT_K_MULTIPLE_NUMERICAL_QUESTION) && $thisvalue == "") {
$updateqr .= App()->db->quoteColumnName($fieldname)." = NULL, \n";
$aFieldAttributes[$fieldname] = NULL;
} elseif ($irow['type'] == Question::QT_VERTICAL_FILE_UPLOAD && strpos($irow['fieldname'], '_filecount') && $thisvalue == "") {
$updateqr .= App()->db->quoteColumnName($fieldname)." = NULL, \n";
$aFieldAttributes[$fieldname] = NULL;
} elseif ($irow['type'] == 'submitdate') {
if (isset($_POST['completed']) && ($_POST['completed'] == "N")) {
$updateqr .= App()->db->quoteColumnName($fieldname)." = NULL, \n";
$aFieldAttributes[$fieldname] = NULL;
} elseif (isset($_POST['completed']) && $thisvalue == "") {
$updateqr .= App()->db->quoteColumnName($fieldname)." = ".App()->db->quoteValue($_POST['completed']).", \n";
$aFieldAttributes[$fieldname] = $_POST['completed'];
} else {
$updateqr .= App()->db->quoteColumnName($fieldname)." = ".App()->db->quoteValue($thisvalue).", \n";
$aFieldAttributes[$fieldname] = $thisvalue;
}
} else {
$updateqr .= App()->db->quoteColumnName($fieldname)." = ".App()->db->quoteValue($thisvalue).", \n";
$aFieldAttributes[$fieldname] = $thisvalue;
}
}
$updateqr = substr($updateqr, 0, -3);
$updateqr .= " WHERE id=$id";

$beforeDataEntryUpdate = new PluginEvent('beforeDataEntryUpdate');
$beforeDataEntryUpdate->set('iSurveyID', $surveyid);
$beforeDataEntryUpdate->set('iResponseID', $id);
App()->getPluginManager()->dispatchEvent($beforeDataEntryUpdate);

dbExecuteAssoc($updateqr) or safeDie("Update failed:<br />\n<br />$updateqr");
$arResponse=Response::model($surveyid)->findByPk($id);
$arResponse->setAttributes($aFieldAttributes,false);
$arResponse->save();

Yii::app()->setFlashMessage(sprintf(gT("The response record %s was updated."), $id));
if (Yii::app()->request->getPost('close-after-save') == 'true') {
Expand Down Expand Up @@ -1386,30 +1381,21 @@ public function insert()
$lastanswfortoken = ''; // check if a previous answer has been submitted or saved

if (Yii::app()->request->getPost('token') && Permission::model()->hasSurveyPermission($surveyid, 'tokens', 'update')) {
$tokencompleted = "";
$tcquery = "SELECT completed from {{tokens_{$surveyid}}} WHERE token=".App()->db->quoteValue($_POST['token']);
$tcresult = dbExecuteAssoc($tcquery);
$tcresult = $tcresult->readAll();
$tccount = count($tcresult);
foreach ($tcresult as $tcrow) {
$tokencompleted = $tcrow['completed'];
}

if ($tccount < 1) {
// token doesn't exist in survey participants table
$aToken = Token::model($surveyid)->findByAttributes(['token'=>$_POST['token']]);
if (empty($aToken)) {
// token doesn't exist in survey participants table
$lastanswfortoken = 'UnknownToken';
} elseif ($survey->isAnonymized) {
// token exist but survey is anonymous, check completed state
// token exist but survey is anonymous, check completed state
// token is completed
if ($tokencompleted != "" && $tokencompleted != "N") {
if ($aToken->completed != "" && $aToken->completed != "N") {
$lastanswfortoken = 'PrivacyProtected';
}
} else {
// token is valid, survey not anonymous, try to get last recorded response id
$aquery = "SELECT id,startlanguage FROM $surveytable WHERE token=".App()->db->quoteValue($_POST['token']);
$aresult = dbExecuteAssoc($aquery);
foreach ($aresult->readAll() as $arow) {
if ($tokencompleted != "N") { $lastanswfortoken = $arow['id']; }
// token is valid, survey not anonymous, try to get last recorded response id
$aresult = Response::model($surveyid)->findAllByAttributes(['token'=>$_POST['token']]);
foreach ($aresult as $arow) {
if ($aToken->completed != "N") { $lastanswfortoken = $arow['id']; }
$rlanguage = $arow['startlanguage'];
}
}
Expand Down Expand Up @@ -1547,41 +1533,36 @@ public function insert()
$new_response->save();
$last_db_id = $new_response->getPrimaryKey();
if (isset($_POST['closerecord']) && isset($_POST['token']) && $_POST['token'] != '') {
// submittoken
// submittoken
// get submit date
if (isset($_POST['closedate'])) {
$submitdate = $_POST['closedate'];
} else {
$submitdate = date("Y-m-d H:i:s");
}

// check how many uses the token has left
$usesquery = "SELECT usesleft FROM {{tokens_}}$surveyid WHERE token=".App()->db->quoteValue($_POST['token']);
$usesresult = dbExecuteAssoc($usesquery);
$usesrow = $usesresult->readAll(); //$usesresult->row_array()
if (isset($usesrow)) { $usesleft = $usesrow[0]['usesleft']; }

// query for updating tokens
$utquery = "UPDATE {{tokens_$surveyid}}\n";
// query for updating tokens uses left
$aToken=Token::model($surveyid)->findByAttributes(['token'=>$_POST['token']]);
if (isTokenCompletedDatestamped($thissurvey)) {
if (isset($usesleft) && $usesleft <= 1) {
$utquery .= "SET usesleft=usesleft-1, completed=".App()->db->quoteValue($submitdate);
if ($aToken->usesleft <= 1) {
$aToken->usesleft=((int)$aToken->usesleft)-1;
$aToken->completed=$submitdate;
} else {
$utquery .= "SET usesleft=usesleft-1\n";
$aToken->usesleft=((int)$aToken->usesleft)-1;
}
} else {
if (isset($usesleft) && $usesleft <= 1) {
$utquery .= "SET usesleft=usesleft-1, completed='Y'\n";
if ($aToken->usesleft <= 1) {
$aToken->usesleft=((int)$aToken->usesleft)-1;
$aToken->completed='Y';
} else {
$utquery .= "SET usesleft=usesleft-1\n";
$aToken->usesleft=((int)$aToken->usesleft)-1;
}
}
$utquery .= "WHERE token=".App()->db->quoteValue($_POST['token']);
dbExecuteAssoc($utquery); //Yii::app()->db->Execute($utquery) or safeDie ("Couldn't update tokens table!<br />\n$utquery<br />\n".Yii::app()->db->ErrorMsg());

$aToken->save();

// save submitdate into survey table
$sdquery = "UPDATE {{survey_$surveyid}} SET submitdate='".$submitdate."' WHERE id={$last_db_id}\n";
dbExecuteAssoc($sdquery) or safeDie("Couldn't set submitdate response in survey table!<br />\n$sdquery<br />\n");
$aResponse=Response::model($surveyid)->findByPk($last_db_id);
$aResponse->submitdate=$submitdate;
$aResponse->save();
}
if (isset($_POST['save']) && $_POST['save'] == "on") {
$srid = $last_db_id;
Expand All @@ -1604,30 +1585,19 @@ public function insert()
$aDataentrymsgs[] = CHtml::tag('font', array('class'=>'successtitle'), gT("Your survey responses have been saved successfully. You will be sent a confirmation e-mail. Please make sure to save your password, since we will not be able to retrieve it for you."));
$tokens_table = "{{tokens_$surveyid}}";
if (tableExists($tokens_table)) {
//If the query fails, assume no tokens table exists
$tkquery = "SELECT * FROM {$tokens_table}";
dbExecuteAssoc($tkquery);
/*$tokendata = array (
"firstname"=> $saver['identifier'],
"lastname"=> $saver['identifier'],
"email"=>$saver['email'],
"token"=>randomChars(15),
"language"=>$saver['language'],
"sent"=>dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", $timeadjust),
"completed"=>"N");*/

$columns = array("firstname", "lastname", "email", "token",
"language", "sent", "completed");
$values = array("'".$saver['identifier']."'", "'".$saver['identifier']."'", "'".$saver['email']."'", "'".$password."'",
"'".randomChars(15)."'", "'".$saver['language']."'", "'"."N"."'");

$SQL = "INSERT INTO {$tokens_table}
(".implode(',', $columns).")
VALUES
(".implode(',', $values).")";
dbExecuteAssoc($SQL);
$tokendata = array (
"firstname"=> $saver['identifier'],
"lastname"=> $saver['identifier'],
"email"=>$saver['email'],
"token"=>$password,
"language"=>$saver['language'],
"sent"=>date("Y-m-d H:i:s"),
"completed"=>"N");

$aToken=new Token($surveyid);

This comment has been minimized.

Sign in to view

Copy link
@olleharstedt

olleharstedt Jul 8, 2019 •
edited

Contributor

This line cannot work, since Token is an abstract class. How to test it?

Maybe it should be TokenDynamic?
$aToken->setAttributes($tokendata, false);
$aToken->save();
$aDataentrymsgs[] = CHtml::tag('font', array('class'=>'successtitle'), gT("A survey participant entry for the saved survey has been created too."));
//$aDataentryoutput .= "<font class='successtitle'></font><br />\n";
}
if ($saver['email']) {
//Send email
Expand Down
11 changes: 7 additions & 4 deletions application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -1812,7 +1812,7 @@ private function _createSampleGroup($iSurveyID)
$oGroup->group_order = 1;
$oGroup->grelevance = '1';
$oGroup->save();
$oGroupL10ns = new QuestionGroupL10ns();
$oGroupL10ns = new QuestionGroupL10n();
$oGroupL10ns->gid = $oGroup->gid;
$oGroupL10ns->group_name = gt('My first question group', 'html', $sLanguage);
$oGroupL10ns->language = $sLanguage;
Expand All @@ -1835,13 +1835,16 @@ private function _createSampleQuestion($iSurveyID, $iGroupID)
$oQuestion->gid = $iGroupID;
$oQuestion->type = Question::QT_T_LONG_FREE_TEXT;
$oQuestion->title = 'Q00';
$oQuestion->question = gt('A first example question. Please answer this question:', 'html', $sLanguage);
$oQuestion->help = gt('This is a question help text.', 'html', $sLanguage);
$oQuestion->mandatory = 'N';
$oQuestion->relevance = '1';
$oQuestion->question_order = 1;
$oQuestion->language = $sLanguage;
$oQuestion->save();
$oQuestionLS = new QuestionL10n();
$oQuestionLS->question = gt('A first example question. Please answer this question:', 'html', $sLanguage);
$oQuestionLS->help = gt('This is a question help text.', 'html', $sLanguage);
$oQuestionLS->language = $sLanguage;
$oQuestionLS->qid=$oQuestion->qid;
$oQuestionLS->save();
return $oQuestion->qid;
}

Expand Down
7 changes: 4 additions & 3 deletions application/helpers/admin/activate_helper.php
View file
Expand Up @@ -512,9 +512,10 @@ function mssql_drop_constraint($fieldname, $tablename)
sys.sysobjects AS t_obj ON c_obj.parent_obj = t_obj.id INNER JOIN
sys.sysconstraints AS con ON c_obj.id = con.constid INNER JOIN
sys.syscolumns AS col ON t_obj.id = col.id AND con.colid = col.colid
WHERE (c_obj.xtype = 'D') AND (col.name = '$fieldname') AND (t_obj.name='{{{$tablename}}}')";
$result = dbExecuteAssoc($dfquery)->read();
$defaultname = $result['CONTRAINT_NAME'];
WHERE (c_obj.xtype = 'D') AND (col.name = '{$fieldname}') AND (t_obj.name='{{{$tablename}}}')";
$result = Yii::app()->db->createCommand($dfquery)->query();
$result = $result->read();
$defaultname = $result['CONSTRAINT_NAME'];
if ($defaultname != false) {
modifyDatabase("", "ALTER TABLE {{{$tablename}}} DROP CONSTRAINT {$defaultname[0]}"); echo $modifyoutput; flush();
}
Expand Down
33 changes: 1 addition & 32 deletions application/helpers/database_helper.php
View file
Expand Up @@ -16,38 +16,7 @@
*/

/**
*
* @param string $sql
* @param array|bool $inputarr
* @param boolean $silent
* @return bool|CDbDataReader
* @throws Exception
* @deprecated Do not use anymore. If you see this replace it with a proper ActiveRecord Model query
*/
function dbExecuteAssoc($sql, $inputarr = false, $silent = true)
{
$error = '';
try {
if ($inputarr) {
$dataset = Yii::app()->db->createCommand($sql)->bindValues($inputarr)->query(); //Checked
} else {
$dataset = Yii::app()->db->createCommand($sql)->query();

}
} catch (CDbException $e) {
$error = $e->getMessage();
$dataset = false;
}

if (!$dataset && (Yii::app()->getConfig('debug') > 0 || !$silent)) {
// Exception is better than safeDie, because you can see the backtrace.
throw new \Exception('Error executing query in dbExecuteAssoc:'.$error);
}
return $dataset;
}

/**
* Return the random function to use in ORDER BY sql statements
* Return the database-specific random function to use in ORDER BY sql statements
*
* @return string
*/
Expand Down

0 comments on commit a452cf0

Please sign in to comment.