diff --git a/admin/survey/classes/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
similarity index 100%
rename from admin/survey/classes/class.SurveyAnalysis.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
diff --git a/admin/survey/classes/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
similarity index 100%
rename from admin/survey/classes/class.SurveyAnalysisArchive.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
diff --git a/admin/survey/classes/class.SurveyAnalysisHelper.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
similarity index 100%
rename from admin/survey/classes/class.SurveyAnalysisHelper.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
diff --git a/admin/survey/classes/class.SurveyBreak.php b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
similarity index 100%
rename from admin/survey/classes/class.SurveyBreak.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
diff --git a/admin/survey/classes/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
similarity index 98%
rename from admin/survey/classes/class.SurveyChart.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index e6e077ffb..e79ebe512 100644
--- a/admin/survey/classes/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -151,7 +151,7 @@ class SurveyChart {
// Pobrisemo stare (starejse od $expire_time v dnevih) slike grafov iz cache folderja
static function clearCache($expire_time = 14){
- $folderPath = dirname(__FILE__).'/../pChart/Cache/';
+ $folderPath = dirname(__FILE__).'/../../pChart/Cache/';
$fileTypes = '*';
// Pobrisemo file starejse od
@@ -206,7 +206,7 @@ class SurveyChart {
if($DataSet != 0 && $DataSet != -1){
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, self::$settings, $DataSet->GetNumerus());
@@ -866,7 +866,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -923,8 +923,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -1048,7 +1046,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -1104,8 +1102,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -1249,7 +1245,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -1283,8 +1279,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -1361,7 +1355,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -1392,9 +1386,7 @@ class SurveyChart {
}
// Shranimo v cache
- $Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
+ $Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
}
// dobimo ime slike c cache-u
@@ -1482,7 +1474,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -1538,8 +1530,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -1641,7 +1631,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -1681,8 +1671,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -1799,7 +1787,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -1844,8 +1832,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -1972,7 +1958,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -2017,8 +2003,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -2096,7 +2080,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -2126,8 +2110,6 @@ class SurveyChart {
// Shranimo v cache
$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);
-
- //$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');
}
// dobimo ime slike c cache-u
@@ -2205,7 +2187,7 @@ class SurveyChart {
echo '';
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($spid, $settings, $DataSet->GetNumerus());
@@ -6190,7 +6172,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*220);
$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -6237,11 +6219,11 @@ class SurveyChart {
$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
// Draw the bar graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->drawBarGraph($Data,$DataSet->GetDataDescription(), false, 95, self::$settings['barLabel'], self::$settings['barLabelSmall']);
// Finish the graph
@@ -6253,7 +6235,7 @@ class SurveyChart {
//$Test->setFontProperties("Fonts/verdana.ttf",10);
//$Test->drawTitle(50,22,$spremenljivka['variable'].' - '.$spremenljivka['naslov'],50,50,50,585);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
@@ -6311,7 +6293,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Sirina label
// Ce iamo povprecje ni labele
@@ -6409,10 +6391,10 @@ class SurveyChart {
$Test->drawHorGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Draw the bar graph
$Test->drawHorBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(), self::$settings['barLabel'], self::$settings['barLabelSmall']);
@@ -6430,7 +6412,7 @@ class SurveyChart {
if($spremenljivka['tip'] == 18 || $spremenljivka['tip'] == 20)
$Test->drawTitle(self::$quality*200,self::$quality*22,$lang['srv_analiza_sums_average'],0,0,0,self::$quality*680);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
@@ -6488,7 +6470,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Pri navadnem radio in checkbox vprasanju imamo samo en stolpec - zato so dimenzije drugacne
if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3)
@@ -6504,11 +6486,11 @@ class SurveyChart {
$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
// Draw the bar graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->drawStackedBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(), self::$settings['barLabel'], 95);
// Finish the graph
@@ -6520,7 +6502,7 @@ class SurveyChart {
$Test->setFontProperties("Fonts/verdana.ttf",self::$quality*10);
//$Test->drawTitle(50,22,$spremenljivka['variable'].' - '.$spremenljivka['naslov'],50,50,50,585);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
@@ -6570,7 +6552,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Sirina label
if(self::$settings['labelWidth'] == 20){
@@ -6618,10 +6600,10 @@ class SurveyChart {
}
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Draw the bar graph
$Test->drawStackedHorBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(),self::$settings['barLabel'],95);
@@ -6638,7 +6620,7 @@ class SurveyChart {
$Test->setFontProperties("Fonts/verdana.ttf",self::$quality*10);
//$Test->drawTitle(50,22,$spremenljivka['variable'].' - '.$spremenljivka['naslov'],50,50,50,585);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
@@ -6684,7 +6666,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
//$Test->setGraphArea(50,40,685,220);
$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -6705,18 +6687,18 @@ class SurveyChart {
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
//$Test->drawLegend(700,30,$DataSet->GetDataDescription(),255,255,255);
if($show_legend == 1)
$Test->drawPieLegend(self::$quality*600,self::$quality*50,$DataSet->GetData(),$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*10);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*10);
if($spremenljivka['tip'] == 18)
$Test->drawTitle(self::$quality*180,self::$quality*30,$lang['srv_analiza_sums_average'],0,0,0,self::$quality*610);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->setAntialias(false, 0);
@@ -6760,7 +6742,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
//$Test->setGraphArea(50,40,685,220);
$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -6781,18 +6763,18 @@ class SurveyChart {
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
//$Test->drawLegend(700,30,$DataSet->GetDataDescription(),255,255,255);
if($show_legend == 1)
$Test->drawPieLegend(self::$quality*600,self::$quality*50,$DataSet->GetData(),$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*10);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*10);
if($spremenljivka['tip'] == 18)
$Test->drawTitle(self::$quality*180,self::$quality*30,$lang['srv_analiza_sums_average'],0,0,0,self::$quality*610);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->setAntialias(false, 0);
@@ -6853,7 +6835,7 @@ class SurveyChart {
$angle = 45;
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*220);
$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -6881,7 +6863,7 @@ class SurveyChart {
$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
//$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
// Draw the bar graph
@@ -6892,7 +6874,7 @@ class SurveyChart {
if($show_legend == 1)
$Test->drawLegend(self::$quality*680,self::$quality*30,$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
$char = (self::$settings['base'] == 1 && ($spremenljivka != null && ($spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 16))) ? 'r' : 'n';
@@ -6944,7 +6926,7 @@ class SurveyChart {
}
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->setGraphArea(self::$quality*270,self::$quality*50,self::$quality*530,self::$quality*(220+$addHeight));
@@ -6957,10 +6939,10 @@ class SurveyChart {
$Test->drawHorGrid(4,false,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Draw the line graph
$Test->drawVerLineGraph($DataSet->GetData(),$DataSet->GetDataDescription(), $insideValues=false);
@@ -6974,12 +6956,12 @@ class SurveyChart {
$Test->drawLegend(self::$quality*680,self::$quality*30,$DataSet->GetDataDescription(),255,255,255);
}
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
if($spremenljivka['tip'] == 18)
$Test->drawTitle(self::$quality*200,self::$quality*22,'Povprečje',150,150,150,self::$quality*585);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
$char = (self::$settings['base'] == 1 && ($spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 16)) ? 'r' : 'n';
@@ -7011,7 +6993,7 @@ class SurveyChart {
$Test = self::setChartColors($Test, self::$skin);
$Test->setLineStyle(self::$quality,$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*320);
$Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*343,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -7021,7 +7003,7 @@ class SurveyChart {
//$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
@@ -7050,7 +7032,7 @@ class SurveyChart {
$Test->setAntialias(false, 0);
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
if($show_legend == 1){
// posebna legenda pri povprecjih
@@ -7063,7 +7045,7 @@ class SurveyChart {
$Test->setFontProperties("Fonts/verdana.ttf",self::$quality*10);
//$Test->drawTitle(50,22,$spremenljivka['variable'].' - '.$spremenljivka['naslov'],50,50,50,585);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize);
// Prikaz numerusa na grafu
$char = (self::$settings['base'] == 1 && ($spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 16)) ? 'r' : 'n';
diff --git a/admin/survey/classes/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
similarity index 100%
rename from admin/survey/classes/class.SurveyCrosstabs.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
diff --git a/admin/survey/classes/class.SurveyEditsAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyEditsAnalysis.php
similarity index 99%
rename from admin/survey/classes/class.SurveyEditsAnalysis.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyEditsAnalysis.php
index 3cfe488bc..ae07e781d 100644
--- a/admin/survey/classes/class.SurveyEditsAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyEditsAnalysis.php
@@ -235,7 +235,7 @@ class SurveyEditsAnalysis{
//$DataSet->SetYAxisUnit("null");
$DataSet->SetYAxisFormat("number");
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = self::generateChartId($DataSet->GetNumerus());
echo '';
diff --git a/admin/survey/classes/class.SurveyMeans.php b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
similarity index 100%
rename from admin/survey/classes/class.SurveyMeans.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
diff --git a/admin/survey/classes/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
similarity index 100%
rename from admin/survey/classes/class.SurveyMultiCrosstabs.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
diff --git a/admin/survey/classes/class.SurveyTTest.php b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
similarity index 100%
rename from admin/survey/classes/class.SurveyTTest.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
diff --git a/admin/survey/classes/class.SurveyTableChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
similarity index 95%
rename from admin/survey/classes/class.SurveyTableChart.php
rename to admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
index 3fc576d18..29803c78c 100644
--- a/admin/survey/classes/class.SurveyTableChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
@@ -189,7 +189,7 @@ class SurveyTableChart {
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = $this->generateChartId($chartID, $this->settings, $DataSet->GetNumerus());
@@ -319,7 +319,7 @@ class SurveyTableChart {
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = $this->generateChartId($chartID, $this->settings, $DataSet->GetNumerus());
@@ -410,7 +410,7 @@ class SurveyTableChart {
$DataSet = $this->getTTestDataSet($chartID, $this->settings);
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = $this->generateChartId($chartID, $this->settings, $DataSet->GetNumerus());
@@ -442,7 +442,7 @@ class SurveyTableChart {
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = $this->generateChartId($chartID, $this->settings, $DataSet->GetNumerus());
@@ -548,7 +548,7 @@ class SurveyTableChart {
// Cache
- $Cache = new pCache(dirname(__FILE__).'/../pChart/Cache/');
+ $Cache = new pCache(dirname(__FILE__).'/../../pChart/Cache/');
$ID = $this->generateChartId($chartID, $this->settings, $DataSet->GetNumerus());
@@ -1702,7 +1702,7 @@ class SurveyTableChart {
$Test = $this->setChartColors($Test, $this->skin);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -1712,11 +1712,11 @@ class SurveyTableChart {
$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Draw the bar graph
$Test->drawBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(), false, 95, $this->settings['barLabel']);
@@ -1724,7 +1724,7 @@ class SurveyTableChart {
if($show_legend == 1)
$Test->drawLegend($this->settings['hq']*680,$this->settings['hq']*30,$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Prikaz napisa frekvence/odstotki (samo crosstabi)
@@ -1755,7 +1755,7 @@ class SurveyTableChart {
$Test = $this->setChartColors($Test, $this->skin);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Dolge labele
$startX = ($this->settings['labelWidth'] == 20) ? 225 : 360;
@@ -1776,10 +1776,10 @@ class SurveyTableChart {
$Test->drawHorGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Draw the bar graph
$Test->drawHorBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(), $this->settings['barLabel']);
@@ -1789,7 +1789,7 @@ class SurveyTableChart {
$Test->drawLegend($this->settings['hq']*680,$this->settings['hq']*60,$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Prikaz napisa frekvence in 1. spremenljivke na vrhu (samo crosstabi)
@@ -1840,7 +1840,7 @@ class SurveyTableChart {
$Test = $this->setChartColors($Test, $this->skin);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Pri navadnem radio in checkbox vprasanju imamo samo en stolpec - zato so dimenzije drugacne
/*if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3)
@@ -1856,18 +1856,18 @@ class SurveyTableChart {
$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
// Draw the bar graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->drawStackedBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(), $this->settings['barLabel'], 95);
$Test->drawLegend($this->settings['hq']*680,$this->settings['hq']*30,$DataSet->GetDataDescription(),255,255,255,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=false,$reverse=true);
$Test->setFontProperties("Fonts/verdana.ttf",$this->settings['hq']*10);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Prikaz napisa frekvence (samo crosstabi)
@@ -1898,7 +1898,7 @@ class SurveyTableChart {
$Test = $this->setChartColors($Test, $this->skin);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Dolge labele
$startX = ($this->settings['labelWidth'] == 20) ? 225 : 360;
@@ -1925,10 +1925,10 @@ class SurveyTableChart {
//}
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Draw the bar graph
$Test->drawStackedHorBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(),$this->settings['barLabel'],95);
@@ -1939,7 +1939,7 @@ class SurveyTableChart {
$Test->setFontProperties("Fonts/verdana.ttf",$this->settings['hq']*10);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Prikaz napisa frekvence in 1. spremenljivke na vrhu (samo crosstabi)
@@ -1974,7 +1974,7 @@ class SurveyTableChart {
$Test->setAntialias(true, 20);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->setGraphArea(50,40,685,220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -1989,15 +1989,15 @@ class SurveyTableChart {
$Test->setAntialias(false, 0);
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->drawLegend(700,30,$DataSet->GetDataDescription(),255,255,255);
if($show_legend == 1)
$Test->drawPieLegend($this->settings['hq']*600,$this->settings['hq']*50,$DataSet->GetData(),$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*10);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*10);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
return $Test;
@@ -2017,7 +2017,7 @@ class SurveyTableChart {
$Test->setAntialias(true, 20);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->setGraphArea(50,40,685,220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -2032,15 +2032,15 @@ class SurveyTableChart {
$Test->setAntialias(false, 0);
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->drawLegend(700,30,$DataSet->GetDataDescription(),255,255,255);
if($show_legend == 1)
$Test->drawPieLegend($this->settings['hq']*600,$this->settings['hq']*50,$DataSet->GetData(),$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*10);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*10);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
return $Test;
@@ -2062,7 +2062,7 @@ class SurveyTableChart {
$Test = $this->setChartColors($Test, $this->skin);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*270,$this->settings['hq']*50,$this->settings['hq']*530,$this->settings['hq']*(220+$addHeight));
@@ -2082,10 +2082,10 @@ class SurveyTableChart {
$Test->drawHorGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
// Draw the line graph
$Test->drawVerLineGraph($DataSet->GetData(),$DataSet->GetDataDescription(), $insideValues=false);
@@ -2094,9 +2094,9 @@ class SurveyTableChart {
if($show_legend == 1)
$Test->drawLegend($this->settings['hq']*680,$this->settings['hq']*30,$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
return $Test;
@@ -2119,7 +2119,7 @@ class SurveyTableChart {
$Test->setAntialias(true, 20);
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*320);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*343,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -2129,7 +2129,7 @@ class SurveyTableChart {
//$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
$VMax = -1;
@@ -2147,14 +2147,14 @@ class SurveyTableChart {
$Test->setAntialias(false, 0);
// Finish the graph
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
if($show_legend == 1)
$Test->drawLegend($this->settings['hq']*680,$this->settings['hq']*30,$DataSet->GetDataDescription(),255,255,255);
$Test->setFontProperties("Fonts/verdana.ttf",$this->settings['hq']*10);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
return $Test;
}
@@ -2176,7 +2176,7 @@ class SurveyTableChart {
$angle = 45;
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
@@ -2187,7 +2187,7 @@ class SurveyTableChart {
$Test->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
// Draw the bar graph
@@ -2198,7 +2198,7 @@ class SurveyTableChart {
if($show_legend == 1)
$Test->drawLegend($this->settings['hq']*680,$this->settings['hq']*30,$DataSet->GetDataDescription(),255,255,255);
- $Test->setFontProperties(dirname(__FILE__).'/../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
+ $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->drawTextBox($this->settings['hq']*690,$this->settings['hq']*(210+$addHeight),$this->settings['hq']*795,$this->settings['hq']*(220+$addHeight),$numerus,$Angle=0,$R=0,$G=0,$B=0,$Align=ALIGN_LEFT,$Shadow=FALSE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=0);
diff --git a/admin/survey/classes/class.SurveyAlert.php b/admin/survey/classes/surveyEmails/class.SurveyAlert.php
similarity index 100%
rename from admin/survey/classes/class.SurveyAlert.php
rename to admin/survey/classes/surveyEmails/class.SurveyAlert.php
diff --git a/admin/survey/classes/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
similarity index 100%
rename from admin/survey/classes/class.SurveyInvitationsNew.php
rename to admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
diff --git a/admin/survey/classes/class.SurveySimpleMailInvitation.php b/admin/survey/classes/surveyEmails/class.SurveySimpleMailInvitation.php
similarity index 100%
rename from admin/survey/classes/class.SurveySimpleMailInvitation.php
rename to admin/survey/classes/surveyEmails/class.SurveySimpleMailInvitation.php
diff --git a/admin/survey/classes/class.SurveyUnsubscribe.php b/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php
similarity index 100%
rename from admin/survey/classes/class.SurveyUnsubscribe.php
rename to admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php
diff --git a/admin/survey/classes/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
similarity index 100%
rename from admin/survey/classes/CrossRoad.php
rename to admin/survey/classes/tracking/CrossRoad.php
diff --git a/admin/survey/classes/TrackingClass.php b/admin/survey/classes/tracking/TrackingClass.php
similarity index 100%
rename from admin/survey/classes/TrackingClass.php
rename to admin/survey/classes/tracking/TrackingClass.php
diff --git a/admin/survey/classes/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php
similarity index 100%
rename from admin/survey/classes/UserTrackingClass.php
rename to admin/survey/classes/tracking/UserTrackingClass.php