Dev Removed extended conditions feature (agreed with contributor on t…

…his) git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9515 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Nov 22, 2010 · 2644112 · 2644112
1 parent decbe3a
commit 2644112
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 579 deletions.
diff --git a/admin/admin.php b/admin/admin.php
@@ -169,11 +169,6 @@
         if(bHasSurveyPermission($surveyid,'surveycontent','read'))    {include('conditionshandling.php');}
         else { include('access_denied.php');}
     }
-    elseif ($action == 'extendedconditions')
-    {
-        if(bHasSurveyPermission($surveyid,'surveycontent','read'))    {include('extendedconditionshandling.php');}
-        else { include('access_denied.php');}
-    }
     elseif ($action == 'importsurveyresources')
     {
         if (bHasSurveyPermission($surveyid,'surveycontent','import'))	{$_SESSION['FileManagerContext']="edit:survey:$surveyid";include('import_resources_zip.php');}
@@ -416,7 +411,7 @@
         }
     }
     if (!isset($assessmentsoutput) && !isset($statisticsoutput) && !isset($browseoutput) &&
-        !isset($savedsurveyoutput) && !isset($listcolumnoutput) && !isset($conditionsoutput) && !isset($extendedconditionsoutput) &&
+        !isset($savedsurveyoutput) && !isset($listcolumnoutput) && !isset($conditionsoutput) && 
         !isset($importoldresponsesoutput) && !isset($exportroutput) && !isset($vvoutput) &&
         !isset($tokenoutput) && !isset($exportoutput) && !isset($templatesoutput) && !isset($translateoutput) && //<AdV>
         !isset($iteratesurveyoutput) && (substr($action,0,4)!= 'ajax') && ($action!='update') &&
@@ -523,7 +518,7 @@
     if (!isset($labelsoutput)  && !isset($templatesoutput) && !isset($printablesurveyoutput) &&
     !isset($assessmentsoutput) && !isset($tokenoutput) && !isset($browseoutput) && !isset($exportspssoutput) &&  !isset($exportroutput) &&
     !isset($dataentryoutput) && !isset($statisticsoutput)&& !isset($savedsurveyoutput)  && !isset($translateoutput) && //<AdV>
-    !isset($exportoutput) && !isset($importoldresponsesoutput) && !isset($conditionsoutput) && !isset($extendedconditionsoutput) &&
+    !isset($exportoutput) && !isset($importoldresponsesoutput) && !isset($conditionsoutput) && 
     !isset($vvoutput) && !isset($listcolumnoutput) && !isset($importlabelresources) && !isset($iteratesurveyoutput) &&
     (substr($action,0,4)!= 'ajax') && $action!='update' && $action!='showphpinfo')
     {
@@ -584,7 +579,6 @@
     if (isset($savedsurveyoutput)) {$adminoutput.= $savedsurveyoutput;}
     if (isset($importoldresponsesoutput)) {$adminoutput.= $importoldresponsesoutput;}
     if (isset($conditionsoutput)) {$adminoutput.= $conditionsoutput;}
-    if (isset($extendedconditionsoutput)) {$adminoutput.= $extendedconditionsoutput;}
     if (isset($deletesurveyoutput)) {$adminoutput.= $deletesurveyoutput;}
     if (isset($resetsurveylogicoutput)) {$adminoutput.= $resetsurveylogicoutput;}
     if (isset($vvoutput)) {$adminoutput.= $vvoutput;}