Dev Fix USER_RIGHT_PREVIEW index issue

Dev Fix EM for data_entry.php Dev Fix EM undefined index when have Equation question in Group-by-Group git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11164 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 14, 2011 · a7f5c3d · a7f5c3d
1 parent ca4933b
commit a7f5c3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -2325,7 +2325,7 @@ function view($surveyid,$lang=NULL)
                     $cdata['qidattributes'] = $qidattributes;
                     $hidden = (isset($qidattributes['hidden']) ? $qidattributes['hidden'] : 0);
                     // TODO - can questions be hidden?  Are JavaScript variables names used?  Consistently with everywhere else?
-                    LimeExpressionManager::ProcessRelevance($qidattributes['relevance'],$deqrow['qid'],NULL,$deqrow['type'],$hidden);
+//                    LimeExpressionManager::ProcessRelevance($qidattributes['relevance'],$deqrow['qid'],NULL,$deqrow['type'],$hidden);
 
                     //GET ANY CONDITIONS THAT APPLY TO THIS QUESTION
                     $explanation = ""; //reset conditions explanation

diff --git a/application/controllers/survey.php b/application/controllers/survey.php
@@ -1017,7 +1017,7 @@ function _canUserPreviewSurvey($surveyId)
     }
 
     function _userHasPreviewAccessSession($surveyId){
-        return isset($_SESSION['USER_RIGHT_PREVIEW']) || $_SESSION['USER_RIGHT_PREVIEW'] != $surveyId;
+        return (!(isset($_SESSION['USER_RIGHT_PREVIEW']) && ($_SESSION['USER_RIGHT_PREVIEW'] == $surveyId)));
     }
 
     function _killPage(&$redata, $iDebugLine, $sTemplateDir = null, $asMessage = array(), $bKillSession = false)

diff --git a/application/libraries/Group_format.php b/application/libraries/Group_format.php
@@ -1299,6 +1299,8 @@ function checkconditions(value, name, type)
                 }
                 if ($qa[8] == '*')
                 {
+                    // TMW - replace this with a call to EM to get hidden attribute status
+                    $eqnAttributes = getQuestionAttributeValues($qa[4], $qa[8]);
                     if ($eqnAttributes['hidden']==1) {
                         $n_q_display = ' style="display: none;"';
                     }