Skip to content

Commit

Permalink
Dev: Filtre title + Better filter in survey logic file
Browse files Browse the repository at this point in the history
Dev: Show complete HTML only in text and help, other remove HTML except EM
  • Loading branch information
Shnoulle committed Mar 13, 2016
1 parent df80fbd commit eb61356
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions application/helpers/expressions/em_manager_helper.php
Expand Up @@ -9115,7 +9115,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
);
}

$surveyname = templatereplace('{SURVEYNAME}',array('SURVEYNAME'=>$aSurveyInfo['surveyls_title']));
$surveyname = viewHelper::stripTagsEM(templatereplace('{SURVEYNAME}',array('SURVEYNAME'=>$aSurveyInfo['surveyls_title'])));

$out = '<div id="showlogicfilediv" class="table-responsive"><h3>' . $LEM->gT('Logic File for Survey # ') . '[' . $LEM->sid . "]: $surveyname</h3>\n";
$out .= "<table id='logicfiletable' class='table table-bordered'>";
Expand Down Expand Up @@ -9175,7 +9175,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
$sGroupRelevance= '{'.($ginfo['grelevance']=='' ? 1 : $ginfo['grelevance']).'}';
$LEM->ProcessString($sGroupRelevance, $qid,NULL,false,1,1,false,false);
$bGroupHaveError=$bGroupHaveError || $LEM->em->HasErrors();
$sGroupRelevance= viewHelper::purified($LEM->GetLastPrettyPrintExpression());
$sGroupRelevance= viewHelper::stripTagsEM($LEM->GetLastPrettyPrintExpression());
$sGroupText = ((trim($ginfo['description']) == '') ? '&nbsp;' : $ginfo['description']);
$LEM->ProcessString($sGroupText, $qid,NULL,false,1,1,false,false);
$bGroupHaveError=$bGroupHaveError || $LEM->em->HasErrors();
Expand Down Expand Up @@ -9205,7 +9205,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
if (count($sgqas) == 1 && !is_null($q['info']['default']))
{
$LEM->ProcessString($q['info']['default'], $qid,NULL,false,1,1,false,false);// Default value is Y or answer code or go to input/textarea, then we can filter it
$_default = viewHelper::purified($LEM->GetLastPrettyPrintExpression());
$_default = viewHelper::stripTagsEM($LEM->GetLastPrettyPrintExpression());
if ($LEM->em->HasErrors())
{
++$errorCount;
Expand Down

0 comments on commit eb61356

Please sign in to comment.