diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index 011890635..22a48fffd 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -328,11 +328,14 @@ class SurveyCustomReport {
 			echo	'<option value="2" '.($reportElement['type'] == 2 ? 'selected="selected"' : '').'>'.$lang['srv_frequency'].'</option>';
 			echo	'<option value="3" '.($reportElement['type'] == 3 ? 'selected="selected"' : '').'>'.$lang['srv_descriptor_short'].'</option>';
 			echo	'<option value="4" '.($reportElement['type'] == 4 ? 'selected="selected"' : '').'>'.$lang['srv_chart'].'</option>';
-			echo	'<option value="5" '.($reportElement['type'] == 5 ? 'selected="selected"' : '').'>'.$lang['srv_crosstabs'].'</option>';
-			echo	'<option value="10" '.($reportElement['type'] == 10 ? 'selected="selected"' : '').'>'.$lang['srv_multicrosstab'].'</option>';
-			echo	'<option value="6" '.($reportElement['type'] == 6 ? 'selected="selected"' : '').'>'.$lang['srv_means_label'].'</option>';
-			echo	'<option value="7" '.($reportElement['type'] == 7 ? 'selected="selected"' : '').'>'.$lang['srv_ttest'].'</option>';
-			echo	'<option value="9" '.($reportElement['type'] == 9 ? 'selected="selected"' : '').'>'.$lang['srv_break'].'</option>';		
+
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") != 0){
+			    echo	'<option value="5" '.($reportElement['type'] == 5 ? 'selected="selected"' : '').'>'.$lang['srv_crosstabs'].'</option>';
+			    echo	'<option value="10" '.($reportElement['type'] == 10 ? 'selected="selected"' : '').'>'.$lang['srv_multicrosstab'].'</option>';
+			    echo	'<option value="6" '.($reportElement['type'] == 6 ? 'selected="selected"' : '').'>'.$lang['srv_means_label'].'</option>';
+			    echo	'<option value="7" '.($reportElement['type'] == 7 ? 'selected="selected"' : '').'>'.$lang['srv_ttest'].'</option>';
+			    echo	'<option value="9" '.($reportElement['type'] == 9 ? 'selected="selected"' : '').'>'.$lang['srv_break'].'</option>';		
+            }
 
 			echo '</select>';
 
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index e52146acc..7758fdaf7 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -768,39 +768,44 @@ class SurveyStaticHtml
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_FREQUENCY . '" title="' . $lang['srv_frequency'] . '"><span>' . $lang['srv_frequency'] . '</span></a>';
                 echo '</li>';
 
-                # crostabs
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_CROSSTAB ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[4] . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_CROSSTAB . '" title="' . $lang['srv_crosstabs'] . '"><span>' . $lang['srv_crosstabs'] . '</span></a>';
-                echo '</li>';
+                // Pri glasovanju nimamo teh modulov ker imamo samo 1 vprasanje
+                if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") != 0){
 
-                # multicrostabs
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[8] . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MULTICROSSTABS . '" title="' . $lang['srv_multicrosstabs'] . '"><span>' . $lang['srv_multicrosstabs'] . '</span></a>';
-                echo '</li>';
+                    # crostabs
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_CROSSTAB ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[4] . '>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_CROSSTAB . '" title="' . $lang['srv_crosstabs'] . '"><span>' . $lang['srv_crosstabs'] . '</span></a>';
+                    echo '</li>';
 
-                # povprečaj
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_MEANS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[5] . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MEANS . '" title="' . $lang['srv_means'] . '"><span>' . $lang['srv_means'] . '</span></a>';
-                echo '</li>';
+                    # multicrostabs
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[8] . '>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MULTICROSSTABS . '" title="' . $lang['srv_multicrosstabs'] . '"><span>' . $lang['srv_multicrosstabs'] . '</span></a>';
+                    echo '</li>';
 
-                # ttest
-                if ($admin_type == 0) {
-                    echo '<li' . ($_GET['m'] == M_ANALYSIS_TTEST ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[6] . '>';
-                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_TTEST . '" title="' . $lang['srv_ttest'] . '"><span>' . $lang['srv_ttest'] . '</span></a>';
+                    # povprečaj
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_MEANS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[5] . '>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MEANS . '" title="' . $lang['srv_means'] . '"><span>' . $lang['srv_means'] . '</span></a>';
+                    echo '</li>';
+
+                    # ttest
+                    if ($admin_type == 0) {
+                        echo '<li' . ($_GET['m'] == M_ANALYSIS_TTEST ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[6] . '>';
+                        echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_TTEST . '" title="' . $lang['srv_ttest'] . '"><span>' . $lang['srv_ttest'] . '</span></a>';
+                        echo '</li>';
+                    }
+
+                    # break
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
                     echo '</li>';
                 }
 
-                # break
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
-                echo '</li>';
-
                 # predogled
                 echo '<li class="previewCheck displayNone">';
                 echo '<label><input type="checkbox" id="cbx_shoq_analiza_preview" onchange="change_analiza_preview();"' . ($show_analiza_preview == true ? ' checked=checked' : '') . '>' . $lang['srv_preview'] . '</label>';
                 echo '</li>';
                 echo '</ul>';
             }
+
             if ($showDiv) {
                 echo '</div>';
             }
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
index 308f55614..9e6104e32 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
@@ -52,6 +52,11 @@ class SurveyBreak
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
 
 			$this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/';
+
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
 				
 			#inicializiramo class za datoteke
 			$this->SDF = SurveyDataFile::get_instance();
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
index 44398adb4..9703b1f0e 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
@@ -106,6 +106,11 @@ class SurveyCrosstabs {
 			SurveyInfo :: getInstance()->SurveyInit($this->sid);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
 
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
+
 			$this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/';
 
 			# Inicializiramo in polovimo nastavitve missing profila
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
index 6b2602a68..39b90b00c 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
@@ -43,6 +43,11 @@ class SurveyMeans{
 			SurveyInfo :: getInstance()->SurveyInit($this->sid);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
 
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
+            
 			# Inicializiramo in polovimo nastavitve missing profila
 			SurveyStatusProfiles::Init($this->sid);
 			SurveyUserSetting::getInstance()->Init($this->sid, $global_user_id);
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
index db9c9e448..7916bf662 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
@@ -75,6 +75,11 @@ class SurveyMultiCrosstabs {
 			# polovimo vrsto tabel (aktivne / neaktivne)
 			SurveyInfo :: getInstance()->SurveyInit($this->ank_id);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
+
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
 			
 			$this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/';
 			
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
index 035fe98c9..3314c6bee 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
@@ -33,11 +33,17 @@ class SurveyTTest
 	function __construct($sid) {
 
 		if ((int)$sid > 0) {
+            
 			$this->sid = $sid;
 
 			# polovimo vrsto tabel (aktivne / neaktivne)
 			SurveyInfo :: getInstance()->SurveyInit($this->sid);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
+
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
 				
 			# Inicializiramo in polovimo nastavitve missing profila
 			SurveyStatusProfiles::Init($this->sid);