From d905a9a7f8ac9b45fb4445b4cce97d7c2475492a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fl=C3=BCr?=
\n"
- . "getController()->createUrl("admin/tokens/sa/tokenify/surveyid/$iSurveyId", array('ok'=>'Y')))."\" />\n"
+ . "\n"
. "getController()->createUrl("admin/tokens/sa/index/surveyid/$iSurveyId")."', '_top')\" />\n"
. "
\n"
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 7292efd4825..f31477d24a4 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -314,7 +314,13 @@ function getGidNext($surveyid, $gid)
}
-
+/**
+ * convertGETtoPOST a function to create a post Request from get parameters
+ * !!! This functions result has to be wrappen in singlequotes!
+ *
+ * @param String $url | The complete url with all parameters
+ * @return String | The onclick action for the element
+ */
function convertGETtoPOST($url)
{
// This function must be deprecated and replaced by $.post
@@ -332,7 +338,7 @@ function convertGETtoPOST($url)
$postArray[$paramname] = $value;
}
- $callscript = "window.LS.sendPost('".$calledscript."','".json_encode($postArray)."');";
+ $callscript = "window.LS.sendPost(\"".$calledscript."\",\"\",".json_encode($postArray).");";
return $callscript;
}
diff --git a/application/models/Question.php b/application/models/Question.php
index 35997c78643..3dd69529b30 100644
--- a/application/models/Question.php
+++ b/application/models/Question.php
@@ -823,10 +823,13 @@ public function getbuttons()
$gid_search = Yii::app()->request->getParam('gid');
if ($oSurvey->active != "Y" && Permission::model()->hasSurveyPermission($this->sid, 'surveycontent', 'delete')) {
- $button .= 'createUrl("admin/questions/sa/delete/surveyid/$this->sid/qid/$this->qid/gid/$gid_search")).'} ">
-
- ';
+ $button .= '"
+ .'
+ ';
}
return $button;
diff --git a/application/views/admin/responses/browsemenubar_view.php b/application/views/admin/responses/browsemenubar_view.php
index 0be49a3796b..edfe265387d 100644
--- a/application/views/admin/responses/browsemenubar_view.php
+++ b/application/views/admin/responses/browsemenubar_view.php
@@ -229,7 +229,7 @@ class="btn btn-default selector--ConfirmModal">
hasSurveyPermission($surveyid, 'responses', 'delete') && isset($rlanguage)): ?>
- ')) { createUrl("admin/dataentry/sa/delete/id/$id/sid/$surveyid")); ?>}">
+ $id, 'sid' => $surveyid])); ?>}">
diff --git a/application/views/admin/survey/_activation_feedback.php b/application/views/admin/survey/_activation_feedback.php
index fcf91172289..102717230b1 100644
--- a/application/views/admin/survey/_activation_feedback.php
+++ b/application/views/admin/survey/_activation_feedback.php
@@ -36,7 +36,7 @@
type="submit"
class="btn btn-default btn-lg limebutton"
value=""
- onclick=""
+ onclick=''
/>