Merge branch 'master' into release/produkcija

# Conflicts:
#	.gitignore
#	composer.lock
#	resources/sass/admin/branching/branching_collapsed.scss
#	resources/sass/admin/branching/branching_expanded.scss
#	resources/sass/admin/branching/form.scss
#	resources/sass/admin/branching/voting.scss
#	resources/sass/admin/footer.scss
#	resources/sass/admin/icons/standard.scss
#	resources/sass/admin/main_page/survey_list.scss
#	resources/sass/admin/media.scss
#	resources/sass/admin/popup/basic.scss
#	resources/sass/admin/popup/popup.scss
#	resources/sass/admin/users.scss
#	resources/sass/main/main/admin.scss
#	resources/sass/main/main_mobile/content.scss
#	vendor/autoload.php
#	vendor/composer/autoload_files.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php
#	vendor/composer/installed.json

admin/exportclases/class.pdfIzvoz.php

@@ -1953,7 +1953,7 @@ class PdfIzvoz {
 		
 		// Prelom strani ce je kateri od naslovov gridov predolg
 		$sqlVsehVrednsti = sisplet_query("SELECT g.naslov, g.variable FROM srv_grid g, srv_grid_multiple m WHERE m.parent='".$spremenljivke['id']."' AND g.spr_id=m.spr_id");
-		$sqlMultiple = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode($multiple, ',').") ORDER BY m.vrstni_red, g.vrstni_red");
+		$sqlMultiple = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode(',', $multiple).") ORDER BY m.vrstni_red, g.vrstni_red");
 		$linecount = 0;
 		while ($rowVsehVrednosti = mysqli_fetch_assoc($sqlVsehVrednsti))
 		{
@@ -1984,7 +1984,7 @@ class PdfIzvoz {
 		
 		// izišemo header celice
 		$sqlVsehVrednsti = sisplet_query("SELECT g.naslov,g.variable,m.vrstni_red FROM srv_grid g, srv_grid_multiple m WHERE m.parent='".$spremenljivke['id']."' AND g.spr_id=m.spr_id ORDER BY m.vrstni_red");
-		$sqlMultiple = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode($multiple, ',').") ORDER BY m.vrstni_red, g.vrstni_red");
+		$sqlMultiple = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode(',', $multiple).") ORDER BY m.vrstni_red, g.vrstni_red");
 		while ($rowVsehVrednosti = mysqli_fetch_assoc($sqlVsehVrednsti))
 		{
 			# priredimo naslov če prevajamo anketo

admin/survey/Branching.php

@@ -1641,13 +1641,30 @@ class Branching {
 			echo '</div>';
 		}
 		// Kvota
-		else if($row['tip'] == 25){
+		elseif($row['tip'] == 25){
 			echo '<div class="naslov '.($row['orientation']==0?'floatLeft':'').' quota">';
 			echo $row['naslov'];
 			echo '</div>';
 		}
+        // GDPR vprasanje in prevajanje - prevedemo v anglescino
+        elseif($prevajanje && $row['variable'] == 'gdpr'){
+
+            // nastavimo na jezik za respondentov vmesnik
+            $language_id_bck = $lang['id'];
+            $file = ($this->lang_id == '1') ? '../../lang/1.php' : '../../lang/2.php';
+            @include($file);
+
+            $gdpr_naslov = GDPR::getSurveyIntro($this->anketa);
+
+            echo '<div class="naslov '.($row['orientation']==0?'':'').' naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row['id'].'" '.(strpos($row['naslov'], $lang['srv_new_vprasanje'])!==false || strpos($row['naslov'], $lang1['srv_new_vprasanje'])!==false || $this->lang_id!=null ? ' default="1"':'').'>';
+			echo $gdpr_naslov;
+			echo '</div>';
+
+            // nastavimo nazaj na admin jezik
+            $file = '../../lang/'.$language_id_bck.'.php';
+            @include($file);
+        }
 		else{
-			//echo '<div class="naslov '.($row['orientation']==0?'floatLeft':'').' naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row['id'].'" '.(strpos($row['naslov'], $lang['srv_new_vprasanje'])!==false || strpos($row['naslov'], $lang1['srv_new_vprasanje'])!==false || $this->lang_id!=null ? ' default="1"':'').'>';
 			echo '<div class="naslov '.($row['orientation']==0?'':'').' naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row['id'].'" '.(strpos($row['naslov'], $lang['srv_new_vprasanje'])!==false || strpos($row['naslov'], $lang1['srv_new_vprasanje'])!==false || $this->lang_id!=null ? ' default="1"':'').'>';
 			echo $row['naslov'];
 			echo '</div>';
@@ -1929,6 +1946,23 @@ class Branching {
 					save('lang_id', $this->lang_id);
 					$naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($row1['id']);
 					if ($naslov != '') $row1['naslov'] = $naslov;
+
+                    // Prevajanje in gdpr
+                    if($prevajanje && $row['variable'] == 'gdpr'){
+
+                        $gdpr_answer = '';
+
+                        if($row1['variable'] == '2')
+                            $gdpr_answer = 'yes';
+
+                        if($row1['variable'] == '1')
+                            $gdpr_answer = 'no';
+
+                        // Prevedemo gdpr odgovore
+                        if($gdpr_answer != ''){
+                            $row1['naslov'] = $lang['srv_gdpr_intro_'.$gdpr_answer];
+                        }             
+                    }
 				}
 
 				// Ce je variabla ne vem in imamo vklopljen prikaz ob opozorilu -> rdec
@@ -5043,7 +5077,7 @@ class Branching {
 			while ($rowM = mysqli_fetch_array($sqlM)) {
 				$multiple[] = $rowM['spr_id'];
 			}
-			$sql2 = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode($multiple, ',').") ORDER BY m.vrstni_red, g.vrstni_red");
+			$sql2 = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode(',', $multiple).") ORDER BY m.vrstni_red, g.vrstni_red");
 			$row2 = mysqli_fetch_array($sql2);
 
 			for ($i = 1; $i <= mysqli_num_rows($sql2); $i++) {
@@ -6921,8 +6955,6 @@ class Branching {
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
 		} else {
             echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-//			echo '<span class="sprites add_blue_light"></span>';
-//			echo '<span class="sprites delete_blue_light"></span>';
 		}
 		echo '</td>';
 
@@ -7228,12 +7260,6 @@ class Branching {
         echo '</table>';
 
         echo '</form>'."\n\r";
-
-		/* kaj je to??
-        echo '    <script type="text/javascript">                                                                           '."\n\r";
-        echo '      //document.form.condition_'.$condition.'.submit();   '."\n\r";
-        echo '    </script>                                                                                                 '."\n\r";
-		*/
     }
 
     /**

admin/survey/Glasovanje.php

@@ -2,7 +2,7 @@
 
 global $site_path;
 
-define('NEW_LINE', "\n", true);
+define('NEW_LINE', "\n");
 
 class Glasovanje {
 

admin/survey/R/class.SurveyAnalysisR.php

@@ -9,8 +9,8 @@
  *
  */
 
-define("DATA_FOLDER", "admin/survey/R/TempData", true);
+define("DATA_FOLDER", "admin/survey/R/TempData");
-define("SCRIPT_FOLDER", "admin/survey/R/script", true);
+define("SCRIPT_FOLDER", "admin/survey/R/script");
 
 
 class SurveyAnalysisR {

admin/survey/SurveyAdmin.php

@@ -61,23 +61,23 @@
 
 
 // STARO
-define("A_IZVOZI", "izvozi", true);
+define("A_IZVOZI", "izvozi");
 
-define("M_IZVOZI_EXCEL", "excel", true);
+define("M_IZVOZI_EXCEL", "excel");
-define("M_IZVOZI_SPSS", "spss", true);
+define("M_IZVOZI_SPSS", "spss");
-define("M_IZVOZI_txt", "txt", true);
+define("M_IZVOZI_txt", "txt");
 
-define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf", true);
+define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf");
-define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf", true);
+define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf");
 
-define("M_REPORT_TEXT", "text", true);
+define("M_REPORT_TEXT", "text");
-define("M_REPORT_GRAPHICAL", "graphical", true);
+define("M_REPORT_GRAPHICAL", "graphical");
-define("M_REPORT_TOTAL", "total", true);
+define("M_REPORT_TOTAL", "total");
 
 
 // ali je enka še v fazi razvoja (za potrebe skrivanja navigacije,zavihkov,ipd...)
 // skrite elemente prikaže samo administratorju
-define("SRV_DEVELOPMENT_VERSION", true, true);
+define("SRV_DEVELOPMENT_VERSION", true);
 
 // tipi uporabnikov, (za kontrolo prikaza posameznih elementov) za preverjanje kličemo funkcijo user_role_cehck
 define("U_ROLE_ADMIN", 0);
@@ -122,13 +122,12 @@ class SurveyAdmin
             $this->skin = 0;
 
         // polovimo anketa ID
-        if (isset ($_GET['anketa']))
+        if ($anketa != 0)
+            $this->anketa = $anketa;
+        elseif (isset ($_GET['anketa']))
             $this->anketa = $_GET['anketa'];
         elseif (isset ($_POST['anketa']))
             $this->anketa = $_POST['anketa'];
-        elseif ($anketa != 0)
-            $this->anketa = $anketa;
-
 
         # clearing E_NOTICE
         if (!isset($_GET['a'])) {
@@ -264,6 +263,8 @@ class SurveyAdmin
         global $global_user_id;
         global $lang;
         global $admin_type;
+        global $site_domain;
+        global $aai_instalacija;
 
         $sql = sisplet_query("SELECT email FROM users WHERE id='$global_user_id'");
         $row = mysqli_fetch_assoc($sql);
@@ -289,7 +290,8 @@ class SurveyAdmin
             
         echo '<form method="GET" id="1kasf" action="'.$drupal_search_url.'">';
 
-		echo '<input type="hidden" id="drupal_search_url" name="drupal_search_url" value="'.$drupal_search_url.'" />';
+        echo '<input type="hidden" id="drupal_search_url" name="drupal_search_url" value="'.$drupal_search_url.'" />';
+
 		echo '<a href="#" onclick="showSearch();"><span class="faicon search pointer"></span></a> ';
         echo '<input id="searchSurvey" type="text" value="" placeholder="' . $lang['s_search_frontend'] . '" name="search" />';
         echo '<input type="button" style="display: none;" value="' . $lang['s_search'] . '" />';
@@ -328,11 +330,13 @@ class SurveyAdmin
 
         $text = $row['name'] . ' ' . $row['surname'];
         $text = (strlen($text) > 25) ? substr($text, 0, 25) . '...' : $text;
-        
+
-		echo '<div id="xtradiv"><strong class="xtraname">' . $text . ' <span class="faicon after sort_down_arrow"/></strong>';
+
+        echo '<div id="xtradiv"><strong class="xtraname">' . $text . ' <span class="faicon after sort_down_arrow"/></strong>';
         echo '<div id="xtradivSettings">';
-        echo '<span class="xtraSetting"><a class="xtra" href="' . $site_url . 'admin/survey/index.php?a=nastavitve&m=global_user_myProfile"><span class="faicon user"></span>' . $lang['edit_data'] . '</a></span>';
         
+        echo '<span class="xtraSetting"><a class="xtra" href="' . $site_url . 'admin/survey/index.php?a=nastavitve&m=global_user_myProfile"><span class="faicon user"></span>' . $lang['edit_data'] . '</a></span>';
+
 		// Odjava na nov nacin preko frontend/api
 		echo '<form name="odjava" method="post" action="'.$site_url.'frontend/api/api.php?action=logout">';
 		echo '<span class="xtraSetting"><a class="xtra" href="#" onClick="document.odjava.submit();"><span class="faicon logout"></span>' . $lang['logout'] . '</a></span>';
@@ -371,7 +375,7 @@ class SurveyAdmin
             // Prikaze podatke o anketi in navigacijo - na vrhu (top bar)
             $this->displayAnketaTop();
 
-            echo '<div id="anketa_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['m'].'">';
+            echo '<div id="anketa_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['m'].' '.($this->survey_type == '1' ? 'forma' : '').' '.($this->survey_type == '0' ? 'glasovanje' : '').'">';
             $this->displayAnketa();
             echo '</div>';
 
@@ -454,6 +458,9 @@ class SurveyAdmin
         echo '<div id="vrednost_edit" class="divPopUp"></div>';
 
 
+        // Generičen popup
+        echo '<div id="popup_note" class="divPopUp"></div>';
+
         // urejanje calculation-ov
         echo '<div id="calculation" class="divPopUp"></div>';
 
@@ -564,6 +571,8 @@ class SurveyAdmin
         global $lang;
         global $app_settings;
         global $site_frontend;
+        global $aai_instalacija;
+        global $mysql_database_name;
 
         echo '<div id="srv_footer">';
         
@@ -579,11 +588,14 @@ class SurveyAdmin
         else{
             echo $lang['srv_footer_links'];
 
+            if(isset($aai_instalacija) && $aai_instalacija == true){
+                echo ' | <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-arnes-aai-prijavi-uporabi-orodja-1ka" target="_blank">'.$lang['aa4'].'</a>';
+            }
+
             echo '<br />';
 
             // Verzijo izpišemo samo za admine
-            if ($admin_type == 0) {
+            if ($admin_type == 0) {   
-                
                 
                 // Verzija 1ka
                 $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what='version'", "obj");
@@ -609,10 +621,20 @@ class SurveyAdmin
         // Desna stran footerja - report a bug
         echo '<div id="reportabug" class="footer_right">';
         
+        // www.1ka.si ima se link na go instrukcije
+        if($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'test21kasi'){
+
+            echo '<a href="#" onClick="consultingPopupOpen();"><span class="faicon external_link"></span> '.$lang['srv_svetovanje'].'</a>';
+            echo '<br>';
+        }
+
         // Posebej report buga za gorenje
         if (Common::checkModule('gorenje')){
             echo '<a href="https://helpdesk.gorenje.com/SubmitSR.jsp" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
         }
+        elseif(isset($aai_instalacija) && $aai_instalacija == true){
+            echo '<a href="https://www.1ka.si/help1KA" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
+        }
         else{
             // Slovenski jezik
             if ($lang['id'] == 1)
@@ -906,7 +928,7 @@ class SurveyAdmin
         }
         # če je manj kot 20 variabel naj gre default na graf
         $sql = sisplet_query("SELECT COUNT(*) AS count FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa'");
-        list($varcount) = mysqli_fetch_array($sql);
+        [$varcount] = mysqli_fetch_array($sql);
 
 
         if ($varcount < 20) {
@@ -1484,7 +1506,7 @@ class SurveyAdmin
             if ($this->survey_type > 1) {
                 $str_testdata = "SELECT count(*) FROM srv_user WHERE ank_id='" . $this->anketa . "' AND (testdata='1' OR testdata='2') AND deleted='0'";
                 $query_testdata = sisplet_query($str_testdata);
-                list($testdata) = mysqli_fetch_row($query_testdata);
+                [$testdata] = mysqli_fetch_row($query_testdata);
 
                 if ((int)$testdata > 0) {
                     echo '<ul class="secondNavigationArchive">';
@@ -2689,7 +2711,7 @@ class SurveyAdmin
                     break;
 
                 // 360 stopinjske analize (1ka)
-                case M_ANALYSIS_360_1ka :
+                case M_ANALYSIS_360_1KA :
                     $S360 = new Survey3601ka($this->anketa);
                     $S360->displayReports();
 
@@ -2967,8 +2989,8 @@ class SurveyAdmin
         echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=alert&amp;m=active" title="' . $lang['srv_alert_active'] . '"><span>' . $lang['srv_alert_active'] . '</span></a></li> ';
         echo '<li ' . (($tab == 'delete') ? ' class="highlightLineTab "' : ' class="nonhighlight"') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=alert&amp;m=delete" title="' . $lang['srv_alert_delete'] . '"><span>' . $lang['srv_alert_delete'] . '</span></a></li> ';
-		// Gorenje tega nima
+		// Gorenje tega nima, po novem to vidijo samo admini, ostali posiljajo preko default
-		if (!Common::checkModule('gorenje')){
+		if (!Common::checkModule('gorenje') && $admin_type == '0'){
 			echo '<li ' . (($tab == 'email_server') ? ' class="highlightLineTab "' : ' class="nonhighlight"') . '>';
 			echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=alert&amp;m=email_server" title="' . $lang['srv_user_base_email_server_settings'] . '"><span>' . $lang['srv_user_base_email_server_settings'] . '</span></a></li> ';
 		}		
@@ -3258,7 +3280,7 @@ class SurveyAdmin
      *
      */
     function displaySeznamAnket(){
-        global $lang, $site_url, $global_user_id, $admin_type;
+        global $lang, $site_url, $global_user_id, $admin_type, $site_domain;
 
         // Pobrisemo vse preview vnose
         Common::deletePreviewData($this->anketa);
@@ -3383,11 +3405,11 @@ class SurveyAdmin
             elseif($_GET['m'] == 'odjavljeni'){
                 $sas->unsignedUsersList();
             }
-            elseif(in_array($_GET['m'], ['all', 'my'])){
+            elseif($_GET['m'] == 'all'){
 	            $sas->allUsersList();
             }
             else {
-	            $sas->anketa_list_users();
+	            $sas->assignedUsersList();
             }
 
             echo '</div>';
@@ -3465,7 +3487,7 @@ class SurveyAdmin
                 $sas = new SurveyAdminSettings();
                 $sas->globalUserSettings();
             }
-			if ($_GET['m'] == 'global_user_myProfile') {
+			if ($_GET['m'] == 'global_user_myProfile' && $site_domain != '1ka.arnes.si') {
                 $sas = new SurveyAdminSettings();
                 $sas->globalUserMyProfile();
             }
@@ -4167,7 +4189,7 @@ class SurveyAdmin
                     $file = $site_path . 'main/survey/uploads/' . $logo;
                     $fileExt = pathinfo($_FILES['fajl']['name'], PATHINFO_EXTENSION);
               
-                    list($width, $height) = getimagesize($_FILES['fajl']['tmp_name']);
+                    [$width, $height] = getimagesize($_FILES['fajl']['tmp_name']);
 
                     // If logo too large resize uploaded logo to max 150px height
                     if($height > 150){
@@ -4346,7 +4368,7 @@ class SurveyAdmin
     /**
      * @desc ustvari novo anketo
      */
-    function nova_anketa($naslov = null, $intro_opomba = '', $akronim = null, $survey_type = 2, $lang_resp = 1, $skin = '1kaBlue')
+    function nova_anketa($naslov = null, $intro_opomba = '', $akronim = null, $survey_type = 2, $skin = '1kaBlue')
     {
 
         global $lang;
@@ -4365,7 +4387,7 @@ class SurveyAdmin
         $lang_admin = $row['lang'];
 
         $res = sisplet_query("SELECT value FROM misc WHERE what='SurveyCookie'");
-        list ($SurveyCookie) = mysqli_fetch_row($res);
+        [$SurveyCookie] = mysqli_fetch_row($res);
 
         $text = '';
         $url = $site_url;
@@ -4381,10 +4403,10 @@ class SurveyAdmin
 
         $starts = $_POST['starts'] ? "'" . $_POST['starts'] . "'" : "NOW()";
         $expire = $_POST['expire'] ? "'" . $_POST['expire'] . "'" : "NOW() + INTERVAL 3 MONTH  ";
-        #$expire = $_POST['expire'] ? "'" . $_POST['expire'] . "'" : "NOW() + INTERVAL 30 DAY ";
 
-        $lang_resp = ((int)$lang_resp > 0) ? $lang_resp : 1;
+        // Nastavimo jezik - admin in response jezik je vedno enak nastavitvi, ki jo ima uporabnik a default
         $lang_admin = ((int)$lang_admin > 0) ? $lang_admin : 1;
+        $lang_resp = $lang_admin;
 
         # ali ima uporabnik nastavljeno da je anketa privzeto aktivna:
         $autoActiveSurvey = (int)UserSetting::getInstance()->getUserSetting('autoActiveSurvey');
@@ -6580,10 +6602,20 @@ class SurveyAdmin
         echo '<b>' . $lang['srv_monitor_toolbox_title'] . '</b>';
 
         echo '<p>';
-        echo '<b><a href="' . $link . '&preview=on' . $preview_options . '" target="_blank">' . $lang['srv_preview'] . ' PC</a>';
+
-        echo ' &nbsp;(<a href="' . $link . '&preview=on&mobile=1' . $preview_options . '" target="_blank">' . $lang['srv_preview_mobile'] . '</a>, ';
+        // Ce imamo izklopljene mobilne prilagoditve ne pustimo preview-ja na mobile, ker itak ne prikaze scalano
-        echo '<a href="' . $link . '&preview=on&mobile=2' . $preview_options . '" target="_blank">' . $lang['srv_preview_tablet'] . '</a>)</b>';
+        $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
+        if($mobile_friendly != '0'){ 
+            echo '<b><a href="' . $link . '&preview=on' . $preview_options . '" target="_blank">' . $lang['srv_preview'] . ' PC</a>';
+            echo ' &nbsp;(<a href="' . $link . '&preview=on&mobile=1' . $preview_options . '" target="_blank">' . $lang['srv_preview_mobile'] . '</a>, ';
+            echo '<a href="' . $link . '&preview=on&mobile=2' . $preview_options . '" target="_blank">' . $lang['srv_preview_tablet'] . '</a>)</b>';
+        }
+        else{
+            echo '<b><a href="' . $link . '&preview=on' . $preview_options . '" target="_blank">' . $lang['srv_preview'] . ' PC</a></b>';
+        }
+
         echo '<br />(' . $lang['srv_monitor_toolbox_preview'] . ')';
+
         echo '</p>';
 
         // V formi in glasovanju nimamo testnih vnosov

admin/survey/SurveyAdminAjax.php

@@ -6,7 +6,7 @@
 */
 
 // STARO
-define("A_REPORTI", "reporti", true);
+define("A_REPORTI", "reporti");
 
 // tipi uporabnikov, (za kontrolo prikaza posameznih elementov) za preverjanje kličemo funkcijo user_role_cehck
 define("U_ROLE_ADMIN", 0);
@@ -14,7 +14,7 @@ define("U_ROLE_MANAGER", 1);
 define("U_ROLE_CLAN", 2);
 define("U_ROLE_NAROCNIK", 3);
 
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
 
 global $site_path;
 
@@ -597,19 +597,8 @@ class SurveyAdminAjax {
 					if (!$sql)
 						echo mysqli_error($GLOBALS['connect_db']);
 				}
-				if (isset ($_POST['SurveyLang_admin'])) {
+            } 
-					$val = $_POST['SurveyLang_admin'];
+            elseif ($_GET['m'] == 'global_user_settings') {
-					$sql = sisplet_query("UPDATE misc SET value='$val' WHERE what = 'SurveyLang_admin'");
-					if (!$sql)
-						echo mysqli_error($GLOBALS['connect_db']);
-				}
-				if (isset ($_POST['SurveyLang_resp'])) {
-					$val = $_POST['SurveyLang_resp'];
-					$sql = sisplet_query("UPDATE misc SET value='$val' WHERE what = 'SurveyLang_resp'");
-					if (!$sql)
-						echo mysqli_error($GLOBALS['connect_db']);
-				}
-			} elseif ($_GET['m'] == 'global_user_settings') {
 				if (isset ($_POST['language'])) {
 					$lang = $_POST['language'];
 		
@@ -1755,7 +1744,7 @@ class SurveyAdminAjax {
 			if (trim($_POST['survey_type']) == '') {
 				$_POST['survey_type'] = 2;
 			}
-			$anketa = $this->SurveyAdmin->nova_anketa($naslov, $intro_opomba, $akronim, $_POST['survey_type'], $_POST['lang_resp'], $skin);
+			$anketa = $this->SurveyAdmin->nova_anketa($naslov, $intro_opomba, $akronim, $_POST['survey_type'], $skin);
 			
 			// Ce imamo pri ustvarjanju doloceno tudi mapo, anketo vstavimo v njo
 			if(isset($_POST['folder']) && $_POST['folder'] > 0){
@@ -5134,10 +5123,6 @@ class SurveyAdminAjax {
 				$s = sisplet_query("DELETE FROM srv_password WHERE ank_id='$this->anketa' AND password = '$password'");
 				if (!$s) echo mysqli_error($GLOBALS['connect_db']);
 			}
-		} elseif ($_GET['a'] == 'refreshUserDiagnostic') {
-			$sas = new SurveyAdminSettings();
-			$sas->anketa_list_users();
-
 		} elseif ($_GET['a'] == 'getDataStatusTitles') {
 			global $lang;
 			$return = array();
@@ -6337,6 +6322,44 @@ class SurveyAdminAjax {
 		
 		echo $site_url.'admin/survey/index.php?anketa='.$this->anketa;
 	}
+
+
+    // Display consulting popup
+    function ajax_consulting_popup_open () {
+        global $lang;
+
+        echo '<div class="popup_close"><a href="#" onClick="quick_title_edit_cancel(); return false;">✕</a></div>';
+			
+        echo '<h2>'.$lang['srv_svetovanje'].'</h2>';
+
+        
+        echo '<div class="popup_content consulting">';
+
+        echo $lang['srv_svetovanje_text'].': '; 
+        echo '<br /><br />';   
+        
+        echo '  <div class="row">';
+
+        echo '  <div class="col">';
+        echo '      <a href="https://www.go-tel.si/instrukcije/1KA" target="_blank"><span class="faicon cog_large"></span><span>'.$lang['srv_svetovanje_uporaba'].'</span></a>';
+        echo '  </div>';
+
+        echo '  <div class="col">';
+        echo '      <a href="https://www.go-tel.si/instrukcije/statistika" target="_blank"><span class="faicon chart_large"></span><span>'.$lang['srv_svetovanje_statistika'].'</span></a>';
+        echo '  </div>';
+
+        echo '  <div class="col">';
+        echo '      <a href="https://www.1ka.si/d/sl/cenik/ostale-storitve" target="_blank"><span class="faicon reload_large"></span><span>'.$lang['srv_svetovanje_metodologija'].'</span></a>';
+        echo '  </div>';
+
+        echo '</div>';
+
+        echo '</div>';
+
+        echo '<div class="buttons_holder">';
+        echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="smtpAAIPopupClose(); return false;"><span>'.$lang['srv_zapri'].'</span></a></span>';
+        echo '</div>';
+    }
 }
 
 ?>

admin/survey/SurveyAdminSettings.php

@@ -3107,7 +3107,7 @@ class SurveyAdminSettings {
 		} else if ($tab == 'email_server') {
 			
 			// Gorenje tega nima
-			if (!Common::checkModule('gorenje'))
+			if (!Common::checkModule('gorenje') && $admin_type == '0')
 				$this->viewServerSettings();
 			
 			
@@ -3937,7 +3937,7 @@ class SurveyAdminSettings {
 			$row['uporabnost_link'] = 'http://';
 
         echo '<p class="bold">'.$lang['srv_uporabnost_link'].'</p>';
-        echo '<p>'.$lang['srv_uporabnost_warning'].'</p>';
+        echo '<p class="red">'.$lang['srv_uporabnost_warning'].'</p>';
 		echo '<p>Link: <input type="text" name="uporabnost_link" value="' . $row['uporabnost_link'] . '" style="width:300px"></p>';
 
 		$uporabnost_razdeli = SurveySetting::getInstance()->getSurveyMiscSetting('uporabnost_razdeli');
@@ -4836,10 +4836,6 @@ class SurveyAdminSettings {
 			list ($SurveyExport) = mysqli_fetch_row($result);
 			$result = sisplet_query("SELECT value FROM misc WHERE what='SurveyForum'");
 			list ($SurveyForum) = mysqli_fetch_row($result);
-			$result = sisplet_query("SELECT value FROM misc WHERE what='SurveyLang_admin'");
-			list ($SurveyLang_admin) = mysqli_fetch_row($result);
-			$result = sisplet_query("SELECT value FROM misc WHERE what='SurveyLang_resp'");
-			list ($SurveyLang_resp) = mysqli_fetch_row($result);
 
 			echo '<span class="nastavitveSpan1" ><label>' . $lang['SurveyDostop'] . ':</label></span>';
 			?>
@@ -4888,55 +4884,8 @@ class SurveyAdminSettings {
 			?>
 			</select>
 			</fieldset>
-			<fieldset><legend><?=$lang['lang']?></legend>
-			<?php
-			
-			$lang_array = array();
-			$lang_orig_id = $lang['id'];
-			// Preberemo razpoložljive jezikovne datoteke
-			if ($dir = opendir('../../lang')) {
-				while (($file = readdir($dir)) !== false) {
-					if ($file != '.' AND $file != '..') {
-						if (is_numeric(substr($file, 0, strpos($file, '.')))) {
-							$i = substr($file, 0, strpos($file, '.'));
-							$file = '../../lang/'.$i.'.php';
-							include($file);
-							$lang_array[$lang['language']] = $i;
-						}
-					}
-				}
-				$file = '../../lang/'.$lang_orig_id.'.php';
-				include($file);	// naložimo nazaj trenutni languague file
-			}
-			
-			// Sortiramo lang datoteke po abecedi
-			ksort($lang_array);
 
-			?>
+			<?php		
-			<span class="nastavitveSpan1" ><label><?=$lang['srv_language_admin']?>:</label></span>			
-			<select name="SurveyLang_admin">
-			<?
-			foreach ($lang_array AS $val => $key) {
-				echo '<option value="'.$key.'"'.($SurveyLang_admin==$key?' selected':'').'>'.$val.'</option>';
-			}
-			?>
-			</select>
-			<br />
-			
-			<span class="nastavitveSpan1" ><label><?=$lang['srv_language_respons']?>:</label></span>			
-			<select name="SurveyLang_resp">
-			<?
-			foreach ($lang_array AS $val => $key) {
-				echo '<option value="'.$key.'"'.($SurveyLang_resp==$key?' selected':'').'>'.$val.'</option>';
-			}
-			?>
-			</select>
-			<br />
-			
-			<?php
-			
-			echo '</fieldset>';
-			
 			echo '<fieldset>';
 			echo '<legend>' . $lang['srv_edithelp'] . '</legend>';
 			
@@ -5668,14 +5617,14 @@ class SurveyAdminSettings {
 		}
 		
 		$cache_row = array();
-		$sql_c = sisplet_query("SELECT id, recnum, time_insert, UNIX_TIMESTAMP(time_insert) AS time_insert_u FROM srv_user WHERE id IN (".implode($usrs_id, ',').")");
+		$sql_c = sisplet_query("SELECT id, recnum, time_insert, UNIX_TIMESTAMP(time_insert) AS time_insert_u FROM srv_user WHERE id IN (".implode(',', $usrs_id).")");
 		if (!$sql_c) echo mysqli_error($GLOBALS['connect_db']);
 		while ($row_c = mysqli_fetch_array($sql_c)) {
 			$cache_row[ $row_c['id'] ] = $row_c;
 		}
 		
 		$cache_row1 = array();
-		$sql1_c = sisplet_query("SELECT usr_id, time_edit, UNIX_TIMESTAMP(time_edit) AS time_edit_u FROM srv_user_grupa".$this->db_table." WHERE usr_id IN (".implode($usrs_id, ',').") AND gru_id = '0'");
+		$sql1_c = sisplet_query("SELECT usr_id, time_edit, UNIX_TIMESTAMP(time_edit) AS time_edit_u FROM srv_user_grupa".$this->db_table." WHERE usr_id IN (".implode(',', $usrs_id).") AND gru_id = '0'");
 		if (!$sql1_c) echo mysqli_error($GLOBALS['connect_db']);
 		while ($row1_c = mysqli_fetch_array($sql1_c)) {
 			$cache_row1[ $row1_c['usr_id'] ] = $row1_c;
@@ -7214,7 +7163,6 @@ class SurveyAdminSettings {
 			$arrayTestni = array();
 			for ($i=1; $i<=$_POST['stevilo_vnosov']; $i++) {
 				
-//				if(session_id() == '') {session_start();}
                 session_start();
 				$_SESSION['progressBar'][$this->anketa]['current'] = $i;
 				session_commit();
@@ -7982,28 +7930,12 @@ class SurveyAdminSettings {
 			header("Location: index.php?anketa=$this->anketa&a=testiranje&m=testnipodatki");
 			
 		} elseif ($_GET['delete_testdata'] == 1 || $_GET['delete_autogen_testdata'] == 1) {
-
-			
-			// Komentarje moramo obdrzat - zato jih zacasno shranimo in na novo vstavimo
-			/*$comment_bck = array();
-			$sqlComment = sisplet_query("SELECT dt.vre_id AS vre_id, dt.text AS text, dt.usr_id AS usr_id FROM srv_data_text".$this->db_table." dt, srv_user u WHERE u.ank_id='$this->anketa' AND u.testdata='1' AND dt.usr_id=u.id AND dt.spr_id='0'");
-			while($rowComment = mysqli_fetch_array($sqlComment)){
-				$comment_bck[] = $rowComment;
-			}*/
-
 			
 			if($_GET['delete_autogen_testdata'] == 1)
 				sisplet_query("DELETE FROM srv_user WHERE ank_id='$this->anketa' AND testdata='2'");
 			else
 				sisplet_query("DELETE FROM srv_user WHERE ank_id='$this->anketa' AND (testdata='1' OR testdata='2')");
 
-				
-			// Komentarje nazaj vstavimo
-			/*foreach($comment_bck as $comment){
-				$sqlComment = sisplet_query("INSERT INTO srv_data_text".$this->db_table." (spr_id, vre_id, text, usr_id) VALUES ('0', '".$comment['vre_id']."', '".$comment['text']."', NULL)");
-			}*/	
-			
-
 			#datoteki z podatki moramo zgenerirati na novo
 			sisplet_query("UPDATE srv_data_files SET head_file_time='0000-00-00', data_file_time='0000-00-00' WHERE sid='$this->anketa'");
 			sisplet_query("COMMIT");
@@ -8136,9 +8068,7 @@ class SurveyAdminSettings {
 				echo '</fieldset>';
 			
 				echo '<p>'.$lang['srv_testni_nakonec'].'</p>';
-			
+			}		
-			}
-			
 		}
 	}
 	
@@ -8151,16 +8081,16 @@ class SurveyAdminSettings {
 	    $chars_length = (strlen($chars) - 1);
 
 	    // Start our string
-	    $string = $chars{mt_rand(0, $chars_length)};
+	    $string = $chars[mt_rand(0, $chars_length)];
 	   
 	    // Generate random string
 	    for ($i = 1; $i < $length; $i = strlen($string))
 	    {
 	        // Grab a random character from our list
-	        $r = $chars{mt_rand(0, $chars_length)};
+	        $r = $chars[mt_rand(0, $chars_length)];
 	       
 	        // Make sure the same two characters don't appear next to each other
-	        if ($r != $string{$i - 1}) $string .=  $r;
+	        if ($r != $string[$i - 1]) $string .=  $r;
 	    }
 	   
 	    // Return the string
@@ -8267,205 +8197,6 @@ class SurveyAdminSettings {
 		echo '</fieldset>';
 	}
 	
-	function anketa_list_users() {
-		global $lang, $global_user_id, $admin_type;
-		
-		$_GET['show'] = isset($_POST['show']) && $_POST['show'] == 'all' ? 'all' : $_GET['show'];
-		$_GET['limit'] = isset($_POST['limit']) ? $_POST['limit'] : $_GET['limit'];
-		
-		if ($admin_type == 0) {
-			echo '<h3>';
-			
-			echo '<a href="index.php?a=diagnostics&t=uporabniki&m=my" '.($_GET['m']=='my'?'style="text-decoration:underline"':'').'>'.$lang['srv_users_added'].'</a>';
-			
-			echo '<span class="spaceLeft">|</span>';
-
-			echo '<span class="spaceLeft"><a href="index.php?a=diagnostics&t=uporabniki&m=all" '.($_GET['m']=='all'?'style="text-decoration:underline"':'').'>'.$lang['srv_users_all'].'</a></span>';
-			
-			echo '<br /><br />';
-		
-			echo '</h3>';
-		}
-		
-		# povezava polj z polji iz baze za sortiranje
-		$sort_by_array = array(
-			'name'=>'u.name', 
-			'email'=>'u.email', 
-			'type'=>'u.type', 
-			//'cnt'=>'sa1.survey_count',
-			//'archive'=>'sa2.survey_archive',
-			'cnt'=>'d1.dostop_survey_count',
-			'archive'=>'d2.dostop_survey_archive',
-			'registred'=>'u.when_reg',
-			'login'=>'u.last_login'
-		);
-		
-		$fields = array(
-			'name'=>$lang['srv_survey_list_users_name'], 
-			'email'=>$lang['srv_survey_list_users_email'],
-			'type'=>$lang['admin_type'],
-			'cnt'=>$lang['srv_survey_list_users_survey_count'],
-			'archive'=>$lang['srv_survey_list_users_survey_archive_count'],
-			'registred'=>$lang['srv_survey_list_users_registred'],
-			'login'=>$lang['srv_survey_list_users_last_login'],
-		);
-		
-
-		$srt_field = isset($sort_by_array[$_POST['field']]) ? $_POST['field'] : 'cnt';
-		$srt_type  = isset($_POST['type']) && $_POST['type'] == 'asc' ? 'asc' : 'desc';
-		 
-		# omejitev uporabnikov kateri nimajo anket		
-		// pri managerjih naj bodo vsi, ker cene se ne vidijo novo dodani uporabniki
-		#if ($admin_type == 0)
-		#	$limit_no_survey = ' WHERE sa1.survey_count > 0';
-		#else
-		$limit_no_survey = ' WHERE 1=1';
-		
-		# izvedemo poljubno sortiranje 
-		$order_by = ' ORDER BY ' . $sort_by_array[$srt_field] . ' '. $srt_type; 
-		
-		// managerji in admini vidijo tudi svoje uporabnike
-		if ($admin_type == 1 || $admin_type == 0) {
-			$user_condition = " AND (u.id = '".$global_user_id."' OR u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') )";
-			
-		# ostali uporabniki lahko vidijo samo svoje ankete
-		} elseif ((int)$global_user_id > 0) {
-			$user_condition = " AND u.id = '".$global_user_id."'";
-		}
-		
-		// Meta admini spet kao vidijo vse
-		//if ( Dostop::isMetaAdmin() )
-		// opcija za vse admine
-		if ( $_GET['show'] == 'all')
-			$user_condition = "";
-		
-		//}
-		#
-		
-		// Stevilo prikazanih
-		if(isset($_GET['limit'])){
-			$limit = " LIMIT ".(int)$_GET['limit'];
-			$limit_cnt = (int)$_GET['limit'];
-		}
-		else{
-			$limit = " LIMIT 100";
-			$limit_cnt = 100;
-		}
-			
-		// Stran (ce ne prikazujemo vseh)	
-		if(isset($_GET['page'])){
-			$offset = " OFFSET ".(((int)$_GET['page']-1) * $limit_cnt);
-		}
-		else{
-			$offset = " OFFSET 0";
-		}	
-		
-		// Ce imamo iskanje izvedemo drugacen query
-		if($admin_type == 0 && isset($_POST['search_users'])){		
-			// Po novem stejemo vse ankete z dostopom (ne samo tiste katerih je avtor)
-			$sql_string = "SELECT u.id, u.type, u.status, u.email, u.name, u.surname, date_format(u.when_reg, '%d.%m.%Y') as when_reg, d1.dostop_survey_count, d2.dostop_survey_archive, date_format(u.last_login, '%d.%m.%Y') as last_login FROM users AS u "
-			." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id " 
-			." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id " 
-			." WHERE u.email LIKE '%".$_POST['search_users']."%' OR u.name LIKE '%".$_POST['search_users']."%' OR u.surname LIKE '%".$_POST['search_users']."%' "
-			. $order_by;
-		}
-		else{		
-			// Po novem stejemo vse ankete z dostopom (ne samo tiste katerih je avtor)
-			$sql_string = "SELECT u.id, u.type, u.status, u.email, u.name, u.surname, date_format(u.when_reg, '%d.%m.%Y') as when_reg, d1.dostop_survey_count, d2.dostop_survey_archive, date_format(u.last_login, '%d.%m.%Y') as last_login FROM users AS u "
-			." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id " 
-			." LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id " 
-			. $limit_no_survey 
-			. $user_condition
-			. $order_by
-			. $limit . $offset;
-		}
-
-		$sql_query = sisplet_query($sql_string);
-		if (!$sql_query) echo mysqli_error($GLOBALS['connect_db']);
-		
-		$sqlu = sisplet_query("SELECT * FROM users WHERE id = '$global_user_id'");
-		$rowu = mysqli_fetch_array($sqlu);
-		if ($admin_type == 0) {
-			echo '<h2>'.$lang['administrator'].': '.$rowu['name'].' '.$rowu['surname'].'</h2>';
-		} elseif ($admin_type == 1) {
-			echo '<h2>'.$lang['manager'].': '.$rowu['name'].' '.$rowu['surname'].'</h2>';
-		}
-		
-		
-		echo '<table id="survey_list_users">';
-		echo '<tr>';
-		echo '<th></th>';
-		foreach ($fields AS $field => $title) {
-			echo '<th class="pointer">';
-			if ($srt_field !== $field) {
-				$img_src = 'sort_unsorted';
-				echo '<div onClick="refresh_user_diagnostic(\''.$field.'\', \'desc\', \''.$_GET['show'].'\', \''.$_GET['limit'].'\')">'.$title.'</div>';
-			} else {
-				if ($srt_type == 'desc') {
-					$img_src = 'sort_descending';
-					echo '<div onClick="refresh_user_diagnostic(\''.$field.'\', \'asc\', \''.$_GET['show'].'\', \''.$_GET['limit'].'\')" class="red">'.$title.'<span class="faicon '.$img_src.'" title=""></span></div>';
-				} else {
-					$img_src = 'sort_ascending';
-					echo '<div onClick="refresh_user_diagnostic(\''.$field.'\', \'desc\', \''.$_GET['show'].'\', \''.$_GET['limit'].'\')" class="red">'.$title.'<span class="faicon '.$img_src.'" title=""></span></div>';
-				}
-			}
-			echo '</th>';
-		}
-		echo '</tr>';
-	
-		while ($row_query = mysqli_fetch_array($sql_query)) {
-			echo '<tr>';
-			
-			echo '<td>';
-			echo ' <a href="#" onclick="edit_user(\''.$row_query['id'].'\'); return false;" title="'.$lang['srv_profile_edit'].'"><span class="faicon users icon-as_link"></span></a>';
-			echo '</td>';
-			
-			echo '<td>';
-			echo $row_query['name'].' '.$row_query['surname'];
-			echo '</td>';
-			
-			if ( true /*$_GET['show'] == '' or Dostop::isMetaAdmin()*/ ) {
-				echo '<td><span class="as_link" onClick="surveyList_user(\'uid\',\''.$row_query['id'].'\'); window.location.href=\'index.php\';">' . $row_query['email'] . '</span></td>';
-			} else {
-				echo '<td><span>' . $row_query['email'] . '</span></td>';
-			}
-			
-			if ($row_query['type'] == '0') $type = $lang['admin_admin'];
-			elseif ($row_query['type'] == '1') $type = $lang['admin_manager'];
-			elseif ($row_query['type'] == '2') $type = $lang['admin_clan'];
-			elseif ($row_query['type'] == '3') $type = $lang['admin_narocnik'];
-			
-			echo '<td>' . $type . '  '.($row_query['status']==0?'<span class="sprites cross" title="'.$lang['srv_user_banned'].'"></span>':'').'</td>';
-			echo '<td class="anl_ac">'.(int)$row_query['dostop_survey_count'].'</td>';
-			echo '<td class="anl_ac">'.(int)$row_query['dostop_survey_archive'].'</td>';
-			echo '<td class="anl_ac">'.$row_query['when_reg'].'</td>';
-			echo '<td class="anl_ac">'.$row_query['last_login'].'</td>';
-			echo '</tr>';
-		}
-		echo '</table>';
-
-		
-		// poiscemo uporabnike, ki imajo managerski pregled na uporabnikovimi anketami
-		$sqlu = sisplet_query("SELECT u.id, u.name, u.surname, u.email FROM srv_dostop_manage m, users u WHERE u.id=m.manager AND m.user = '$global_user_id'");
-		if ( mysqli_num_rows($sqlu) > 0 ) {
-			
-			echo '<br><br><h3><b>'.$lang['srv_manager_manager'].':</b></h3>';
-			
-			while ($rowu = mysqli_fetch_assoc($sqlu)) {
-				
-				echo '<a href="ajax.php?t=dostop&a=edit_remove_user_manager&uid='.$rowu['id'].'" onclick="if ( confirm(\'?\')) {  } else {return false;}"><span class="faicon delete"></span></a> '.$rowu['email'].' - '.$rowu['name'].' '.$rowu['surname'].'<br>';
-		
-			}
-			
-		}
-		
-		// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
-		$this->dodeljeniUporabniki();
-
-        // admin lahko doda novega uporabnika
-        $this->dodajNovegaUporabnika();
-	}
-
     /**
      * Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop
      */
@@ -8474,15 +8205,16 @@ class SurveyAdminSettings {
         global $lang;
         global $virtual_domain;
 
-        // admini in na virtualkah tudi managerji lahko dodajajo uporabnike, ki jih nato managirajo 
+        // admini lahko dodajajo uporabnike, ki jih nato managirajo 
-        if( !($admin_type == 0 || ($admin_type == 1 && $virtual_domain == true)) )
+        if($admin_type != 0)
             return '';
 
+        echo '<div id="dodajanjeNovega">';
 
-        echo ' | <a href="#" onclick="$(\'#dodajanjeNovega\').slideToggle(); return false;">'.$lang['srv_users_add_new'].'</a><br><div id="dodajanjeNovega" '.(!empty($_GET['add']) && ($_GET['error']=='pass' || $_GET['error']=='email')  ? '' : ' style="display: none"').'>';
+        echo '<form class="manager_add_user" name="admin_add_user" action="ajax.php?t=dostop&a=add_new_user" method="post">';
 
-        echo '<form class="manager_add_user" action="ajax.php?t=dostop&a=add_new_user" method="post">';
         echo '<h3><b>'.$lang['srv_users_add_new_title'].'</b></h3>';
+
         echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(!empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
         echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>';
         echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>';
@@ -8494,14 +8226,17 @@ class SurveyAdminSettings {
                         <option value="2">'.$lang['srv_diagnostics_filter_lang_ang'].'</option>
                     </select>
                 </p>';
-        echo '<p><button type="submit">'.$lang['add'].'</button></p>';
+                
+        //echo '<p><button type="submit">'.$lang['add'].'</button></p>';
+        echo '<p><div class="buttonwrapper floatLeft">';
+        echo '  <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.admin_add_user.submit();">'.$lang['create'].'</a>';
+        echo '</div></p>';
 
         echo '</form>';
 
         echo '</div>';
     }
 
-
 	/**
 	 * Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop
 	 */
@@ -8509,38 +8244,83 @@ class SurveyAdminSettings {
 	    global $admin_type;
 	    global $lang;
 	    global $global_user_id;
+	    global $virtual_domain;
 
         // managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
         if( !($admin_type == 1 || $admin_type == 0) )
             return '';
 
+        // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET
+        if(false && $virtual_domain && $admin_type == 1){
 
-        echo '<br><br><a href="#" onclick="$(\'#dodajanje\').slideToggle(); return false;">'.$lang['srv_invitation_system_validateAndAdd'].'</a><div id="dodajanje" '.(empty($_GET['add']) && ($_GET['error']=='pass' || $_GET['error']=='email') ? '' : ' style="display: none"').'>';
+            // Limit st. dodeljenih uporabnikov
+            $managed_accounts_limit = 5;
 
-        echo '<form class="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
+            // Prestejemo dodeljene uporabnike
-        echo '<h3><b>'.$lang['srv_manager_add_user'].'</b></h3>';
+            $sql = sisplet_query("SELECT u.email
+                                    FROM srv_dostop_manage m, users u
+                                    WHERE m.manager='".$global_user_id."' AND u.id=m.user AND u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%')
+                                ");
+
+            $managed_accounts_count = mysqli_num_rows($sql);
+
+
+            echo '<p class="bold" style="padding-left:0px;">';
+            echo $lang['srv_users_add_assigned_max_1'].' <span class="red bold">'.$managed_accounts_limit.'</span> '.$lang['srv_users_add_assigned_max_2'];
+
+            // Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje
+            if($managed_accounts_count >= $managed_accounts_limit){
+                echo '<br /><br />';
+                echo $lang['srv_users_add_assigned_max_reached'];
+                echo '</p>';
+                
+                return;
+            }
+            elseif($managed_accounts_count > 0){             
+                echo '<br /><br />';
+                echo $lang['srv_users_add_assigned_current'].' <span class="red bold">'.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'</span>';
+            }
+
+            echo '</p>';
+        }
+
+        echo '<div id="dodajanje">';
+
+        // Dodajanje novih uporabnikov - ustvari racun, doda uporabnika pod pregled in mu poslje mail
+        echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
+        echo '<h3><b>'.$lang['srv_users_add_assigned_title'].'</b></h3>';
         echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
         echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>';
         echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>';
         echo '<p><label for="password">'.$lang['password'].':</label><input type="password" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'').'</p>';
         echo '<p><label for="password2">'.$lang['again'].':</label><input type="password" id="password2" name="password2"></p>';
-        echo '<p><button type="submit">'.$lang['add'].'</button></p>';
+        
+        echo '<p><div class="buttonwrapper floatLeft">';
+        echo '  <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.manager_add_user.submit();">'.$lang['create_add'].'</a>';
+        echo '</div></p>';
 
         echo '</form>';
 
         // admini si lahko dodajajo ze obstojece uporabnike
         if ($admin_type == 0) {
 
-            echo '<br><form class="manager_add_user" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
+            echo '<br /><br /><br />';
+
+            echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
+
             echo '<h3><b>'.$lang['srv_manager_add_user2'].'</b></h3>';
             echo '<p><select name="uid" class="js-obstojeci-uporabniki-admin-ajax" style="width: 500px;"></select></p>';
-            echo '<p><button type="submit">'.$lang['add'].'</button></p>';
+            
+            //echo '<p><button type="submit">'.$lang['add'].'</button></p>';
+            echo '<p><div class="buttonwrapper floatLeft">';
+            echo '  <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.admin_add_dostop.submit();">'.$lang['add'].'</a>';
+            echo '</div></p>';
 
             echo '</form>';
         }
         // Managerji lahko dodajajo samo uporabnike z dolocenimi emaili (če jim domeno posebej nastavi admin)
         // TODO: trenutno onemogočimo dodaja ostalih uporabnikov za managerje. Ko bo stvar vezana na domeno se jim bo omogočilo dodajanje samo domenskih
-        elseif(false && $admin_type == 1){
+        /*elseif(false && $admin_type == 1){
 
             UserSetting :: getInstance()->Init($global_user_id);
             $emails = UserSetting :: getInstance()->getUserSetting('manage_domain');
@@ -8551,7 +8331,7 @@ class SurveyAdminSettings {
             echo '<p><button type="submit" id="manager-email-submit" style="display:none;">'.$lang['add'].'</button></p>';
 
             echo '</form>';
-        }
+        }*/
 
         echo '</div>';
     }
@@ -8559,43 +8339,104 @@ class SurveyAdminSettings {
 	/**
 	 * Seznam vseh uporabnikov znotraj 1ke
 	 */
-	public function allUsersList()
+	public function allUsersList(){
-	{
 		global $lang;
 		global $admin_type;
 
-			echo '<a href="index.php?a=diagnostics&t=uporabniki&m=my" '.($_GET['m']=='my'?'style="text-decoration:underline"':'').'>'.$lang['srv_users_added'].'</a>';
+		echo '<table id="all_users_list" class="dataTable">';
+        
+        echo '<thead><tr>';
+        echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
+        echo '<th>' . $lang['admin_type'] . '</th>';
+        echo '<th>' . $lang['lang'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_aai'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_survey_count'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_survey_archive_count'] . '</th>';
+        echo '<th>' . $lang['srv_manager_count'] . '</th>';
+        echo '<th>' . $lang['srv_manager_count_manager'] . '</th>';
+        echo '<th>' . $lang['users_gdpr_title'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
+        echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
+        echo '</tr></thead>';
+        
+        echo '</table>';
+        
+        // Dodajanje uporabnikov
+        echo '<div class="add_user">';
 
-			if($admin_type == 0) {
+        // Admin lahko doda novega uporabnika v sistem (brez pregleda)
-                echo '<span class="spaceLeft">|</span>';
+        if($admin_type == '0'){
-                echo '<span class="spaceLeft"><a href="index.php?a=diagnostics&t=uporabniki&m=all" '.($_GET['m'] == 'all' ? 'style="text-decoration:underline"' : '').'>'.$lang['srv_users_all'].'</a></span>';
+            echo '<fieldset class="new_user"><legend>'.$lang['srv_users_add_new'].'</legend>';
-            }
+            $this->dodajNovegaUporabnika();
-                echo '<br /><br />';
+            echo '</fieldset>';
+        }
+
+        echo '</div>';
+    }
+    
+    /**
+	 * Osnovni pregled uporabnikov za managerje in admine
+	 */
+	public function assignedUsersList(){
+		global $lang;
+		global $admin_type;
+		global $global_user_id;
+        
+        $sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'");
+        $rowU = mysqli_fetch_array($sqlU);
 
 
+        // Naslov
+        echo '<h2 style="margin-bottom:30px;">';
+
+        if($admin_type == 0)
+            echo $lang['administrator'];
+        elseif($admin_type == 1)
+            echo $lang['manager'];
+        else
+            echo $lang['user'];
+
+        echo ': '.$rowU['name'].' '.$rowU['surname'].' ('.$rowU['email'].')';
+
+        echo ' <a href="#" onclick="edit_user(\''.$global_user_id.'\'); return false;" title="Uredi"><i class="fa fa-pencil-alt link-moder"></i></a>';
+
+        echo '</h2>';
 
 
-			echo '<table id="'.($_GET['m'] == 'all' ? 'all_users_list' : 'my_users_list').'" class="dataTable">';
+        // Tabela
-		echo '<thead><tr>';
+        echo '<fieldset style="max-width: 100% !important;"><legend>'.$lang['srv_users_assigned_title'].'</legend>';
-            echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
+        //echo '<h4 style="margin-bottom: 10px;">'.$lang['srv_users_assigned_title'].'</h4>';
-            echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
+        echo '<table id="my_users_list" class="dataTable">';
-            echo '<th>' . $lang['admin_type'] . '</th>';
-            echo '<th>' . $lang['lang'] . '</th>';
-            echo '<th>' . $lang['srv_survey_list_users_aai'] . '</th>';
-            echo '<th>' . $lang['srv_survey_list_users_survey_count'] . '</th>';
-            echo '<th>' . $lang['srv_survey_list_users_survey_archive_count'] . '</th>';
-            echo '<th>' . $lang['users_gdpr_title'] . '</th>';
-            echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
-            echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
-			echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
-		echo '</tr></thead>';
-		echo '</table>';
 
+        echo '<thead><tr>';
+        echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
+        echo '<th>' . $lang['admin_type'] . '</th>';
+        echo '<th>' . $lang['lang'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_aai'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_survey_count'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_survey_archive_count'] . '</th>';
+        echo '<th>' . $lang['users_gdpr_title'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
+        echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
+        echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
+        echo '</tr></thead>';
+
+        echo '</table>';
+        echo '</fieldset>';
+
+
+        // Dodajanje uporabnikov
+        echo '<div class="add_user">';
+
+        // Manager ali admin lahko doda novega uporabnika pod pregled
+        echo '<fieldset class="assign_user"><legend>'.$lang['srv_users_add_assigned'].'</legend>';
 		$this->dodeljeniUporabniki();
+        echo '</fieldset>';
 
-        // admin lahko doda novega uporabnika
+        echo '</div>';
-        $this->dodajNovegaUporabnika();
-
 	}
 
 	/**
@@ -9357,14 +9198,7 @@ class SurveyAdminSettings {
         echo '<input name="lockSurvey" type="checkbox" value="1" '.($lockSurvey == 1?' checked="checked"':'').'></label>';
 
         echo '<br />';
-		
+				
-		// Napredni vmesnik (star design za moje ankete) - TEGA NIMAMO VEC (PUSTIMO SAMO KODO V OZADJU, CE BI KDAJ VASJA HOTEL NAZAJ:))
-		/*echo '<label><span class="nastavitveSpan6">'.$lang['srv_settings_advancedMySurveys'].':</span>';
-		echo '<input name="advancedMySurveys" type="hidden" value="0">';
-		echo '<input name="advancedMySurveys" type="checkbox" value="1" '.($advancedMySurveys == 1?' checked="checked"':'').'></label>';
-
-		echo '<br />';*/
-		
 		// Opcija enklik ustvarjanja ankete (v mojih anketah)
 		echo '<label><span class="nastavitveSpan6">'.$lang['srv_settings_oneClickCreate'].':</span>';
 		echo '<input name="oneclickCreateMySurveys" type="hidden" value="0">';
@@ -9452,7 +9286,7 @@ class SurveyAdminSettings {
 	}
 	
 	function globalUserMyProfile () {
-		global $lang, $global_user_id, $admin_type, $site_domain, $site_url, $app_settings;
+		global $lang, $global_user_id, $admin_type, $site_domain, $site_url, $app_settings, $aai_instalacija;
 		
 		// podatki prijavljenega uporabnika
 		$sql = sisplet_query("SELECT id, name, surname, email, type, gdpr_agree, last_login FROM users WHERE id = '$global_user_id'");
@@ -9534,60 +9368,66 @@ class SurveyAdminSettings {
 		
 		echo '<br />';
 		
-		echo '		<div class="setting"><span class="setting_title">'.$lang['name'].':</span>';
+        // AAI nima moznosti spreminjanja imena, priimka, emaila, gesla...
-		echo '		<input class="text " name="ime" placeholder="Ime" value="'.$row['name'].'" type="text"></div>';
+        if($aai_instalacija){
-			
+            echo '<span class="italic">'.$lang['srv_profil_aai_warning'].'</span>';
-		echo '		<div class="setting"><span class="setting_title">'.$lang['surname'].' :</span>';
+        }
-		echo '		<input class="text " name="priimek" placeholder="Priimek" value="'.$row['surname'].'" type="text"></div>';
+        else{
+            echo '		<div class="setting"><span class="setting_title">'.$lang['name'].':</span>';
+            echo '		<input class="text " name="ime" placeholder="Ime" value="'.$row['name'].'" type="text"></div>';
+                
+            echo '		<div class="setting"><span class="setting_title">'.$lang['surname'].' :</span>';
+            echo '		<input class="text " name="priimek" placeholder="Priimek" value="'.$row['surname'].'" type="text"></div>';
 
-		echo '		<div class="setting"><span class="setting_title">'.$lang['email'].' : <span class="faicon add icon-blue pointer" id="klik-dodaj-email" deluminate_imagetype="png"></span></span>';
+            echo '		<div class="setting"><span class="setting_title">'.$lang['email'].' : <span class="faicon add icon-blue pointer" id="klik-dodaj-email" deluminate_imagetype="png"></span></span>';
-		echo '		<input class="text" disabled="disabled" value="'.$row['email'].'" type="text">';
+            echo '		<input class="text" disabled="disabled" value="'.$row['email'].'" type="text">';
-		echo '		<input name="email2" value="'.$row['email'].'" type="hidden">';
+            echo '		<input name="email2" value="'.$row['email'].'" type="hidden">';
-        echo '      <span style="margin:0 6.5px">&nbsp;</span>';
+            echo '      <span style="margin:0 6.5px">&nbsp;</span>';
-        $alternativni_emaili = User::getInstance()->allEmails('brez primarnega');
+            
-		echo '<label for="active-master" '.(empty($alternativni_emaili) ? 'class="hidden"' : '').'><input class="text" name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'> '.$lang['login_email_subscription'].'</label>';
+            $alternativni_emaili = User::getInstance()->allEmails('brez primarnega');
-			if(!empty($alternativni_emaili)){
+           
-				foreach($alternativni_emaili as $email) {
+            echo '<label for="active-master" '.(empty($alternativni_emaili) ? 'class="hidden"' : '').'><input class="text" name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'> '.$lang['login_email_subscription'].'</label>';
-					echo '<br/><span style="width:130px; float:left;">&nbsp;</span>';
+                if(!empty($alternativni_emaili)){
-					echo '<input class="text" disabled="disabled" value="'.$email->email.'" type="text">';
+                    foreach($alternativni_emaili as $email) {
-					echo '<span style="margin: 0 5px 10px;" onclick="izbrisiAlternativniEmail(\''.$email->id.'\')"><i class="fa fa-times link-sv-moder"></i></span>';
+                        echo '<br/><span style="width:130px; float:left;">&nbsp;</span>';
-					echo '<input class="text" value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>';
+                        echo '<input class="text" disabled="disabled" value="'.$email->email.'" type="text">';
-			    }
+                        echo '<span style="margin: 0 5px 10px;" onclick="izbrisiAlternativniEmail(\''.$email->id.'\')"><i class="fa fa-times link-sv-moder"></i></span>';
-		    }
+                        echo '<input class="text" value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>';
-		echo '</div><br />';
+                    }
+                }
+            echo '</div><br />';
 
-		echo '<div class="dodaj-alternativni-email" style="display: none;">';
+            echo '<div class="dodaj-alternativni-email" style="display: none;">';
-		    echo '<div class="vnos">';
+                echo '<div class="vnos">';
-                echo '<span class="setting_title">'.$lang['login_alternative_emails'].' :</span>';
+                    echo '<span class="setting_title">'.$lang['login_alternative_emails'].' :</span>';
-                echo '<input class="text" id="alternativni-email" value="" type="text">';
+                    echo '<input class="text" id="alternativni-email" value="" type="text">';
-                echo '<span style="margin:0 8px">&nbsp;</span>';
+                    echo '<span style="margin:0 8px">&nbsp;</span>';
-                echo '<a href="#" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</a>';
+                    echo '<a href="#" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</a>';
+                echo '</div>';
+                echo '<br><div id="alternativno-obvestilo" style="font-style: italic;"></div>';
+            echo '<br />';
             echo '</div>';
-            echo '<br><div id="alternativno-obvestilo" style="font-style: italic;"></div>';
-        echo '<br />';
-		echo '</div>';
 
-		
+            // Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo
-		// Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo
+            if (Common::checkModule('gorenje')){
-		if (Common::checkModule('gorenje')){
+                if(SurveyGorenje::checkGorenjePassword())
-			if(SurveyGorenje::checkGorenjePassword())
+                    echo '<p class="red bold">'.$lang['gorenje_password_warning'].'</p>';
-				echo '<p class="red bold">'.$lang['gorenje_password_warning'].'</p>';
+            }
-		}
 
-        // Obveščanje
+            // Obveščanje
-        echo '		<div class="setting"><span class="setting_title">'.$lang['password'].':</span>';
+            echo '		<div class="setting"><span class="setting_title">'.$lang['password'].':</span>';
-		echo '		<input class="text" name="geslo" placeholder="'.$lang['password'].'" id="p1" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p1\').value=\'\';" type="password"></div>';
+            echo '		<input class="text" name="geslo" placeholder="'.$lang['password'].'" id="p1" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p1\').value=\'\';" type="password"></div>';
-				
+                    
-		echo '		<div class="setting"><span class="setting_title">'.$lang['again'].':</span>';
+            echo '		<div class="setting"><span class="setting_title">'.$lang['again'].':</span>';
-		echo '		<input class="text" name="geslo2" placeholder="'.$lang['password'].'" id="p2" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p2\').value=\'\';" type="password"></div>';
+            echo '		<input class="text" name="geslo2" placeholder="'.$lang['password'].'" id="p2" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p2\').value=\'\';" type="password"></div>';
-				
+                    
-		// Prejemanje obvestil
+            // Prejemanje obvestil
-		$red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : '';
+            $red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : '';
-		echo '		<div class="setting" style="height:auto; float:left; clear:both; margin: 15px 0; '.$red_border.'"><span class="setting_title">'.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').'</span>';
+            echo '		<div class="setting" style="height:auto; float:left; clear:both; margin: 15px 0; '.$red_border.'"><span class="setting_title">'.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').'</span>';
-		echo '		<label for="gdpr-agree-yes"><input type="radio" name="gdpr_agree" id="gdpr-agree-yes" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : null).'/>'.$lang['yes'].'</label>';
+            echo '		<label for="gdpr-agree-yes"><input type="radio" name="gdpr_agree" id="gdpr-agree-yes" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : null).'/>'.$lang['yes'].'</label>';
-		echo '      <label for="gdpr-agree-no"><input type="radio" name="gdpr_agree" id="gdpr-agree-no" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : null).'/>'.$lang['no1'].'</label></div>';
+            echo '      <label for="gdpr-agree-no"><input type="radio" name="gdpr_agree" id="gdpr-agree-no" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : null).'/>'.$lang['no1'].'</label></div>';
 
-        // Google 2 FA
+            // Google 2 FA
             $user_option = User::option($global_user_id, 'google-2fa-secret');
             $user_option_validate = User::option($global_user_id, 'google-2fa-validation');
             echo '		<div class="setting" style="clear: both;"><span class="setting_title">'.$lang['google_2fa'].':  '.Help::display('srv_google_2fa_options').'</span>';
@@ -9625,30 +9465,32 @@ class SurveyAdminSettings {
                 echo '<div id="google-2fa-bvestilo" style="font-style: italic;">'.$lang['google_2fa_user_error_code'].'</div>';
                 echo '</div>';
             }
-
+        }
-
+		
-
         echo '		</fieldset>';
 		
 		echo '	</form>';
 		
-		// save gumb
-		echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="save1kaRacunSettings();"><span>'.$lang['edit1337'] . '</span></a></div>';
 
-		echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>';
+		// Save gumb - ce ni AAI
+        if(!$aai_instalacija){
 
-		echo '<span class="clr"></span>';
+            echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="save1kaRacunSettings();"><span>'.$lang['edit1337'] . '</span></a></div>';
+
+            echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>';
+
+            echo '<span class="clr"></span>';
+            
+            // div za prikaz uspešnosti shranjevanja
+            if ($_GET['s'] == '1') {
+                echo '<div id="success_save"></div>';
+                echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
+            }
+
+            echo '<br /><br />';
+        }
 		
-		// div za prikaz uspešnosti shranjevanja
+
-		if ($_GET['s'] == '1') {
-			echo '<div id="success_save"></div>';
-			echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
-		}
-		
-		
-		echo '<br /><br />';
-		
-			
 		// Tabela aktivnosti (prijav)
 		echo '<fieldset><legend>'.$lang['srv_login_tracking_title'].'</legend>';
 		
@@ -9680,7 +9522,7 @@ class SurveyAdminSettings {
 		
 		echo '</fieldset>';	
                 
-                UserTrackingClass::init()->userTrackingDisplay();
+        UserTrackingClass::init()->userTrackingDisplay();
 		
 		echo '</div>';
 	}

admin/survey/ajax.php

@@ -33,7 +33,6 @@ if ($anketa > 0) {
 	$lang_admin = $row['lang_admin'];
 }
 if ($lang_admin == 0) {
-	//$sql = sisplet_query("SELECT * FROM misc WHERE what = 'SurveyLang_admin'");
 	$sql = sisplet_query("SELECT lang FROM users WHERE id = '$global_user_id'");
 	$row = @mysqli_fetch_array($sql);
 	$lang_admin = $row['lang'];

admin/survey/classes/class.Common.php

@@ -1560,7 +1560,7 @@ class Common {
 			}
 			
 			//Users
-			else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && (in_array($_GET['m'], array('my', 'izbrisani', 'nepotrjeni', 'odjavljeni', 'sa-modul'))) ) {
+			else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki') {
 				$help_url = 'https://www.1ka.si/d/en/help/user-guide/my-surveys/users';
 			}
 			
@@ -1982,7 +1982,7 @@ class Common {
 			}
 			
 			//Uporabniki
-			else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && (in_array($_GET['m'], array('my', 'izbrisani', 'nepotrjeni', 'odjavljeni', 'sa-modul'))) ) {
+			else if ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki') {
 				$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/moje-ankete/uporabniki';
 			}
 			
@@ -2149,7 +2149,7 @@ class Common {
     public static function getEmailSignature($lang_id = 0){
         global $lang;
         global $app_settings;
-        
+
         if(isset($app_settings['email_signature_custom']) && $app_settings['email_signature_custom'] == 1){
             $signature = '<br /><br /><br />'.$app_settings['email_signature_text'];
         }

admin/survey/classes/class.Dostop.php

@@ -193,66 +193,81 @@ class Dostop {
 		return FALSE;
 	}
 
-	function ajax()
+	function ajax(){
-	{
 
 		if ($_GET['a'] == 'manager_add_user') {
 			$this->ajax_manager_add_user();
-
+		} 
-		} elseif($_GET['a'] == 'add_new_user'){
+        elseif($_GET['a'] == 'add_new_user'){
             $this->ajax_add_new_user();
-
+        } 
-        } elseif ($_GET['a'] == 'anketa_user_dostop') {
+        elseif ($_GET['a'] == 'anketa_user_dostop') {
 			$this->ajax_anketa_user_dostop();
-
+		} 
-		} elseif ($_GET['a'] == 'anketa_user_dostop_save') {
+        elseif ($_GET['a'] == 'anketa_user_dostop_save') {
 			$this->ajax_anketa_user_dostop_save();
-
+		} 
-		} elseif ($_GET['a'] == 'edit_user') {
+        elseif ($_GET['a'] == 'edit_user') {
 			$this->ajax_edit_user();
-
+		} 
-		} elseif ($_GET['a'] == 'edit_user_save') {
+        elseif ($_GET['a'] == 'edit_user_save') {
 			$this->ajax_edit_user_save();
-
+		} 
-		} elseif ($_GET['a'] == 'admin_add_user') {
+        elseif ($_GET['a'] == 'admin_add_user') {
              $this->ajax_admin_add_user();
-
+        } 
-        } elseif($_GET['a'] == 'find_user'){
+        elseif ($_GET['a'] == 'admin_add_user_popup') {
+            $this->ajax_admin_add_user_popup();
+        } 
+        elseif($_GET['a'] == 'find_user'){
             $this->ajax_find_user();
-
+		} 
-		} elseif ($_GET['a'] == 'edit_remove_user') {
+        elseif ($_GET['a'] == 'edit_remove_user') {
 			$this->ajax_edit_remove_user();
-
+		} 
-		} elseif ($_GET['a'] == 'edit_remove_user_manager') {
+        elseif ($_GET['a'] == 'edit_remove_user_manager') {
 			$this->ajax_edit_remove_user_manager();
-
+		} 
-		} elseif ($_GET['a'] == 'all_users_list') {
+        elseif ($_GET['a'] == 'edit_remove_user_admin') {
-			if ($_GET['m'] == 'delete') {
+			$this->ajax_edit_remove_user_admin();
+		} 
+        elseif ($_GET['a'] == 'all_users_list') {
+			
+            if ($_GET['m'] == 'delete') {
 				$this->ajax_all_users_list_delete();
-			}if ($_GET['m'] == 'ban') {
+            }
+            
+            if ($_GET['m'] == 'ban') {
 				$this->ajax_all_users_list_ban();
-			}else {
+            }
+            else {
 				$this->ajax_all_users_list();
 			}
-
+		} 
-		} elseif($_GET['a'] == 'my_users_list'){
+        elseif($_GET['a'] == 'my_users_list'){
-			$this->ajax_all_users_list(true);
+			$this->ajax_all_users_list_my();
-
+		} 
-		}elseif ($_GET['a'] == 'delete_users_list') {
+        elseif ($_GET['a'] == 'delete_users_list') {
 			$this->ajax_delete_users_list();
-
+		} 
-		} elseif ($_GET['a'] == 'unsigned_users_list') {
+        elseif ($_GET['a'] == 'unsigned_users_list') {
 			$this->ajax_unsigned_users_list();
-
+		} 
-		} elseif ($_GET['a'] == 'unconfirmed_mail_user_list') {
+        elseif ($_GET['a'] == 'unconfirmed_mail_user_list') {
-			if ($_GET['m'] == 'delete') {
+			
+            if ($_GET['m'] == 'delete') {
 				$this->ajax_unconfirmed_mail_user_list_delet_user();
-			} elseif ($_GET['m'] == 'accept') {
+            } 
+            elseif ($_GET['m'] == 'accept') {
 				$this->ajax_confirm_user_email();
-			} else {
+            } 
+            else {
 				$this->ajax_unconfirmed_mail_user_list();
 			}
 		}
+        elseif ($_GET['a'] == 'dodeljeni_uporabniki_display') {
+			$this->ajax_dodeljeni_uporabniki_display();
+		}
 	}
 
     /**
@@ -380,7 +395,7 @@ class Dostop {
 	{
 		global $pass_salt;
 		global $lang;
-		global $global_user_id, $site_path;
+		global $global_user_id, $site_path, $site_domain;
 		global $admin_type;
 
 		$error = FALSE;
@@ -423,13 +438,20 @@ class Dostop {
 					echo mysqli_error($GLOBALS['connect_db']);
 				}
 
-				$subject = $lang['srv_dodanmail_1'] . '';
+                $subject = sprintf($lang['srv_dodanmail_1'], $site_domain);
-				$content = sprintf($lang['srv_dodanmail_2'], $MailReply) . '<br /><br />' . sprintf($lang['srv_dodanmail_3'], $email, $password);
+
+                $content = sprintf($lang['srv_dodanmail_2'], $MailReply, $site_domain).'<br /><br />';
+                $content .= $lang['srv_dodanmail_3'];
+                $content .= '<ul>';
+                $content .= '<li>'.$lang['srv_dodanmail_3_email'].' <b>'.$email.'</b></li>';
+                $content .= '<li>'.$lang['srv_dodanmail_3_pass_1'].' <b>'.$password.'</b> ('.$lang['srv_dodanmail_3_pass_2'].')</li>';
+                $content .= '</ul>';
 
                 // Podpis
                 $signature = Common::getEmailSignature();
                 $content .= $signature;
 
+                
 				// Posljemo mail vsakemu uporabniku posebej
 				try {
 					$MA = new MailAdapter($this->anketa, $type='account');
@@ -477,10 +499,7 @@ class Dostop {
 
 		echo '<h3><span class="bold">';
 
-		if ($r['type'] == 2) {
+        if ($r['type'] == 2 || $r['type'] == 3) {
-			echo $lang['admin_clan'];
-        } 
-        elseif ($r['type'] == 3) {
 			echo $lang['admin_narocnik'];
         } 
         elseif ($r['type'] == 1) {
@@ -661,6 +680,7 @@ class Dostop {
 		global $lang;
 		global $global_user_id;
 		global $admin_type;
+		global $virtual_domain;
 
 		$uid = $_POST['uid'];
 
@@ -733,9 +753,13 @@ class Dostop {
 			echo '<p><label for="manage_domain" style="width:200px;">Manager domene (npr. 1ka.si):</label><input type="text" id="manage_domain" name="manage_domain" value="' . $emails . '" autocomplete="off" size="30"></p>';
 		}
 
-		$sqlu = sisplet_query("SELECT * FROM srv_dostop_manage WHERE manager='$global_user_id' AND user='$uid'");
+        // Na virtualkah manager ne sme odstraniti uporabnika iz pregleda (zaradi omejitve)
-		if (mysqli_num_rows($sqlu) > 0) {
+        if($admin_type != '1' || !$virtual_domain){
-			echo '<p><a href="ajax.php?t=dostop&a=edit_remove_user&uid=' . $uid . '" onclick="if ( confirm(\'?\')) {  } else {return false;}">' . $lang['srv_manager_rem_user2'] . '</a></p>';
+            $sqlu = sisplet_query("SELECT * FROM srv_dostop_manage WHERE manager='$global_user_id' AND user='$uid'");
+
+            if (mysqli_num_rows($sqlu) > 0) {
+                echo '<br /><p><a href="ajax.php?t=dostop&a=edit_remove_user&uid=' . $uid . '" onclick="if ( confirm(\'?\')) {  } else {return false;}">' . $lang['srv_manager_rem_user2'] . '</a></p>';
+            }
         }
 
         echo '</div>';
@@ -962,7 +986,31 @@ class Dostop {
 			}
 		}
 
-		//header("Location: index.php?a=diagnostics&t=uporabniki&m=my&error=" . ($error !== FALSE ? $error : ''));
+		header("Location: index.php?a=diagnostics&t=uporabniki".($error !== FALSE ? '&error='.$error : ''));
+	}
+
+    /**
+	 * Admin: dodajanje obstojecih uporabnikov drugemu uporabniku v popupu
+	 *
+	 */
+	function ajax_admin_add_user_popup(){
+		global $lang;
+		global $admin_type;
+
+		if ($admin_type != 0)
+			return;
+
+        $manager = (isset($_POST['manager'])) ? $_POST['manager'] : '0';
+        $user = (isset($_POST['user'])) ? $_POST['user'] : '0';
+
+        if($manager == '' || $manager == '0' || $user == '' || $user == '0')
+            return;
+        
+        $sql = sisplet_query("INSERT INTO srv_dostop_manage (manager, user) VALUES ('".$manager."', '".$user."')");
+        if (!$sql)
+            echo mysqli_error($GLOBALS['connect_db']);
+        
+        $this->ajax_dodeljeni_uporabniki_display();
 	}
 
     /**
@@ -975,36 +1023,37 @@ class Dostop {
 
 	    if($admin_type == 0){
 
-          $sqls = sisplet_query("SELECT id, name, surname, email FROM users WHERE id NOT IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') AND  email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%') AND email LIKE '%".$_GET['term']."%' ORDER BY email", "obj");
+            $sqls = sisplet_query("SELECT id, name, surname, email FROM users WHERE id NOT IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') AND  email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%') AND email LIKE '%".$_GET['term']."%' ORDER BY email", "obj");
 
-          if(!empty($sqls->email)){
+            if(!empty($sqls->email)){
-              $json['results'][] = [
+                $json['results'][] = [
-                  'id' => $sqls->id,
+                    'id' => $sqls->id,
-                  'text' => $sqls->email.' - '.$sqls->name.' '.$sqls->surname
+                    'text' => $sqls->email.' - '.$sqls->name.' '.$sqls->surname
-              ];
+                ];
-          }else{
+            }
-              foreach ($sqls as $user) {
+            else{
-                  $json['results'][] = [
+                foreach ($sqls as $user) {
-                      'id' => $user->id,
+                    $json['results'][] = [
-                      'text' => $user->email.' - '.$user->name.' '.$user->surname
+                        'id' => $user->id,
-                  ];
+                        'text' => $user->email.' - '.$user->name.' '.$user->surname
-              }
+                    ];
-          }
+                }
+            }
 
-          echo json_encode($json);
+            echo json_encode($json);
-
+        }
-       }elseif ($admin_type == 1){
+        elseif ($admin_type == 1){
 	        $email = trim($_POST['uemail']);
             $user = sisplet_query("SELECT id, name, surname, email FROM users WHERE id NOT IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') AND  email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%') AND email='".$email."'");
 
-              if(mysqli_num_rows($user) > 0) {
+            if(mysqli_num_rows($user) > 0) {
-                  echo 'success';
+                echo 'success';
-              }else{
+            }
-                  echo 'error';
+            else{
-              }
+                echo 'error';
-
+            }
-      }
+        }
-  }
+    }
 
 	// Če je administrator
 
@@ -1012,8 +1061,7 @@ class Dostop {
 	 * odstrani uporabnika iz nadzora
 	 *
 	 */
-	function ajax_edit_remove_user()
+	function ajax_edit_remove_user(){
-	{
 		global $global_user_id;
 		global $site_url;
 
@@ -1028,8 +1076,7 @@ class Dostop {
 	 * odstrani uporabnika iz managerjevega nadzora
 	 *
 	 */
-	function ajax_edit_remove_user_manager()
+	function ajax_edit_remove_user_manager(){
-	{
 		global $global_user_id;
 		global $site_url;
 
@@ -1040,123 +1087,134 @@ class Dostop {
 		header("Location:  " . $site_url . "admin/survey/index.php?a=diagnostics&t=uporabniki");
 	}
 
+    /**
+	 * admin odstrani uporabnika iz nadzora drugemu uporabniku (managerju ali adminu)
+	 *
+	 */
+	function ajax_edit_remove_user_admin(){
+		global $admin_type;
+
+        if($admin_type != '0')
+            return;
+
+		$manager = (isset($_POST['manager'])) ? $_POST['manager'] : '0';
+		$user = (isset($_POST['user'])) ? $_POST['user'] : '0';
+
+        if($manager == '' || $manager == '0' || $user == '' || $user == '0')
+            return;
+
+		$sql = sisplet_query("DELETE FROM srv_dostop_manage WHERE user='$user' AND manager='$manager'");
+
+        $this->ajax_dodeljeni_uporabniki_display();
+	}
+
 	/**
 	 * Seznam vseh uporabnikov znotrja 1ke
 	 */
-	function ajax_all_users_list($my = null)
+	function ajax_all_users_list(){
-	{
 		global $admin_languages;
 		global $global_user_id;
 		global $lang;
-		global $admin_type;
+        global $admin_type;
+        
 		$seznam = [];
 
 		$iskanjeSql = "";
 		if(!empty($_POST['search']['value'])){
 		    $iskaniNiz = $_POST['search']['value'];
 		    $iskanjeSql = "  AND (u.name LIKE '%".$iskaniNiz."%' OR u.surname LIKE '%".$iskaniNiz."%' OR u.email LIKE '%".$iskaniNiz."%' OR d1.dostop_survey_count  LIKE '%".$iskaniNiz."%' OR d2.dostop_survey_archive LIKE '%".$iskaniNiz."%')";
-    }
-
-		// Pridobimo vse uporabnike
-		$sql ="SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
-			" LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
-			" LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
-      " LEFT OUTER JOIN  (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1)  AS ue ON ue.user_id = u.id".
-      " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
-
-		// Filter samo po lastnih uporabnikih
-		if(!empty($my)){
-		    // Med lastne uporabnike prikažemo tudi, tiste ki so bili registrirani z isto domeno
-        UserSetting :: getInstance()->Init($global_user_id);
-        $domena = UserSetting :: getInstance()->getUserSetting('manage_domain');
-
-        $isciPoDomeni = '';
-        if(!empty($domena)){
-            $isciPoDomeni = " OR u.email LIKE '%".$domena."'";
         }
 
+		// Pridobimo vse uporabnike
+		$sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, dm.st_dodeljenih_uporabnikov as st_dodeljenih_uporabnikov, dm2.st_managerjev as st_managerjev, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
+                " LEFT OUTER JOIN (SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
+                " LEFT OUTER JOIN (SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
+                " LEFT OUTER JOIN (SELECT srv_dostop_manage.manager, count(*) AS st_dodeljenih_uporabnikov FROM srv_dostop_manage GROUP BY srv_dostop_manage.manager) AS dm ON dm.manager = u.id ".
+                " LEFT OUTER JOIN (SELECT srv_dostop_manage.user, count(*) AS st_managerjev FROM srv_dostop_manage GROUP BY srv_dostop_manage.user) AS dm2 ON dm2.user = u.id ".
+                " LEFT OUTER JOIN (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1)  AS ue ON ue.user_id = u.id".
+                " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
 
-			  $sql .= " AND (u.id = '".$global_user_id."' OR u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') ".$isciPoDomeni.")";
+        // Filtri, ki jih datatables pošilja in po katerih filtriramo
-		}
+        if($_POST['order'][0]['column'] < 12) {
+            $orderPolje = [
+                "u.name ".$_POST['order'][0]['dir'].", u.surname",
+                "u.email",
+                "u.type",
+                "u.lang",
+                "u.eduroam", //AAI
+                "d1.dostop_survey_count", //st_anket
+                "d2.dostop_survey_archive", //st_arhivskih
+                "dm.st_dodeljenih_uporabnikov", //st_dodeljenih_uporabnikov
+                "dm2.st_managerjev", //st_managerjev
+                "u.gdpr_agree",
+                "u.when_reg",
+                "u.last_login"
+            ];
 
+            if($_POST['order'][0]['column'] == 9){
 
-		// Filtri, ki jih datatables pošilja in po katerih filtriramo
+                $vrednost='u.gdpr_agree desc';
-      if($_POST['order'][0]['column'] < 10) {
+                if($_POST['order'][0]['dir'] == 'asc'){
-          $orderPolje = [
+                    $vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
-            "u.name ".$_POST['order'][0]['dir'].", u.surname",
+                }
-            "u.email",
-            "u.type",
-            "u.lang",
-            "u.eduroam", //AAI
-            "d1.dostop_survey_count", //st_anket
-            "d2.dostop_survey_archive", //st_arhivskih
-            "u.gdpr_agree",
-            "u.when_reg",
-            "u.last_login"
-          ];
 
-          if($_POST['order'][0]['column'] == 7){
+                $sql .= " ORDER BY ".$vrednost;
+            }
+            else {
+                $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
+            }
+        }
 
-              $vrednost='u.gdpr_agree desc';
+        if($_POST['length'] != '-1') {
-              if($_POST['order'][0]['dir'] == 'asc'){
+            $sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
-                  $vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
+        }
-              }
 
-              $sql .= " ORDER BY ".$vrednost;
+        $resultQuery = sisplet_query($sql);
-          }else {
-              $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
-          }
-      }
-
-      if($_POST['length'] != '-1') {
-          $sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
-      }
-
-		$resultQuery = sisplet_query($sql);
         $resultU = lazyLoadSqlObj($resultQuery);
 
-		// Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
+        // Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
-		if (!empty($resultU) && ($this->jeAdministrator() || !$this->jeAdministrator() && !empty($my) )) {
+        if (!empty($resultU)) {
 
-			if (!empty($resultU->name)) {
+            if (!empty($resultU->name)) {
-				$vsi[] = $resultU;
+                $vsi[] = $resultU;
-			} else {
+            } 
-				$vsi = $resultU;
+            else {
-			}
+                $vsi = $resultU;
+            }
 
-			foreach ($vsi as $uporabnik) {
+            foreach ($vsi as $uporabnik) {
-				$seznam[] = [
+                $seznam[] = [
-					iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
+                    iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
-          (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding(  $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
+                    (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding(  $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
-					$this->userTypeToText($uporabnik->type),
+                    $this->userTypeToText($uporabnik->type),
-					$admin_languages[$uporabnik->lang],
+                    $admin_languages[$uporabnik->lang],
-					(!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
+                    (!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
-					(!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
+                    (!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
-					(!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
+                    (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
-          $lang["users_gdpr".$uporabnik->gdpr_agree],
+                    '<a href="#" onclick="dodeljeni_uporabniki_display(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_manager_manager'].'">'.(!empty($uporabnik->st_dodeljenih_uporabnikov) ? $uporabnik->st_dodeljenih_uporabnikov : 0).'</a>',
-					$uporabnik->registriran,
+                    (!empty($uporabnik->st_managerjev) ? $uporabnik->st_managerjev : 0),
-					$uporabnik->last_login,
+                    $lang["users_gdpr".$uporabnik->gdpr_agree],
-					'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
+                    $uporabnik->registriran,
-					' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
+                    $uporabnik->last_login,
-					' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
+                    '<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
-				];
+                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
+                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
+                ];
+            }
+        }
 
-			}
+        $sql_recordsTotal = sisplet_query("SELECT count(id) as stVseh FROM users WHERE email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%')", "obj");
-		}
+        
+        // Število vseh zadetkov, ki jih imamo v bazi
+        $recordsTotal = 0;
+        if(!empty($sql_recordsTotal)) {
+            $recordsTotal = $sql_recordsTotal->stVseh;
+        } 
 
-		$sql_recordsTotal = sisplet_query("SELECT count(id) as stVseh FROM users WHERE email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%')", "obj");
+        // Število filtriranih zadetkov
-		// Število vseh zadetkov, ki jih imamo v bazi
+        $recordFiltered = $recordsTotal;
-		$recordsTotal = 0;
+        if(!empty($_POST['search']['value']))
-		if(!empty($sql_recordsTotal) && is_null($my)) {
+            $recordFiltered = sizeof($vsi);
-        $recordsTotal = $sql_recordsTotal->stVseh;
-    } elseif(!is_null($my)) {
-		    $recordsTotal = sizeof($vsi);
-    }
-
-    // Število filtriranih zadetkov
-    $recordFiltered = $recordsTotal;
-    if(!empty($_POST['search']['value']))
-        $recordFiltered = sizeof($vsi);
 
 		echo json_encode([
                        "draw" => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
@@ -1164,7 +1222,126 @@ class Dostop {
 			                 "recordsFiltered" => $recordFiltered,
 			                 "data" => $seznam   // polje z vsebino
 		                 ]);
+    }
+    
+    /**
+	 * Seznam dodeljenih uporabnikov (manager in admin)
+	 */
+	function ajax_all_users_list_my(){
+		global $admin_languages;
+		global $global_user_id;
+		global $lang;
+        global $admin_type;
+        
+		$seznam = [];
 
+		$iskanjeSql = "";
+		if(!empty($_POST['search']['value'])){
+		    $iskaniNiz = $_POST['search']['value'];
+		    $iskanjeSql = "  AND (u.name LIKE '%".$iskaniNiz."%' OR u.surname LIKE '%".$iskaniNiz."%' OR u.email LIKE '%".$iskaniNiz."%' OR d1.dostop_survey_count  LIKE '%".$iskaniNiz."%' OR d2.dostop_survey_archive LIKE '%".$iskaniNiz."%')";
+        }
+
+		// Pridobimo vse uporabnike
+		$sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
+                " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
+                " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
+                " LEFT OUTER JOIN  (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1)  AS ue ON ue.user_id = u.id".
+                " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
+
+		// Filter samo po lastnih uporabnikih
+        $isciPoDomeni = '';
+
+        // Med lastne uporabnike prikažemo tudi, tiste ki so bili registrirani z isto domeno
+        /*UserSetting :: getInstance()->Init($global_user_id);
+        $domena = UserSetting :: getInstance()->getUserSetting('manage_domain');
+        if(!empty($domena)){
+            $isciPoDomeni = " OR u.email LIKE '%".$domena."'";
+        }*/
+
+        $sql .= " AND (u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') ".$isciPoDomeni.")";
+
+
+        // Filtri, ki jih datatables pošilja in po katerih filtriramo
+        if($_POST['order'][0]['column'] < 10) {
+            $orderPolje = [
+                "u.name ".$_POST['order'][0]['dir'].", u.surname",
+                "u.email",
+                "u.type",
+                "u.lang",
+                "u.eduroam", //AAI
+                "d1.dostop_survey_count", //st_anket
+                "d2.dostop_survey_archive", //st_arhivskih
+                "u.gdpr_agree",
+                "u.when_reg",
+                "u.last_login"
+            ];
+
+            if($_POST['order'][0]['column'] == 7){
+
+                $vrednost='u.gdpr_agree desc';
+                if($_POST['order'][0]['dir'] == 'asc'){
+                    $vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
+                }
+
+                $sql .= " ORDER BY ".$vrednost;
+            }
+            else {
+                $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
+            }
+        }
+
+        if($_POST['length'] != '-1') {
+            $sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
+        }
+
+        $resultQuery = sisplet_query($sql);
+        $resultU = lazyLoadSqlObj($resultQuery);
+
+        // Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
+        if (!empty($resultU) && ($this->jeAdministrator() || !$this->jeAdministrator())) {
+
+            if (!empty($resultU->name)) {
+                $vsi[] = $resultU;
+            } 
+            else {
+                $vsi = $resultU;
+            }
+
+            foreach ($vsi as $uporabnik) {
+                $seznam[] = [
+                    iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
+                    (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding(  $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
+                    $this->userTypeToText($uporabnik->type),
+                    $admin_languages[$uporabnik->lang],
+                    (!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
+                    (!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
+                    (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
+                    $lang["users_gdpr".$uporabnik->gdpr_agree],
+                    $uporabnik->registriran,
+                    $uporabnik->last_login,
+                    '<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
+                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
+                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
+                ];
+
+            }
+        }
+        
+        // Število vseh zadetkov, ki jih imamo v bazi
+        $recordsTotal = 0;
+        $recordsTotal = sizeof($vsi);
+
+        // Število filtriranih zadetkov
+        $recordFiltered = $recordsTotal;
+        if(!empty($_POST['search']['value']))
+            $recordFiltered = sizeof($vsi);
+
+		echo json_encode([
+                       "draw" => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
+			                 "recordsTotal" => $recordsTotal,
+			                 "recordsFiltered" => $recordFiltered,
+			                 "data" => $seznam   // polje z vsebino
+		                 ]);
 	}
 
 	/**
@@ -1238,7 +1415,8 @@ class Dostop {
 				$type = $lang['admin_manager'];
 				break;
 			case 2:
-				$type = $lang['admin_clan'];
+			case 3:
+				$type = $lang['admin_narocnik'];
 				break;
 		}
 
@@ -1315,23 +1493,21 @@ class Dostop {
 
 	public function ajax_unconfirmed_mail_user_list_delet_user()
 	{
-		global $user_db;
-
 		$uid = (!empty($_POST['uid']) ? $_POST['uid'] : NULL);
 
 		if (empty($uid)) {
 			return NULL;
 		}
 
-		sisplet_query("DELETE FROM $user_db.users_to_be WHERE id='" . $uid . "'");
+		sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "'");
 
 		echo 'ok';
 	}
 
-	public function ajax_confirm_user_email()
+	public function ajax_confirm_user_email(){
-	{
 		global $pass_salt;
-		global $user_db;
+		global $lang;
+		global $app_settings;
 
 		$uid = (!empty($_POST['uid']) ? $_POST['uid'] : NULL);
 
@@ -1340,18 +1516,58 @@ class Dostop {
 		}
 
 		// kopirano iz user_to_be v users
-		$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM " . $user_db . "users_to_be WHERE id='" . $uid . "'");
+		$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM users_to_be WHERE id='" . $uid . "'");
 
 		if (mysqli_num_rows($result) > 0) {
 			$r = mysqli_fetch_assoc($result);
 			$g = base64_encode((hash('SHA256', base64_decode($r['pass']) . $pass_salt)));
 
-			sisplet_query("INSERT INTO $user_db.users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) 
+			sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) 
                       VALUES ('" . $r['type'] . "', '" . $r['email'] . "', '" . $r['name'] . "', '" . $r['surname'] . "', '" . $g . "','" . $r['status'] . "', '" . $r['gdpr_agree'] . "','" . $r['when_reg'] . "', '" . $r['came_from'] . "', '" . $r['lang'] . "',  'Y')");
-			sisplet_query("DELETE FROM $user_db.users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
+			sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
+           
 
-			echo 'ok';
+            // Uporabniku posljemo email da je bil njegov racun aktiviran
-		} else {
+            $Content = $lang['confirmed_user_mail'];
+        
+            // Podpis
+            $signature = Common::getEmailSignature();
+            $Content .= $signature;
+
+            // Ce gre slucajno za virutalko
+            $Subject = $lang['confirmed_user_mail_subject'];	
+            
+            $PageName = $app_settings['app_name'];
+            $ZaMail = '<!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.0 Transitional//EN">'.'<html><head>  <title>'.$Subject.'</title><meta content="text/html; charset=utf-8" http-equiv=Content-type></head><body>';
+
+            // Besedilo v lang dilu je potrebno popravit, ker nimamo vec cel kup parametrov
+            $Content = str_replace("SFNAME", $r['name'].' '.$r['surname'], $Content);
+            $Content = str_replace("SFPAGENAME", $PageName, $Content);
+
+            $Subject = str_replace("SFPAGENAME", $PageName, $Subject);
+
+            $ZaMail .= $Content;
+            $ZaMail .= "</body></html>";
+
+            // Za testiranje brez posiljanja maila
+            if(isDebug()) {
+                echo $ZaMail; 
+                die();
+            }
+
+            // Posljemo mail, da je bil racun aktiviran
+            try{
+                $MA = new MailAdapter(null, 'account');  
+                $MA->addRecipients($r['email']);
+                $result = $MA->sendMail($ZaMail, $Subject);
+            }
+            catch (Exception $e){
+                echo $e;
+            }
+
+            echo 'ok';
+        } 
+        else {
 			echo 'non';
 		}
 	}
@@ -1393,6 +1609,83 @@ class Dostop {
 		                 ]);
 	}
 
+    // Popup z dodeljenimi uporabniki
+    private function ajax_dodeljeni_uporabniki_display(){
+        global $lang;
+
+        $manager = (isset($_POST['manager'])) ? $_POST['manager'] : '0';
+
+        if($manager == '' || $manager == '0'){
+            return;
+        }
+
+
+        echo '<div class="popup_close"><a href="#" onClick="dodeljeni_uporabniki_close(); return false;">✕</a></div>';
+			
+        echo '<h2>'.$lang['srv_manager_count'].'</h2>';
+
+        
+        echo '<div class="popup_content dodeljeni_uporabniki">';
+
+         // Seznam dodeljenih uporabnikov
+        $sqlUsers = sisplet_query("SELECT u.id, u.name, u.surname, u.email, u.status
+                                    FROM users u, srv_dostop_manage m
+                                    WHERE u.id=m.user AND m.manager='".$manager."'
+                                ");
+        if(mysqli_num_rows($sqlUsers) > 0){
+
+            echo '<ul>';
+
+            while($rowUsers = mysqli_fetch_array($sqlUsers)){
+                echo '<li>';
+                
+                echo '  <span>';
+                echo $rowUsers['name'].' '.$rowUsers['surname'].' ('.$rowUsers['email'].')';
+                if($rowUsers['status'] == '0')
+                    echo ' - <span class="red italic">NEAKTIVEN</span>';
+                echo '  </span>';
+                
+                echo '  <span><a onClick="dodeljeni_uporabniki_remove(\''.$manager.'\', \''.$rowUsers['id'].'\');">'.$lang['hour_remove'].'</a></span>';
+                
+                echo '</li>';
+            }
+
+            echo '</ul>';
+        }
+
+        // Dodajanje novega uporabnika
+        echo '<h4>'.$lang['srv_manager_add_admin'].'</h4>';
+        echo '<div class="add_user">';
+        
+        echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
+
+        echo '<h3><b>'.$lang['srv_manager_add_user_popup'].'</b></h3>';
+        echo '<p><select name="add_user_id" id="add_user_id" class="js-obstojeci-uporabniki-admin-ajax" style="width: 300px;"></select></p>';
+        
+        echo '<p><div class="buttonwrapper floatLeft">';
+        echo '  <a class="ovalbutton ovalbutton_orange" href="#" onClick="dodeljeni_uporabniki_add(\''.$manager.'\', \''.$rowUsers['id'].'\');">'.$lang['add'].'</a>';
+        echo '</div></p><br><br>';
+
+        echo '</form>';
+
+        echo '<script>$(\'.js-obstojeci-uporabniki-admin-ajax\').select2({
+                    minimumInputLength: 3,
+                    ajax: {
+                        url: \'ajax.php?t=dostop&a=find_user\',
+                        dataType: \'json\'
+                    }
+                });</script>';
+
+        echo '</div>';
+
+        echo '</div>';
+
+
+        echo '<div class="buttons_holder">';
+        echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dodeljeni_uporabniki_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></span>';
+        echo '</div>';
+    }
+
 	function isAnketar()
 	{
 		global $admin_type;

admin/survey/classes/class.Forum.php

@@ -118,7 +118,6 @@ class Forum {
 		global $admin_type;
 		global $pass_salt;
 		global $global_user_id;
-		global $user_db;
 		global $cookie_domain;
 
 		// preden naredimo karkoli, odstranimo javascript iz vsebine in naslova:
@@ -142,7 +141,7 @@ class Forum {
 
 			if ($global_user_id > 0) {
 				$uid = $global_user_id;
-				$resu = sisplet_query ("SELECT name FROM $user_db.users WHERE id='" .$uid ."'");
+				$resu = sisplet_query ("SELECT name FROM users WHERE id='" .$uid ."'");
 				$ru = mysqli_fetch_row ($resu);
 				$user = $ru[0];
 			} else {
@@ -194,7 +193,7 @@ class Forum {
 
 				if ($_POST['alertmail'] != '') {
 					$mail = $_POST['alertmail'];
-					$sqla = sisplet_query("SELECT id FROM $user_db.users WHERE email = '$mail'");
+					$sqla = sisplet_query("SELECT id FROM users WHERE email = '$mail'");
 
 					if (mysqli_num_rows($sqla) > 0) {
 						$rowa = mysqli_fetch_row($sqla);
@@ -204,16 +203,16 @@ class Forum {
 						// Preveri ali je vzdevek ze zaseden- ce je, mu dodaj neko stevilko da bo unique
 						$a2 = $avtor;
 
-						$result = sisplet_query ("SELECT * FROM $user_db.users WHERE name='$a2' AND surname=''");
+						$result = sisplet_query ("SELECT * FROM users WHERE name='$a2' AND surname=''");
 						while (mysqli_num_rows ($result) > 0) {
 							$a2 = $avtor .rand(0, 32767);
-							$result = sisplet_query ("SELECT * FROM $user_db.users WHERE name='$a2' AND surname=''");
+							$result = sisplet_query ("SELECT * FROM users WHERE name='$a2' AND surname=''");
 						}
 
 						$avtor = $a2;
 						$g = base64_encode((hash('SHA256', '' .$pass_salt)));
 
-						$sqln = sisplet_query("INSERT INTO $user_db.users (email, name, when_reg, came_from, pass) VALUES ('" .$_POST['alertmail'] ."', '$avtor', NOW(), '2', '$g')");
+						$sqln = sisplet_query("INSERT INTO users (email, name, when_reg, came_from, pass) VALUES ('" .$_POST['alertmail'] ."', '$avtor', NOW(), '2', '$g')");
 						$narocnikID = mysqli_insert_id($GLOBALS['connect_db']);
 
 						// Ker je noviregistriran mu dajmo se UID.
@@ -287,14 +286,14 @@ class Forum {
 
 				foreach ($mails as $key => $mail) {
 					$mail = trim($mail);
-					$sqla = sisplet_query("SELECT id FROM $user_db.users WHERE email = '$mail'");
+					$sqla = sisplet_query("SELECT id FROM users WHERE email = '$mail'");
 
 					if (mysqli_num_rows($sqla) > 0) {
 						$rowa = mysqli_fetch_row($sqla);
 						$narocnikID = $rowa[0];
 					} else {
 						$g = base64_encode((hash('SHA256', '' .$pass_salt)));
-						$sqln = sisplet_query("INSERT INTO $user_db.users (email, name, when_reg, camefrom, pass) VALUES ('$mail', '$mail', NOW(), '2', '$g')");
+						$sqln = sisplet_query("INSERT INTO users (email, name, when_reg, camefrom, pass) VALUES ('$mail', '$mail', NOW(), '2', '$g')");
 						$narocnikID = mysqli_insert_id($GLOBALS['connect_db']);
 					}
 
@@ -351,10 +350,9 @@ class Forum {
 		global $global_user_id;
 		global $admin_type;
 		global $lang;
-		global $user_db;
 
 		if (isset ($_GET['em'])) {		// email iz alerta
-			$result = sisplet_query ("SELECT id FROM $user_db.users WHERE email='" .$_GET['em'] ."'");
+			$result = sisplet_query ("SELECT id FROM users WHERE email='" .$_GET['em'] ."'");
 			$r = mysqli_fetch_row ($result);
 			return $r[0];
  		}
@@ -368,10 +366,9 @@ class Forum {
 		global $lang;
 		global $site_url;
 		global $skin_name;
-		global $user_db;
 
 		if ($uid > 0) {
-			$sql = sisplet_query("SELECT email, name, show_email FROM $user_db.users WHERE id='$uid'");
+			$sql = sisplet_query("SELECT email, name, show_email FROM users WHERE id='$uid'");
 			$row = mysqli_fetch_row($sql);
 			$return = '';
 

admin/survey/classes/class.GDPR.php

@@ -252,7 +252,7 @@ class GDPR{
 
 
 		// Gumb shrani
-		echo '<div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="editGDPRProfile(); return false;"><span>Shrani spremembe</span></a></div>';
+		echo '<div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="editGDPRProfile(); return false;"><span>'.$lang['edit1337'].'</span></a></div>';
 
 		// div za prikaz uspešnosti shranjevanja
 		if ($_GET['s'] == '1') {
@@ -355,7 +355,7 @@ class GDPR{
 				
 				// Checkbox ce je zahteva opravljena
 				//echo '<td>'.($request['status'] == '1' ? $lang['srv_gdpr_requests_status_1'] : $lang['srv_gdpr_requests_status_0']).'</td>';
-				echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'</td>';
+				echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'></td>';
 
 				// Komentar avtorja
 				echo '<td><textarea style="height:30px; width:200px;" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
@@ -411,7 +411,7 @@ class GDPR{
 				
 				// Checkbox ce je zahteva opravljena
 				//echo '<td>'.($request['status'] == '1' ? $lang['srv_gdpr_requests_status_1'] : $lang['srv_gdpr_requests_status_0']).'</td>';
-				echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'</td>';
+				echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'></td>';
 
 				// Komentar avtorja
 				echo '<td><textarea style="height:30px; width:200px;" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
@@ -619,6 +619,7 @@ class GDPR{
 	public function displayGDPRSurvey($ank_id){
 		global $site_url;
 		global $lang;
+		global $admin_languages;
 		global $global_user_id;
 
         $gdpr_settings = self::getSurveySettings($ank_id);
@@ -629,6 +630,26 @@ class GDPR{
         else
             $gdpr_show_advanced = false;
 
+
+        // Preverimo, če imamo anketo v večih jezikih
+        $survey_settings = SurveyInfo::getInstance()->getSurveyRow();
+
+        $language_slo = ($survey_settings['lang_resp'] == 1) ? true : false;
+        $language_eng = ($survey_settings['lang_resp'] > 1) ? true : false;
+
+        $sqlLang = sisplet_query("SELECT lang_id FROM srv_language WHERE ank_id='".$ank_id."' ORDER BY lang_id ASC");
+        while ($rowLang = mysqli_fetch_array($sqlLang)) {
+            
+            if($rowLang['lang_id'] == '1'){
+                $language_slo = true;
+            }
+            else{
+                $language_eng = true;
+                break;
+            }
+        }
+
+
 		// GDPR nastavitve ankete
 		echo '<fieldset class="wide">';
 		echo '<legend>'.$lang['srv_gdpr_survey_settings'].'</legend>';
@@ -693,8 +714,18 @@ class GDPR{
 		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_other'].':</span>';
 		echo '	<label for="other_1"><input type="radio" name="other" id="other_1" '.($gdpr_settings['other'] != 0 ? ' checked':'').' value="1" onChange="showGDPRSettings(); toggleGDPROtherText(this);">'.$lang['yes'].'</label> ';
 		echo '	<label for="other_0"><input type="radio" name="other" id="other_0" '.($gdpr_settings['other'] == 0 ? ' checked':'').' value="0" onChange="showGDPRSettings(); toggleGDPROtherText(this);">'.$lang['no'].'</label> ';
-		echo '	<br /><span class="nastavitveSpan1"></span>';
+		
-        echo '	<textarea class="other" name="other_text" id="other_text" style="width:550px; height:80px; '.($gdpr_settings['other'] == 0 ? ' display:none;' : '').'">'.$gdpr_settings['other_text'].'</textarea>';
+        echo '<div id="other_text" '.($gdpr_settings['other'] == 0 ? ' style="display:none;"' : '').'>';
+        if($language_slo){
+            echo '	<span class="nastavitveSpan1">&nbsp;</span>';
+            echo '	<textarea class="other" name="other_text_slo" id="other_text_slo" style="width:500px; height:80px; margin-top:10px;">'.$gdpr_settings['other_text_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
+            echo '<br />';
+        }
+        if($language_eng){
+            echo '	<span class="nastavitveSpan1">&nbsp;</span>';
+            echo '	<textarea class="other" name="other_text_eng" id="other_text_eng" style="width:500px; height:80px; margin-top:10px;">'.$gdpr_settings['other_text_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
+        echo '</div>';
         
         echo '</div>';
 
@@ -723,7 +754,7 @@ class GDPR{
 		echo '	<br /><br /><br /><br />';
 
 		// Podrobnosti o zbiranju podatkov (popup v uvodu)
-		if($gdpr_settings['about'] == ''){
+		/*if($gdpr_settings['about'] == ''){
             $about_array = self::getGDPRInfoArray($ank_id);
             $about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
 		}
@@ -731,7 +762,22 @@ class GDPR{
 			$about_text = $gdpr_settings['about'];
 		}
 		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
-		echo '	<textarea name="about" id="about" style="width:550px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';
+		echo '	<textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';*/
+
+        echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
+		if($language_slo){
+            $about_array = self::getGDPRInfoArray($ank_id, $language_id='1');
+            $about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
+
+            echo '	<textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
+            echo '	<br><br><span class="nastavitveSpan1">&nbsp;</span>';
+        }
+        if($language_eng){
+            $about_array = self::getGDPRInfoArray($ank_id, $language_id='2');
+            $about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
+
+            echo '	<textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 
 		echo '<br /><br />';
 		
@@ -761,9 +807,14 @@ class GDPR{
 		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_expire'].':</span>';
 		echo '	<label for="expire_0"><input type="radio" name="expire" id="expire_0" '.($gdpr_settings['expire'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_expire_0'].'</label> ';
         
-        echo '	<br /><span class="nastavitveSpan1"></span>';
+        echo '	<br /><span class="nastavitveSpan1">&nbsp;</span>';
         echo '	<label for="expire_1"><input type="radio" name="expire" id="expire_1" '.($gdpr_settings['expire'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_expire_1'].'</label> ';
-        echo '	<input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text" id="expire_text" value="'.$gdpr_settings['expire_text'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'>';
+        if($language_slo){
+            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text_slo" id="expire_text_slo" value="'.$gdpr_settings['expire_text_slo'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+        }
+        if($language_eng){
+            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text_eng" id="expire_text_eng" value="'.$gdpr_settings['expire_text_eng'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 
 		echo '	<br /><br />';
 
@@ -772,9 +823,14 @@ class GDPR{
 		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_other_users'].':</span>';
 		echo '	<label for="other_users_0"><input type="radio" name="other_users" id="other_users_0" '.($gdpr_settings['other_users'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_other_users_0'].'</label> ';
         
-        echo '	<br /><span class="nastavitveSpan1"></span>';
+        echo '	<br /><span class="nastavitveSpan1">&nbsp;</span>';
         echo '	<label for="other_users_1"><input type="radio" name="other_users" id="other_users_1" '.($gdpr_settings['other_users'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_other_users_1'].'</label> ';
-        echo '	<input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text" id="other_users_text" value="'.$gdpr_settings['other_users_text'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'>';
+        if($language_slo){
+            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text_slo" id="other_users_text_slo" value="'.$gdpr_settings['other_users_text_slo'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+        }
+        if($language_eng){
+            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text_eng" id="other_users_text_eng" value="'.$gdpr_settings['other_users_text_eng'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 
 		echo '	<br /><br />';
 
@@ -783,15 +839,32 @@ class GDPR{
 		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export'].':</span>';
 		echo '	<label for="export_0"><input type="radio" name="export" id="export_0" '.($gdpr_settings['export'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_export_0'].'</label> ';
         
-        echo '	<br /><span class="nastavitveSpan1"></span>';
+        echo '	<br /><span class="nastavitveSpan1">&nbsp;</span>';
         echo '	<label for="export_1"><input type="radio" name="export" id="export_1" '.($gdpr_settings['export'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_export_country'].'</label> ';
-        echo '	<input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country" id="export_country" value="'.$gdpr_settings['export_country'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'>';
+        if($language_slo){
+            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country_slo" id="export_country_slo" value="'.$gdpr_settings['export_country_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+        }
+        if($language_eng){
+            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country_eng" id="export_country_eng" value="'.$gdpr_settings['export_country_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 
-        echo '	<br /><span class="nastavitveSpan1"></span>';
+        echo '	<br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_user'].':</span>';
-        echo '	<span style="padding-left:21px;">'.$lang['srv_gdpr_survey_gdpr_export_user'].'</span> <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user" id="export_user" value="'.$gdpr_settings['export_user'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'>';
+        if($language_slo){
+            echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user_slo" id="export_user_slo" value="'.$gdpr_settings['export_user_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+            echo ' <br />';
+        }
+        if($language_eng){
+            echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user_eng" id="export_user_eng" value="'.$gdpr_settings['export_user_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 
-        echo '	<br /><span class="nastavitveSpan1"></span>';
+        echo '<br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_legal'].':</span>';
-        echo '	<span style="padding-left:21px;">'.$lang['srv_gdpr_survey_gdpr_export_legal'].'</span> <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal" id="export_legal" value="'.$gdpr_settings['export_legal'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'>';
+        if($language_slo){
+            echo ' <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal_slo" id="export_legal_slo" value="'.$gdpr_settings['export_legal_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+            echo ' <br /><span class="nastavitveSpan1">&nbsp;</span>';
+        }
+        if($language_eng){
+            echo ' <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal_eng" id="export_legal_eng" value="'.$gdpr_settings['export_legal_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 
 		echo '	<br /><br />';
 
@@ -863,14 +936,19 @@ class GDPR{
 
         // Opomba
 		echo '	<span class="nastavitveSpan1">'.$lang['note'].':</span>';
-		echo '	<textarea name="note" id="note" style="width:550px; height:80px;">'.$gdpr_settings['note'].'</textarea>';
+		if($language_slo){
+            echo '	<textarea name="note_slo" id="note_slo" style="width:500px; height:80px;">'.$gdpr_settings['note_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
+            echo '	<span class="nastavitveSpan1">&nbsp;</span>';
+        }
+        if($language_eng){
+            echo '	<textarea name="note_eng" id="note_eng" style="width:500px; height:80px;">'.$gdpr_settings['note_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+        }
 		
 		echo '	<br /><br />';
 
 		echo '</fieldset>';
 
 
-
         // Gumb shrani spremembe
 		echo '<br class="clr" />';
 
@@ -897,13 +975,28 @@ class GDPR{
         if(!$userAccess->checkUserAccess($what='gdpr_export')){
             $userAccess->displayNoAccess($what='gdpr_export');
         }
-        else{    
+        else{
-            echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
-            echo '	<br />';
-            echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
-        }
 
-        echo '	<br /><br />';
+            echo '<br />';
+
+            if($language_slo){
+                echo '<span class="bold">'.$admin_languages['1'].':</span><br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
+                echo '<br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+                
+                echo '<br /><br />';
+            }
+
+            if($language_eng){
+                echo '<span class="bold">'.$admin_languages['2'].':</span><br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
+                echo '<br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+            
+                echo '<br /><br />';
+            }
+        }
 
         echo '</fieldset>';
 
@@ -924,12 +1017,27 @@ class GDPR{
             $userAccess->displayNoAccess($what='gdpr_export');
         }
         else{     
-            echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
-            echo '	<br />';
-            echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
-        }
 
-        echo '	<br /><br />';
+            echo '<br />';
+
+            if($language_slo){
+                echo '<span class="bold">'.$admin_languages['1'].':</span><br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
+                echo '	<br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+                    
+                echo '<br /><br />';
+            }
+
+            if($language_eng){
+                echo '<span class="bold">'.$admin_languages['2'].':</span><br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
+                echo '	<br />';
+                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+                
+                echo '<br /><br />';
+            }
+        }
 
         echo '</fieldset>';
 	}
@@ -1245,6 +1353,8 @@ class GDPR{
 		else{
 			$user_settings = GDPR::getSurveySettings($ank_id);
 
+            $translation = ($lang['id'] == '1') ? '_slo' : '_eng';
+
 			$naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
 			
 			$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
@@ -1260,7 +1370,7 @@ class GDPR{
 			if($user_settings['web'])
 				$naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>';
 			if($user_settings['other'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'].'</li>';
+				$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>';
 			$naslov .= '</ul>';
 
 			$naslov .= '<p>'.$lang['srv_gdpr_intro2'];
@@ -1716,13 +1826,28 @@ class GDPR{
     
 
     // Vrnemo celoten gdpr text za respondenta (pravice...)  v obliki array-a
-    public static function getGDPRInfoArray($ank_id){
+    public static function getGDPRInfoArray($ank_id, $language_id=''){
         global $global_user_id;
         global $lang;
 
         $gdpr_settings = self::getUserSettings();
         $gdpr_survey_settings = self::getSurveySettings($ank_id);
 
+        // Force language
+        $language_id_bck = '';
+        if($language_id != '' && $lang['id'] != $language_id){
+
+            // Shranimo star jezik da lahko preklopimo nazaj
+            $language_id_bck = $lang['id'];
+
+            $file = '../../lang/'.$language_id.'.php';
+            include($file);
+
+            $translation = ($language_id == '1') ? '_slo' : '_eng';
+        }
+        else{
+            $translation = ($lang['id'] == '1') ? '_slo' : '_eng';
+        }
 
         $result = array();        
 
@@ -1748,7 +1873,7 @@ class GDPR{
         if($gdpr_survey_settings['web'])
             $temp_text .= $lang['srv_gdpr_intro_web'].', ';
         if($gdpr_survey_settings['other'])
-            $temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'].', ';
+            $temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'.$translation].', ';
         
         $result[0]['text'][2] .= ' <strong>'.substr(ucfirst(strtolower($temp_text)), 0,-2).'</strong>'; 
 
@@ -1759,8 +1884,8 @@ class GDPR{
         $result[1]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text2_3'];
         $result[1]['text'][2] = $lang['srv_gdpr_survey_gdpr_about_text2_4'];
 		
-		if($gdpr_survey_settings['expire'] == '1' && $gdpr_survey_settings['expire_text'] != '')
+		if($gdpr_survey_settings['expire'] == '1' && $gdpr_survey_settings['expire_text'.$translation] != '')
-            $result[1]['text'][2] .= ' <strong>'.$gdpr_survey_settings['expire_text'].'</strong>.';
+            $result[1]['text'][2] .= ' <strong>'.$gdpr_survey_settings['expire_text'.$translation].'</strong>.';
         else
             $result[1]['text'][2] .= ' <strong>'.$lang['srv_gdpr_survey_gdpr_about_text2_5'].'</strong>';
 
@@ -1769,8 +1894,8 @@ class GDPR{
         $result[2]['heading'] = $lang['srv_gdpr_survey_gdpr_about_text3_1'];
         $result[2]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text3_2'];
         
-        if($gdpr_survey_settings['other_users'] == '1' && $gdpr_survey_settings['other_users_text'] != '')
+        if($gdpr_survey_settings['other_users'] == '1' && $gdpr_survey_settings['other_users_text'.$translation] != '')
-            $result[2]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text3_32'].' <strong>'.$gdpr_survey_settings['other_users_text'].'</strong>. ';
+            $result[2]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text3_32'].' <strong>'.$gdpr_survey_settings['other_users_text'.$translation].'</strong>. ';
         else
             $result[2]['text'][1] = '<strong>'.$lang['srv_gdpr_survey_gdpr_about_text3_31'].'.</strong>';
 
@@ -1781,9 +1906,9 @@ class GDPR{
         $result[3]['heading'] = $lang['srv_gdpr_survey_gdpr_about_text4_1'];
 
         if($gdpr_survey_settings['export'] == '1'){
-            $result[3]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text4_22'].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_2'].' <strong>'.$gdpr_survey_settings['export_country'].'</strong> '.$lang['srv_gdpr_survey_gdpr_about_text4_22_3'];
+            $result[3]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text4_22'].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_2'].' <strong>'.$gdpr_survey_settings['export_country'.$translation].'</strong> '.$lang['srv_gdpr_survey_gdpr_about_text4_22_3'];
-            $result[3]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text4_22_4'].' <strong>'.$gdpr_survey_settings['export_user'].'</strong>';
+            $result[3]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text4_22_4'].' <strong>'.$gdpr_survey_settings['export_user'.$translation].'</strong>';
-            $result[3]['text'][1] = ' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_5'].' <strong>'.$gdpr_survey_settings['export_legal'].'</strong>.';
+            $result[3]['text'][1] = ' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_5'].' <strong>'.$gdpr_survey_settings['export_legal'.$translation].'</strong>.';
         }
         else{
             $result[3]['text'][0] = '<strong>'.$lang['srv_gdpr_survey_gdpr_about_text4_21'].'</strong>';
@@ -1857,11 +1982,18 @@ class GDPR{
 
 
         // OPOMBA
-        if($gdpr_survey_settings['note'] != ''){
+        if($gdpr_survey_settings['note'.$translation] != ''){
             $result[7]['heading'] = $lang['note'];
-            $result[7]['text'][0] = '<strong>'.$gdpr_survey_settings['note'].'</strong>';
+            $result[7]['text'][0] = '<strong>'.$gdpr_survey_settings['note'.$translation].'</strong>';
         }
-        
+
+
+        // Preklopimo nazaj jezik
+        if($language_id_bck != '' && $language_id_bck != $lang['id']){
+            $file = '../../lang/'.$language_id_bck.'.php';
+            include($file);
+        }
+
 
         return $result;
     }
@@ -1874,6 +2006,7 @@ class GDPR{
         $gdpr_settings = self::getUserSettings();
         $gdpr_survey_settings = self::getSurveySettings($ank_id);
 
+        $translation = ($lang['id'] == '1') ? '_slo' : '_eng';
 
         $result = array(); 
 
@@ -1923,7 +2056,7 @@ class GDPR{
         if($gdpr_survey_settings['web'])
             $temp_text .= $lang['srv_gdpr_intro_web'].', ';
         if($gdpr_survey_settings['other'])
-            $temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'].', ';
+            $temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'.$translation].', ';
         
         $result[4]['text'][0] = '<strong>'.substr(ucfirst(strtolower($temp_text)), 0,-2).'</strong>';
 
@@ -1939,7 +2072,7 @@ class GDPR{
         if($gdpr_survey_settings['expire'] != '1')
             $result[6]['text'][0] .= '<strong>'.$lang['srv_gdpr_survey_gdpr_evidenca_text7_2'].'</strong>';
         else
-            $result[6]['text'][0] .= '<strong>'.$gdpr_survey_settings['expire_text'].'</strong>.';
+            $result[6]['text'][0] .= '<strong>'.$gdpr_survey_settings['expire_text'.$translation].'</strong>.';
 
 
         $result[7]['heading'] = 'VIII. '.$lang['srv_gdpr_survey_gdpr_evidenca_text8'];
@@ -1947,18 +2080,18 @@ class GDPR{
         $result[7]['text'][1] = $lang['srv_gdpr_survey_gdpr_evidenca_text8_2'];
 
         if($gdpr_survey_settings['other_users'] == '1')
-            $result[7]['text'][2] = '<strong>'.ucfirst($gdpr_survey_settings['other_users_text']).'</strong>';
+            $result[7]['text'][2] = '<strong>'.ucfirst($gdpr_survey_settings['other_users_text'.$translation]).'</strong>';
 
 
         $result[8]['heading'] = 'IX. '.$lang['srv_gdpr_survey_gdpr_evidenca_text9'];
         
         if($gdpr_survey_settings['export'] == '1'){
             $result[8]['text'][0] = $lang['srv_gdpr_survey_gdpr_evidenca_text9_22'].' ';
-            $result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_country'].'</strong>';
+            $result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_country'.$translation].'</strong>';
             $result[8]['text'][0] .= $lang['srv_gdpr_survey_gdpr_evidenca_text9_23'].' ';
-            $result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_user'].'</strong>';
+            $result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_user'.$translation].'</strong>';
             $result[8]['text'][0] .= $lang['srv_gdpr_survey_gdpr_evidenca_text9_24'].' ';
-            $result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_legal'].'</strong>.';
+            $result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_legal'.$translation].'</strong>.';
         }
         else{
             $result[8]['text'][0] = '<strong>'.$lang['srv_gdpr_survey_gdpr_evidenca_text9_21'].'</strong>';
@@ -1970,9 +2103,9 @@ class GDPR{
 
 
         // OPOMBA
-        if($gdpr_survey_settings['note'] != ''){
+        if($gdpr_survey_settings['note'.$translation] != ''){
             $result[10]['heading'] = 'XI. '.$lang['note'];
-            $result[10]['text'][0] = $gdpr_survey_settings['note'];
+            $result[10]['text'][0] = '<strong>'.$gdpr_survey_settings['note'.$translation].'</strong>.';
         }
 
 
@@ -2185,23 +2318,30 @@ class GDPR{
 					$phone = isset($_POST['phone']) ? $_POST['phone'] : '';
 					$web = isset($_POST['web']) ? $_POST['web'] : '';
 					$other = isset($_POST['other']) ? $_POST['other'] : '';
-					$other_text = isset($_POST['other_text']) ? $_POST['other_text'] : '';
+					$other_text_slo = isset($_POST['other_text_slo']) ? $_POST['other_text_slo'] : '';
+					$other_text_eng = isset($_POST['other_text_eng']) ? $_POST['other_text_eng'] : '';
 					
 					$template_1ka = isset($_POST['1ka_template']) ? $_POST['1ka_template'] : '';
 					
 					$about = (isset($_POST['about'])) ? $_POST['about'] : '';
 					
 					$expire = isset($_POST['expire']) ? $_POST['expire'] : '';
-					$expire_text = isset($_POST['expire_text']) ? $_POST['expire_text'] : '';
+					$expire_text_slo = isset($_POST['expire_text_slo']) ? $_POST['expire_text_slo'] : '';
+					$expire_text_eng = isset($_POST['expire_text_eng']) ? $_POST['expire_text_eng'] : '';
 					$other_users = isset($_POST['other_users']) ? $_POST['other_users'] : '';
-					$other_users_text = isset($_POST['other_users_text']) ? $_POST['other_users_text'] : '';
+					$other_users_text_slo = isset($_POST['other_users_text_slo']) ? $_POST['other_users_text_slo'] : '';
+					$other_users_text_eng = isset($_POST['other_users_text_eng']) ? $_POST['other_users_text_eng'] : '';
 					$export = isset($_POST['export']) ? $_POST['export'] : '';
-					$export_country = isset($_POST['export_country']) ? $_POST['export_country'] : '';
+					$export_country_slo = isset($_POST['export_country_slo']) ? $_POST['export_country_slo'] : '';
-					$export_user = isset($_POST['export_user']) ? $_POST['export_user'] : '';
+					$export_country_eng = isset($_POST['export_country_eng']) ? $_POST['export_country_eng'] : '';
-					$export_legal = isset($_POST['export_legal']) ? $_POST['export_legal'] : '';
+					$export_user_slo = isset($_POST['export_user_slo']) ? $_POST['export_user_slo'] : '';
+					$export_user_eng = isset($_POST['export_user_eng']) ? $_POST['export_user_eng'] : '';
+					$export_legal_slo = isset($_POST['export_legal_slo']) ? $_POST['export_legal_slo'] : '';
+					$export_legal_eng = isset($_POST['export_legal_eng']) ? $_POST['export_legal_eng'] : '';
 					$authorized = isset($_POST['authorized']) ? $_POST['authorized'] : '';
 					$contact_email = isset($_POST['contact_email']) ? $_POST['contact_email'] : '';
-					$note = isset($_POST['note']) ? $_POST['note'] : '';
+					$note_slo = isset($_POST['note_slo']) ? $_POST['note_slo'] : '';
+					$note_eng = isset($_POST['note_eng']) ? $_POST['note_eng'] : '';
 
 					$sql = sisplet_query("INSERT INTO srv_gdpr_anketa (
 												ank_id, 
@@ -2212,19 +2352,26 @@ class GDPR{
 												phone, 
 												web, 
 												other, 
-												other_text, 
+												other_text_slo, 
+												other_text_eng, 
 												about, 
 												expire, 
-												expire_text, 
+												expire_text_slo, 
+												expire_text_eng, 
 												other_users, 
-												other_users_text, 
+												other_users_text_slo, 
+												other_users_text_eng, 
 												export, 
-												export_user, 
+												export_user_slo, 
-												export_country, 
+												export_user_eng, 
-												export_legal, 
+												export_country_slo, 
+												export_country_eng, 
+												export_legal_slo, 
+												export_legal_eng, 
 												authorized, 
 												contact_email,
-                                                note
+                                                note_slo,
+                                                note_eng
 											)
 											VALUES (
 												'".$ank_id."', 
@@ -2235,19 +2382,26 @@ class GDPR{
 												'".$phone."', 
 												'".$web."', 
 												'".$other."', 
-												'".$other_text."',
+												'".$other_text_slo."',
+												'".$other_text_eng."',
 												'".$about."',
 												'".$expire."',
-												'".$expire_text."',
+												'".$expire_text_slo."',
+												'".$expire_text_eng."',
 												'".$other_users."',
-												'".$other_users_text."',
+												'".$other_users_text_slo."',
+												'".$other_users_text_eng."',
 												'".$export."',
-												'".$export_user."',
+												'".$export_user_slo."',
-												'".$export_country."',
+												'".$export_user_eng."',
-												'".$export_legal."',
+												'".$export_country_slo."',
+												'".$export_country_eng."',
+												'".$export_legal_slo."',
+												'".$export_legal_eng."',
 												'".$authorized."',
 												'".$contact_email."',
-												'".$note."'
+												'".$note_slo."',
+												'".$note_eng."'
 											)
 											ON DUPLICATE KEY UPDATE
 												1ka_template='".$template_1ka."', 
@@ -2257,19 +2411,26 @@ class GDPR{
 												phone='".$phone."', 
 												web='".$web."', 
 												other='".$other."', 
-												other_text='".$other_text."', 
+												other_text_slo='".$other_text_slo."', 
+												other_text_eng='".$other_text_eng."', 
 												about='".$about."', 
 												expire='".$expire."', 
-												expire_text='".$expire_text."', 
+												expire_text_slo='".$expire_text_slo."', 
+												expire_text_eng='".$expire_text_eng."', 
 												other_users='".$other_users."', 
-												other_users_text='".$other_users_text."', 
+												other_users_text_slo='".$other_users_text_slo."', 
+												other_users_text_eng='".$other_users_text_eng."', 
 												export='".$export."', 
-												export_user='".$export_user."', 
+												export_user_slo='".$export_user_slo."', 
-												export_country='".$export_country."', 
+												export_user_eng='".$export_user_eng."', 
-												export_legal='".$export_legal."', 
+												export_country_slo='".$export_country_slo."', 
+												export_country_eng='".$export_country_eng."', 
+												export_legal_slo='".$export_legal_slo."', 
+												export_legal_eng='".$export_legal_eng."', 
 												authorized='".$authorized."', 
 												contact_email='".$contact_email."',
-												note='".$note."'"
+												note_slo='".$note_slo."',
+												note_eng='".$note_eng."'"
 										);
 					if (!$sql)
 						echo mysqli_error($GLOBALS['connect_db']);

admin/survey/classes/class.Library.php

@@ -27,41 +27,45 @@ class Library {
         if (isset($surveySkin))
             $this->skin = $surveySkin;
 
-        //include_once('Branching.php');
-
         $this->SurveyAdmin = new SurveyAdmin(1, -1);
         $this->Branching = new Branching($this->SurveyAdmin->anketa);
 
-
         if (isset($_options['tab'])) {
 			$this->tab = $_options['tab'];
             if ($this->tab <= 1)
                 $this->tip = 0;
             else
                 $this->tip = 1;
-        } else if (isset($_POST['tab'])) {
+        } 
+        else if (isset($_POST['tab'])) {
             $this->tab = ($_POST['tab'] == 0 || $_POST['tab'] == 'undefined') ? 0 : $_POST['tab'];
             if ($this->tab <= 1)
                 $this->tip = 0;
             else
                 $this->tip = 1;
-        } else {
+        } 
+        else {
             $this->tab = 0;
             $this->tip = 0;
         }
+
         if (isset($_options['prva'])) {
         	$this->prva = $_options['prva'];
-        } else {
+        } 
+        else {
         	$this->prva = 0;
         }
+
         if (isset($_GET['tab'])) $this->tab = (int)$_GET['tab'];
 
         // nastavimo mode v odvisnosti od survey_type ( če nismo v anketi je -1)
         if (isset($this->SurveyAdmin->anketa) && $this->SurveyAdmin->anketa > 0) {
         	$_st = $this->SurveyAdmin->getSurvey_type($this->SurveyAdmin->anketa);
-			if ($_st > -1)
+			
+            if ($_st > -1)
 				$this->mode = $_st;
         }
+        
 		$this->repareTabs();
 		
 		// Preverimo ce gre za search po anketah
@@ -195,24 +199,28 @@ class Library {
 			echo '<input type="hidden" name="lib_tip" id="lib_tip" value="'.($this->tip == 0 || $this->tip== "" ? "0" : "$this->tip").'">';
 			echo '<input type="hidden" name="lib_prva" id="lib_prva" value="'.($this->prva == 0 || $this->prva== "" ? "0" : "$this->prva").'">';
 
-			//echo '<div class="folder_right_label red">'.$lang['srv_kopiranje'].'</div>';
-
 			echo '<ul title="'.($uid==0?$lang['srv_library_left']:$lang['srv_library_left_right']).'" style="padding-left:0;" class="'.($admin_type==0 || $uid == $global_user_id?'can_edit':'').'">'."\n";
         }
 
-
         $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' $language ORDER BY naslov");
-        if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
+        if (!$sql) 
+            echo mysqli_error($GLOBALS['connect_db']);
+
         if (mysqli_num_rows($sql) == 0 && $uid > 0 && $parent == 0) {
+            
             // za prvic ko pride user, da mu dodamo folder
             if ($this->tip == 0)
             	$naslov = $lang['srv_moja_vprasanja'];
             else
             	$naslov = $lang['srv_moje_ankete'];
+            
             sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent, lang) VALUES ('$uid', '$this->tip', '$naslov', '0', '$lang[id]')");
+            
             $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' ORDER BY naslov");
-            if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
+            if (!$sql) 
+                echo mysqli_error($GLOBALS['connect_db']);
         }
+
         while ($row = mysqli_fetch_array($sql)) {
             if (strpos($cookie, '-'.$row['id'].'-')=== false && $parent!=0)
                 $hidden = true;
@@ -222,8 +230,6 @@ class Library {
 
             echo '  <li id="li'.$row['id'].'" eid="'.$row['id'].'" class="folder" name="folder">';
 
-            // ne preverjamo vec ce je folder prazen, ker so tisti queryiji zelo pocasni...
-            //if ($parent != 0 && !$empty)
             if ($parent != 0)
                 echo '  <a href="/" onclick="javascript:library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" id="f_pm_'.$row['id'].'"><span class="faicon icon-blue '.($hidden?'plus':'minus').'"></span></a>';
             else
@@ -257,117 +263,118 @@ class Library {
 				if (mysqli_num_rows($sql1) > 0) {
 
 					while ($row1 = mysqli_fetch_array($sql1)) {
-							echo '<li class="anketa tip'.$this->tip.'">';
-							echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container '.($this->tip==0?'new_spr':'').'" name="library">';
 
-							echo '          <div class="folder_right">';
+                        echo '<li class="anketa tip'.$this->tip.'">';
+                        echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container '.($this->tip==0?'new_spr':'').'" name="library">';
 
-							if ($this->tip == 0) {
+                        echo '          <div class="folder_right">';
-								//echo '<a href="/" onclick="javascript:copy_spremenljivka(\''.$row1['id'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_spr'].'" /></a>';
-								if ($admin_type==0 or $uid==$global_user_id)
-									echo ' <a href="/" onclick="library_brisi_spremenljivko(\''.$row1['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_brisispremenljivko'].'"></span></a>';
-							}
-							else {
-								SurveyInfo::getInstance()->SurveyInit($row1['id']);
-								if ($this->prva == "1") {
-                                    
-                                    // Dodaj anketo v javno knjiznico
-                                    if ($admin_type == 0 && $this->tab == 3) {
 
-                                        $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
+                        if ($this->tip == 0) {
-                                        if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
+                            //echo '<a href="/" onclick="javascript:copy_spremenljivka(\''.$row1['id'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_spr'].'" /></a>';
+                            if ($admin_type==0 or $uid==$global_user_id)
+                                echo ' <a href="/" onclick="library_brisi_spremenljivko(\''.$row1['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_brisispremenljivko'].'"></span></a>';
+                        }
+                        else {
+                            SurveyInfo::getInstance()->SurveyInit($row1['id']);
 
-                                        // Anketa ze obstaja v javni knjiznici - jo pobrisemo
+                            if ($this->prva == "1") {
-                                        if (mysqli_num_rows($sqlPublic) > 0) {
+                                
-                                            echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+                                // Dodaj anketo v javno knjiznico
-                                            echo '      <span class="sprites faicon remove icon-orange small"></span> '.$lang['srv_ank_lib_off'];
+                                if ($admin_type == 0 && $this->tab == 3) {
-                                            echo '  </a>';
+
-                                        }
+                                    $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
-                                        // Anketo dodamo v javno knjiznico
+                                    if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
-                                        else{
+
-                                            echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
+                                    // Anketa ze obstaja v javni knjiznici - jo pobrisemo
-                                            echo '      <span class="sprites faicon library"></span> '.$lang['srv_ank_lib_on'];
+                                    if (mysqli_num_rows($sqlPublic) > 0) {
-                                            echo '  </a>';
+                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
-                                        }
+                                        echo '      <span class="sprites faicon remove icon-orange small"></span> '.$lang['srv_ank_lib_off'];
+                                        echo '  </a>';
                                     }
-
+                                    // Anketo dodamo v javno knjiznico
-									// nova anketa kot template iz knjiznice
+                                    else{
-									echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> '.$lang['srv_anketacopy'].'</a> ';
+                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
-									//echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\', \''.$lang['srv_anketa_copy'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_srv'].'" /></a>';
+                                        echo '      <span class="sprites faicon library"></span> '.$lang['srv_ank_lib_on'];
-									echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
+                                        echo '  </a>';
-                                    
-                                    // brisi iz knjiznice
-									if ($admin_type == 0) {
-										echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> '.$lang['edit3'].'</a>';
                                     }
-                                    
+                                }
-									if ($admin_type==0 && $this->tab==2) {// sistemska
-										echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="sprites faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-                                    }
-                                    
-									if($this->tab==3){// moja knjiznica
-										echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-									}
-								}
-								else {
-									echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
-									// moznost da povozi anketo z anketo iz knjiznice
-									//TEGA NE DOVOLIMO KER NI OK DA SE KAR PREPISE OBSTOJECO ANKETO - anketo iz knjiznice se lahko po novem dodaja samo iz mojih anket oz. pri ustvarjanju
-									echo ' <a href="/" onclick="alert_copy_anketa(\''.$row1['id'].'\'); return false;"><span class="sprites copy_small" title="'.$lang['srv_copy_srv'].'"></span></a>';
-								}
-							}
-							echo '</div>';
 
-							echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';
+                                // nova anketa kot template iz knjiznice
-							if ($this->tip == 1 && $this->prva == "0") {
+                                echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> '.$lang['srv_anketacopy'].'</a> ';
-								echo '<a href="/" onclick="javascript:library_anketa_plusminus(\''.$row1['id'].'\', this); return false;"><span class="faicon icon-blue plus" style="opacity: 0.3"></span></a> ';
+                                echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
-							} else {
+                                
-								if ($this->tip != 0)
+                                // brisi iz knjiznice
-									echo '  <span class="sprites spacer12"></span>';
+                                if ($admin_type == 0) {
-							}
+                                    echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> '.$lang['edit3'].'</a>';
+                                }
+                                
+                                if ($admin_type==0 && $this->tab==2) {// sistemska
+                                    echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="sprites faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
+                                }
+                                
+                                if($this->tab==3){// moja knjiznica
+                                    echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
+                                }
+                            }
+                            else {
+                                echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
+                                // moznost da povozi anketo z anketo iz knjiznice
+                                //TEGA NE DOVOLIMO KER NI OK DA SE KAR PREPISE OBSTOJECO ANKETO - anketo iz knjiznice se lahko po novem dodaja samo iz mojih anket oz. pri ustvarjanju
+                                echo ' <a href="/" onclick="alert_copy_anketa(\''.$row1['id'].'\'); return false;"><span class="sprites copy_small" title="'.$lang['srv_copy_srv'].'"></span></a>';
+                            }
+                        }
+                        echo '</div>';
+
+                        echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';
+                        if ($this->tip == 1 && $this->prva == "0") {
+                            echo '<a href="/" onclick="javascript:library_anketa_plusminus(\''.$row1['id'].'\', this); return false;"><span class="faicon icon-blue plus" style="opacity: 0.3"></span></a> ';
+                        } else {
+                            if ($this->tip != 0)
+                                echo '  <span class="sprites spacer12"></span>';
+                        }
 
 
-							if ($this->tip == 0) {
+                        if ($this->tip == 0) {
-								if ($row1['tip']==1 || $row1['tip']==2 || $row1['tip']==3 || $row1['tip']==21 || $row1['tip']==7)
+                            if ($row1['tip']==1 || $row1['tip']==2 || $row1['tip']==3 || $row1['tip']==21 || $row1['tip']==7)
-									$ikonca = 'osnovna_vprasanja';
+                                $ikonca = 'osnovna_vprasanja';
-								elseif ($row1['tip']==6 || $row1['tip']==16 || $row1['tip']==19 || $row1['tip']==20)
+                            elseif ($row1['tip']==6 || $row1['tip']==16 || $row1['tip']==19 || $row1['tip']==20)
-									$ikonca = 'table';
+                                $ikonca = 'table';
-								else
+                            else
-									$ikonca = 'other_vprasanja';
+                                $ikonca = 'other_vprasanja';
-							} else {
+                        } else {
-								$ikonca = 'anketa';
+                            $ikonca = 'anketa';
-							}
+                        }
 
-							echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
+                        echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
-							echo skrajsaj(strip_tags($row1['naslov']), 40).'</a>'."\n";
+                        echo skrajsaj(strip_tags($row1['naslov']), 40).'</a>'."\n";
 
-							echo '          </div>';
+                        echo '          </div>';
 
 
-							if ($this->prva == "0") {
+                        if ($this->prva == "0") {
 
-								echo '<div id="anketa_vprasanja_'.$row1['id'].'" class="anketa_vprasanja">';
+                            echo '<div id="anketa_vprasanja_'.$row1['id'].'" class="anketa_vprasanja">';
-								if ($this->tip == 1) {
+                            if ($this->tip == 1) {
-									$sql2 = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$row1[id]'");
+                                $sql2 = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$row1[id]'");
-									while ($row2 = mysqli_fetch_array($sql2)) {
+                                while ($row2 = mysqli_fetch_array($sql2)) {
 
-										if ($row2['tip']==1 || $row2['tip']==2 || $row2['tip']==3 || $row2['tip']==21 || $row2['tip']==7)
+                                    if ($row2['tip']==1 || $row2['tip']==2 || $row2['tip']==3 || $row2['tip']==21 || $row2['tip']==7)
-											$ikonca = 'osnovna_vprasanja';
+                                        $ikonca = 'osnovna_vprasanja';
-										elseif ($row2['tip']==6 || $row2['tip']==16 || $row2['tip']==19 || $row2['tip']==20)
+                                    elseif ($row2['tip']==6 || $row2['tip']==16 || $row2['tip']==19 || $row2['tip']==20)
-											$ikonca = 'table';
+                                        $ikonca = 'table';
-										else
+                                    else
-											$ikonca = 'other_vprasanja';
+                                        $ikonca = 'other_vprasanja';
 
-										echo '<span class="new_spr" copy="'.$row2['id'].'" onclick="library_spremenljivka_new(\''.$row2['id'].'\'); return false;"><span class="faicon '.$ikonca.' icon-blue" title="'.$lang['srv_copy_spr'].'" style="display:inline-block"></span>';
+                                    echo '<span class="new_spr" copy="'.$row2['id'].'" onclick="library_spremenljivka_new(\''.$row2['id'].'\'); return false;"><span class="faicon '.$ikonca.' icon-blue" title="'.$lang['srv_copy_spr'].'" style="display:inline-block"></span>';
-										echo ' '.skrajsaj(strip_tags($row2['naslov']), 40).'</span>';
+                                    echo ' '.skrajsaj(strip_tags($row2['naslov']), 40).'</span>';
 
-									}
+                                }
-								}
+                            }
-								echo '</div>';
 
-							}
+                            echo '</div>';
+                        }
 
-							echo '</div></li>';
+                        echo '</div></li>';
 					}
 
 				}
@@ -376,7 +383,6 @@ class Library {
             echo '    </ul>'."\n";
 
             echo '  </li>'."\n";
-
         }
 
         if ($parent == 0) {
@@ -910,7 +916,6 @@ class Library {
 
         sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'");
 
-        //$this->display();
         $this->display_folders();
     }
 
@@ -921,7 +926,6 @@ class Library {
 
         sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'");
 
-        //$this->display();
         $this->display_folders();
     }
 

admin/survey/classes/class.Prevajanje.php

@@ -563,12 +563,8 @@ class Prevajanje {
 			$this->Branching->introduction_conclusion(-1);
 		elseif ($spremenljivka == -2)
 			$this->Branching->introduction_conclusion(-2);
-		else{
+		else
 			$this->Branching->vprasanje($spremenljivka);
-			if ($row['tip'] == 7 && $row['ranking_k'] == 1){	//ce je tip vprasanja stevilo in je postavitev slider
-				//echo '</div>'; //pokomentiral, ker se sedaj pojavi težava pri izpisu v prevodu
-			}
-		}
 		
 		echo '</div>';
 			
@@ -585,13 +581,8 @@ class Prevajanje {
 			$this->Branching->introduction_conclusion(-1);
 		elseif ($spremenljivka == -2)
 			$this->Branching->introduction_conclusion(-2);
-		else{
+		else
 			$this->Branching->vprasanje($spremenljivka, true);	//poklici izris vprasanja za prevajanje (za enkrat je drugi argument pomemben le za slider)
-
-			if ($row['tip'] == 7 && $row['ranking_k'] == 1){	//ce je tip vprasanja stevilo in je postavitev slider
-				//echo '</div>';	//pokomentiral, ker se sedaj pojavi težava pri izpisu v prevodu
-			}
-		}
 		
         echo '</div>';		
     

admin/survey/classes/class.SurveyAapor.php

@@ -481,7 +481,7 @@ class SurveyAapor {
 
 		# od direktnega klika odštejemo e-mail vabila
 		if (count($user_id_to_check_link)> 0) {
-			$qry_stringEmail = "SELECT COUNT(*) as cnt FROM srv_userstatus  WHERE usr_id IN (".implode($user_id_to_check_link,',').") AND status IN (".implode($this->emailStatus,',').")";
+			$qry_stringEmail = "SELECT COUNT(*) as cnt FROM srv_userstatus  WHERE usr_id IN (".implode(',', $user_id_to_check_link).") AND status IN (".implode(',', $this->emailStatus).")";
 			$qryEmail = sisplet_query($qry_stringEmail);
 			$rwsEmail = mysqli_fetch_assoc($qryEmail);
 			$this->userRedirections["email"] = (int)$rwsEmail['cnt'];

admin/survey/classes/class.SurveyAktivnost.php

@@ -884,10 +884,10 @@ class SurveyAktivnost{
                 $filter .= " ((user_access.package_id='2' OR user_access.package_id='3') AND user_access.time_expire > NOW()) AND ";
             }
             if($package_2ka == 0){
-                $filter .= " (user_access.package_id!='2' OR user_access.time_expire < NOW()) AND ";
+                $filter .= " (user_access.package_id!='2' OR user_access.time_expire < NOW() OR user_access.package_id IS NULL) AND ";
             }
             if($package_3ka == 0){
-                $filter .= " (user_access.package_id!='3' OR user_access.time_expire < NOW()) AND ";
+                $filter .= " (user_access.package_id!='3' OR user_access.time_expire < NOW() OR user_access.package_id IS NULL) AND ";
             }
         }
 

admin/survey/classes/class.SurveyDiagnostics.php

@@ -9,27 +9,27 @@
  */
 if(session_id() == '') {session_start();}
 
-define("SPR_ON_PAGE_LIMIT", 8, true);							# priporočeno število spremenljivk na stran
+define("SPR_ON_PAGE_LIMIT", 8);							# priporočeno število spremenljivk na stran
-define("SPR_IN_BLOCK_LIMIT", 15, true);							# priporočeno število spremenljivk na blok
+define("SPR_IN_BLOCK_LIMIT", 15);							# priporočeno število spremenljivk na blok
-define("SUB_Q_IN_GRID_LIMIT", 8, true);							# priporočeno število podvprašanj na grid
+define("SUB_Q_IN_GRID_LIMIT", 8);							# priporočeno število podvprašanj na grid
-define("SPR_UNAPROPRIATE_START_LIMIT", 30, true);				# koliko % spremenljivk preverjamo na pravilen začetek 
+define("SPR_UNAPROPRIATE_START_LIMIT", 30);				# koliko % spremenljivk preverjamo na pravilen začetek 
-define("SPR_REMINDER_ON_MGRID_LIMIT", 10, true);				# koliko % spremenljivk preverjamo na pravilen začetek 
+define("SPR_REMINDER_ON_MGRID_LIMIT", 10);				# koliko % spremenljivk preverjamo na pravilen začetek 
-define("TIME_SOFT_LIMIT", 120, true);							# čas izpolnjevanja 2 minuti priporočilo 
+define("TIME_SOFT_LIMIT", 120);							# čas izpolnjevanja 2 minuti priporočilo 
-define("TIME_HARD_LIMIT", 900, true);							# čas izpolnjevanja 15 minut opozorilo 
+define("TIME_HARD_LIMIT", 900);							# čas izpolnjevanja 15 minut opozorilo 
 
  
 	
-define("DIAG_SPR_ON_PAGE", "DIAG_SPR_ON_PAGE", true);				# Zaznali smo preveč spremenljivk na stran
+define("DIAG_SPR_ON_PAGE", "DIAG_SPR_ON_PAGE");				# Zaznali smo preveč spremenljivk na stran
-define("DIAG_SPR_IN_BLOCK", "DIAG_SPR_IN_BLOCK", true);				# Zaznali smo preveč spremenljivk na blok
+define("DIAG_SPR_IN_BLOCK", "DIAG_SPR_IN_BLOCK");				# Zaznali smo preveč spremenljivk na blok
-define("DIAG_SUB_Q_IN_GRID", "DIAG_SUB_Q_IN_GRID", true);			# Zaznali smo preveč podvprašanj v gridu
+define("DIAG_SUB_Q_IN_GRID", "DIAG_SUB_Q_IN_GRID");			# Zaznali smo preveč podvprašanj v gridu
-define("DIAG_REMINDER_ON_IF", "DIAG_REMINDER_ON_IF", true);			# Manjka reminder na spremenljvko na katero se sklicuje if
+define("DIAG_REMINDER_ON_IF", "DIAG_REMINDER_ON_IF");			# Manjka reminder na spremenljvko na katero se sklicuje if
-define("DIAG_REMINDER_ON_MGRID", "DIAG_REMINDER_ON_MGRID", true);	# Reminder na spremenljvko z veliko podvprašanji
+define("DIAG_REMINDER_ON_MGRID", "DIAG_REMINDER_ON_MGRID");	# Reminder na spremenljvko z veliko podvprašanji
-define("DIAG_UNAPROPRIATE_START", "DIAG_UNAPROPRIATE_START", true);	# ali imamo na začetku ankete neprimerna vprašanja
+define("DIAG_UNAPROPRIATE_START", "DIAG_UNAPROPRIATE_START");	# ali imamo na začetku ankete neprimerna vprašanja
-define("DIAG_INVALID_CONDITIONS", "DIAG_INVALID_CONDITIONS", true);	# Ali so napake v ifih
+define("DIAG_INVALID_CONDITIONS", "DIAG_INVALID_CONDITIONS");	# Ali so napake v ifih
-define("DIAG_INVALID_VARIABLENAMES", "DIAG_INVALID_VARIABLENAMES", true);	# Ali so varable podvojene
+define("DIAG_INVALID_VARIABLENAMES", "DIAG_INVALID_VARIABLENAMES");	# Ali so varable podvojene
-define("DIAG_INVALID_VALIDATIONS", "DIAG_INVALID_VALIDATIONS", true);	# Ali so napacne validacije na spremenljivkah
+define("DIAG_INVALID_VALIDATIONS", "DIAG_INVALID_VALIDATIONS");	# Ali so napacne validacije na spremenljivkah
-define("DIAG_TIME_SOFT_LIMIT", "DIAG_TIME_SOFT_LIMIT", true);		# predolga anketa 1
+define("DIAG_TIME_SOFT_LIMIT", "DIAG_TIME_SOFT_LIMIT");		# predolga anketa 1
-define("DIAG_TIME_HARD_LIMIT", "DIAG_TIME_HARD_LIMIT", true);		# predolga anketa 2
+define("DIAG_TIME_HARD_LIMIT", "DIAG_TIME_HARD_LIMIT");		# predolga anketa 2
 
 class SurveyDiagnostics
 {

admin/survey/classes/class.SurveyExport.php

@@ -11,13 +11,12 @@
  *
  */
 
-DEFINE (NEW_LINE, "\n", true);
+DEFINE (NEW_LINE, "\n");
-DEFINE (TMP_EXT, '.tmp', true);
+DEFINE (TMP_EXT, '.tmp');
-DEFINE (STR_DLMT, '|', true);
+DEFINE (STR_DLMT, '|');
-DEFINE (DAT_EXT, '.dat', true);
+DEFINE (DAT_EXT, '.dat');
 
-#define("EXPORT_FOLDER", "tmp", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
 
 class SurveyExport
 {

admin/survey/classes/class.SurveyInpect.php

@@ -5,10 +5,10 @@
  *
  */
 
-define('SI_DEFAULT_PROFILE', false, true);
+define('SI_DEFAULT_PROFILE', false);
-define('SI_GOTO_ANALIZE', 0, true);
+define('SI_GOTO_ANALIZE', 0);
-define('SI_GOTO_VPOGLED', 1, true);
+define('SI_GOTO_VPOGLED', 1);
-define('SI_GOTO_PODATKI', 2, true);
+define('SI_GOTO_PODATKI', 2);
 
 class SurveyInspect {
 

admin/survey/classes/class.SurveyList.php

@@ -7,14 +7,14 @@
  *
  */
 
-define('SRV_LIST_ORDER_BY', 16, true);				# privzeto: sortiranje po stolpcu 1
+define('SRV_LIST_ORDER_BY', 16);				# privzeto: sortiranje po stolpcu 1
-define('SRV_LIST_ORDER_TYPE', 1, true);				# privzeto: sortiranje padajoče
+define('SRV_LIST_ORDER_TYPE', 1);				# privzeto: sortiranje padajoče
-define('SRV_LIST_REC_PER_PAGE', 25, true);			# privzeto: koliko zapisov na stran prikažemo
+define('SRV_LIST_REC_PER_PAGE', 25);			# privzeto: koliko zapisov na stran prikažemo
-define('SRV_LIST_GET_AS_LIST', true, true);			# privzeto: ali lovimo kot seznam ali kot drevo folderjev
+define('SRV_LIST_GET_AS_LIST', true);			# privzeto: ali lovimo kot seznam ali kot drevo folderjev
-define('SRV_LIST_GET_SUB_FOLDERS', true, true);		# privzeto: ali poizvedujemo po poddirektorijih
+define('SRV_LIST_GET_SUB_FOLDERS', true);		# privzeto: ali poizvedujemo po poddirektorijih
-define('SRV_LIST_CHECK_DOSTOP', true, true);		# ali preverja dostop na nivoju ankete
+define('SRV_LIST_CHECK_DOSTOP', true);		# ali preverja dostop na nivoju ankete
-define('SRV_LIST_GROUP_PAGINATE', 5, true);			# po kolko strani grupira pri paginaciji
+define('SRV_LIST_GROUP_PAGINATE', 5);			# po kolko strani grupira pri paginaciji
-define('SRV_LIST_UPDATE_TIME_LIMIT', 900, true);	# na koliko minut updejtamo: 15min = 60s*15
+define('SRV_LIST_UPDATE_TIME_LIMIT', 900);	# na koliko minut updejtamo: 15min = 60s*15
 
 if(session_id() == '') {session_start();}
 
@@ -231,7 +231,7 @@ class SurveyList {
     * @desc prikaze zgornjo navigacijo
     */
     function display_sub_tabs () {
-    	global $lang, $global_user_id, $admin_type;
+    	global $lang, $global_user_id, $admin_type, $site_domain, $aai_instalacija;
 
 		$SLCount = $this->countSurveys();
 
@@ -239,14 +239,26 @@ class SurveyList {
 		echo '<div id="secondNavigation" class="library clr">';    	
 
     	if ($_GET['a']=='diagnostics') {
-    		if ($_GET['t'] == 'uporabniki') {
+            
-				if ($admin_type == 0) {
+            if ($_GET['t'] == 'uporabniki') {
+                
+                // Admini imajo pregled nad vsemi zavihki uporabnikov
+                if ($admin_type == 0) {
 					echo '<ul class="secondNavigation">';
 
-					#zavihek ankete - seznam vseh uporabnikov
+                    #zavihek osnovni pregled uporabnikov
 					echo '<li>';
-					echo '<a class="no-img single '.(in_array($_GET['m'], ['my', 'all']) ? 'active' : '').'"'
+					echo '<a class="no-img single '.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=uporabniki&m=my" title="'.$lang['n_users_list_all'].'">';
+						 .' href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
+					echo $lang['n_users_list'].'</a>';
+                    echo '</li>';
+                    
+                    echo '<li class="space"></li>';
+
+					#zavihek seznam vseh uporabnikov
+					echo '<li>';
+					echo '<a class="no-img single '.($_GET['m'] == 'all' ? 'active' : '').'"'
+						 .' href="index.php?a=diagnostics&t=uporabniki&m=all" title="'.$lang['n_users_list_all'].'">';
 					echo $lang['n_users_list_all'].'</a>';
 					echo '</li>';
 
@@ -286,12 +298,25 @@ class SurveyList {
 					echo $lang['srv_hierarchy_users_access'].'</a>';
 					echo '</li>';
 
+					echo '</ul>';
+                }
+                
+                // Menegerji imajo samo osnovni pregled svojih uporabnikov
+                if ($admin_type == 1) {
 
-	
+					echo '<ul class="secondNavigation">';
+
+                    #zavihek osnovni pregled uporabnikov
+					echo '<li>';
+					echo '<a class="no-img single active" href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
+					echo $lang['n_users_list'].'</a>';
+                    echo '</li>';
+                    
 					echo '</ul>';
 				}
-    			
+            } 
-    		} else {
+            else {
+
 				if ($admin_type == 0) {
 					echo '<ul class="secondNavigation">';
 					#zavihek ankete
@@ -426,7 +451,7 @@ class SurveyList {
 				echo '</li>';
 			}
 			
-			#nastavitve uporabnika
+			// nastavitve uporabnika
 			if($admin_type == 0)
 				echo '<li class="space"></li>';
 			
@@ -438,12 +463,11 @@ class SurveyList {
 			
 			echo '<li class="space"></li>';
 			
-			// Moj profil - preneseno iz sispleta (sispleta se ne bo uporabljalo vec)
+			// Moj profil
-			echo '<li>';
+            echo '<li>';
-			echo '<a class="no-img side-right'.($tab=='global_user_myProfile' ? ' active' : '').'"'
+            echo '<a class="no-img side-right' . ($tab == 'global_user_myProfile' ? ' active' : '') . '"' . ' href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
-				 .' href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="'.$lang['edit_data'].'">';
+            echo $lang['edit_data'] . '</a>';
-			echo $lang['edit_data'].'</a>';
+            echo '</li>';
-			echo '</li>';
 			
 			echo '</ul>';
 		}
@@ -701,7 +725,7 @@ class SurveyList {
 			# ni smiselno da ostali uporabniki vidijo zavihek, ker so tako prikazane samo njihove ankete
 			echo '<li class="spaceBig">&nbsp;</li>';
 			echo '<li>';
-			echo '<a  href="index.php?a=diagnostics&t=uporabniki&m=my" title="' . $lang['hour_users'] . '">';
+			echo '<a  href="index.php?a=diagnostics&t=uporabniki" title="' . $lang['hour_users'] . '">';
 			echo '<div class="smaller-singlebutton-'.$css_5.'">'. $lang['hour_users'] . '</div>';
 			echo '</a>';
 			echo '</li>';
@@ -3047,7 +3071,7 @@ class SurveyList {
 				$to_update = $meta_surveys_ids;
 
 				# poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update
-				$stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode($meta_surveys_ids,',').")"
+				$stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $meta_surveys_ids).")"
 				#. " AND (updated = '0' OR (updated = '1' AND TIME_TO_SEC(TIMEDIFF(NOW(),last_updated)) < ".SRV_LIST_UPDATE_TIME_LIMIT.")) AND ( last_updated IS NOT NULL)";
 				. " AND updated = '0' AND last_updated IS NOT NULL";
 				$sqlSurveyList = sisplet_query($stringSurveyList);
@@ -3061,7 +3085,7 @@ class SurveyList {
 				$to_update = $this->surveys_ids;
 				
 				# poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update
-				$stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode($this->surveys_ids,',').")"
+				$stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $this->surveys_ids).")"
 				#. " AND (updated = '0' OR (updated = '1' AND TIME_TO_SEC(TIMEDIFF(NOW(),last_updated)) < ".SRV_LIST_UPDATE_TIME_LIMIT.")) AND ( last_updated IS NOT NULL)";
 				. " AND updated = '0' AND last_updated IS NOT NULL";
 				$sqlSurveyList = sisplet_query($stringSurveyList);
@@ -3091,24 +3115,24 @@ class SurveyList {
 				
 				. ' FROM srv_anketa sa'
 				
-				. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_glb FROM srv_library_anketa as sla WHERE sla.uid = '0' AND sla.ank_id IN (".implode($to_update,',').") GROUP BY ank_id ) 
+				. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_glb FROM srv_library_anketa as sla WHERE sla.uid = '0' AND sla.ank_id IN (".implode(',', $to_update).") GROUP BY ank_id ) 
 						AS sla1 ON sla1.ank_id = sa.id" 
-				. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_usr FROM srv_library_anketa as sla WHERE sla.uid = '".$this->g_uid."' AND sla.ank_id IN (".implode($to_update,',').") GROUP BY ank_id ) 
+				. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_usr FROM srv_library_anketa as sla WHERE sla.uid = '".$this->g_uid."' AND sla.ank_id IN (".implode(',', $to_update).") GROUP BY ank_id ) 
 						AS sla2 ON sla2.ank_id = sa.id"
 
 				//. ' LEFT OUTER JOIN users AS us1 ON us1.id = sa.edit_uid' 
 				//. ' LEFT OUTER JOIN users AS us2 ON us2.id = sa.insert_uid' 
 				
-				. ' LEFT OUTER JOIN ( SELECT us3.ank_id, COUNT(us3.ank_id) as answers, MIN( us3.time_insert ) as vnos_time_first, MAX( us3.time_insert ) as vnos_time_last, preview FROM srv_user as us3 WHERE us3.ank_id IN ('.implode($to_update,',').') AND us3.preview = \'0\' AND us3.deleted=\'0\' GROUP BY us3.ank_id ) 
+				. ' LEFT OUTER JOIN ( SELECT us3.ank_id, COUNT(us3.ank_id) as answers, MIN( us3.time_insert ) as vnos_time_first, MAX( us3.time_insert ) as vnos_time_last, preview FROM srv_user as us3 WHERE us3.ank_id IN ('.implode(',', $to_update).') AND us3.preview = \'0\' AND us3.deleted=\'0\' GROUP BY us3.ank_id ) 
 						AS us3 ON us3.ank_id = sa.id'
 				
-				. ' LEFT OUTER JOIN ( SELECT g.ank_id, COUNT(s.gru_id) as variables FROM srv_grupa g, srv_spremenljivka s WHERE g.id = s.gru_id AND g.ank_id IN ('.implode($to_update,',').') GROUP BY g.ank_id ) 
+				. ' LEFT OUTER JOIN ( SELECT g.ank_id, COUNT(s.gru_id) as variables FROM srv_grupa g, srv_spremenljivka s WHERE g.id = s.gru_id AND g.ank_id IN ('.implode(',', $to_update).') GROUP BY g.ank_id ) 
 						AS g ON g.ank_id = sa.id'
 				//spodaj dodaj  AND us5.lurker=\'0\'
-				. ' LEFT OUTER JOIN ( SELECT us5.ank_id, COUNT(us5.ank_id) as approp, preview FROM srv_user as us5 WHERE last_status IN (' . $this->appropriateStatus . ') AND us5.ank_id IN ('.implode($to_update,',').') AND us5.preview =\'0\' AND us5.deleted=\'0\' GROUP BY us5.ank_id ) 
+				. ' LEFT OUTER JOIN ( SELECT us5.ank_id, COUNT(us5.ank_id) as approp, preview FROM srv_user as us5 WHERE last_status IN (' . $this->appropriateStatus . ') AND us5.ank_id IN ('.implode(',', $to_update).') AND us5.preview =\'0\' AND us5.deleted=\'0\' GROUP BY us5.ank_id ) 
 						AS us5 ON us5.ank_id = sa.id'
 				
-				. ' WHERE sa.id IN ('.implode($to_update,',').')';
+				. ' WHERE sa.id IN ('.implode(',', $to_update).')';
 				
 				$sqlUpdateList = sisplet_query($stringUpdateList);
 	 			if (!$sqlUpdateList) echo mysqli_error($GLOBALS['connect_db']);
@@ -3122,7 +3146,7 @@ class SurveyList {
 												FROM srv_anketa sa
 												LEFT OUTER JOIN users AS us1 ON us1.id = sa.edit_uid
 												LEFT OUTER JOIN users AS us2 ON us2.id = sa.insert_uid
-												WHERE sa.id IN (".implode($to_update,',').")");
+												WHERE sa.id IN (".implode(',', $to_update).")");
 					while($rowUsers = mysqli_fetch_array($sqlUsers)){
 						$users[$rowUsers['ank_id']] = $rowUsers;
 					}
@@ -3147,7 +3171,7 @@ class SurveyList {
 					}
 					
 					$updateString = "INSERT INTO srv_survey_list (id, lib_glb, lib_usr, answers, variables, approp, i_name, i_surname, i_email, e_name, e_surname, e_email, a_first, a_last, updated, last_updated) "
-					 ." VALUES ".implode($values,',')." ON DUPLICATE KEY UPDATE id=VALUES(id), lib_glb=VALUES(lib_glb), lib_usr=VALUES(lib_usr), answers=VALUES(answers), variables=VALUES(variables), approp=VALUES(approp), i_name=VALUES(i_name), i_surname=VALUES(i_surname), i_email=VALUES(i_email), e_name=VALUES(e_name), e_surname=VALUES(e_surname), e_email=VALUES(e_email), a_first=VALUES(a_first), a_last=VALUES(a_last), updated='0', last_updated=NOW()";
+					 ." VALUES ".implode(',', $values)." ON DUPLICATE KEY UPDATE id=VALUES(id), lib_glb=VALUES(lib_glb), lib_usr=VALUES(lib_usr), answers=VALUES(answers), variables=VALUES(variables), approp=VALUES(approp), i_name=VALUES(i_name), i_surname=VALUES(i_surname), i_email=VALUES(i_email), e_name=VALUES(e_name), e_surname=VALUES(e_surname), e_email=VALUES(e_email), a_first=VALUES(a_first), a_last=VALUES(a_last), updated='0', last_updated=NOW()";
 					 
 					 sisplet_query($updateString);
 	
@@ -3193,7 +3217,7 @@ class SurveyList {
 		}
 		
 		$sqlSurveyList = sisplet_query($stringSurveyList);
-		list($count) = mysqli_fetch_row($sqlSurveyList);
+		[$count] = mysqli_fetch_row($sqlSurveyList);
 		
 		return (int)$count;
 	}

admin/survey/classes/class.SurveyParaGraph.php

@@ -208,7 +208,7 @@ class SurveyParaGraph{
 		SurveySetting::getInstance()->Init($this->anketa);
 		
 		// Preberemo tabelo s podatki za izbrane filtre (ce ze obstaja)
-		$filterString = implode($this->paraGraph_filter, '_');
+		$filterString = implode('_', $this->paraGraph_filter);
 		$paraData = unserialize(SurveySetting::getInstance()->getSurveyMiscSetting('para_graph_data_'.$filterString));
 		
 		// Pogledamo kdaj je bila kreirana datoteka (ce imamo nove podatke)

admin/survey/classes/class.SurveyStatistic.php

@@ -548,12 +548,6 @@ class SurveyStatistic {
 			}
 		}
 
-        /*$qry = sisplet_query("SELECT id, last_status, lurker, testdata, inv_res_id, referer, language 
-                                FROM srv_user 
-                                WHERE ank_id = '".$this->getSurveyId()."' AND preview = '0' AND deleted='0' 
-                                    AND ( (time_insert BETWEEN '".$this->startDate."' AND '".$this->endDate."' + INTERVAL 1 DAY) OR (last_status IN (".implode($this->emailStatus,',').") ) )"
-                                    .$email_filter_string
-                            );*/
         // Tukaj ne vem zakaj filtriramo po datumu? Itak rabimo vse
 		$qry = sisplet_query("SELECT id, last_status, lurker, testdata, inv_res_id, referer, language 
                                 FROM srv_user 
@@ -647,7 +641,7 @@ class SurveyStatistic {
 		# od direktnega klika odštejemo e-mail vabila
 	 	if (count($user_id_to_check_link)> 0) {
 
-	 		$qryEmail = sisplet_query("SELECT COUNT(*) as cnt FROM srv_userstatus  WHERE usr_id IN (".implode($user_id_to_check_link,',').") AND status IN (".implode($this->emailStatus,',').")");
+	 		$qryEmail = sisplet_query("SELECT COUNT(*) as cnt FROM srv_userstatus  WHERE usr_id IN (".implode(',', $user_id_to_check_link).") AND status IN (".implode(',', $this->emailStatus).")");
              $rwsEmail = mysqli_fetch_assoc($qryEmail);
              
 	 		$this->userRedirections["email"] = (int)$rwsEmail['cnt'];

admin/survey/classes/class.SurveyStatusProfiles.php

@@ -6,7 +6,7 @@
  */
 
 session_start();
-DEFINE (STR_DLMT, "|", true);
+DEFINE (STR_DLMT, "|");
 
 class SurveyStatusProfiles
 {

admin/survey/classes/class.SurveyTelephone.php

@@ -5,9 +5,9 @@
  *
  * @author Gorazd_Veselic
  */
-define('GROUP_PAGINATE', 4, true);			# po kolko strani grupira pri paginaciji
+define('GROUP_PAGINATE', 4);			# po kolko strani grupira pri paginaciji
-define('REC_ON_PAGE', 50, true);			# kolko zapisov na stran pri urejanju respondentov
+define('REC_ON_PAGE', 50);			# kolko zapisov na stran pri urejanju respondentov
-define('REC_ON_SEND_PAGE', 20, true);		# kolko zapisov na stran pri pošiljanju
+define('REC_ON_SEND_PAGE', 20);		# kolko zapisov na stran pri pošiljanju
 set_time_limit(2400); # 30 minut
 
 
@@ -698,7 +698,7 @@ class SurveyTelephone {
 		$onlyThisSurvey = (isset($_SESSION['inv_rec_only_this_survey']) && $_SESSION['inv_rec_only_this_survey'] == false) ? 0 : 1;
 		if ($onlyThisSurvey == 0) {
 			#id-ji profilov do katerih lahko dostopamo
-			$sql_string = "SELECT name, pid FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."') OR pid IN (SELECT DISTINCT pid FROM srv_invitations_recipients_profiles_access where uid = '$global_user_id')";
+			$sql_string = "SELECT name, pid FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."') OR pid IN (SELECT DISTINCT pid FROM srv_invitations_recipients_profiles_access where uid = '$global_user_id')";
 			$sql_query = sisplet_query($sql_string);
 		} else {
 			# 1
@@ -2865,7 +2865,7 @@ class SurveyTelephone {
 		$array_profiles = array();
 			
 		# polovimo še ostale porfile
-		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."') AND from_survey = '".$this->sid. "'";
+		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."') AND from_survey = '".$this->sid. "'";
 		$sql_query = sisplet_query($sql_string);
 		while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 			$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name'], 'comment'=>$sql_row['comment']);
@@ -3415,7 +3415,7 @@ class SurveyTelephone {
 			$res_row = mysqli_fetch_assoc($res_query);
 			
 			#preverimo ali že obstaja povezava med respondentom in userjem
-			$chk_user = "SELECT id, pass FROM srv_user WHERE inv_res_id='$usr_id'";
+			$chk_user = "SELECT id, pass FROM srv_user WHERE inv_res_id='$usr_id' AND ank_id='".$this->sid."'";
 			$chk_query = sisplet_query($chk_user);
 			$return['msg'] = $chk_user;
 			if (mysqli_num_rows($chk_query) > 0) {
@@ -3423,7 +3423,7 @@ class SurveyTelephone {
 				$user_data = mysqli_fetch_assoc($chk_query);
 				
 				# sestavimo še url za odpiranje izpolnjevanja ankete
-				$return['surveyUrl'] = $site_url.'a/'.Common::encryptAnketaID($this->sid).'&survey-'.$this->sid.'&code='.$user_data[pass];
+				$return['surveyUrl'] = $site_url.'a/'.Common::encryptAnketaID($this->sid).'&survey-'.$this->sid.'&code='.$user_data['pass'];
 				$return['error'] = '';
 			} 
 			else {

admin/survey/classes/class.SurveyVariablesProfiles.php

@@ -11,7 +11,7 @@
  *
  */
 DEFINE ('SVP_DEFAULT_PROFILE', 0);
-DEFINE (NEW_LINE, "\n", true);
+DEFINE (NEW_LINE, "\n");
 
 class SurveyVariablesProfiles
 {

admin/survey/classes/class.SurveyZankaProfiles.php

@@ -19,7 +19,7 @@
  */
 session_start();
 
-define('SZP_DEFAULT_PROFILE', 0, true);
+define('SZP_DEFAULT_PROFILE', 0);
 
 class SurveyZankaProfiles {
 

admin/survey/classes/class.Vprasanje.php

@@ -3380,11 +3380,7 @@ class Vprasanje {
             echo '<option value="9"' . ($row['orientation'] == 9 ? ' selected="true"' : '') . '>'.$lang['srv_custom-picture_radio'].'</option>';	// Custom picture za radio tip
 			echo '<option value="10"' . ($row['orientation'] == 10 ? ' selected="true"' : '') . '>'.$lang['srv_hot_spot'].'</option>';	//image hotspot
             echo '<option value="11"' . ($row['orientation'] == 11 ? ' selected="true"' : '') . '>'.$lang['srv_visual_analog_scale'].'</option>';	//vizualna analaogna skala - smeški
-			if ($admin_type == 0){
+            echo '<option value="5"' . ($row['hidden_default'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_potrditev'].'</option>';
-				//echo '<option value="8"' . ($row['orientation'] == 8 ? ' selected="true"' : '') . '>'.$lang['srv_drag_drop'].'</option>';
-				echo '<option value="5"' . ($row['hidden_default'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_potrditev'].'</option>';
-				//echo '<option value="10"' . ($row['orientation'] == 10 ? ' selected="true"' : '') . '>'.$lang['srv_hot_spot'].'</option>';	//image hotspot
-			}
 		echo '</select></span>';
 		echo '</p>';
 	}
@@ -4893,6 +4889,14 @@ class Vprasanje {
 	function set_GDPR () {
 		global $lang;
 		
+        $lang_admin = SurveyInfo::getInstance()->getSurveyColumn('lang_admin');
+        $lang_resp  = SurveyInfo::getInstance()->getSurveyColumn('lang_resp');
+        
+        // nastavimo na jezik za respondentov vmesnik
+        $file = '../../lang/'.$lang_resp.'.php';
+        include($file);
+        
+
 		$user_settings = GDPR::getSurveySettings($this->anketa);
 		
 		// GDPR je radio (da / ne) tip vprasanja z predefiniranim textom
@@ -4910,6 +4914,11 @@ class Vprasanje {
 		
 		// Popravimo, da ima anketa vklopljen gdpr
 		sisplet_query("INSERT INTO srv_gdpr_anketa (ank_id) VALUES ('".$this->anketa."')");
+
+
+        // nastavimo nazaj na admin jezik
+        $file = '../../lang/'.$lang_admin.'.php';
+        include($file);
 	}
 	
 	/**
@@ -7407,7 +7416,7 @@ class Vprasanje {
         echo '<p>';
 		echo '<span class="title">'.$lang['srv_gridmultiple_width'].': </span>';
 		echo '<span class="content"><select name="gridmultiple_width" id="gridmultiple_width">';
-		echo '<option value="0"'.($grid_width==0?' selected':'').'>Privzeto</option>';
+		echo '<option value="0"'.($grid_width==0?' selected':'').'>'.$lang['default'].'</option>';
 		echo '<option value="10"'.($grid_width==10?' selected':'').'>10%</option>';
 		echo '<option value="20"'.($grid_width==20?' selected':'').'>20%</option>';
 		echo '<option value="30"'.($grid_width==30?' selected':'').'>30%</option>';

admin/survey/classes/objects/obj.MailAdapter.php

@@ -537,7 +537,7 @@ class MailAdapter{
         $this->phpMailerClass->Subject = $email_subject;
        
         // Vsebina maila
-        $this->phpMailerClass->msgHTML($email_msg);
+        $this->prepareEmailDesign($email_msg);
 
 
         // Loop cez prejemnike in posiljanje
@@ -664,7 +664,7 @@ class MailAdapter{
         $this->phpMailerClass->Subject = $email_subject;
        
         // Vsebina maila
-        $this->phpMailerClass->msgHTML($email_msg);
+        $this->prepareEmailDesign($email_msg);
 
 
         // Loop cez prejemnike in posiljanje
@@ -707,6 +707,168 @@ class MailAdapter{
         }
     }
 
+    // Pripravimo design emaila
+    private function prepareEmailDesign($content, $heading='', $image='', $button=''){
+        global $lang, $app_settings, $site_domain;
+
+        // V nekaterih primerih ne designeramo maila
+        if(!in_array($this->type, array('account', 'payments')) || !in_array($site_domain, array('localhost', 'www.1ka.si', 'test.1ka.si', 'test2.1ka.si'))){
+            $this->phpMailerClass->msgHTML($content);
+            return;
+        }
+
+        // Najprej pocistimo signature
+        $signature = Common::getEmailSignature();
+        $content = str_replace($signature, "", $content);
+
+        // Logo
+        $logo_src = ($lang['id'] == '1') ? 'https://www.1ka.si/public/img/logo/1ka_slo.png' : 'https://www.1ka.si/public/img/logo/1ka_eng.png';
+
+        // Naslov
+        //$heading = 'Naslovček';
+        $heading_html = ($heading != '') ? '<tr><td style="color: #153643; font-family: Montserrat,sans-serif;"><h1 style="font-size: 24px; margin: 0;">'.$heading.'</h1></td></tr>' : '';
+
+        // Vsebina
+        $text = $content;
+        $text_html = ($text != '') ? '<tr><td style="color: #153643; font-family: Montserrat,sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 30px 0;"><p style="margin: 0;">'.$text.'</p></td></tr>' : '';
+
+        // Slika
+        //$image = '<img src="https://www.go-tel.si/upload/relevantna-slika.png" style="display: block;" />';
+        $image_html = ($image != '') ? '<tr><td align="center"><img src="'.$image.'" style="display: block;" /></td></tr>' : '';
+        
+        // Gumb
+        //$button = array('url'=>'https://1ka.si', 'text'=>'Gumbek');
+        $button_html = ($button != '') ? '<tr><td align="center"><a href="'.$button['url'].'" style="text-decoration:none"><p style="font-family: Montserrat,sans-serif; font-size: 18px; padding: 20px 0 20px 0;text-align:center;background-color:#1e88e5;color:white;">'.$button['text'].'</p></a></td></tr>' : '';
+        
+        
+        $designed_content = '
+            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+            <html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB">
+            
+                <head>
+                    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                    <title>1ka sporočilo</title>
+                    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+                    
+                    <style type="text/css">
+                        a[x-apple-data-detectors] {color: inherit !important;}
+
+                        a{
+                            color:#1e88e5;
+                            text-decoration:none;
+                            transition:0.2s;
+                        }
+                        a:hover{
+                            color: #4ca0ea;
+                        }
+
+                        @media only screen and (max-width: 600px){
+                            table.white_holder{
+                                border-collapse:collapse;
+                                width:100%;
+                            }
+                            .content img{
+                                width:100%;
+                            }
+                        }
+                    </style> 
+                </head>
+
+                <body style="margin: 0; padding: 0;">
+                <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color:#1e88e5;" bgcolor="#1e88e5"><tr><td>
+                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr>
+                        <td style="padding: 30px 15px 30px 15px;">
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" width="570" class="white_holder">
+                            <tr>
+                                <td align="center" bgcolor="white" style="padding: 30px 0 30px 0;">
+                                <img src="'.$logo_src.'" alt="header" width="100" style="display: block;" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td bgcolor="#ffffff" style="padding: 20px 30px 40px 30px;">
+                                <table border="0" cellpadding="0" cellspacing="0" width="100%" class="content">
+                                    
+                                    <!-- NASLOV -->
+                                    '.$heading_html.'
+
+                                    <!-- SLIKA -->
+                                    '.$image_html.'
+
+                                    <!-- VSEBINA -->
+                                    '.$text_html.'
+                                    
+                                    <!-- GUMB -->
+                                    '.$button_html.'
+                                    
+                                    <!-- PODPIS -->
+                                    <tr>
+                                        <td style="color: #153643; font-family: Montserrat,sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
+                                            <p style="margin: 0;">'.$lang['srv_1ka_mail_signature_bye'].'</p>
+                                        </td>
+                                    </tr>
+                                    
+                                </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td bgcolor="#f7f7f7" style="padding: 30px 30px;color:#ababab;">
+                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+                                    <tr>
+                                    <td style="color: #828282; font-family: Montserrat,sans-serif; font-size: 13px; line-height: 24px;">
+                                        <p style="margin: 0 0 25px 0;">'.$lang['email_template_footer'].'</p>
+                                    </td>
+                                    </tr>
+                                    <tr>
+                                    <td align="center">
+                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: collapse;">
+                                        <tr>
+                                            <td style="width:40px;" width="40">
+                                            <a href="https://www.facebook.com/1KAenklikanketa/" target="_blank">
+                                                <img src="https://www.1ka.si/public/img/social/fb_blue.svg" alt="Facebook" height="35" style="display: block;" border="0" />
+                                            </a>
+                                            </td>
+                                            <td style="background-color:#f7f7f7;width:20px;" width="20">&nbsp;</td>
+                                            <td style="width:40px;" width="40">
+                                            <a href="https://www.youtube.com/channel/UCWhsQe9qIjGpbD0-TCdPg7Q" target="_blank">
+                                                <img src="https://www.go-tel.si/upload/yt-logo.png" alt="Youtube" height="35" style="display: block;" border="0" />
+                                            </a>
+                                            </td>
+                                            <td style="background-color:#f7f7f7;width:20px;" width="20" >&nbsp;</td>
+                                            <td style="width:40px;" width="40">
+                                            <a href="https://twitter.com/enklikanketa" target="_blank">
+                                                <img src="https://www.1ka.si/public/img/social/twitter_blue.svg" alt="Twitter" height="35" style="display: block;" border="0" />
+                                            </a>
+                                            </td>
+                                        </tr>
+                                        </table>
+                                    </td>
+                                    </tr>
+                                </table>
+                                </td>
+                            </tr>
+                            </table> <!-- &reg; 1KA -->
+                            <p style="color: #efefef; font-family: Montserrat,sans-serif; font-size: 12px; line-height: 24px; padding: 5px 0 30px 0;text-align:center">
+                                '.$lang['email_template_footer2_recipient'].' <a href="mailto:'.$this->recipients[0].'" style="color: #efefef;">'.$this->recipients[0].'</a>.
+                                <br>
+                                '.$lang['email_template_footer2_unsubscribe'].'
+                            </p>
+                        </td>
+                        </tr>
+                    </table>
+                </td></tr></table>
+                </body>
+
+            </html>
+        ';
+
+        
+        /*echo $designed_content;
+        die();*/
+
+        $this->phpMailerClass->msgHTML($designed_content);
+    }
+
     
 
     // Preveri ce je mail veljaven

admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php

@@ -9,8 +9,8 @@
  * " -> \x22
  */
 
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
-#define(EXPORT_FOLDER, "tmp", true);
+
 define('DATE_FORMAT', 'Y-m-d');
 define("ALLOW_HIDE_ZERRO_REGULAR", false);				# omogočimo delovanje prikazovanja/skrivanja ničelnih vrednosti za navadne odgovore
 define("ALLOW_HIDE_ZERRO_MISSING", true);				# omogočimo delovanje prikazovanja/skrivanja ničelnih vrednosti za missinge
@@ -18,15 +18,15 @@ define("AUTO_HIDE_ZERRO_VALUE", 20);						# nad koliko kategorij skrivamo ničel
 
 
 # mejne vrednosti za barvanje residualov
-define("RESIDUAL_COLOR_LIMIT1", 1.00, true);
+define("RESIDUAL_COLOR_LIMIT1", 1.00);
-define("RESIDUAL_COLOR_LIMIT2", 2.00, true);
+define("RESIDUAL_COLOR_LIMIT2", 2.00);
-define("RESIDUAL_COLOR_LIMIT3", 3.00, true);
+define("RESIDUAL_COLOR_LIMIT3", 3.00);
 
 
-DEFINE (STR_DLMT, '|', true);
+DEFINE (STR_DLMT, '|');
-DEFINE (NEW_LINE, "\n", true);
+DEFINE (NEW_LINE, "\n");
-DEFINE (TMP_EXT, '.tmp', true);
+DEFINE (TMP_EXT, '.tmp');
-DEFINE (DAT_EXT, '.dat', true);
+DEFINE (DAT_EXT, '.dat');
 
 class SurveyAnalysis {
 	
@@ -1387,11 +1387,7 @@ class SurveyAnalysis {
 						break;
 					case 27:
 						# heatmap
-						//echo '<script>console.log('.$spremenljivka['tip'].') </script>';
-						//self::sumMultiText($spid,'sums',true, true);
 						self::sumMultiTextHeatMap($spid,'sums',true, true);
-						//self::sumVerticalCheckbox($spid,'sums');
-						//self::sumHorizontal($spid,'sums*');
 						
 						break;
 					case 5:
@@ -1517,9 +1513,7 @@ class SurveyAnalysis {
 						break;
 					case 27:
 						# heatmap
-						//self::sumMultiText($spid,'sums',true, true);
 						self::sumMultiTextHeatMap($spid,'sums',true, true);
-						//self::sumHorizontal($spid,'sums*');
 						break;
 					case 5:
 						# nagovor

admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php

@@ -21,8 +21,8 @@
 */
 
 
-define("SAA_FOLDER", "AnalysisArchive", true);
+define("SAA_FOLDER", "AnalysisArchive");
-define("DEFAULT_DURATION", " +3 month", true); // privzet čas trajanja athiva
+define("DEFAULT_DURATION", " +3 month"); // privzet čas trajanja athiva
 
 class SurveyAnalysisArchive {
 	

admin/survey/classes/surveyAnalysis/class.SurveyBreak.php

@@ -8,8 +8,8 @@
  *
  */
 
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
-define("BREAK_OPTION_LIMIT", 15, true);
+define("BREAK_OPTION_LIMIT", 15);
 
 class SurveyBreak
 {

admin/survey/classes/surveyAnalysis/class.SurveyChart.php

@@ -4,7 +4,7 @@
 * @date		Februar 2011
 */
 
-define("SAA_FOLDER", "AnalysisArchive", true);
+define("SAA_FOLDER", "AnalysisArchive");
 	
 class SurveyChart {
 	
@@ -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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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);   			
+			$Cache->WriteToCache($ID,$DataSet->GetData(),$Test);   			 
-			
-			//$Test->Render(dirname(__FILE__).'/../pChart/Cache/'.$ID.'.png');  
 		}
 		
 		// dobimo ime slike c cache-u
@@ -1482,7 +1474,7 @@ class SurveyChart {
 		echo '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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 '<div id="'.$spid.'_loop_'.self::$current_loop.'"></div>';
 		
 		// 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';

admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php

@@ -5,11 +5,11 @@
  *
  */
 
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
 # mejne vrednosti za barvanje residualov
-define("RESIDUAL_COLOR_LIMIT1", 1.00, true);
+define("RESIDUAL_COLOR_LIMIT1", 1.00);
-define("RESIDUAL_COLOR_LIMIT2", 2.00, true);
+define("RESIDUAL_COLOR_LIMIT2", 2.00);
-define("RESIDUAL_COLOR_LIMIT3", 3.00, true);
+define("RESIDUAL_COLOR_LIMIT3", 3.00);
 define("AUTO_HIDE_ZERRO_VALUE", 20);					# nad koliko kategorij skrivamo ničelne vrednosti
 
 @session_start();

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 '<div style="margin-top:-2.5em;">';

admin/survey/classes/surveyAnalysis/class.SurveyMeans.php

@@ -8,7 +8,7 @@
  *
  */
 
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
 
 class SurveyMeans{
     

admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php

@@ -1,8 +1,8 @@
 <?php
 
 define("AUTO_HIDE_ZERRO_VALUE", 20);					# nad koliko kategorij skrivamo ničelne vrednosti
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
-define("R_FOLDER", "admin/survey/R", true);
+define("R_FOLDER", "admin/survey/R");
 
 class SurveyMultiCrosstabs {
 

admin/survey/classes/surveyAnalysis/class.SurveyTTest.php

@@ -8,9 +8,9 @@
  *
  */
 
-define("EXPORT_FOLDER", "admin/survey/SurveyData", true);
+define("EXPORT_FOLDER", "admin/survey/SurveyData");
-define("BC_PRECISION", 20, true);
+define("BC_PRECISION", 20);
-define("R_FOLDER", "admin/survey/R", true);
+define("R_FOLDER", "admin/survey/R");
 
 class SurveyTTest
 {

admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php

@@ -4,7 +4,7 @@
 * @date		April 2012
 */
 
-define("SAA_FOLDER", "AnalysisArchive", true);
+define("SAA_FOLDER", "AnalysisArchive");
 	
 class SurveyTableChart {
 	
@@ -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);		

admin/survey/classes/surveyData/class.SurveyDataDisplay.php

@@ -12,28 +12,28 @@
 
 #KONSTANTE
 // spremenljivke, ki se podajajo preko GETa
-define('VAR_REC_ON_PAGE', 'rec_on_page', true);
+define('VAR_REC_ON_PAGE', 'rec_on_page');
-define('VAR_SPR_LIMIT', 'spr_limit', true);
+define('VAR_SPR_LIMIT', 'spr_limit');
-define('VAR_CUR_REC_PAGE', 'cur_rec_page', true);
+define('VAR_CUR_REC_PAGE', 'cur_rec_page');
-define('VAR_SPR_PAGE', 'spr_page', true);
+define('VAR_SPR_PAGE', 'spr_page');
-define('VAR_ORDER', 'order', true);
+define('VAR_ORDER', 'order');
-define('VAR_EDIT', 'edit', true);
+define('VAR_EDIT', 'edit');
-define('VAR_PRINT', 'print', true);
+define('VAR_PRINT', 'print');
-define('VAR_MONITORING', 'monitoring', true);
+define('VAR_MONITORING', 'monitoring');
-define('VAR_CODING', 'coding', true);
+define('VAR_CODING', 'coding');
-define('VAR_DATA', 'view_data', true);
+define('VAR_DATA', 'view_data');
-define('VAR_META', 'view_meta', true);
+define('VAR_META', 'view_meta');
-define('VAR_CIRCLES', 'view_circles', true);
+define('VAR_CIRCLES', 'view_circles');
-define('VAR_METAFULL', 'view_fullmeta', true);
+define('VAR_METAFULL', 'view_fullmeta');
-define('VAR_SHOW_SYSTEM', 'view_system', true);
+define('VAR_SHOW_SYSTEM', 'view_system');
-define('VAR_SORT_SEQ', 'sort_seq', true);
+define('VAR_SORT_SEQ', 'sort_seq');
-define('VAR_SORT_TYPE', 'sort_type', true);
+define('VAR_SORT_TYPE', 'sort_type');
-define('VAR_PDF_TYPE', 'type', true);
+define('VAR_PDF_TYPE', 'type');
-define('VAR_RELEVANCE', 'view_relevance', true);
+define('VAR_RELEVANCE', 'view_relevance');
 define('VAR_SHOW_DATE', 'view_date', false);
 define('VAR_SHOW_NO', 'view_no', false);
-define('VAR_EMAIL', 'email', true);
+define('VAR_EMAIL', 'email');
-define('SRV_LIST_GROUP_PAGINATE', 4, true);			# po kolko strani grupira pri paginaciji
+define('SRV_LIST_GROUP_PAGINATE', 4);			# po kolko strani grupira pri paginaciji
 
 global $site_path;
 

admin/survey/classes/surveyData/class.SurveyDataFile.php

@@ -32,9 +32,9 @@ class SurveyDataFile {
     private $HEADER = NULL;
     
 
-    public static function get_instance() {
+    public static function get_instance($force_new=false) {
 
-    	if(!is_object(self::$instance)) {
+    	if(!is_object(self::$instance) || $force_new) {
 			self::$instance = new SurveyDataFile();
         }
         

admin/survey/classes/surveyEmails/class.SurveyAlert.php

@@ -198,10 +198,12 @@ class SurveyAlert
 		    $MailFrom = Common::getInstance()->getFromEmail();
 		    $MailReply = Common::getInstance()->getReplyToEmail();
 			if ($emails != "" && $text != "" && $subject != "" && self::$data['alert_date'] != "") {
-				// izberemo bazo srvcrontab
+                
+                // izberemo bazo srvcrontab
 				$db = mysqli_select_db($GLOBALS['connect_db'],'surveycrontab');
-					//or die($lang['srv_alert_database_error']);
+				//or die($lang['srv_alert_database_error']);
-				if ($db) {
+                
+                if ($db) {
 					# najprej pobrišemo stare vrendosti, ker se alerti niso spremenili ob trajni anketi
 					$del = sisplet_query("DELETE FROM srv_alert WHERE sid='".self::getSurveyId()."'");
 					// najprej preverimo ali imamo za obstojeco anketo se kaj v crontabu (status = 0) in popravimo na status = 2 (spremenjen)
@@ -215,24 +217,26 @@ class SurveyAlert
 						$sqlInsertString = "INSERT INTO srv_alert (dbname, sid, emails, text, subject, send_date, status, MailFrom, MailReply) " .
 								"VALUES ('".$oldDb."', '".self::getSurveyId()."', '".$emails."', '".$text."', '".$subject."', '".self::$data['alert_date']."', 0, '".$MailFrom."', '".$MailReply."')";
 						$sqlInsert = sisplet_query($sqlInsertString);
-							
-						// uporabimo spet staro bazo
-						mysqli_select_db($GLOBALS['connect_db'],$oldDb);
 					}
-				}
+                }
+                
+                // uporabimo spet staro bazo
+				mysqli_select_db($GLOBALS['connect_db'],$oldDb);
 			} 
 			
 				
 		} else {
 			# ankata je deaktivirana, vse alerte ki so še aktivni spremenimo v status 3
 			$db = mysqli_select_db($GLOBALS['connect_db'],'surveycrontab');
-			if ($db) {
+            
+            if ($db) {
 				//	or die($lang['srv_alert_database_error']);
 				# nastavimo status na 3 - sprememba aktivnosti ankete
 				$sqlUpdateOld = sisplet_query("UPDATE srv_alert SET status = 3 WHERE dbname = '".$oldDb."' AND sid = '".self::getSurveyId()."' AND status = 0");
-				// uporabimo spet staro bazo
+            }
-				mysqli_select_db($GLOBALS['connect_db'],$oldDb);
+            
-			}
+            // uporabimo spet staro bazo
+			mysqli_select_db($GLOBALS['connect_db'],$oldDb);
 		}
 		sisplet_query("COMMIT");
 	}

admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php

@@ -9,10 +9,10 @@
  *
  */
 
-define('GROUP_PAGINATE', 4, true);			# po kolko strani grupira pri paginaciji
+define('GROUP_PAGINATE', 4);			# po kolko strani grupira pri paginaciji
-define('REC_ON_PAGE', 10, true);			# kolko zapisov na stran pri urejanju respondentov
+define('REC_ON_PAGE', 10);			# kolko zapisov na stran pri urejanju respondentov
-define('REC_ON_SEND_PAGE', 20, true);		# kolko zapisov na stran pri pošiljanju
+define('REC_ON_SEND_PAGE', 20);		# kolko zapisov na stran pri pošiljanju
-define('NOTIFY_INFO1KA', 5, true);			# Nad koliko emaili obveščamo info@1ka.si
+define('NOTIFY_INFO1KA', 5);			# Nad koliko emaili obveščamo info@1ka.si
 set_time_limit(2400); # 30 minut
 
 class SurveyInvitationsNew {
@@ -315,6 +315,8 @@ class SurveyInvitationsNew {
 			$this->setNoEmailing();
 		} else if ($action == 'set_noEmailing_type') {
 			$this->setNoEmailingType();
+		} else if ($action == 'showAAISmtpPopup') {
+			$this->showAAISmtpPopup();
 		} else {			
 			$sql = sisplet_query("SELECT EXISTS (SELECT 1 FROM srv_invitations_archive WHERE ank_id='".$this->sid."')");
 			$row = mysqli_fetch_array($sql);
@@ -3287,7 +3289,7 @@ class SurveyInvitationsNew {
 
 				# polovimo sezname
 				$lists = array();
-				$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')";
+				$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')";
 				$sql_query = sisplet_query($sql_string);
 				while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 					$lists[$sql_row['pid']] = $sql_row['name'];
@@ -3440,7 +3442,7 @@ class SurveyInvitationsNew {
 
 				# polovimo sezname
 				$lists = array();
-				$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')";
+				$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')";
 				$sql_query = sisplet_query($sql_string);
 				while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 					$lists[$sql_row['pid']] = $sql_row['name'];
@@ -4532,7 +4534,7 @@ class SurveyInvitationsNew {
 		echo '<div id="inv_view_arch_recipients">';
 		# polovimo sezname
 		$lists = array();
-		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')";
+		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')";
 		$sql_query = sisplet_query($sql_string);
 		while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 			$lists[$sql_row['pid']] = $sql_row['name'];
@@ -4877,34 +4879,12 @@ class SurveyInvitationsNew {
 			$array_profiles[-1] = array('name' => $_SESSION['inv_rec_profile'][$this->sid]['name']);
 		}
 		$array_profiles[0] = array('name' => $lang['srv_temp_profile_author']);
-		/*	
-			$_only_this_survey = (isset($_SESSION['inv_rec_only_this_survey']) && $_SESSION['inv_rec_only_this_survey'] == false) ? '' : " AND from_survey = '".$this->sid. "'" ;
-	
-		$ppid = isset($_POST['pid']) ? (int)$_POST['pid'] : -1;
-
-		#id-ji profilov do katerih lahko dostopamo
-		$accPid = '';
-		$accStr = "SELECT DISTINCT pid FROM srv_invitations_recipients_profiles_access where uid = '$global_user_id'";
-		$accQry = sisplet_query($accStr);
-		while (list($pid) = mysqli_fetch_row($accQry)) {
-			$accPid .= $prefix."'".$pid."'";
-			$prefix = ',';
-		}
-		if ($accPid != '') {
-			$accPid = ' OR pid IN ('.$accPid.')';
-		}
-		# polovimo še ostale porfile
-		$sql_string = "SELECT pid, name FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')".$accPid.$_only_this_survey;
-		$sql_query = sisplet_query($sql_string);
-		while ($sql_row = mysqli_fetch_assoc($sql_query)) {
-			$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name']);
-		}
 		
-		*/
+
 		$onlyThisSurvey = (isset($_SESSION['inv_rec_only_this_survey']) && (int)$_SESSION['inv_rec_only_this_survey'] == 1) ? false : true;
 		if ($onlyThisSurvey == 0) {
 			#id-ji profilov do katerih lahko dostopamo
-			$sql_string = "SELECT * FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."') OR pid IN (SELECT DISTINCT pid FROM srv_invitations_recipients_profiles_access where uid = '$global_user_id')";
+			$sql_string = "SELECT * FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."') OR pid IN (SELECT DISTINCT pid FROM srv_invitations_recipients_profiles_access where uid = '$global_user_id')";
 			$sql_query = sisplet_query($sql_string);
 		} else {
 			# 1
@@ -5148,12 +5128,12 @@ class SurveyInvitationsNew {
 		else {
 			# dodajamo v obstoječ profil
 			# polovimo podatke obstoječega profila
-			$sql_string = "SELECT * FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."') AND pid = '".$profile_id."'";
+			$sql_string = "SELECT * FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."') AND pid = '".$profile_id."'";
 			$sql_query = sisplet_query($sql_string);
 			$sql_row = mysqli_fetch_assoc($sql_query);
 			$respondents = $sql_row['respondents']."\n".$recipients_list;
 				
-			$sql_string_update = "UPDATE srv_invitations_recipients_profiles SET respondents = '".$respondents."', comment='".$profile_comment."' WHERE uid in('0', '".$global_user_id."') AND pid = '".$profile_id."'";
+			$sql_string_update = "UPDATE srv_invitations_recipients_profiles SET respondents = '".$respondents."', comment='".$profile_comment."' WHERE uid in('".$global_user_id."') AND pid = '".$profile_id."'";
 			$sqlQuery = sisplet_query($sql_string_update);
 			sisplet_query("COMMIT");
 			if (!$sqlQuery) {
@@ -6612,7 +6592,7 @@ class SurveyInvitationsNew {
 	
 		# polovimo sezname
 		$lists = array();
-		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')";
+		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')";
 		$sql_query = sisplet_query($sql_string);
 		while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 			$lists[$sql_row['pid']] = $sql_row['name'];
@@ -7957,7 +7937,7 @@ class SurveyInvitationsNew {
 			}
 
 			# polovimo še ostale porfile
-			$sql_string = "SELECT rp.*,DATE_FORMAT(rp.insert_time,'%d.%m.%Y, %T') AS ds, u.name as firstname, u.surname, u.email FROM srv_invitations_recipients_profiles AS rp LEFT JOIN users AS u ON rp.uid = u.id WHERE rp.uid in('0', '".$global_user_id."')".($accPid != '' ? ' OR pid IN ('.$accPid.')':'');
+			$sql_string = "SELECT rp.*,DATE_FORMAT(rp.insert_time,'%d.%m.%Y, %T') AS ds, u.name as firstname, u.surname, u.email FROM srv_invitations_recipients_profiles AS rp LEFT JOIN users AS u ON rp.uid = u.id WHERE rp.uid in('".$global_user_id."')".($accPid != '' ? ' OR pid IN ('.$accPid.')':'');
 
 			$sql_query = sisplet_query($sql_string);
 		} else if ($onlyThisSurvey == 2) {
@@ -8466,7 +8446,7 @@ class SurveyInvitationsNew {
 		session_start();
 			
 		# polovimo še ostale porfile
-		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')";
+		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')";
 		$sql_query = sisplet_query($sql_string);
 		while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 			$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name'], 'comment'=>$sql_row['comment']);
@@ -8539,7 +8519,7 @@ class SurveyInvitationsNew {
 		$rec_profile_comment = $_POST['rec_profile_comment'];
 
 		# dodajamo v obstoječ profil
-		$sql_string_update = "UPDATE srv_invitations_recipients_profiles SET name='$rec_profile_name', comment='$rec_profile_comment', respondents = '$recipients_list', fields='$field_list' WHERE uid in('0', '$global_user_id') AND pid = '$profile_id'";
+		$sql_string_update = "UPDATE srv_invitations_recipients_profiles SET name='$rec_profile_name', comment='$rec_profile_comment', respondents = '$recipients_list', fields='$field_list' WHERE uid in('$global_user_id') AND pid = '$profile_id'";
 		$sqlQuery = sisplet_query($sql_string_update);
 		sisplet_query("COMMIT");
 		$this->removeDuplicates($profile_id);
@@ -8589,7 +8569,7 @@ class SurveyInvitationsNew {
 			sisplet_query("COMMIT");
 		} else {
 			# dodajamo v obstoječ profil
-			$sql_string_update = "UPDATE srv_invitations_recipients_profiles SET name='$profile_name', respondents = '$recipients_list', comment='$profile_comment' WHERE uid in('0', '$global_user_id') AND pid = '$profile_id'";
+			$sql_string_update = "UPDATE srv_invitations_recipients_profiles SET name='$profile_name', respondents = '$recipients_list', comment='$profile_comment' WHERE uid in('$global_user_id') AND pid = '$profile_id'";
 			$sqlQuery = sisplet_query($sql_string_update);
 			sisplet_query("COMMIT");
 				
@@ -9492,7 +9472,7 @@ class SurveyInvitationsNew {
 		$_only_this_survey = (isset($_SESSION['inv_rec_only_this_survey']) && (int)$_SESSION['inv_rec_only_this_survey'] == 1) ? '' : " AND from_survey = '".$this->sid. "'" ;
 		
 		# polovimo še ostale porfile
-		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('0', '".$global_user_id."')".$_only_this_survey;
+		$sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')".$_only_this_survey;
 		$sql_query = sisplet_query($sql_string);
 		while ($sql_row = mysqli_fetch_assoc($sql_query)) {
 			$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name'], 'comment'=>$sql_row['comment']);
@@ -9864,14 +9844,15 @@ class SurveyInvitationsNew {
 	function viewServerSettings(){
 		global $lang;
 		global $site_url;
+		global $site_url;
 		global $site_path;
 		global $admin_type;
 		global $global_user_id;
 		global $mysql_database_name;
+		global $aai_instalacija;
 		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
 
-		
 		echo '<form name="settingsanketa_' . $row['id'] . '" action="ajax.php?a=editanketasettings&m=inv_server" method="post" autocomplete="off">' . "\n\r";
 		echo '	<input type="hidden" name="anketa" value="' . $this->sid . '" />' . "\n\r";
 				echo '  <input type="hidden" name="location" value="' . $_GET['a'] . '" />' . "\n\r";
@@ -9880,21 +9861,39 @@ class SurveyInvitationsNew {
 		$MA = new MailAdapter($this->sid, $type='invitation');
 		
 		// Dostop za posiljanje mailov preko 1ka serverja
-		$enabled1ka = ( $MA->is1KA() || (($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi' || $mysql_database_name == '1kaarnessi')) ) ? true : false;
+		$enabled1ka = $MA->is1KA() ? true : false;
 		
+        // Admini na testu, www in virtualkah imajo 1ka smtp
+        if(($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi'))
+            $enabled1ka = true;
+        
+        // Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve
+		echo '<p class="red bold">'.$lang['srv_email_server_settings_warning'].'</p>';
+
+        // Izbira SMTP streznika
 		echo '<span class="bold">'.$lang['srv_email_setting_select_server'].'</span>&nbsp;';
-		echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">';
+		
-        echo $lang['srv_email_setting_adapter0']. ' </label>';
+        // AAI ima Arnesov smtp
+        if($aai_instalacija){
+            echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' onclick="smtpAAIPopupShow();">';
+            echo $lang['srv_email_setting_adapter0_aai']. ' </label>';  
+        }
+        else{
+            echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">';
+            echo $lang['srv_email_setting_adapter0']. ' </label>';
+        }
+
         // Google smtp je viden samo starim, kjer je ze vklopljen
         if($MA->isGoogle()){
             echo '<label><input type="radio" name="SMTPMailMode" value="1" '.($MA->isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">';
             echo $lang['srv_email_setting_adapter1'].' </label>';
         }
-		echo '<label><input type="radio" name="SMTPMailMode" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">';
-		echo $lang['srv_email_setting_adapter2'].' </label>';
-		echo Help :: display('srv_mail_mode');
-
 		
+        // Lastni smtp
+        echo '<label><input type="radio" name="SMTPMailMode" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">';
+        echo $lang['srv_email_setting_adapter2'].' </label>';
+
+		echo Help :: display('srv_mail_mode');
 		
 		#1KA
 		$enkaSettings = $MA->get1KASettings($raziskave=true);
@@ -10051,4 +10050,25 @@ class SurveyInvitationsNew {
 			SurveySession::set('inv_noEmailing_type', (int)$_POST['value']);
 		}		
 	}
+
+    // Prikazemo popup za vklop arnes smtp-ja na aai
+    private function showAAISmtpPopup(){
+        global $lang;
+
+        echo '<div class="popup_close"><a href="#" onClick="quick_title_edit_cancel(); return false;">✕</a></div>';
+			
+        echo '<h2>'.$lang['srv_email_setting_adapter0_aai_title'].'</h2>';
+
+        echo '<div class="popup_content">';
+        echo $lang['srv_email_setting_adapter0_aai_popup']; 
+        echo '<br /><br />';   
+        echo '<input type="checkbox" id="aai_smtp_checkbox" name="aai_smtp_checkbox" class="pointer" onClick="smtpAAIAccept();">';
+        echo ' <label for="aai_smtp_checkbox"><b>'.$lang['srv_email_setting_adapter0_aai_popup2'].'</b></label>';
+        echo '</div>';
+
+        echo '<div class="buttons_holder">';
+        echo '<span class="buttonwrapper floatRight spaceLeft" id="aai_smtp_button" style="display:none;" title="'.$lang['srv_save_profile_yes'].'"><a class="ovalbutton ovalbutton_orange" href="#" onClick="smtpAAISet(); return false;"><span>'.$lang['srv_save_profile_yes'].'</span></a></span>';
+        echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="smtpAAIPopupClose(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
+        echo '</div>';
+    }
 }

admin/survey/classes/surveyEmails/class.SurveySimpleMailInvitation.php

@@ -5,7 +5,8 @@
  *
  */
 
-define("SIMPLE_MAIL_QUOTA", 20, true);
+define("SIMPLE_MAIL_QUOTA", 20);
+
 class SurveySimpleMailInvitation {
 
 	public $sid;									# id ankete

admin/survey/classes/tracking/UserTrackingClass.php

@@ -43,7 +43,7 @@ class UserTrackingClass
         echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>';
 
         // Izvoz v Excel
-        echo '<p><a href="ajax.php?a=user_tracking&d=download">Download Excel</a></p>';
+        echo '<p>'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
 
 
         echo '<table id="tracking">';
@@ -51,26 +51,19 @@ class UserTrackingClass
         // Prva vrstica
         echo '<tr>';
         echo '	<th>' . $lang['date'] . '</th>';
-        //echo '	<th>User</th>';
         echo '	<th class="center">IP</th>';
-        //echo '	<th class="center">Podstran</th>';
         echo '	<th>GET</th>';
         echo '	<th>POST</th>';
         echo '</tr>';
 
         // Vrstice s podatki
-        $sql = sisplet_query("SELECT * FROM user_tracking WHERE user = '$global_user_id' ORDER BY datetime DESC");
+        $sql = sisplet_query("SELECT * FROM user_tracking WHERE user = '$global_user_id' ORDER BY datetime DESC LIMIT 25");
         
-        //$sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$global_user_id'");
-        //$rowu = mysqli_fetch_array($sqlu);
-            
         while ($row = mysqli_fetch_array($sql)) {
             echo '<tr>';
 
             echo '	<td>' . datetime($row['datetime']) . '</td>';
-            //echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
             echo '	<td class="center">' . $row['ip'] . '</td>';
-            //echo '	<td class="center">' . $statuses[$row['status']] . '</td>';
             echo '	<td>' . $row['get'] . '</td>';
             echo '	<td>' . $row['post'] . '</td>';
 

admin/survey/definition.php

@@ -4,245 +4,245 @@
 	define('IS_LINUX', (DIRECTORY_SEPARATOR === '\\') ? FALSE : TRUE);
 
 	# NASTAVITVE ANKETE
-	define('ANKETA_NASLOV_MAXLENGTH', '40', true);		# KOLIKO ZNAKOV LAHKO VSEBUJE INTERNO IME ANKETE
+	define('ANKETA_NASLOV_MAXLENGTH', '40');		# KOLIKO ZNAKOV LAHKO VSEBUJE INTERNO IME ANKETE
-	define('ANKETA_AKRONIM_MAXLENGTH', '100', true);	# KOLIKO ZNAKOV LAHKO VSEBUJE AKRONIM ANKETE
+	define('ANKETA_AKRONIM_MAXLENGTH', '100');	# KOLIKO ZNAKOV LAHKO VSEBUJE AKRONIM ANKETE
-	define('ANKETA_NOTE_MAXLENGTH', '250', true);		# KOLIKO ZNAKOV LAHKO VSEBUJE OPIS ANKETE
+	define('ANKETA_NOTE_MAXLENGTH', '250');		# KOLIKO ZNAKOV LAHKO VSEBUJE OPIS ANKETE
 
 	# za url-je za navigacijo
-	define('NEW_LINE', "\n", true);
+	define('NEW_LINE', "\n");
 
 	##### NAVIGACIJA ####
-    define("NAVI_STATUS", "NAVI_STATUS", true);
+    define("NAVI_STATUS", "NAVI_STATUS");
-    define("NAVI_STATUS_OSNOVNI", "NAVI_STATUS_OSNOVNI", true);
+    define("NAVI_STATUS_OSNOVNI", "NAVI_STATUS_OSNOVNI");
-    define("NAVI_STATUS_TRAJANJE", "NAVI_STATUS_TRAJANJE", true);
+    define("NAVI_STATUS_TRAJANJE", "NAVI_STATUS_TRAJANJE");
-    define("NAVI_AAPOR","AAPOR",true);
+    define("NAVI_AAPOR", "AAPOR");
-    define("NAVI_UREJANJE", "NAVI_UREJANJE", true);
+    define("NAVI_UREJANJE", "NAVI_UREJANJE");
-    define("NAVI_TESTIRANJE", "NAVI_TESTIRANJE", true);
+    define("NAVI_TESTIRANJE", "NAVI_TESTIRANJE");
-    define("NAVI_TESTIRANJE_KOMENTARJI", "NAVI_TESTIRANJE_KOMENTARJI", true);
+    define("NAVI_TESTIRANJE_KOMENTARJI", "NAVI_TESTIRANJE_KOMENTARJI");
-    define("NAVI_TESTIRANJE_PREDVIDENI", "NAVI_TESTIRANJE_PREDVIDENI", true);
+    define("NAVI_TESTIRANJE_PREDVIDENI", "NAVI_TESTIRANJE_PREDVIDENI");
-    define("NAVI_TESTIRANJE_CAS", "NAVI_TESTIRANJE_CAS", true);
+    define("NAVI_TESTIRANJE_CAS", "NAVI_TESTIRANJE_CAS");
-    define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI", true);
+    define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI");
-    define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", true);
+    define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY");
-    define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", true);
+    define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD");
-    define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING", true);
+    define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING");
-    define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA", true);
+    define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA");
-    define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA", true);
+    define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA");
-    define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT", true);
+    define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT");
-    define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE", true);
+    define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE");
-    define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA", true);
+    define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA");
-    define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE", true);
+    define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE");
-    define("NAVI_OBJAVA", "NAVI_OBJAVA", true);
+    define("NAVI_OBJAVA", "NAVI_OBJAVA");
-    define("NAVI_ANALYSIS", "NAVI_ANALYSIS", true);
+    define("NAVI_ANALYSIS", "NAVI_ANALYSIS");
-    define("NAVI_RESULTS", "NAVI_RESULTS", true);
+    define("NAVI_RESULTS", "NAVI_RESULTS");
-    define("NAVI_ADVANCED", "NAVI_ADVANCED", true);
+    define("NAVI_ADVANCED", "NAVI_ADVANCED");
-    define("NAVI_UPORABNOST", "NAVI_UPORABNOST", true);
+    define("NAVI_UPORABNOST", "NAVI_UPORABNOST");
-    define("NAVI_HIERARHIJA_SUPERADMIN", "NAVI_HIERARHIJA_SUPERADMIN", true);
+    define("NAVI_HIERARHIJA_SUPERADMIN", "NAVI_HIERARHIJA_SUPERADMIN");
-    define("NAVI_HIERARHIJA", "NAVI_HIERARHIJA", true);
+    define("NAVI_HIERARHIJA", "NAVI_HIERARHIJA");
-    define("NAVI_KVIZ", "NAVI_KVIZ", true);
+    define("NAVI_KVIZ", "NAVI_KVIZ");
-    define("NAVI_VNOS", "NAVI_VNOS", true);
+    define("NAVI_VNOS", "NAVI_VNOS");
-    define("NAVI_PHONE", "NAVI_PHONE", true);
+    define("NAVI_PHONE", "NAVI_PHONE");
-    define("NAVI_360", "NAVI_360", true);
+    define("NAVI_360", "NAVI_360");
-    define("NAVI_SOCIAL_NETWORK", "NAVI_SOCIAL_NETWORK", true);
+    define("NAVI_SOCIAL_NETWORK", "NAVI_SOCIAL_NETWORK");
-    define("NAVI_SLIDESHOW", "NAVI_SLIDESHOW", true);
+    define("NAVI_SLIDESHOW", "NAVI_SLIDESHOW");
-    define("NAVI_STATISTIC_ANALYSIS", "NAVI_STATISTIC_ANALYSIS", true);
+    define("NAVI_STATISTIC_ANALYSIS", "NAVI_STATISTIC_ANALYSIS");
-    define("NAVI_ANALYSIS_LINKS", "NAVI_ANALYSIS_LINKS", true);
+    define("NAVI_ANALYSIS_LINKS", "NAVI_ANALYSIS_LINKS");
-    define("NAVI_ANALYSIS_TIMES", "NAVI_ANALYSIS_TIMES", true);
+    define("NAVI_ANALYSIS_TIMES", "NAVI_ANALYSIS_TIMES");
-    define("NAVI_DATA", "NAVI_DATA", true);
+    define("NAVI_DATA", "NAVI_DATA");
-    define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT", true);
+    define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT");
 
 
 	# Dashboard - status - report
-	define("A_REPORTI", "reporti", true);
+	define("A_REPORTI", "reporti");
-	define("A_NONRESPONSE_GRAPH", "nonresponse_graph", true);
+	define("A_NONRESPONSE_GRAPH", "nonresponse_graph");
-	define("A_PARA_GRAPH", "para_graph", true);
+	define("A_PARA_GRAPH", "para_graph");
-	define("A_USABLE_RESP", "usable_resp", true);
+	define("A_USABLE_RESP", "usable_resp");
-	define("A_SPEEDER_INDEX", "speeder_index", true);
+	define("A_SPEEDER_INDEX", "speeder_index");
-	define("A_TEXT_ANALYSIS", "text_analysis", true);
+	define("A_TEXT_ANALYSIS", "text_analysis");
-	define("A_GEOIP_LOCATION", "geoip_location", true);
+	define("A_GEOIP_LOCATION", "geoip_location");
-        define("A_EDITS_ANALYSIS", "edits_analysis", true);
+    define("A_EDITS_ANALYSIS", "edits_analysis");
-	define("A_UL_EVALVATION", "ul_evalvation", true);
+	define("A_UL_EVALVATION", "ul_evalvation");
-	define("A_REMINDER_TRACKING", "reminder_tracking", true);
+	define("A_REMINDER_TRACKING", "reminder_tracking");
-	define("A_REMINDER_TRACKING_RECNUM", "recnum", true);
+	define("A_REMINDER_TRACKING_RECNUM", "recnum");
-	define("A_REMINDER_TRACKING_VAR", "vars", true);
+	define("A_REMINDER_TRACKING_VAR", "vars");
 
 	#urejanje
-	define("A_BRANCHING", "branching", true);
+	define("A_BRANCHING", "branching");
-	define("A_SETTINGS", "nastavitve", true);
+	define("A_SETTINGS", "nastavitve");
-	define("A_NAGOVORI", "nagovori", true);
+	define("A_NAGOVORI", "nagovori");
-	define("A_ALERT", "alert", true);
+	define("A_ALERT", "alert");
-	define("A_TESTIRANJE", "testiranje", true);
+	define("A_TESTIRANJE", "testiranje");
-	define("A_ARHIVI", "arhivi", true);
+	define("A_ARHIVI", "arhivi");
-	define("A_TRACKING", "tracking", true);
+	define("A_TRACKING", "tracking");
-    define("A_TRACKING_HIERARHIJA", "tracking-hierarhija", true);
+    define("A_TRACKING_HIERARHIJA", "tracking-hierarhija");
-	define("A_GLASOVANJE", "glasovanja", true);
+	define("A_GLASOVANJE", "glasovanja");
 
 	# TESTIRANJE
-	define('M_TESTIRANJE_REVIEW', 'pregled', true);
+	define('M_TESTIRANJE_REVIEW', 'pregled');
-	define('M_TESTIRANJE_DIAGNOSTIKA', 'diagnostika', true);
+	define('M_TESTIRANJE_DIAGNOSTIKA', 'diagnostika');
-	define('M_TESTIRANJE_KOMENTARJI', 'komentarji', true);
+	define('M_TESTIRANJE_KOMENTARJI', 'komentarji');
-	define('M_TESTIRANJE_KOMENTARJI_ANKETA', 'komentarji_anketa', true);
+	define('M_TESTIRANJE_KOMENTARJI_ANKETA', 'komentarji_anketa');
-	define('M_TESTIRANJE_VNOSI', 'testnipodatki', true);
+	define('M_TESTIRANJE_VNOSI', 'testnipodatki');
-        define('M_TESTIRANJE_TRAJANJE', 'trajanje', true);
+    define('M_TESTIRANJE_TRAJANJE', 'trajanje');
-	define('M_TESTIRANJE_PREDVIDENI', 'predvidenicas', true);
+	define('M_TESTIRANJE_PREDVIDENI', 'predvidenicas');
-	define("M_TESTIRANJE_CAS", "cas", true);
+	define("M_TESTIRANJE_CAS", "cas");
 
 	# objava
-	define('A_VABILA', 'vabila', true);
+	define('A_VABILA', 'vabila');
-	define('A_EMAIL', 'email', true);
+	define('A_EMAIL', 'email');
-	define('A_INVITATIONS', 'invitations', true);
+	define('A_INVITATIONS', 'invitations');
-	define('M_INVITATIONS_STATUS', 'inv_status', true);
+	define('M_INVITATIONS_STATUS', 'inv_status');
-	define('M_INVITATIONS_SETTINGS', 'inv_settings', true);
+	define('M_INVITATIONS_SETTINGS', 'inv_settings');
-	define('M_INVITATIONS', 'vabila', true);
+	define('M_INVITATIONS', 'vabila');
 
 	# TELEFON
-	define('A_TELEPHONE', 'telephone', true);
+	define('A_TELEPHONE', 'telephone');
 
 	# CHAT
-	define('A_CHAT', 'chat', true);
+	define('A_CHAT', 'chat');
 	
 	# PANEL
-	define('A_PANEL', 'panel', true);
+	define('A_PANEL', 'panel');
 
 	# FIELDWORK (tablice, notebooki)
-	define('A_FIELDWORK', 'fieldwork', true);
+	define('A_FIELDWORK', 'fieldwork');
         
         # Mobilna aplikacija za anketirance
-	define('A_MAZA', 'maza', true);
+	define('A_MAZA', 'maza');
         
         # Web push notifications
-	define('A_WPN', 'wpn', true);
+	define('A_WPN', 'wpn');
         
 	# 360 STOPINJ
-	define('A_360', '360_stopinj', true);
+	define('A_360', '360_stopinj');
-	define('A_360_1KA', '360_stopinj_1ka', true);
+	define('A_360_1KA', '360_stopinj_1ka');
 
 	# SA- HIERARHIJA
-	define('A_HIERARHIJA', 'hierarhija', true); #izgradnja hierarhije
+	define('A_HIERARHIJA', 'hierarhija'); #izgradnja hierarhije
-	define('M_ADMIN_UREDI_SIFRANTE', 'uredi-sifrante', true); #hierarhija - uredi šifrante za kasnejšo izgradno
+	define('M_ADMIN_UREDI_SIFRANTE', 'uredi-sifrante'); #hierarhija - uredi šifrante za kasnejšo izgradno
-	define('M_ADMIN_UVOZ_SIFRANTOV', 'uvoz-sifrantov', true); #hierarhija - uvoz sifrantov
+	define('M_ADMIN_UVOZ_SIFRANTOV', 'uvoz-sifrantov'); #hierarhija - uvoz sifrantov
-    define('M_ADMIN_UPLOAD_LOGO', 'upload-logo', true); #hierarhija - upload logo
+    define('M_ADMIN_UPLOAD_LOGO', 'upload-logo'); #hierarhija - upload logo
-	define('M_ADMIN_IZVOZ_SIFRANTOV', 'izvoz-sifrantov', true); #hierarhija - izvoz sifrantov
+	define('M_ADMIN_IZVOZ_SIFRANTOV', 'izvoz-sifrantov'); #hierarhija - izvoz sifrantov
-	define('M_UREDI_UPORABNIKE', 'uredi-uporabnike', true); #hierarhija - uredi uporabnike
+	define('M_UREDI_UPORABNIKE', 'uredi-uporabnike'); #hierarhija - uredi uporabnike
-    define('M_ADMIN_AKTIVACIJA', 'aktivacija-strukture-ankete', true); #aktivacija hierarhije
+    define('M_ADMIN_AKTIVACIJA', 'aktivacija-strukture-ankete'); #aktivacija hierarhije
-    define('M_ADMIN_KOPIRANJE', 'kopiranje-strukture-in-uporabnikov', true); #kopiranje hierarhije
+    define('M_ADMIN_KOPIRANJE', 'kopiranje-strukture-in-uporabnikov'); #kopiranje hierarhije
-	define('M_ANALIZE', 'analize', true); #hierarhija analize
+	define('M_ANALIZE', 'analize'); #hierarhija analize
-	define('M_HIERARHIJA_STATUS', 'status', true); #hierarhija - statusi
+	define('M_HIERARHIJA_STATUS', 'status'); #hierarhija - statusi
 
 
 	# REZULTATI
 	#analize
-	define('A_ANALYSIS', 'analysis', true);
+	define('A_ANALYSIS', 'analysis');
-	define('M_ANALYSIS_DESCRIPTOR', 'descriptor', true);
+	define('M_ANALYSIS_DESCRIPTOR', 'descriptor');
-	define('M_ANALYSIS_FREQUENCY', 'frequency', true);
+	define('M_ANALYSIS_FREQUENCY', 'frequency');
-	define('M_ANALYSIS_SUMMARY', 'sumarnik', true);
+	define('M_ANALYSIS_SUMMARY', 'sumarnik');
-	define('M_ANALYSIS_SUMMARY_NEW', 'sums_new', true);
+	define('M_ANALYSIS_SUMMARY_NEW', 'sums_new');
-	define('M_ANALYSIS_CROSSTAB', 'crosstabs', true);
+	define('M_ANALYSIS_CROSSTAB', 'crosstabs');
-	define("M_ANALYSIS_MULTICROSSTABS", "multicrosstabs", true);
+	define("M_ANALYSIS_MULTICROSSTABS", "multicrosstabs");
-	define('M_ANALYSIS_MEANS', 'means', true);
+	define('M_ANALYSIS_MEANS', 'means');
-	define('M_ANALYSIS_MEANS_HIERARHY', 'hierarhy-means', true);
+	define('M_ANALYSIS_MEANS_HIERARHY', 'hierarhy-means');
-	define('M_ANALYSIS_TTEST', 'ttest', true);
+	define('M_ANALYSIS_TTEST', 'ttest');
-	define('M_ANALYSIS_BREAK', 'break', true);
+	define('M_ANALYSIS_BREAK', 'break');
-	define('M_ANALYSIS_STATISTICS', 'statistics', true);
+	define('M_ANALYSIS_STATISTICS', 'statistics');
-	define('M_ANALYSIS_ARCHIVE', 'anal_arch', true);
+	define('M_ANALYSIS_ARCHIVE', 'anal_arch');
-	define("M_ANALYSIS_LINKS", "analysis_links", true);
+	define("M_ANALYSIS_LINKS", "analysis_links");
-	define("M_ANALYSIS_CREPORT", "analysis_creport", true);
+	define("M_ANALYSIS_CREPORT", "analysis_creport");
-	define("M_ANALYSIS_CHARTS", "charts", true);
+	define("M_ANALYSIS_CHARTS", "charts");
-	define("M_ANALYSIS_PARA", "para", true);
+	define("M_ANALYSIS_PARA", "para");
-	define("M_ANALYSIS_NONRESPONSES", "nonresponses", true);
+	define("M_ANALYSIS_NONRESPONSES", "nonresponses");
-	define("M_ANALYSIS_VIZUALIZACIJA", "vizualizacija", true);
+	define("M_ANALYSIS_VIZUALIZACIJA", "vizualizacija");
-	define("M_ANALYSIS_360", "360_stopinj", true);
+	define("M_ANALYSIS_360", "360_stopinj");
-	define("M_ANALYSIS_360_1KA", "360_stopinj_1ka", true);
+	define("M_ANALYSIS_360_1KA", "360_stopinj_1ka");
-	define('M_ANALYSIS_HEATMAP', 'heatmap', true);
+	define('M_ANALYSIS_HEATMAP', 'heatmap');
 	# vnosi - zbiranje podatkov
-	define('A_COLLECT_DATA', 'data', true);
+	define('A_COLLECT_DATA', 'data');
-	define('M_COLLECT_DATA_VIEW', 'view', true);
+	define('M_COLLECT_DATA_VIEW', 'view');
-	define('M_COLLECT_DATA_VARIABLE_VIEW', 'variables', true);
+	define('M_COLLECT_DATA_VARIABLE_VIEW', 'variables');
-	define('M_COLLECT_DATA_EDIT', 'edit', true);
+	define('M_COLLECT_DATA_EDIT', 'edit');
-	define('M_COLLECT_DATA_QUICKEDIT', 'quick_edit', true);
+	define('M_COLLECT_DATA_QUICKEDIT', 'quick_edit');
-	define('M_COLLECT_DATA_MONITORING', 'monitoring', true);
+	define('M_COLLECT_DATA_MONITORING', 'monitoring');
-	define('M_COLLECT_DATA_PRINT', 'print', true);
+	define('M_COLLECT_DATA_PRINT', 'print');
-	define('M_COLLECT_DATA_CALCULATION', 'calculation', true);
+	define('M_COLLECT_DATA_CALCULATION', 'calculation');
-	define('M_COLLECT_DATA_CODING', 'coding', true);
+	define('M_COLLECT_DATA_CODING', 'coding');
-	define('M_COLLECT_DATA_RECODING', 'recoding', true);
+	define('M_COLLECT_DATA_RECODING', 'recoding');
-	define('M_COLLECT_DATA_RECODING_DASHBOARD', 'recoding_dashboard', true);
+	define('M_COLLECT_DATA_RECODING_DASHBOARD', 'recoding_dashboard');
-	define('A_COLLECT_DATA_EXPORT', 'export', true);
+	define('A_COLLECT_DATA_EXPORT', 'export');
-	define('A_COLLECT_DATA_EXPORT_ALL', 'export_PDF', true);
+	define('A_COLLECT_DATA_EXPORT_ALL', 'export_PDF');
-	define('M_EXPORT_EXCEL', 'excel', true);
+	define('M_EXPORT_EXCEL', 'excel');
-	define('M_EXPORT_EXCEL_XLS', 'excel_xls', true);
+	define('M_EXPORT_EXCEL_XLS', 'excel_xls');
-	define('M_EXPORT_SPSS', 'spss', true);
+	define('M_EXPORT_SPSS', 'spss');
-	define('M_EXPORT_SAV', 'sav', true);
+	define('M_EXPORT_SAV', 'sav');
-	define('M_EXPORT_TXT', 'txt', true);
+	define('M_EXPORT_TXT', 'txt');
 
 	# dodatne nastavitve
-	define('A_ADVANCED', 'advanced', true);
+	define('A_ADVANCED', 'advanced');
-	define('A_UPORABNOST', 'uporabnost', true);
+	define('A_UPORABNOST', 'uporabnost');
-	define('A_HIERARHIJA_SUPERADMIN', 'hierarhija_superadmin', true);
+	define('A_HIERARHIJA_SUPERADMIN', 'hierarhija_superadmin');
-	define('A_KVIZ', 'kviz', true);
+	define('A_KVIZ', 'kviz');
-	define('A_VNOS', 'vnos', true);
+	define('A_VNOS', 'vnos');
-	define('A_PHONE', 'telefon', true); # Telefon
+	define('A_PHONE', 'telefon'); # Telefon
-	define('T_PHONE', 'telefon', true); # Telefon
+	define('T_PHONE', 'telefon'); # Telefon
-	define('A_SOCIAL_NETWORK', 'social_network', true);
+	define('A_SOCIAL_NETWORK', 'social_network');
-	define('A_SLIDESHOW', 'slideshow', true);
+	define('A_SLIDESHOW', 'slideshow');
-	define('A_ADVANCED_PARADATA', 'advanced_paradata', true);
+	define('A_ADVANCED_PARADATA', 'advanced_paradata');
-	define('A_JSON_SURVEY_EXPORT', 'json_survey_export', true);
+	define('A_JSON_SURVEY_EXPORT', 'json_survey_export');
 
 
 	# primerno redirektamo klik na link anketo (dashboard .vs. urejanje)
-	define("A_REDIRECTLINK", "redirectLink", true);
+	define("A_REDIRECTLINK", "redirectLink");
 
-	define("A_QUICK_SETTINGS", "quicksettings", true);
+	define("A_QUICK_SETTINGS", "quicksettings");
 
 	# za tretji nivo navigacije
-	define("A_OSNOVNI_PODATKI", "osn_pod", true); # urejanje ankete - osnovni podatki
+	define("A_OSNOVNI_PODATKI", "osn_pod"); # urejanje ankete - osnovni podatki
-	define('A_MISSING', 'missing', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_MISSING', 'missing');	# urejanje ankete - manjkajoče vrednosti
-	define('A_TEMA', 'tema', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_TEMA', 'tema');	# urejanje ankete - manjkajoče vrednosti
-	define('A_COOKIE', 'piskot', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_COOKIE', 'piskot');	# urejanje ankete - manjkajoče vrednosti
-	define("A_KOMENTARJI", "komentarji", true); # urejanje ankete - komentarjivrednosti
+	define("A_KOMENTARJI", "komentarji"); # urejanje ankete - komentarjivrednosti
-	define("A_KOMENTARJI_ANKETA", "komentarji_anketa", true); # urejanje ankete - komentarjivrednosti
+	define("A_KOMENTARJI_ANKETA", "komentarji_anketa"); # urejanje ankete - komentarjivrednosti
-	define("A_TRAJANJE", "trajanje", true); # urejanje ankete - komentarjivrednosti
+	define("A_TRAJANJE", "trajanje"); # urejanje ankete - komentarjivrednosti
-	define("A_TRAJANJE_PREDVIDENI", "predvidenicas", true); # urejanje ankete - komentarjivrednosti
+	define("A_TRAJANJE_PREDVIDENI", "predvidenicas"); # urejanje ankete - komentarjivrednosti
-	define("A_TRAJANJE_CAS", "cas", true); # urejanje ankete - komentarjivrednosti
+	define("A_TRAJANJE_CAS", "cas"); # urejanje ankete - komentarjivrednosti
-	define('A_UREJANJE', 'urejanje', true);	# urejanje ankete - komentarjivrednosti
+	define('A_UREJANJE', 'urejanje');	# urejanje ankete - komentarjivrednosti
-	define('A_DOSTOP', 'dostop', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_DOSTOP', 'dostop');	# urejanje ankete - manjkajoče vrednosti
-	define('A_JEZIK', 'jezik', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_JEZIK', 'jezik');	# urejanje ankete - manjkajoče vrednosti
-	define('A_PREVAJANJE', 'prevajanje', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_PREVAJANJE', 'prevajanje');	# urejanje ankete - manjkajoče vrednosti
-	define('A_FORMA', 'forma', true);	# urejanje ankete - manjkajoče vrednosti
+	define('A_FORMA', 'forma');	# urejanje ankete - manjkajoče vrednosti
-	define('A_METADATA', 'metadata', true);	# urejanje ankete - prikaz metapodatkov
+	define('A_METADATA', 'metadata');	# urejanje ankete - prikaz metapodatkov
-	define('A_MOBILESETTINGS', 'mobile_settings', true);	# urejanje ankete - nastavitve prikaza pri mobitelih
+	define('A_MOBILESETTINGS', 'mobile_settings');	# urejanje ankete - nastavitve prikaza pri mobitelih
-	define('A_PRIKAZ', 'prikaz', true);	# prikaz podatkov in analiz
+	define('A_PRIKAZ', 'prikaz');	# prikaz podatkov in analiz
-	define('A_MAILING', 'advanced_email', true);	# nastavitve email strežnika
+	define('A_MAILING', 'advanced_email');	# nastavitve email strežnika
-	define('A_SKUPINE', 'skupine', true);	# skupine
+	define('A_SKUPINE', 'skupine');	# skupine
-	define('A_EXPORTSETTINGS', 'export_settings', true);	# nastavitve pdf/rtf izvozov
+	define('A_EXPORTSETTINGS', 'export_settings');	# nastavitve pdf/rtf izvozov
-	define('A_GDPR', 'gdpr_settings', true);	# GDPR nastavitve posamezne ankete
+	define('A_GDPR', 'gdpr_settings');	# GDPR nastavitve posamezne ankete
-    define('A_LANGUAGE_TECHNOLOGY', 'language_technology', true);    # skupine
+    define('A_LANGUAGE_TECHNOLOGY', 'language_technology');    # skupine
-	define('A_LANGUAGE_TECHNOLOGY_OLD', 'language_technology_old', true);	# skupine
+	define('A_LANGUAGE_TECHNOLOGY_OLD', 'language_technology_old');	# skupine
 
 	##### NAVIGACIJA ####
 
 	# profili mankjajočih vrednosti
-	define('MISSING_TYPE_SUMMARY', '0', true);
+	define('MISSING_TYPE_SUMMARY', '0');
-	define('MISSING_TYPE_DESCRIPTOR', '1', true);
+	define('MISSING_TYPE_DESCRIPTOR', '1');
-	define('MISSING_TYPE_FREQUENCY', '2', true);
+	define('MISSING_TYPE_FREQUENCY', '2');
-	define('MISSING_TYPE_CROSSTAB', '3', true);
+	define('MISSING_TYPE_CROSSTAB', '3');
 
 	# za vnose ali analize in kreacijo datotek
-	define('EXPORT_FOLDER', 'admin/survey/SurveyData', true);
+	define('EXPORT_FOLDER', 'admin/survey/SurveyData');
-	define('VALID_USER_LIMIT_STRING', ' AND u.last_status IN (5,6) ', true);
+	define('VALID_USER_LIMIT_STRING', ' AND u.last_status IN (5,6) ');
-	define('ALLOW_CREATE_LIMIT', 80, true);		        # prvih 100 userjev vedno spustimo skozi
+	define('ALLOW_CREATE_LIMIT', 80);		        # prvih 100 userjev vedno spustimo skozi
-	define('AUTO_CREATE_LIMIT', 150, true);			    # Koliko je meja, ko ne prikazujemo progresbara, in avtomatsko skreiramo datoteko ON THE FLY
+	define('AUTO_CREATE_LIMIT', 150);			    # Koliko je meja, ko ne prikazujemo progresbara, in avtomatsko skreiramo datoteko ON THE FLY
-	define('AUTO_CREATE_TIME_LIMIT', 10, true);		    # Na koliko sekund pustimo da se generira inkrementalno s progressbarom
+	define('AUTO_CREATE_TIME_LIMIT', 10);		    # Na koliko sekund pustimo da se generira inkrementalno s progressbarom
-	define('AUTO_CREATE_PREVENT_LIMIT', 1000, true);	# Koliko je meja, ko avtomatsko sploh ne generiramo datoteke s podatki
+	define('AUTO_CREATE_PREVENT_LIMIT', 1000);	# Koliko je meja, ko avtomatsko sploh ne generiramo datoteke s podatki
-	define('ONLY_VALID_LIMIT', 3000, true);		        # nad koliko respondentov lovimo samo ustrezne
+	define('ONLY_VALID_LIMIT', 3000);		        # nad koliko respondentov lovimo samo ustrezne
-	define('MAX_USER_PER_LOOP', 250, true);
+	define('MAX_USER_PER_LOOP', 250);
-	define('FILE_STATUS_OK', '1', true);			    # datoteka je ažurna
+	define('FILE_STATUS_OK', '1');			    # datoteka je ažurna
-	define('FILE_STATUS_OLD', '0', true);		        # datoteka je stara
+	define('FILE_STATUS_OLD', '0');		        # datoteka je stara
-	define('FILE_STATUS_NO_FILE', '-1', true);	        # datoteka ne obstaja
+	define('FILE_STATUS_NO_FILE', '-1');	        # datoteka ne obstaja
-	define('FILE_STATUS_NO_DATA', '-2', true);	        # v bazi nipodatkov
+	define('FILE_STATUS_NO_DATA', '-2');	        # v bazi nipodatkov
-	define('FILE_STATUS_SRV_DELETED', '-3', true);	    # Anketa je bila izbrisana
+	define('FILE_STATUS_SRV_DELETED', '-3');	    # Anketa je bila izbrisana
 
-	define('INCREMENTAL_LOCK_TIMEOUT', 10, true);	    # po kolikem času tajmoutamo možnost ponovnega generiranja (10min)
+	define('INCREMENTAL_LOCK_TIMEOUT', 10);	    # po kolikem času tajmoutamo možnost ponovnega generiranja (10min)
 
-	define("SYSTEM_VARIABLES", serialize (array('geslo','email','telefon','ime','priimek','naziv','drugo','odnos')), true);
+	define("SYSTEM_VARIABLES", serialize (array('geslo','email','telefon','ime','priimek','naziv','drugo','odnos')));
 
 	# fiksna polja v tabeli s podatki (prvo je 0)
 	# polja po vrsti :
@@ -254,34 +254,34 @@
 	# - lurker (6)
 	# - time insered (unix) (7)
 	# - record_number (8)
-	define('USER_ID_FIELD', '$1', true);
+	define('USER_ID_FIELD', '$1');
-	define('RELEVANCE_FIELD', '$2', true);
+	define('RELEVANCE_FIELD', '$2');
-	define('EMAIL_FIELD', '$3', true);
+	define('EMAIL_FIELD', '$3');
-	define('STATUS_FIELD', '$4', true);
+	define('STATUS_FIELD', '$4');
-	define('LURKER_FIELD', '$5', true);
+	define('LURKER_FIELD', '$5');
-	define('TIME_FIELD', '$6', true);
+	define('TIME_FIELD', '$6');
-	define('MOD_REC_FIELD', '$7', true);
+	define('MOD_REC_FIELD', '$7');
-	define('ITIME_FIELD', '$8', true);
+	define('ITIME_FIELD', '$8');
 
-	define('SCP_DEFAULT_PROFILE', 1, true);
+	define('SCP_DEFAULT_PROFILE', 1);
-	define('SSP_DEFAULT_PROFILE', 2, true);			#ustrezni
+	define('SSP_DEFAULT_PROFILE', 2);			#ustrezni
 
-	define('PERMANENT_DATE', '2099-01-01', true);	# Kateri datum velja kot datum trajne ankete
+	define('PERMANENT_DATE', '2099-01-01');	# Kateri datum velja kot datum trajne ankete
 
 	# privzete nastavitve analiz
-	define('NUM_DIGIT_PERCENT', 0, true);						# stevilo digitalnih mest za odstotek
+	define('NUM_DIGIT_PERCENT', 0);						# stevilo digitalnih mest za odstotek
-	define('NUM_DIGIT_AVERAGE', 1, true);						# stevilo digitalnih mest za povprecje
+	define('NUM_DIGIT_AVERAGE', 1);						# stevilo digitalnih mest za povprecje
-	define('NUM_DIGIT_DEVIATION', 2, true);					# stevilo digitalnih mest za odklon
+	define('NUM_DIGIT_DEVIATION', 2);					# stevilo digitalnih mest za odklon
-	define('NUM_DIGIT_RESIDUAL', 3, true);					# stevilo digitalnih mest za residuale
+	define('NUM_DIGIT_RESIDUAL', 3);					# stevilo digitalnih mest za residuale
-	define('NUM_DIGIT_PERCENT_MAX', 6, true);						# max stevilo digitalnih mest za odstotek
+	define('NUM_DIGIT_PERCENT_MAX', 6);						# max stevilo digitalnih mest za odstotek
-	define('NUM_DIGIT_AVERAGE_MAX', 6, true);						# max stevilo digitalnih mest za povprecje
+	define('NUM_DIGIT_AVERAGE_MAX', 6);						# max stevilo digitalnih mest za povprecje
-	define('NUM_DIGIT_DEVIATION_MAX', 6, true);					# max stevilo digitalnih mest za odklon
+	define('NUM_DIGIT_DEVIATION_MAX', 6);					# max stevilo digitalnih mest za odklon
-	define('NUM_DIGIT_RESIDUAL_MAX', 6, true);					# max stevilo digitalnih mest za residual
+	define('NUM_DIGIT_RESIDUAL_MAX', 6);					# max stevilo digitalnih mest za residual
 	
-	define('TEXT_ANSWER_LIMIT', 100, true);					# max stevilo text odgovorov pri izvozih
+	define('TEXT_ANSWER_LIMIT', 100);					# max stevilo text odgovorov pri izvozih
 
 
-	define('SURVEY_LIST_DATE_FORMAT', '%d.%m.%y', true);					# max stevilo digitalnih mest za residual
+	define('SURVEY_LIST_DATE_FORMAT', '%d.%m.%y');					# max stevilo digitalnih mest za residual
 
 	define('STP_DATE_FORMAT', 'd.m.Y');				# format v katerem operiramo v tem klasu
 	define('STP_OUTPUT_DATE_FORMAT', 'Y-m-d'); 		# format v katerem vrne
@@ -291,14 +291,14 @@
 
 	define('SDS_DEFAULT_PROFILE', 0);
 
-	define ('STR_OTHER_TEXT', '_text', true);
+	define ('STR_OTHER_TEXT', '_text');
-	define ('STR_DLMT', "|", true);
+	define ('STR_DLMT', "|");
-	define ('DAT_EXT', '.dat', true);
+	define ('DAT_EXT', '.dat');
-	define ('TMP_EXT', '.tmp', true);
+	define ('TMP_EXT', '.tmp');
-	define ('PIPE_CHAR', "\x7C",true);
+	define ('PIPE_CHAR', '\x7C');
-	define ('STR_LESS_THEN', '\x3C', true);
+	define ('STR_LESS_THEN', '\x3C');
-	define ('STR_GREATER_THEN', '\x3E', true);
+	define ('STR_GREATER_THEN', '\x3E');
-	define ('STR_EQUALS', '\x3D', true);
+	define ('STR_EQUALS', '\x3D');
 
 
 ?>

admin/survey/export/export_definitions.php

@@ -5,93 +5,93 @@ define('IS_WINDOWS', (DIRECTORY_SEPARATOR === '\\') ? TRUE : FALSE);
 define('IS_LINUX', (DIRECTORY_SEPARATOR === '\\') ? FALSE : TRUE);
 
 
-define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+define("M_ANALIZA_DESCRIPTOR", "descriptor");
-define("M_ANALIZA_FREQUENCY", "frequency", true);
+define("M_ANALIZA_FREQUENCY", "frequency");
-define("M_ANALIZA_CROSSTAB", "crosstabs", true);
+define("M_ANALIZA_CROSSTAB", "crosstabs");
-define("M_ANALIZA_STATISTICS", "statistics", true);
+define("M_ANALIZA_STATISTICS", "statistics");
-define("M_ANALIZA_SUMS", "sums", true);
+define("M_ANALIZA_SUMS", "sums");
 
 
 /*PDF*/
-define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf", true);
+define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf");
-define("A_REPORT_PDF_RESULTS","pdf_results",true);
+define("A_REPORT_PDF_RESULTS","pdf_results");
-define("A_REPORT_PDF_COMMENT","pdf_comment",true);
+define("A_REPORT_PDF_COMMENT","pdf_comment");
 
-define("M_REPORT_ANALIZA_PDF_FREKVENCA","frequency",true);
+define("M_REPORT_ANALIZA_PDF_FREKVENCA","frequency");
-define("M_REPORT_ANALIZA_PDF_CROSSTAB_IZPIS","crosstabs_izpis",true);
+define("M_REPORT_ANALIZA_PDF_CROSSTAB_IZPIS","crosstabs_izpis");
-define("M_REPORT_ANALIZA_PDF_MULTICROSSTAB_IZPIS","multicrosstabs_izpis",true);
+define("M_REPORT_ANALIZA_PDF_MULTICROSSTAB_IZPIS","multicrosstabs_izpis");
-define("M_REPORT_ANALIZA_PDF_MEAN_IZPIS","mean_izpis",true);
+define("M_REPORT_ANALIZA_PDF_MEAN_IZPIS","mean_izpis");
-define("M_REPORT_ANALIZA_PDF_TTEST_IZPIS","ttest_izpis",true);
+define("M_REPORT_ANALIZA_PDF_TTEST_IZPIS","ttest_izpis");
-define("M_REPORT_ANALIZA_PDF_BREAK_IZPIS","break_izpis",true);
+define("M_REPORT_ANALIZA_PDF_BREAK_IZPIS","break_izpis");
-define("M_REPORT_ANALIZA_PDF_STAT","statistics",true);
+define("M_REPORT_ANALIZA_PDF_STAT","statistics");
-define("M_REPORT_ANALIZA_PDF_CHARTS","charts",true);
+define("M_REPORT_ANALIZA_PDF_CHARTS","charts");
-define("M_REPORT_ANALIZA_PDF_SUMS","sums",true);
+define("M_REPORT_ANALIZA_PDF_SUMS","sums");
-define("M_REPORT_ANALIZA_PDF_CREPORT","creport_pdf",true);
+define("M_REPORT_ANALIZA_PDF_CREPORT","creport_pdf");
 
-define("A_REPORT_PDF_STATUS","status",true);
+define("A_REPORT_PDF_STATUS","status");
-define("A_REPORT_PDF_EDITS_ANALYSIS","editsAnalysis",true);
+define("A_REPORT_PDF_EDITS_ANALYSIS","editsAnalysis");
-define("A_REPORT_PDF_LIST","list_pdf",true);
+define("A_REPORT_PDF_LIST","list_pdf");
-define("M_REPORT_PDF_EVOLI","pdf_evoli",true);
+define("M_REPORT_PDF_EVOLI","pdf_evoli");
-define("M_REPORT_PDF_TEAMMETER","pdf_teammeter",true);
+define("M_REPORT_PDF_TEAMMETER","pdf_teammeter");
-define("M_REPORT_PDF_MFDPS","pdf_mfpds",true);
+define("M_REPORT_PDF_MFDPS","pdf_mfpds");
-define("M_REPORT_PDF_HEATMAP_IMAGE","heatmap_image_pdf",true);
+define("M_REPORT_PDF_HEATMAP_IMAGE","heatmap_image_pdf");
 
-define("M_REPORT_HIERARHIJA_PDF_IZPIS", "hierarhija_pdf_izpis", true);
+define("M_REPORT_HIERARHIJA_PDF_IZPIS", "hierarhija_pdf_izpis");
 
-define("A_GDPR_PDF_INDIVIDUAL", "pdf_gdpr_individual", true);
+define("A_GDPR_PDF_INDIVIDUAL", "pdf_gdpr_individual");
-define("A_GDPR_PDF_ACTIVITY", "pdf_gdpr_activity", true);
+define("A_GDPR_PDF_ACTIVITY", "pdf_gdpr_activity");
 
 
 /*RTF*/
-define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf", true);
+define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf");
-define("A_REPORT_RTF_RESULTS", "rtf_results", true);
+define("A_REPORT_RTF_RESULTS", "rtf_results");
-define("A_REPORT_RTF_COMMENT","rtf_comment",true);
+define("A_REPORT_RTF_COMMENT", "rtf_comment");
 
-define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf", true);
+define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf");
-define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf", true);
+define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf");
-define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf", true);
+define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf");
-define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf", true);
+define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf");
-define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf", true);
+define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf");
 
-define("A_REPORT_RTF_LIST", "list_rtf", true);
+define("A_REPORT_RTF_LIST", "list_rtf");
-define("M_REPORT_ANALIZA_RTF_HEATMAP_IMAGE","heatmap_image_rtf",true);
+define("M_REPORT_ANALIZA_RTF_HEATMAP_IMAGE","heatmap_image_rtf");
 
-define("A_GDPR_RTF_INDIVIDUAL", "rtf_gdpr_individual", true);
+define("A_GDPR_RTF_INDIVIDUAL", "rtf_gdpr_individual");
-define("A_GDPR_RTF_ACTIVITY", "rtf_gdpr_activity", true);
+define("A_GDPR_RTF_ACTIVITY", "rtf_gdpr_activity");
 
 
 /*XLS*/
-define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls", true);
+define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls");
-define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls", true);
+define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls");
-define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls", true);
+define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls");
-define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls");
 
-define("A_REPORT_XLS_LIST", "list_xls", true);
+define("A_REPORT_XLS_LIST", "list_xls");
-define("A_REPORT_XLS_USABLE", "usable_xls", true);
+define("A_REPORT_XLS_USABLE", "usable_xls");
-define("A_REPORT_XLS_SPEEDER", "speeder_xls", true);
+define("A_REPORT_XLS_SPEEDER", "speeder_xls");
-define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls", true);
+define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls");
-define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv", true);
+define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv");
-define("A_LANGUAGE_TECHNOLOGY_XLS", "lt_excel", true);
+define("A_LANGUAGE_TECHNOLOGY_XLS", "lt_excel");
 
 
 /*PPT*/
-define("M_REPORT_ANALIZA_PPT_CHARTS", "charts_ppt", true);
+define("M_REPORT_ANALIZA_PPT_CHARTS", "charts_ppt");
-define("M_REPORT_ANALIZA_PPT_HEATMAP_IMAGE","heatmap_image_ppt",true);
+define("M_REPORT_ANALIZA_PPT_HEATMAP_IMAGE", "heatmap_image_ppt");
 
 
 /*IMAGE*/
-define("M_REPORT_ANALIZA_HEATMAP_IMAGE", "heatmap_image", true);
+define("M_REPORT_ANALIZA_HEATMAP_IMAGE", "heatmap_image");
 
 /*XML*/
-define("A_REPORT_VPRASALNIK_XML", "vprasalnik_xml", true);
+define("A_REPORT_VPRASALNIK_XML", "vprasalnik_xml");
 
 ?>

admin/survey/export/latexclasses/Analize/AnalizaBreak.php

@@ -4,33 +4,32 @@
 	
 	include_once('../../function.php');
 	include_once('../survey/definition.php');
-/* 	include_once('../exportclases/class.pdfIzvozAnalizaFunctions.php');
+
-	require_once('../exportclases/class.enka.pdf.php'); */
 	
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/Analize/AnalizaCReport.php

@@ -10,27 +10,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);
@@ -1105,14 +1105,6 @@ class AnalizaCReport extends LatexAnalysisElement{
 		//TODO: Potrebno je v LATEX določiti ali je stran obrnjena landscape
 		$width = $this->landscapeTest() ? 270 : 165;
 		
-		//$this->pdf->ln(15);
-		
-		//$this->pdf->setFont('','b','7');
-		//$this->pdf->MultiCell($width, 1, $this->encodeText($title . $subtitle), 0, 'C', 0, 1, 0 ,0, true);
-		/*$this->pdf->setFont('','','7');
-		$this->pdf->MultiCell($width, 1, $subtitle, 0, 'C', 0, 1, 0 ,0, true);*/
-		
-		//$this->pdf->ln(5);
 		$boldedTitle = $this->returnBold($this->encodeText($this->encodeText($title . $subtitle)));
 		$texTitle .= $this->returnCentered($boldedTitle);
 		

admin/survey/export/latexclasses/Analize/AnalizaCharts.php

@@ -12,27 +12,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/Analize/AnalizaCrosstab.php

@@ -11,27 +11,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);
@@ -179,86 +179,7 @@ class AnalizaCrosstab extends LatexAnalysisElement{
 		//set image scale factor
 		$this->pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
 		return true;
-	}
+	}	
-	
-
-/* 	function createPdf()
-	{		
-		global $site_path;
-		global $lang;
-		global $global_user_id;
-			   		
-		// izpisemo prvo stran
-		//$this->createFrontPage();
-	   		
-		$this->pdf->AddPage();
-		
-		$this->pdf->setFont('','B','11');
-		$this->pdf->MultiCell(150, 5, $lang['export_analisys_sums'], 0, 'L', 0, 1, 0 ,0, true);
-		$this->pdf->ln(5);
-		
-		$this->pdf->SetDrawColor(128, 128, 128);
-		$this->pdf->setFont('','','6');									
-								
-		# preberemo header
-		if ($this->dataFileStatus == FILE_STATUS_NO_DATA || $this->dataFileStatus == FILE_STATUS_NO_FILE || $this->dataFileStatus == FILE_STATUS_SRV_DELETED) {
-		
-			$this->pdf->MultiCell(150, 5, 'NAPAKA!!! Manjkajo datoteke s podatki.', 0, 'L', 0, 1, 0 ,0, true);
-			
-		} else {
-
-			//polovimo podatke o nastavitvah trenutnega profila (missingi..)
-			SurveyAnalysis::$missingProfileData = SurveyMissingProfiles::getProfile(SurveyAnalysis::$currentMissingProfile);
-			
-			
-			// Preverimo ce imamo zanke (po skupinah)
-			SurveyAnalysis::$_LOOPS = SurveyZankaProfiles::getFiltersForLoops();
-
-			# če nimamo zank
-			if(count(SurveyAnalysis::$_LOOPS) == 0){
-				
-				$this->displayTables();
-			}
-			else{
-				// izrisemo samo eno tabelo iz enega loopa
-				if($this->current_loop > 0){
-				
-					$loop = SurveyAnalysis::$_LOOPS[(int)$this->current_loop-1];
-					$loop['cnt'] = $this->current_loop;
-					SurveyAnalysis::$_CURRENT_LOOP = $loop;
-					
-					// Izpisemo naslov zanke za skupino
-					$this->pdf->setFont('','B','10');
-					$this->pdf->ln(5);
-					$this->pdf->MultiCell(200, 5, $this->encodeText($lang['srv_zanka_note'].$loop['text']), 0, 'L', 0, 1, 0 ,0, true);
-					$this->pdf->setFont('','','6');
-					
-					$this->displayTables();
-				}
-				// Izrisemo vse tabele spremenljivka (iz vseh loopov)
-				else{
-					$loop_cnt = 0;
-					# če mamo zanke
-					foreach(SurveyAnalysis::$_LOOPS AS $loop) {
-						$loop_cnt++;
-						$loop['cnt'] = $loop_cnt;
-						SurveyAnalysis::$_CURRENT_LOOP = $loop;
-						
-						// Izpisemo naslov zanke za skupino
-						$this->pdf->setFont('','B','10');
-						$this->pdf->ln(5);
-						$this->pdf->MultiCell(200, 5, $this->encodeText($lang['srv_zanka_note'].$loop['text']), 0, 'L', 0, 1, 0 ,0, true);
-						$this->pdf->setFont('','','6');
-						
-						$this->displayTables();
-					}
-				}
-			}
-
-		} // end if else ($_headFileName == null)
-	
-	} */
-	
 
 	public function showCrosstabsTable($crosstabClass=null, $export_format='', $creport=false) {
 		global $lang;

admin/survey/export/latexclasses/Analize/AnalizaDesc.php

@@ -11,27 +11,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/Analize/AnalizaFreq.php

@@ -11,27 +11,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/Analize/AnalizaMean.php

@@ -10,27 +10,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php

@@ -10,27 +10,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);
@@ -130,74 +130,6 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
 		$this->pdf->Output($fileName, 'I');
 	}
 
-
-/* 	function init(){
-		global $lang;
-		
-		// array used to define the language and charset of the pdf file to be generated
-		$language_meta = Array();
-		$language_meta['a_meta_charset'] = 'UTF-8';
-		$language_meta['a_meta_dir'] = 'ltr';
-		$language_meta['a_meta_language'] = 'sl';
-		$language_meta['w_page'] = $lang['page'];
-
-		//set some language-dependent strings
-	    $this->pdf->setLanguageArray($language_meta);
-
-		//set margins
-		$this->pdf->setPrintHeaderFirstPage(true);
-		$this->pdf->setPrintFooterFirstPage(true);
-		$this->pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-		$this->pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
-		$this->pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
-
-		// set header and footer fonts
-		$this->pdf->setHeaderFont(Array(FNT_HEADER_TEXT, "I", FNT_HEADER_SIZE));
-		$this->pdf->setFooterFont(Array(FNT_HEADER_TEXT, 'I', FNT_HEADER_SIZE));
-
-
-		// set document information
-		$this->pdf->SetAuthor('An Order Form');
-		$this->pdf->SetTitle('An Order');
-		$this->pdf->SetSubject('An Order');
-
-		// set default header data
-		$this->pdf->SetHeaderData(null, null, "www.1ka.si", $this->encodeText(SurveyInfo::getInstance()->getSurveyAkronim()));
-
-		//set auto page breaks
-		$this->pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-		$this->pdf->SetFont(FNT_MAIN_TEXT, '', FNT_MAIN_SIZE);
-		//set image scale factor
-		$this->pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-		
-		return true;
-	} */
-
-
-/* 	function createPdf(){
-		global $site_path;
-		global $lang;
-	   		
-		$this->pdf->AddPage();
-		
-		$this->pdf->setFont('','B','11');
-		$this->pdf->MultiCell(150, 5, $lang['srv_multicrosstabs'], 0, 'L', 0, 1, 0 ,0, true);
-		$this->pdf->ln(5);
-		
-		$this->pdf->setDrawColor(128, 128, 128);
-		$this->pdf->setFont('','','6');
-		
-		// Napolnimo variable s katerimi lahko operiramo
-		$this->multiCrosstabClass->getVariableList();
-		
-		// Izris tabele
-		$this->displayTable();
-		
-		// Izris legende
-		$this->displayLegend();
-	}	 */
-
 	public function displayTable($multiCrosstabClass=null, $export_format=''){
 		global $site_path;
 		global $lang;

admin/survey/export/latexclasses/Analize/AnalizaSums.php

@@ -11,27 +11,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);
@@ -557,40 +557,25 @@ class AnalizaSums extends LatexAnalysisElement{
 		//zacetek latex tabele z obrobo za prvo tabelo - konec
 		
 		//prva vrstica
-		//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{8}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
-		//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{8}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
 		$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
-		//echo $dolzinaVprasanja."</br>";
+
-		if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){	//ce je dolzina vprasanja daljsa od ene vrstice v tabeli			
+        if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){	//ce je dolzina vprasanja daljsa od ene vrstice v tabeli			
 			$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{8}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
-		}else{
+        }
+        else{
 			$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{8}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
 		}	
-		
+			
-		//$variableTex = $this->encodeText($spremenljivka['variable']);
-		//$naslovTex = $this->encodeText($spremenljivka['naslov']);
-		//$tex .= $variableTex.' & \multicolumn{8}{>{\hsize=\dimexpr 9\hsize + 9\tabcolsep + \arrayrulewidth}X|}{'.$naslovTex.'} '.$this->texNewLine;		
 		if($export_format != 'xls'){
 			$tex .= $this->horizontalLineTex; /*obroba*/
 		}
-		
+				
-		
-/* 		$this->pdf->setFont('','b','6');
-		$this->pdf->ln(5);
-		$this->pdf->MultiCell(18, 5, $this->encodeText($spremenljivka['variable']), 1, 'C', 0, 0, 0 ,0, true);
-		$this->pdf->MultiCell(162, 5, $this->encodeText($spremenljivka['naslov']), 1, 'L', 0, 1, 0 ,0, true);	 */	
-		
 		//druga vrstica		
 		$tex .= " & ".$this->encodeText($lang['srv_analiza_opisne_subquestion1'])." & \multicolumn{5}{c|}{".$this->encodeText($lang['srv_analiza_opisne_units'])."} & \multicolumn{2}{c|}{".$this->encodeText($lang['srv_analiza_opisne_arguments'])."} ".$this->texNewLine;		
 		if($export_format != 'xls'){
 			$tex .= $this->horizontalLineTex; /*obroba*/
 		}
 		
-/* 		$this->pdf->MultiCell(18, 5, $this->encodeText(''), 1, 'L', 0, 0, 0 ,0, true);
-		$this->pdf->MultiCell(50, 5, $this->encodeText($lang['srv_analiza_opisne_subquestion']), 1, 'C', 0, 0, 0 ,0, true);
-		$this->pdf->MultiCell(80, 5, $this->encodeText($lang['srv_analiza_opisne_units']), 1, 'C', 0, 0, 0 ,0, true);
-		$this->pdf->MultiCell(32, 5, $this->encodeText($lang['srv_analiza_opisne_arguments']), 1, 'C', 0, 1, 0 ,0, true);	 */
-		
 		//tretja vrstica
 		$text = array();		
 		$text[] = '';

admin/survey/export/latexclasses/Analize/AnalizaTTest.php

@@ -4,33 +4,32 @@
 	
 	include_once('../../function.php');
 	include_once('../survey/definition.php');
-/* 	include_once('../exportclases/class.pdfIzvozAnalizaFunctions.php');
+
-	require_once('../exportclases/class.enka.pdf.php'); */
 	
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php

@@ -10,8 +10,8 @@
  *****************************************/
 
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
 
 class BesediloLatex extends LatexSurveyElement
 {

admin/survey/export/latexclasses/Vprasanja/DatumLatex.php

@@ -13,7 +13,7 @@
 class DatumLatex extends LatexSurveyElement
 {
 	var $internalCellHeight;
-	protected $texBigSkip = '\bigskip';
+	protected $texBigSkip = '\bigskip ';
 	protected $loop_id = null;	// id trenutnega loopa ce jih imamo
 	
     public function __construct()

admin/survey/export/latexclasses/Vprasanja/GridMultipleLatex.php

@@ -10,9 +10,9 @@
  *****************************************/
 
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
 
 class GridMultipleLatex extends LatexSurveyElement
 {
@@ -65,7 +65,8 @@ class GridMultipleLatex extends LatexSurveyElement
 		if($userDataPresent!=0||$export_subtype=='q_empty'||$export_subtype=='q_comment'||$preveriSpremenljivko){	//ce je kaj v bazi ali je prazen vprasalnik ali je potrebno pokazati tudi ne odgovorjena vprasanja
 			global $lang;		
 		
-			// iz baze preberemo vse moznosti - ko nimamo izpisa z odgovori respondenta			
+			// iz baze preberemo vse moznosti - ko nimamo izpisa z odgovori respondenta
+			//echo "SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' AND hidden='0' ORDER BY vrstni_red"."</br>";
 			$sqlVrednosti = sisplet_query("SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' AND hidden='0' ORDER BY vrstni_red");
 			$numRowsSql = mysqli_num_rows($sqlVrednosti);		//za filanje navpicnih odgovorov
 			//echo "SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' ORDER BY vrstni_red";
@@ -84,7 +85,7 @@ class GridMultipleLatex extends LatexSurveyElement
 			$sqlMultiple = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode($multipleSprId, ',').") ORDER BY m.vrstni_red, g.vrstni_red");		
 			//echo "SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode($multipleSprId, ',').") ORDER BY m.vrstni_red, g.vrstni_red";
 			//poizvedba podnaslovov v kombinirani tabeli
-			$sqlMultiplePodNaslovi = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id IN (".implode($multipleSprId, ',').")");		
+			$sqlMultiplePodNaslovi = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id IN (".implode($multipleSprId, ',').")");
 			//novo za kombinirano tabelo - konec
 			
 			$spremenljivkaParams = new enkaParameters($spremenljivke['params']);
@@ -108,6 +109,29 @@ class GridMultipleLatex extends LatexSurveyElement
 			
 			$oznakaVprasanja = $this->UrediOznakoVprasanja($spremenljivke['id']);	//uredi oznako vprasanja, ker ne sme biti stevilska
 
+
+			//ce je prisoten id uporabnika - ureditev belezenja vnesenega odgovora pod Drugo:
+			if($usr_id){
+				$multipleVredIdDrugo = array();	//polje za shranjevanje vre_id, kjer je prisotna moznost Drugo:
+				//poizvedba vrednosti polj, kjer se pojavijo polja Drugo:
+				$sqlMultipleVredIdZaDrugo = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id IN (".implode($multipleSprId, ',').") AND other = 1");				
+				while ($rowsqlMultipleVredIdZaDrugo = mysqli_fetch_array($sqlMultipleVredIdZaDrugo)) {
+					$multipleVredIdDrugo[] = $rowsqlMultipleVredIdZaDrugo['id'];
+				}
+
+				if(!empty($multipleVredIdDrugo)){	
+					$multipleBesediloDrugo = array();	//polje za shranjevanje vnesenega besedila iz strani respondenta, kjer je prisotna moznost Drugo:
+					$sqlStavekMultipleBesediloDrugo = "SELECT text FROM srv_data_text_active WHERE vre_id IN (".implode($multipleVredIdDrugo, ',').") AND usr_id=".$usr_id." ";
+					$sqlMultipleBesediloDrugo = sisplet_query($sqlStavekMultipleBesediloDrugo);
+					while ($rowsqlMultipleBesediloDrugo = mysqli_fetch_array($sqlMultipleBesediloDrugo)) {
+						$multipleBesediloDrugo[] = $rowsqlMultipleBesediloDrugo['text'];
+					}
+				}
+				
+				$indeksBesediloDrugo = 0; //definiranje indeksa za izpis vnesenega besedila v Drugo:
+			}
+			//ce je prisoten id uporabnika - ureditev belezenja vnesenega odgovora pod Drugo: - konec
+
 			//pregled vseh moznih vrednosti (kategorij) po $sqlVrednosti - navpicni odgovori
 			while ($rowVrednost = mysqli_fetch_assoc($sqlVrednosti)){			
 				$stringTitleRow = ((( $rowVrednost['naslov'] ) ? $rowVrednost['naslov'] : ( ( $rowVrednost['naslov2'] ) ? $rowVrednost['naslov2'] : $rowVrednost['variable'] ) ));			
@@ -116,8 +140,21 @@ class GridMultipleLatex extends LatexSurveyElement
 				if ($naslov != '') {
 					//$rowVrednost['naslov'] = $naslov;
 					$stringTitleRow = $naslov;
-				}			
+				}
-				array_push($navpicniOdgovori, $this->encodeText($stringTitleRow) );	//filanje polja z navpicnimi odgovori (po vrsticah)
+
+				$besediloDrugo = '';
+
+				//ce je drugo vnesen kot odgovor in je prisoten id uporabnika
+				if($rowVrednost['other'] && $usr_id){
+					//zabelezi besedilo, ki je trenuten uporabnik za trenuten odgovor zapisal pod Drugo:					
+					$besediloDrugo = $multipleBesediloDrugo[$indeksBesediloDrugo];
+					$this->encodeText($besediloDrugo);
+					$besediloDrugo = ' \\textcolor{crta}{\footnotesize{'.$besediloDrugo.'}} ';
+					$indeksBesediloDrugo++;	//povecaj indeks za izpis vnesenega besedila v Drugo:
+				}
+				//ce je drugo vnesen kot odgovor in je prisoten id uporabnika - konec
+			
+				array_push($navpicniOdgovori, $this->encodeText($stringTitleRow)." ".$besediloDrugo);	//filanje polja z navpicnimi odgovori (po vrsticah)
 			}
 			//pregled vseh moznih vrednosti (kategorij) po $sqlVrednosti - navpicni odgovori - konec
 
@@ -423,7 +460,7 @@ class GridMultipleLatex extends LatexSurveyElement
 						if(($vodoravniOdgovoriEnota[0] == 2 || $vodoravniOdgovoriEnota[0] == 6) && $izpisOdgovorov && $export_data_type == 1 || ($izpisOdgovorov && $export_data_type == 2 && $vodoravniOdgovoriTip[0] == 6 )){	//(ce je roleta ALI seznam) IN je izpis odgovorov IN razsirjen izvoz ALI (je izpis odgovorov IN skrcen izvoz IN radio button)
 							
 						}else{
-							array_push($vodoravniOdgovori, $stringTitleCol);	//filanje polja z vodoravnimi odgovori (po stolpcih)
+							array_push($vodoravniOdgovori, $stringTitleCol);	//filanje polja z vodoravnimi odgovori (po stolpcih)							
 						}
 						//array_push($vodoravniOdgovori, $stringTitleCol);	//filanje polja z vodoravnimi odgovori (po stolpcih)
 						//echo $rowMultiple['naslov']."</br>";

admin/survey/export/latexclasses/Vprasanja/HeatmapLatex.php

@@ -9,9 +9,9 @@
  * Datum: 09/2017
  *****************************************/
 //use enkaParameters;
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
 
 class HeatmapLatex extends LatexSurveyElement
 {	

admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php

@@ -9,7 +9,7 @@
  * Datum: 05/2018
  *****************************************/
 
- define("NAGOVOR_LINE_WIDTH", 0.5, true);
+ define("NAGOVOR_LINE_WIDTH", 0.5);
 
 class KalkulacijaLatex extends LatexSurveyElement
 {

admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php

@@ -9,7 +9,7 @@
  * Datum: 05/2018
  *****************************************/
 
- define("NAGOVOR_LINE_WIDTH", 0.5, true);
+ define("NAGOVOR_LINE_WIDTH", 0.5);
 
 class KvotaLatex extends LatexSurveyElement
 {

admin/survey/export/latexclasses/Vprasanja/MultiGridLatex.php

@@ -10,18 +10,15 @@
  *****************************************/
 
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
-//define("U_SHAPE_WIDTH", 4, true);
+define("U_SHAPE_WIDTH_U", 4);
-define("U_SHAPE_WIDTH_U", 4, true);
+define("U_SHAPE_WIDTH_OKVIR", 3.62);
-define("U_SHAPE_WIDTH_OKVIR", 3.62, true);
+define("U_SHAPE_WIDTH_TEXT_U", 2.2);
-//define("U_SHAPE_WIDTH_TEXT_U", 2.1, true);
+define("U_SHAPE_WIDTH_TEXT_OKVIR", 1.81);
-define("U_SHAPE_WIDTH_TEXT_U", 2.2, true);
+define("MAXSTEVILOSTOLPCEV", 21); 	//max Stevilo Stolpcev za prvo vrstico pod Drsnikom, zaradi tezav z izrisom, ce je teh vec kot toliko
-define("U_SHAPE_WIDTH_TEXT_OKVIR", 1.81, true);
+define("VAS_SIZE", 0.04); //VAS_SIZE
-//define("U_SHAPE_WIDTH_TEXT_OKVIR", 2.1, true);
-define("MAXSTEVILOSTOLPCEV", 21, true); 	//max Stevilo Stolpcev za prvo vrstico pod Drsnikom, zaradi tezav z izrisom, ce je teh vec kot toliko
-define("VAS_SIZE", 0.04, true); //VAS_SIZE
 
 class MultiGridLatex extends LatexSurveyElement
 {
@@ -115,7 +112,7 @@ class MultiGridLatex extends LatexSurveyElement
 				$stringMissingOdgovor = $colVrednost['naslov'];
 				array_push($missingOdgovori, $this->encodeText($stringMissingOdgovor) );	//filanje polja z missing odgovori
 			}else{
-				$stringTitleCol = $colVrednost['naslov'];				
+				$stringTitleCol = $colVrednost['naslov'];
 				array_push($vodoravniOdgovori, $this->encodeText($stringTitleCol) );	//filanje polja z vodoravnimi odgovori (po stolpcih)
 			}
 		}
@@ -432,8 +429,9 @@ class MultiGridLatex extends LatexSurveyElement
 					if (strip_tags($rowl['naslov']) != '') $colVrednost['naslov'] = $rowl['naslov'];
 					#ce je respondent odgovarjal v drugem jeziku - konec ################
 					
-					$stringTitleCol = $colVrednost['naslov'];				
+					$stringTitleCol = $colVrednost['naslov'];
-					array_push($vodoravniOdgovori, $this->encodeText($stringTitleCol) );	//filanje polja z vodoravnimi odgovori (po stolpcih)					
+					$stringTitleCol = str_replace('<br />','',$stringTitleCol);	//odstranitev odvecnih </br> iz naslova stolpcev
+					array_push($vodoravniOdgovori, $this->encodeText($stringTitleCol) );	//filanje polja z vodoravnimi odgovori (po stolpcih)
 				}
 			}
 			//pregled vseh odgovorov po stolpcih po $sqlStolpciVrednosti - konec
@@ -470,10 +468,10 @@ class MultiGridLatex extends LatexSurveyElement
 			$fillablePdf = 0;						
 			if((($spremenljivke['enota']==0)&&($spremenljivke['tip']==6||$spremenljivke['tip']==16))||($spremenljivke['tip']==19||$spremenljivke['tip']==20)){	//klasicna tabela ali multitext ali multinumber
 				
-				if($export_data_type==1||($export_subtype=='q_empty'||$export_subtype=='q_comment')){//ce je dolg izvoz ali(prazen vprasalnik ali vpr. s komentarji)					
+				if($export_data_type==1||($export_subtype=='q_empty'||$export_subtype=='q_comment')){//ce je dolg izvoz ali(prazen vprasalnik ali vpr. s komentarji)
 					//izris tabel ustrezne postavitve					
 					if($spremenljivke['tip']==20){ //ce je tip vprasanja stevilo
-						if(($nacinVnosa == 0)){	//ce je nacin vnosa Stevilo						
+						if(($nacinVnosa == 0)){	//ce je nacin vnosa Stevilo
 							$tex .= $this->IzrisTabeleMultiGrid($spremenljivke, $numColSql, $numRowsSql, $vodoravniOdgovori, $navpicniOdgovori, 0, $symbol, $texNewLine, $texNewLineAfterTable, $export_format, 0, $missingOdgovori, $userAnswerDataText, $export_subtype);						
 						}else if($nacinVnosa == 1 && $export_format=='pdf'){	//ce so drsniki in je pdf		
 							$tex .= $this->IzrisGridDrsnikov($spremenljivke, $navpicniOdgovori, $export_format, $export_subtype, $missingOdgovori, $userAnswerDataText);

admin/survey/export/latexclasses/Vprasanja/NagovorLatex.php

@@ -9,7 +9,7 @@
  * Datum: 09/2017
  *****************************************/
 
- define("NAGOVOR_LINE_WIDTH", 0.5, true);
+ define("NAGOVOR_LINE_WIDTH", 0.5);
 
 class NagovorLatex extends LatexSurveyElement
 {

admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php

@@ -11,8 +11,8 @@
 
 //namespace Export\Latexclasses\Vprasanja;
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
 
 class RadioCheckboxSelectLatex extends LatexSurveyElement
 {
@@ -29,6 +29,7 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement
 	protected $loop_id = null;	// id trenutnega loopa ce jih imamo
 	protected $path2ImagesRadio;
 	protected $language;
+	protected $prevod;
 
     public static function getInstance()
     {		
@@ -43,6 +44,15 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement
 		
 		$this->language = $language;
 		$this->path2ImagesRadio = $site_path.'uploadi/editor/';
+
+		//preverjanje, ali je prevod
+		if(isset($_GET['language'])){
+			$this->language = $_GET['language'];
+			$this->prevod = 1;
+		}else{
+			$this->prevod = 0;
+		}
+		//preverjanje, ali je prevod - konec
 		
 		// Ce je spremenljivka v loopu
 		$this->loop_id = $loop_id;
@@ -54,6 +64,7 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement
 		$userAnswerData = array();		//belezi podatke respondenta
 		$textRArray = array();	//belezi odgovore respondenta, ki se nahajajo v desnem delu vprasanja
 		// iz baze preberemo vse moznosti - ko nimamo izpisa z odgovori respondenta
+		//echo "SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' AND hidden='0' ORDER BY vrstni_red";
 		$sqlVrednosti = sisplet_query("SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' AND hidden='0' ORDER BY vrstni_red");
 		$numRowsSql = mysqli_num_rows($sqlVrednosti);
 		$tex = '';
@@ -66,6 +77,8 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement
 		if ($usr_id){
 			$userDataPresent = $this->GetUsersData($db_table, $spremenljivke['id'], $spremenljivke['tip'], $usr_id, $this->loop_id);	//zgenerira podatke z odgovori respondenta v $this->userAnswer, zabelezi, ce so podatki prisotni
 		}
+
+		//echo "test: ".$userDataPresent."</br>";
 		
 		#izpis izvoza kratek ali zelo kratek ###############################################################################
 		if($export_subtype=='q_data'||$export_subtype=='q_data_all'){	//ce je izvoz odgovorov respondenta/respodentov
@@ -118,12 +131,10 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement
 		
 		#izpis praznega vprasalnika ali dolgega izvoza (vprasalnika z odgovori respondenta) ##################################################
 		if($export_subtype=='q_empty'||$export_data_type==1||$export_subtype=='q_comment'){	//ce je izpis praznega vprasalnika ali dolgega izvoza
-			
+			/* echo "orientacija: ".$spremenljivke['orientation']."</br>";
+			echo "tip: ".$spremenljivke['tip']."</br>"; */
 			if($spremenljivke['orientation']==5){	//ce je postavitev Potrditev
 				if($export_format == 'pdf'){	//ce je pdf
-		/* 			if($spremenljivke['orientation']==0 || $spremenljivke['orientation']==2){	//ce sta vodoravni orientaciji
-						$tex .= $texNewLine;	//dodaj na koncu vprasanja prazno vrstico
-					} */
 					$tex .= $this->texBigSkip;
 					$tex .= '\\end{absolutelynopagebreak}';	//zakljucimo environment, da med vprasanji ne bo prelomov strani
 				}else{	//ce je rtf
@@ -252,26 +263,30 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement
 				while ($rowVrednost = mysqli_fetch_assoc($sqlVrednosti)){
 					$prop['full'] = ( isset($userAnswer[$rowVrednost['id']]) );	
 					
-					//if($this->language!=''){ //ce je prevod ankete
+					
-					if($this->language>1){ //ce je prevod ankete						
+					//if($this->language>1){ //ce je prevod ankete
+					if($this->prevod){ //ce je prevod ankete
 						$rowl = $this->srv_language_vrednost($rowVrednost['id']);	//pridobi prevod naslova v ustreznem jeziku						
 						$stringTitle = ((( $rowl['naslov'] ) ? $rowl['naslov'] : ( ( $rowl['naslov2'] ) ? $rowl['naslov2'] : $rowl['variable'] ) )); //prevod naslova v ustreznem jeziku
 					}else{						
-						$stringTitle = ((( $rowVrednost['naslov'] ) ? $rowVrednost['naslov'] : ( ( $rowVrednost['naslov2'] ) ? $rowVrednost['naslov2'] : $rowVrednost['variable'] ) ));						
+						$stringTitle = ((( $rowVrednost['naslov'] ) ? $rowVrednost['naslov'] : ( ( $rowVrednost['naslov2'] ) ? $rowVrednost['naslov2'] : $rowVrednost['variable'] ) ));
 					}
+					
+					//echo "naslov: $stringTitle</br>";
 					//echo "jezik: ".$this->language."</br>";
 					if ( $spremenljivke['tip'] == 1 || $spremenljivke['tip'] == 3 ){											
 						$symbol = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], 0, $this->userAnswer[$rowVrednost['id']], $spremenljivke['orientation'], $indeksZaWhile, $vizualnaSkalaNumber);
 						//$tex .= '{\ChoiceMenu[radio,radiosymbol=\ding{108},name=myGroupOfRadiobuttons]{}{='.$stringTitle.'}}'.$stringTitle.' '.$this->texNewLine;
 						$internalCellHeight = '0.3 cm';	//visina praznega okvirja @povleci-spusti						
-					}else if ( $spremenljivke['tip']  == 2 )
+					}else if ( $spremenljivke['tip']  == 2 ){						
-					{						
 						$symbol = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], 0, $this->userAnswer[$rowVrednost['id']]);
 						$internalCellHeight = '3 cm'; //visina praznega okvirja @povleci-spusti
 					}
 					
 					if($spremenljivke['orientation']==1&&$spremenljivke['tip'] != 3){	//navpicno						
-						$tex .= $symbol.' '.$this->encodeText($stringTitle, $rowVrednost['id']).' '.$texNewLine;												
+						$tex .= $symbol.' '.$this->encodeText($stringTitle, $rowVrednost['id']).' '.$texNewLine;
+						//$test = $symbol.' '.$this->encodeText($stringTitle, $rowVrednost['id']).' '.$texNewLine;
+						//echo "tukaj! $test </br>";
 					}elseif($spremenljivke['orientation']==7){	//navpicno - tekst levo						
 						$text = $this->encodeText($stringTitle, $rowVrednost['id']).' & '.$symbol.' '.$texNewLine;
 						$textLength = strlen($text);

admin/survey/export/latexclasses/Vprasanja/RazvrscanjeLatex.php

@@ -10,9 +10,9 @@
  *****************************************/
 
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
 
 class RazvrscanjeLatex extends LatexSurveyElement
 {	

admin/survey/export/latexclasses/Vprasanja/SNImena.php

@@ -9,7 +9,7 @@
  * Datum: 05/2018
  *****************************************/
 
- define("NAGOVOR_LINE_WIDTH", 0.5, true);
+ define("NAGOVOR_LINE_WIDTH", 0.5);
 
 class SNImenaLatex extends LatexSurveyElement
 {

admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php

@@ -10,9 +10,9 @@
  *****************************************/
 
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
-define("MAXSTEVILOSTOLPCEV", 21, true); 	//max Stevilo Stolpcev za prvo vrstico pod Drsnikom, zaradi tezav z izrisom, ce je teh vec kot toliko
+define("MAXSTEVILOSTOLPCEV", 21); 	//max Stevilo Stolpcev za prvo vrstico pod Drsnikom, zaradi tezav z izrisom, ce je teh vec kot toliko
 
 class SteviloLatex extends LatexSurveyElement
 {

admin/survey/export/latexclasses/Vprasanja/VsotaLatex.php

@@ -10,9 +10,9 @@
  *****************************************/
 
 
-define("PIC_SIZE", "\includegraphics[width=10cm]", true); 	//slika sirine 50mm
+define("PIC_SIZE", "\includegraphics[width=10cm]"); 	//slika sirine 50mm
-define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); 	//za ikone @ slikovni tip
+define("ICON_SIZE", "\includegraphics[width=0.5cm]"); 	//za ikone @ slikovni tip
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
 
 class VsotaLatex extends LatexSurveyElement
 {	

admin/survey/export/latexclasses/class.LatexAnalysisElement.php

@@ -8,9 +8,8 @@
  */
 
 
-//include('../../function.php');
 include('../../vendor/autoload.php');
-define("MAX_STRING_LENGTH", 20, true);
+define("MAX_STRING_LENGTH", 20);
 
  
 class LatexAnalysisElement{
@@ -925,7 +924,12 @@ class LatexAnalysisElement{
 		$text = str_replace('^','\textasciicircum{} ',$text);		
 		//$text = str_replace('_','\_ ',$text);	
 		$text = str_replace('_','\_',$text);	
-		$text = str_replace('~','\textasciitilde{} ',$text);		
+		$text = str_replace('~','\textasciitilde{} ',$text);
+		if(strpos($text, '&')){	//ce je prisotno v besedilu &'
+			$text = str_replace('&','\& ',$text);
+		}else{
+			$text = str_replace('&','\& ',$text);
+		}		
 		
 		$andSymbolPresent = 0;
 		$posAndSymbolPresent = strpos($text,'&');

admin/survey/export/latexclasses/class.LatexDocument.php

@@ -97,10 +97,10 @@ omenjeno kodo je potrebno deliti z 255, da dobimo stevilke, ki ustrezajo Latex =
 //namespace Export\Latexclasses;
 //include('../../function.php');
 include('../../vendor/autoload.php');
-define("ENKA_LOGO_SIZE", 'width=3.51cm,height=2cm,keepaspectratio', true);
+define("ENKA_LOGO_SIZE", 'width=3.51cm,height=2cm,keepaspectratio');
-define("ENKA_LOGO_SIZE_HEADER", 'width=1.75cm,height=1cm,keepaspectratio', true);
+define("ENKA_LOGO_SIZE_HEADER", 'width=1.75cm,height=1cm,keepaspectratio');
-define("SINGLE_TABLE_WIDTH", 3000, true);
+define("SINGLE_TABLE_WIDTH", 3000);
-define("PAGE_TEXT_WIDTH", 10200, true); //17 cm, 170 mm, je 10200 twips, 1 mm je 60 twips
+define("PAGE_TEXT_WIDTH", 10200); //17 cm, 170 mm, je 10200 twips, 1 mm je 60 twips
 
 #definicija za izris drsnika s kroglico
 define ("circleSlider", '\def\circleSLIDER#1#2{% 1: length, 2: position of the mark (0 to 1)
@@ -111,7 +111,7 @@ define ("circleSlider", '\def\circleSLIDER#1#2{% 1: length, 2: position of the m
 						 \fill[rounded corners=0.1cm, draw=gray, fill=lightgray] (start) rectangle (end);
 						 \fill[draw=gray, rounded corners=0.2mm, fill=gray!20!gray] (mark) circle(.15) ;
 						}
-						}', true);
+						}');
 						
 #definicija za izris drsnika brez kroglice
 define ("emptySlider", '\def\emptySLIDER#1{% 1: length
@@ -120,25 +120,16 @@ define ("emptySlider", '\def\emptySLIDER#1{% 1: length
 						 \coordinate (end) at (#1,0.1cm);
 						 \fill[rounded corners=0.1cm, draw=gray, fill=lightgray] (start) rectangle (end);
 						}
-						}', true);
+						}');
 						
 #definicija latex kode za dodajanje skripte za generiranje xls iz html
-/* define ("headWithXlsScript", 
-	'\ifdefined\HCode
-	\AtBeginDocument{%
-	\Configure{@HEAD}{\HCode{<script src="./table2excel/dist/jquery.table2excel.js"></script>\Hnewline}}
-	\ConfigureEnv{quote}{\Tg<quote>}{\Tg</quote>}{}{}
-	}
-	\fi',
-true); */
 define ("headWithXlsScript", 
 	'\ifdefined\HCode
 	\AtBeginDocument{%
 	\Configure{@HEAD}{\HCode{<script src="./export/script/saveAsExcel2.js"></script>\Hnewline}}
 	\ConfigureEnv{quote}{\Tg<quote>}{\Tg</quote>}{}{}
 	}
-	\fi',
+	\fi');
-true);
 
 class LatexDocument{
 	
@@ -252,8 +243,23 @@ class LatexDocument{
 		echo 'SurveyId: '.SurveyInfo::getSurveyId().'</br>'; */
 		
 		#za pridobitev jezika respondenta
+		//pridobitev splosnega jezika ankete za respondenta nastavitev=> Osnovni jezik za respondente:		
+		$sqlL = sisplet_query("SELECT lang_resp FROM srv_anketa WHERE id='$this->anketa' ");
+		$rowL = mysqli_fetch_array($sqlL);
+		$this->language = $rowL['lang_resp'];
 		
-		if ($this->usr_id  != '') {
+		############testiranje za jezik
+		if(isset($_GET['language'])){
+			$this->language = $_GET['language'];
+			//echo "jezik test: ".$this->language."</br>";
+			// Naložimo jezikovno datoteko
+			$file = '../../lang/'.$this->language.'.php';
+			include($file);
+			$_SESSION['langX'] = $site_url .'lang/'.$this->language.'.php';
+		}
+		############testiranje za jezik - konec
+
+		if ($this->usr_id  != '') {	//ce je izpis za dolocenega respondenta
 			$sqlL = sisplet_query("SELECT language FROM srv_user WHERE id = '$this->usr_id ' AND ank_id='$this->anketa' ");
 			$rowL = mysqli_fetch_array($sqlL);
 			$this->language = $rowL['language'];
@@ -1364,8 +1370,11 @@ class LatexDocument{
 		$text = str_replace('^','\textasciicircum{} ',$text);		
 		$text = str_replace('_','\_ ',$text);	
 		$text = str_replace('~','\textasciitilde{} ',$text);
-		$text = str_replace('&','\&',$text);
+		if(strpos($text, '&amp;')){	//ce je prisotno v besedilu &amp;'
-		$text = str_replace('&amp;','\&',$text);
+			$text = str_replace('&amp;','\& ',$text);
+		}else{
+			$text = str_replace('&','\& ',$text);
+		}
 		$text = str_replace('&nbsp;','~',$text);
 		//$text = str_replace('&lt;','\textless ',$text);
 		$text = str_replace('&lt;',' \textless ',$text);

admin/survey/export/latexclasses/class.LatexEditsAnalysis.php

@@ -9,15 +9,15 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 	
 	define ('FRAME_TEXT_WIDTH', 0.3);
 	define ('FRAME_WIDTH', 480);

admin/survey/export/latexclasses/class.LatexGDPR.php

@@ -105,7 +105,7 @@ class LatexGDPR{
             $url = $matches[1][$key];
             $url_text = $matches[2][$key];
             
-            $tex = str_replace($matches[0][$key], '\textcolor{crta}{ \underline{ \href{'.$url.'}'.'{'.$url_text.'} } }', $tex);
+            $tex = str_replace($matches[0][$key], '\textcolor{crta}{\underline{\href{'.$url.'}'.'{'.$url_text.'}}}', $tex);
         }
 
 

admin/survey/export/latexclasses/class.LatexStatus.php

@@ -9,27 +9,27 @@
 	define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore
 	define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge
 	
-	define("NUM_DIGIT_AVERAGE", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_AVERAGE", 2); 	// stevilo digitalnih mest za povprecje
-	define("NUM_DIGIT_DEVIATION", 2, true); 	// stevilo digitalnih mest za povprecje
+	define("NUM_DIGIT_DEVIATION", 2); 	// stevilo digitalnih mest za povprecje
 
-	define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+	define("M_ANALIZA_DESCRIPTOR", "descriptor");
-	define("M_ANALIZA_FREQUENCY", "frequency", true);
+	define("M_ANALIZA_FREQUENCY", "frequency");
 
-	define("FNT_FREESERIF", "freeserif", true);
+	define("FNT_FREESERIF", "freeserif");
-	define("FNT_FREESANS", "freesans", true);
+	define("FNT_FREESANS", "freesans");
-	define("FNT_HELVETICA", "helvetica", true);
+	define("FNT_HELVETICA", "helvetica");
 
-	define("FNT_MAIN_TEXT", FNT_FREESANS, true);
+	define("FNT_MAIN_TEXT", FNT_FREESANS);
-	define("FNT_QUESTION_TEXT", FNT_FREESANS, true);
+	define("FNT_QUESTION_TEXT", FNT_FREESANS);
-	define("FNT_HEADER_TEXT", FNT_FREESANS, true);
+	define("FNT_HEADER_TEXT", FNT_FREESANS);
 
-	define("FNT_MAIN_SIZE", 10, true);
+	define("FNT_MAIN_SIZE", 10);
-	define("FNT_QUESTION_SIZE", 9, true);
+	define("FNT_QUESTION_SIZE", 9);
-	define("FNT_HEADER_SIZE", 10, true);
+	define("FNT_HEADER_SIZE", 10);
 
-	define("RADIO_BTN_SIZE", 3, true);
+	define("RADIO_BTN_SIZE", 3);
-	define("CHCK_BTN_SIZE", 3, true);
+	define("CHCK_BTN_SIZE", 3);
-	define("LINE_BREAK", 6, true);
+	define("LINE_BREAK", 6);
 
 	define ('PDF_MARGIN_HEADER', 8);
 	define ('PDF_MARGIN_FOOTER', 12);

admin/survey/export/latexclasses/class.LatexSurvey.php

@@ -8,9 +8,9 @@
  */
 //namespace Export\Latexclasses;
 
-//include('../../function.php');
 include('../../vendor/autoload.php');
-define("RADIO_BTN_SIZE", 0.13, true);
+
+define("RADIO_BTN_SIZE", 0.13);
  
 class LatexSurvey{
 	
@@ -153,7 +153,7 @@ class LatexSurvey{
 			$tex .= $this->texNewLine;
 			$tex .= $this->texNewLine;
 		}
-
+		
 		//ce je potrebno izpisati GDPR besedilo v intro
 		if($this->showGDPRIntro == 1){
 			//$GDPRintro = "gdpr INTRO";
@@ -207,18 +207,30 @@ class LatexSurvey{
 		if( ($surveyExpanded != 0 || $this->type != 1) && $this->showIntro == 1 ){
 			if ( SurveyInfo::getInstance()->getSurveyShowIntro() )
 			{ 		
-				if($this->language!=-1){ //ce je prevod ankete
+				//preverjanje, ali je prevod
+				if(isset($_GET['language'])){
+					$this->language = $_GET['language'];
+					$prevod = 1;
+				}else{
+					$prevod = 0;
+				}
+				//preverjanje, ali je prevod - konec
+
+				//if($this->language!=-1){ //ce je prevod ankete
+				if($prevod){ //ce je prevod ankete
 					$spr_id_uvod = -1;
 					$sqll = sisplet_query("SELECT naslov, info FROM srv_language_spremenljivka WHERE ank_id='".$this->anketa."' AND spr_id='".$spr_id_uvod."' AND lang_id='".$this->language."'");
 					$rowl = mysqli_fetch_array($sqll);	//pridobi prevod uvoda v ustreznem jeziku
 					$intro = $rowl['naslov'];	//prevod uvoda v ustreznem jeziku
 				}else{
 					$intro = (SurveyInfo::getInstance()->getSurveyIntro() == '') ? $lang['srv_intro'] : SurveyInfo::getInstance()->getSurveyIntro();
+				}					
+				$tex .=  $this->encodeTextHere($intro);		
+				if($intro){
+					$tex .= $this->texNewLine;
+					$tex .= $this->texNewLine;
 				}
 				
-				$tex .=  $this->encodeTextHere($intro);		
-				$tex .= $this->texNewLine;				
-				$tex .= $this->texNewLine;
 			}
 		}
 		
@@ -503,10 +515,9 @@ class LatexSurvey{
 				//$this->export_data_show_recnum = 1;
 				#izpis statusa respondenta in anketiranja
 				if($this->export_data_show_recnum == 1){	//ce je potrebno pokazati stevilko respondenta					
-					//$tex .= '{\\Large Recnum '.$rowu['recnum'].' (status '.$rowu['last_status'].' - '.$status.')} '.$this->texNewLine.' \\par ';
+					$tex .= '{\\Large Status '.$rowu['last_status'].' - '.$status.' (Recnum '.$rowu['recnum'].')} '.$this->texNewLine.' \\par ';					
-					$tex .= '{\\Large Status '.$rowu['last_status'].' - '.$status.' (Recnum '.$rowu['recnum'].')} '.$this->texNewLine.' \\par ';
 				}else{
-					$tex .= '{\\Large Status '.$rowu['last_status'].' - '.$status.$this->texNewLine.' \\par}';
+					$tex .= '{\\Large Status '.$rowu['last_status'].' - '.$status.$this->texNewLine.' \\par}';					
 				}
 				#izpis statusa respondenta in anketiranja - konec
 				

admin/survey/export/latexclasses/class.LatexSurveyElement.php

@@ -8,16 +8,15 @@
  */
 
 
-//include('../../function.php');
 include('../../vendor/autoload.php');
 
-define("MAX_STRING_LENGTH", 90, true);
+define("MAX_STRING_LENGTH", 90);
-define("LINE_BREAK_AT", '7 cm', true);
+define("LINE_BREAK_AT", '7 cm');
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
-define("CHCK_BTN_SIZE", 0.13, true);
+define("CHCK_BTN_SIZE", 0.13);
-define("PIC_SIZE_ANS", "\includegraphics[width=3cm]", true); 	//slika dolocene sirine
+define("PIC_SIZE_ANS", "\includegraphics[width=3cm]"); 	//slika dolocene sirine
-define("DROPDOWN_SIZE", 0.8, true);
+define("DROPDOWN_SIZE", 0.8);
-define("VAS_SIZE", 0.04, true); //VAS_SIZE
+define("VAS_SIZE", 0.04); //VAS_SIZE
 
  
 class LatexSurveyElement{
@@ -46,6 +45,7 @@ class LatexSurveyElement{
 	protected $path2Images;
 	protected $path2UploadedImages;
 	protected $language;
+	protected $prevod;
 	protected $admin_type;
 	protected $variableName;
 	
@@ -77,15 +77,25 @@ class LatexSurveyElement{
 		
 		//$this->usr_id = $_GET['usr_id'];
 		$this->usr_id = $usr_id;
-
+		
 		if ($this->usr_id  != '') {
 			$sqlL = sisplet_query("SELECT language FROM srv_user WHERE id = '$this->usr_id ' AND ank_id='$this->anketa' ");
 			$rowL = mysqli_fetch_array($sqlL);
 			$this->language = $rowL['language'];			
 		}
 
-		if($language!=-1){ //ce ni default jezik, ampak je prevod			
+		//preverjanje, ali je prevod
-			$this->language = $language;
+		if(isset($_GET['language'])){
+			$this->language = $_GET['language'];
+			$this->prevod = 1;
+		}else{
+			$this->prevod = 0;
+		}
+		//preverjanje, ali je prevod - konec
+
+		//if($language!=-1){ //ce ni default jezik, ampak je prevod
+		if($this->prevod){ //ce ni default jezik, ampak je prevod
+			$this->language = $language;			
 		}
 
 		if ( SurveyInfo::getInstance()->SurveyInit($anketa))
@@ -192,7 +202,8 @@ class LatexSurveyElement{
 			######################################### Pridobimo tekst vprasanja - konec
 			
 			#Stevilcenje vprasanj###############################################################
-			$numberingText = ($this->numbering == 1) ? $spremenljivke['variable'].' - ' : '';		
+			//$numberingText = ($this->numbering == 1) ? $spremenljivke['variable'].' - ' : '';		
+			$numberingText = ($this->numbering == 1) ? $this->encodeText($spremenljivke['variable']).' - ' : '';			
 			######################################### Stevilcenje vprasanj - konec		
 			//echo "goli naslov: ".$spremenljivke['naslov']."</br>";
 
@@ -446,7 +457,8 @@ class LatexSurveyElement{
 	 */
 	 function srv_language_spremenljivka ($spremenljivka=null) {
 		 
-		 if ($this->language != -1) {
+		// if ($this->language != -1) {
+		if ($this->prevod) {
 			$sqll = sisplet_query("SELECT naslov, info FROM srv_language_spremenljivka WHERE ank_id='".$this->anketa."' AND spr_id='".$spremenljivka['id']."' AND lang_id='".$this->language."'");
 			$rowl = mysqli_fetch_array($sqll);
 			
@@ -509,8 +521,7 @@ class LatexSurveyElement{
                 } else
                     $row1 = null;
 
-                $output .= $row1['variable'];
+                $output .= $this->encodeText($row1['variable']);
-
                 // radio, checkbox, dropdown in multigrid
                 if (($row2['tip'] <= 3 || $row2['tip'] == 6) && ($row['spr_id'] || $row['vre_id'])) {
 
@@ -578,8 +589,8 @@ class LatexSurveyElement{
 	        $output .= ' (';
 	        $output .= ' '.$row_if['label'].' ';
 	        $output .= ') ';      		
-        }
+		}
-		
+			
 		return $output;
 	}
 	
@@ -792,6 +803,8 @@ class LatexSurveyElement{
 		//echo "Encoding ".$text."</br>";
 		//echo "vre_id: ".$vre_id."</br>";
 		//echo "ime spremenljivke ".$this->variableName."</br>";
+				
+		$text = htmlspecialchars_decode($text);		//vse html special chars kot je &amp; spremeni v ustrezne simbole (npr. &amp;=>&) 
 		
 		//resevanje razbirajanja predolgih neprekinjenih besed in URL - spremenljivke za kasnejsi prilagojen izpis
 		//$numOfWords = str_word_count($text, 0);
@@ -898,9 +911,12 @@ class LatexSurveyElement{
 		$text = str_replace('€','\euro',$text);		
 		$text = str_replace('^','\textasciicircum{} ',$text);		
 		$text = str_replace('_','\_ ',$text);	
-		$text = str_replace('~','\textasciitilde{} ',$text);
+		$text = str_replace('~','\textasciitilde{} ',$text);		
-		$text = str_replace('&','\&',$text);
+		if(strpos($text, '&amp;')){	//ce je prisotno v besedilu &amp;'
-		$text = str_replace('&amp;','\&',$text);
+			$text = str_replace('&amp;','\& ',$text);	
+		}else{
+			$text = str_replace('&','\& ',$text);				
+		}
 		$text = str_replace('&nbsp;','~',$text);
 		//$text = str_replace('&lt;','\textless ',$text);
 		$text = str_replace('&lt;',' \textless ',$text);
@@ -1000,6 +1016,35 @@ class LatexSurveyElement{
 		}
 		//priprava izpisa zelo dolgega besedila brez presledkov - konec
 		//echo "text potem: ".$text."</br>";
+		
+		//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
+		$findAt = '@';
+		$numOfAt = substr_count($text, $findAt);	//stevilo '@' v besedilu
+
+		$posAt = strpos($text, $findAt);
+		if($posAt){	//ce je prisotna afna
+			//echo "afna je: $posAt </br>";
+			//echo "Encoding: ".$text."</br>";
+
+			//najdi prvi presledek po afni
+			//echo substr($text, $posAt) ."</br>";
+			$posSpace1Mail = strpos(substr($text, $posAt), $findSpace);	//najdi pozicijo prvega presledka v besedilu po e-naslovu
+			$posSpace1Mail = $posSpace1Mail+$posAt;	//koncna pozicija, ce se gleda celotno besedilo
+			//echo $posSpace1Mail."</br>";			
+			
+			//najdi prvi presledek pred afno			
+			$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace);	//najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
+			//echo $posSpace2Mail."</br>";
+			
+			//dodaj po e-naslovu potrebno latex kodo za zakljucek url
+			$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			
+			//dodaj pred e-naslovom potrebno latex kodo za url			
+			//substr_replace(string_name, replacement_string, start_pos, length) 
+			$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
+			//echo $text."</br>";
+		}
+		//detekcija prisotnosti e-naslova v besedilu  in primerna preureditev, da pride do pravilnega izpisa - konec
 
 
 		//RESEVANJE BESEDILA V CIRILICI
@@ -1012,19 +1057,17 @@ class LatexSurveyElement{
 		
 
 		//RESEVANJE odstranitve dodatnih style tag-ov po ul, ipd. #######################################################
-		$findStyleTag = 'style="';
+		$findStyleTag = 'style="';		
-		$findStyleTagEnd = '">';
+		$findStyleTagEnd = '"';
 		$numOfStyleTags = substr_count($text, $findStyleTag);	//stevilo 'style=" ' v tekstu
-		//echo "stevilo style: ".$numOfStyleTags." </br>";
+		//echo "stevilo style: ".$numOfStyleTags." </br>";		
-
+		for($s=0; $s<$numOfStyleTags; $s++){	//za vsako najdeno 'style=" ' besedilo, uredi njeno odstranitev			
-		for($s=0; $s<$numOfStyleTags; $s++){	//za vsako najdeno 'style=" ' besedilo, uredi njeno odstranitev
-			//$posImg = strpos($text, $findImg);
 			$posStyleTag = strpos($text, $findStyleTag);			
-			$posStyleTagEnd = strpos($text, $findStyleTagEnd);
+			$posStyleTagEnd = strpos($text, $findStyleTagEnd, $posStyleTag);	//strpos(string,find,start) najdi $findStyleTagEnd v $text, isci od $posStyleTag dalje
 			$dolzinaOff = $posStyleTagEnd - $posStyleTag + 2;
 			$text = substr_replace($text, "", $posStyleTag, $dolzinaOff);
 		
-		}
+		}		
 		//RESEVANJE odstranitve dodatnih style tag-ov po ul, ipd. - konec #################################################
 
  		if($pos === false && $posImg === false) {	//v tekstu ni br in img 		
@@ -1311,7 +1354,8 @@ class LatexSurveyElement{
 	 * @param mixed $vrednost
 	 */
 	 function srv_language_vrednost ($vre_id=null) {		
-		 if ($this->language != -1) {
+		 //if ($this->language != -1) {
+		if ($this->prevod) {
 			$sqllString = "SELECT naslov, naslov2 FROM srv_language_vrednost WHERE vre_id='".$vre_id."' AND lang_id='".$this->language."'";
 			$sqll = sisplet_query($sqllString);
 			$rowl = mysqli_fetch_array($sqll);			
@@ -1327,7 +1371,8 @@ class LatexSurveyElement{
 	 */
 	function srv_language_grid ($grd_id=null, $spr_id=null) {
 		 
-		 if ($this->language != -1) {
+		 //if ($this->language != -1) {
+		if ($this->prevod) {
 			$sqllString = "SELECT naslov FROM srv_language_grid WHERE spr_id = '".$spr_id."' AND  grd_id='".$grd_id."' AND lang_id='".$this->language."'";
 			$sqll = sisplet_query($sqllString);
 			$rowl = mysqli_fetch_array($sqll);			
@@ -2172,10 +2217,12 @@ class LatexSurveyElement{
 		$loop_id = $loop_id_raw;
 		
 		#za pridobitev stevila vrstic
-		//echo "SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' ORDER BY vrstni_red";
+		//echo "SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' ORDER BY vrstni_red </br>";
 		$sqlVrednostiKombo = sisplet_query("SELECT id, naslov, naslov2, variable, other FROM srv_vrednost WHERE spr_id='".$spremenljivke['id']."' ORDER BY vrstni_red");		
 		$numRowsSql = mysqli_num_rows($sqlVrednostiKombo);
 		//echo $numRowsSql."</br>";
+		//echo $spremenljivke['id']."</br>";
+
 		#za pridobitev stevila vrstic - konec
 		
 		#za pridobitev stevila stolpcev
@@ -2184,6 +2231,7 @@ class LatexSurveyElement{
 		$numColSql = $rowStVrednost['count(*)'];	//stevilo vseh stolpcev
 		//echo "stevilo stolpcev: ".$numColSql."</br>";
 		#za pridobitev stevila stolpcev - konec
+
 		//echo "presirokaTabela: ".$presirokaTabela."</br>";
 		if($presirokaTabela==0){	//ce tabela ni presiroka
 			$sqlSubGrid = sisplet_query("SELECT m.spr_id, s.tip FROM srv_grid_multiple m, srv_spremenljivka s WHERE m.parent='".$spremenljivke['id']."' AND m.spr_id=s.id ORDER BY m.vrstni_red");	//pridobimo spr_id in tip podvprasanj, ki sestavljajo kombinirano tabelo
@@ -2217,9 +2265,12 @@ class LatexSurveyElement{
 				
 				//echo $sqlVsehVrednostiString."</br>";
 				//echo $rowVrednosti['tip']."</br>";
+				//echo $rowVrednosti['other']."</br>";
 				//echo "Vrednost: ".$rowVrednosti['spr_id']."</br>";
 				$sqlVsehVrednosti = sisplet_query($sqlVsehVrednostiString);
 				//echo mysqli_num_rows($sqlVsehVrednosti)."</br>";
+
+				
 				
 				$roletaZabelezena = 0;
 

admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls

@@ -37,7 +37,7 @@
 \urlstyle{same} %nastavitev, da je font URL isti kot je font ostalega besedila (http://ctan.ijs.si/tex-archive/macros/latex/contrib/url/url.pdf)
 \usepackage{montserrat}	% za uporabo Montserrat pisave v dokumentu
 \usepackage{multirow}	% za spajanje vrstic v tabeli
-\usepackage{hyperref}
+\usepackage[hidelinks]{hyperref}
 \usepackage{tikz} % za risanje drsnikov
 \usetikzlibrary{calc} % za risanje drsnikov
 %definiranje uporabljenih barv

admin/survey/export/xmlClasses/Vprasanja/BesediloXml.php

@@ -7,7 +7,7 @@
  * Datum: 10/2018
  *****************************************/
 
-define("VARFORMAT_ELEMENT_TYPE_BESEDILO", "character", true);
+define("VARFORMAT_ELEMENT_TYPE_BESEDILO", "character");
 
 class BesediloXml extends XmlSurveyElement
 {

admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php

@@ -7,8 +7,8 @@
  * Datum: 10/2018
  *****************************************/
 
-define("VARGRP_ELEMENT_TYPE", "multipleResp", true);
+define("VARGRP_ELEMENT_TYPE", "multipleResp");
-define("VARFORMAT_ELEMENT_TYPE", "numeric", true);
+define("VARFORMAT_ELEMENT_TYPE", "numeric");
 
 class CheckboxXml extends XmlSurveyElement
 {

admin/survey/export/xmlClasses/Vprasanja/MultiGridXml.php

@@ -7,9 +7,9 @@
  * Datum: 10/2018
  *****************************************/
 
-define("VARGRP_ELEMENT_TYPE_GRID", "Grid", true);
+define("VARGRP_ELEMENT_TYPE_GRID", "Grid");
-define("VARGRP_ELEMENT_TYPE_MULTIRESP", "multipleResp", true);
+define("VARGRP_ELEMENT_TYPE_MULTIRESP", "multipleResp");
-define("VARFORMAT_ELEMENT_TYPE_GRID", "numeric", true);
+define("VARFORMAT_ELEMENT_TYPE_GRID", "numeric");
 
 class MultiGridXml extends XmlSurveyElement
 {

admin/survey/export/xmlClasses/Vprasanja/RadioXml.php

@@ -7,7 +7,7 @@
  * Datum: 10/2018
  *****************************************/
 
-define("VARFORMAT_ELEMENT_TYPE", "numeric", true);
+define("VARFORMAT_ELEMENT_TYPE", "numeric");
 
 class RadioXml extends XmlSurveyElement
 {

admin/survey/export/xmlClasses/Vprasanja/SteviloXml.php

@@ -7,7 +7,7 @@
  * Datum: 10/2018
  *****************************************/
 
-define("VARFORMAT_ELEMENT_TYPE_STEVILO", "numeric", true);
+define("VARFORMAT_ELEMENT_TYPE_STEVILO", "numeric");
 
 class SteviloXml extends XmlSurveyElement
 {

admin/survey/export/xmlClasses/class.XmlDocument.php

@@ -12,7 +12,7 @@
 ####################################konec
 
 include('../../vendor/autoload.php');
-define("CODEBOOK_VERSION", 2.1, true);
+define("CODEBOOK_VERSION", 2.1);
  
 class XmlDocument{
 	

admin/survey/export/xmlClasses/class.XmlSurveyElement.php

@@ -9,12 +9,12 @@
 
 include('../../vendor/autoload.php');
 
-define("MAX_STRING_LENGTH", 60, true);
+define("MAX_STRING_LENGTH", 60);
-define("LINE_BREAK_AT", '7 cm', true);
+define("LINE_BREAK_AT", '7 cm');
-define("RADIO_BTN_SIZE", 0.13, true);
+define("RADIO_BTN_SIZE", 0.13);
-define("CHCK_BTN_SIZE", 0.13, true);
+define("CHCK_BTN_SIZE", 0.13);
-define("PIC_SIZE_ANS", "\includegraphics[width=3cm]", true); 	//slika dolocene sirine
+define("PIC_SIZE_ANS", "\includegraphics[width=3cm]"); 	//slika dolocene sirine
-define("DROPDOWN_SIZE", 0.8, true);
+define("DROPDOWN_SIZE", 0.8);
 
  
 class XmlSurveyElement{

admin/survey/index.php

@@ -120,7 +120,7 @@
         if(isset($_GET['a']) && ($_GET['a'] == 'hierarhija_superadmin' || $_GET['a'] == 'hierarhija')){
             echo '<script type="text/javascript" src="minify/g=jshierarhija?v='.$rowv['value'].'"></script>';
         }
-        elseif($_GET['a'] == 'narocila' || ($_GET['t'] == 'uporabniki' && in_array($_GET['m'], ['all', 'my', 'izbrisani', 'nepotrjeni', 'odjavljeni']))){
+        elseif($_GET['a'] == 'narocila' || $_GET['t'] == 'uporabniki'){
             echo '<script type="text/javascript" src="minify/g=jsLastLib?v='.$rowv['value'].'"></script>';
         }
         else{

admin/survey/izvoz.php

@@ -22,84 +22,84 @@ else{
 
 
 /****** DEFINITIONS ******/
-define("M_ANALIZA_DESCRIPTOR", "descriptor", true);
+define("M_ANALIZA_DESCRIPTOR", "descriptor");
-define("M_ANALIZA_FREQUENCY", "frequency", true);
+define("M_ANALIZA_FREQUENCY", "frequency");
-define("M_ANALIZA_CROSSTAB", "crosstabs", true);
+define("M_ANALIZA_CROSSTAB", "crosstabs");
-define("M_ANALIZA_STATISTICS", "statistics", true);
+define("M_ANALIZA_STATISTICS", "statistics");
-define("M_ANALIZA_SUMS", "sums", true);
+define("M_ANALIZA_SUMS", "sums");
 
 /*PDF*/
-define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf", true);
+define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf");
-define("A_REPORT_PDF_RESULTS","pdf_results",true);
+define("A_REPORT_PDF_RESULTS","pdf_results");
-define("A_REPORT_PDF_COMMENT","pdf_comment",true);
+define("A_REPORT_PDF_COMMENT","pdf_comment");
-define("M_REPORT_ANALIZA_PDF_FREKVENCA","frequency",true);
+define("M_REPORT_ANALIZA_PDF_FREKVENCA","frequency");
-define("M_REPORT_ANALIZA_PDF_CROSSTAB_IZPIS","crosstabs_izpis",true);
+define("M_REPORT_ANALIZA_PDF_CROSSTAB_IZPIS","crosstabs_izpis");
-define("M_REPORT_ANALIZA_PDF_MULTICROSSTAB_IZPIS","multicrosstabs_izpis",true);
+define("M_REPORT_ANALIZA_PDF_MULTICROSSTAB_IZPIS","multicrosstabs_izpis");
-define("M_REPORT_ANALIZA_PDF_MEAN_IZPIS","mean_izpis",true);
+define("M_REPORT_ANALIZA_PDF_MEAN_IZPIS","mean_izpis");
-define("M_REPORT_ANALIZA_PDF_TTEST_IZPIS","ttest_izpis",true);
+define("M_REPORT_ANALIZA_PDF_TTEST_IZPIS","ttest_izpis");
-define("M_REPORT_ANALIZA_PDF_BREAK_IZPIS","break_izpis",true);
+define("M_REPORT_ANALIZA_PDF_BREAK_IZPIS","break_izpis");
-define("M_REPORT_ANALIZA_PDF_STAT","statistics",true);
+define("M_REPORT_ANALIZA_PDF_STAT","statistics");
-define("M_REPORT_ANALIZA_PDF_CHARTS","charts",true);
+define("M_REPORT_ANALIZA_PDF_CHARTS","charts");
-define("M_REPORT_ANALIZA_PDF_SUMS","sums",true);
+define("M_REPORT_ANALIZA_PDF_SUMS","sums");
-define("M_REPORT_ANALIZA_PDF_CREPORT","creport_pdf",true);
+define("M_REPORT_ANALIZA_PDF_CREPORT","creport_pdf");
-define("A_REPORT_PDF_STATUS","status",true);
+define("A_REPORT_PDF_STATUS","status");
-define("A_REPORT_PDF_EDITS_ANALYSIS","editsAnalysis",true);
+define("A_REPORT_PDF_EDITS_ANALYSIS","editsAnalysis");
-define("A_REPORT_PDF_LIST","list_pdf",true);
+define("A_REPORT_PDF_LIST","list_pdf");
-define("M_REPORT_PDF_EVOLI","pdf_evoli",true);
+define("M_REPORT_PDF_EVOLI","pdf_evoli");
-define("M_REPORT_PDF_TEAMMETER","pdf_teammeter",true);
+define("M_REPORT_PDF_TEAMMETER","pdf_teammeter");
-define("M_REPORT_PDF_EMPLOYMETER","pdf_employmeter",true);
+define("M_REPORT_PDF_EMPLOYMETER","pdf_employmeter");
-define("M_REPORT_PDF_MFDPS","pdf_mfpds",true);
+define("M_REPORT_PDF_MFDPS","pdf_mfpds");
-define("M_REPORT_PDF_MJU","pdf_mju",true);
+define("M_REPORT_PDF_MJU","pdf_mju");
-define("M_REPORT_PDF_MJU2","pdf_mju2",true);
+define("M_REPORT_PDF_MJU2","pdf_mju2");
-define("M_REPORT_BORZA","borza_chart",true);
+define("M_REPORT_BORZA","borza_chart");
-define("M_REPORT_PDF_HEATMAP_IMAGE","heatmap_image_pdf",true);
+define("M_REPORT_PDF_HEATMAP_IMAGE","heatmap_image_pdf");
-define("M_REPORT_HIERARHIJA_PDF_IZPIS", "hierarhija_pdf_izpis", true);
+define("M_REPORT_HIERARHIJA_PDF_IZPIS", "hierarhija_pdf_izpis");
 
 /*RTF*/
-define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf", true);
+define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf");
-define("A_REPORT_RTF_RESULTS", "rtf_results", true);
+define("A_REPORT_RTF_RESULTS", "rtf_results");
-define("A_REPORT_RTF_COMMENT","rtf_comment",true);
+define("A_REPORT_RTF_COMMENT","rtf_comment");
-define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf", true);
+define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf");
-define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf", true);
+define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf");
-define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf", true);
+define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf");
-define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf", true);
+define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf");
-define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf", true);
+define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf");
-define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf", true);
+define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf");
-define("A_REPORT_RTF_LIST", "list_rtf", true);
+define("A_REPORT_RTF_LIST", "list_rtf");
-define("M_REPORT_ANALIZA_RTF_HEATMAP_IMAGE","heatmap_image_rtf",true);
+define("M_REPORT_ANALIZA_RTF_HEATMAP_IMAGE","heatmap_image_rtf");
 
 /*XLS*/
-define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls", true);
+define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls");
-define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls", true);
+define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls");
-define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls", true);
+define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls");
-define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls");
-define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls", true);
+define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls");
-define("A_REPORT_XLS_LIST", "list_xls", true);
+define("A_REPORT_XLS_LIST", "list_xls");
-define("A_REPORT_XLS_USABLE", "usable_xls", true);
+define("A_REPORT_XLS_USABLE", "usable_xls");
-define("A_REPORT_XLS_SPEEDER", "speeder_xls", true);
+define("A_REPORT_XLS_SPEEDER", "speeder_xls");
-define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls", true);
+define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls");
-define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv", true);
+define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv");
-define("M_REPORT_CSV_MAZA_USERS", "maza_csv", true);
+define("M_REPORT_CSV_MAZA_USERS", "maza_csv");
-define("M_REPORT_CSV_ADVANCED_PARADATA", "advanced_paradata_csv", true);
+define("M_REPORT_CSV_ADVANCED_PARADATA", "advanced_paradata_csv");
 
 /*JSON*/
-define("M_REPORT_JSON_SURVEY_EXPORT", "json_survey", true);
+define("M_REPORT_JSON_SURVEY_EXPORT", "json_survey");
 
-define("A_LANGUAGE_TECHNOLOGY_XLS", "lt_excel", true);
+define("A_LANGUAGE_TECHNOLOGY_XLS", "lt_excel");
 
 /*PPT*/
-define("M_REPORT_ANALIZA_PPT_CHARTS", "charts_ppt", true);
+define("M_REPORT_ANALIZA_PPT_CHARTS", "charts_ppt");
-define("M_REPORT_ANALIZA_PPT_HEATMAP_IMAGE","heatmap_image_ppt",true);
+define("M_REPORT_ANALIZA_PPT_HEATMAP_IMAGE","heatmap_image_ppt");
 
 /*IMAGE*/
-define("M_REPORT_ANALIZA_HEATMAP_IMAGE", "heatmap_image", true);
+define("M_REPORT_ANALIZA_HEATMAP_IMAGE", "heatmap_image");
 
 
 

admin/survey/modules/Evalvacija/class.Evalvacija.php

@@ -8,10 +8,10 @@ ini_set('max_execution_time', 3600);		// 1800 seconds = 30 minutes
 * 	
 */
 
-define("TEMP_FOLDER", "admin/survey/modules/Evalvacija/temp", true);
+define("TEMP_FOLDER", "admin/survey/modules/Evalvacija/temp");
-define("SCRIPT_FOLDER", "admin/survey/modules/Evalvacija/R", true);
+define("SCRIPT_FOLDER", "admin/survey/modules/Evalvacija/R");
-define("RESULTS_FOLDER", "admin/survey/modules/Evalvacija/results", true);
+define("RESULTS_FOLDER", "admin/survey/modules/Evalvacija/results");
-define("PDF_FOLDER", "admin/survey/modules/Evalvacija/pdf", true);
+define("PDF_FOLDER", "admin/survey/modules/Evalvacija/pdf");
 
 class Evalvacija{
 
@@ -407,7 +407,7 @@ class Evalvacija{
 		global $lang;
                 
         // Inicializiramo class za datoteko s podatki
-        $SDF = SurveyDataFile::get_instance();
+        /*$SDF = SurveyDataFile::get_instance();
 
 		// Nastavimo ustrezno anketo za generiranje datoteke s podatki
 		if($this->exportSettings['anketa_pred'] > 0){
@@ -430,7 +430,7 @@ class Evalvacija{
         $SDF->prepareFiles();  
 
         $this->_headFileName = $SDF->getHeaderFileName();
-        $this->_dataFileName = $SDF->getDataFileName();
+        $this->_dataFileName = $SDF->getDataFileName();*/
 		
 		
 		// PRVI CSV - profesorji s predmeti
@@ -598,7 +598,7 @@ class Evalvacija{
     
         
         // Poskrbimo za datoteko s podatki
-        $SDF = SurveyDataFile::get_instance();
+        $SDF = SurveyDataFile::get_instance($force_new=true);
         $SDF->init($anketa);           
         $SDF->prepareFiles();  
 
@@ -1390,6 +1390,9 @@ class Evalvacija{
 		if(move_uploaded_file($_FILES['import_csv']['tmp_name'], $target_file)){
 			//echo 'Datoteka '. basename( $_FILES["fileToUpload"]["name"]). ' je bila uspešno uvožena.';
 			
+            // Za odstranjevanje bom znakov
+            $bom = pack('H*','EFBBBF');
+
 			$file = fopen($target_file, 'r');
 			while(!feof($file)){
 			
@@ -1405,6 +1408,10 @@ class Evalvacija{
 					// Ce je stevilo studentov 0 ne uvazamo
 					if($i == 8 && $val == '0')
 						$skip = true;
+
+                    // za vsak slucaj odstranimo utf8 bom znake
+					if($i == 0)
+                        $val = preg_replace("/^$bom/", '', $val);
 						
 					$values .= '\''.$val.'\',';
 					

admin/survey/modules/Evalvacija/class.GC.php

@@ -30,18 +30,18 @@ set_time_limit(7200); # 120 minut
 ini_set('default_socket_timeout', 1000);
 
 
-define('CERT_FOLDER', "modules/Evalvacija/GC_cert", true);
+define('CERT_FOLDER', "modules/Evalvacija/GC_cert");
 
 // Produkcijski streznik
-define('GC_URL', "https://gcwserac.uni-lj.si/IntegrationUL/Services/GcService.asmx", true);
+define('GC_URL', "https://gcwserac.uni-lj.si/IntegrationUL/Services/GcService.asmx");
-//define(WSDL_URL, "https://gcwserac.uni-lj.si/IntegrationUL/Services/GcService.asmx?WSDL", true);
+//define(WSDL_URL, "https://gcwserac.uni-lj.si/IntegrationUL/Services/GcService.asmx?WSDL");
 
 // Direktno produkcijski strežnik za testiranje
-//define(GC_URL, "https://193.2.64.32", true);
+//define(GC_URL, "https://193.2.64.32");
 
 // Testni streznik
-//define(GC_URL, "https://gcwserac-test.uni-lj.si/IntegrationUL/Services/GcService.asmx", true);
+//define(GC_URL, "https://gcwserac-test.uni-lj.si/IntegrationUL/Services/GcService.asmx");
-//define(WSDL_URL, "https://gcwserac-test.uni-lj.si/IntegrationUL/Services/GcService.asmx?WSDL", true);
+//define(WSDL_URL, "https://gcwserac-test.uni-lj.si/IntegrationUL/Services/GcService.asmx?WSDL");
 
 
 class GC{
@@ -53,7 +53,8 @@ class GC{
 	
 	//var $year = '2017_2018';			// Letnica za porocilo
 	//var $year = '2018_2019';			// Letnica za porocilo
-	var $year = '2019_2020';			// Letnica za porocilo
+	//var $year = '2019_2020';			// Letnica za porocilo
+	var $year = '2020_2021';			// Letnica za porocilo
 	
 	var $izvajalec_table = '';			// Katero tabelo izvajalcev uporabljamo - navadna (eval_izvajalec) ali testna (eval_izvajalec2)
 	
@@ -183,14 +184,14 @@ class GC{
 			'4_1' => 'predmeti'
 		);
 
-		$reports_id = '11112020';
+		$reports_id = '02032021';
-		$report_type = '2_2';
+		$report_type = '1_1';
-		$fak_id = '3000027';
+		$fak_id = '3000001';
 		$zip_name = '';
 		
 		// Nastavimo pot do pdf-jev
-		$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
+		//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
-		//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
+		$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
 		//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
 		
 		echo '<span class="bold">Parametri:</span>';
@@ -206,7 +207,7 @@ class GC{
         //$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false);		
     		
 		// BRANJE POROCIL - IZVAJALEC
-		//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_190', $fakultete[$fak_id]['kratica']);
+		//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_321', $fakultete[$fak_id]['kratica']);
 		
 		// BRANJE POROCIL - FAKULTETA
 		//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2019_2020', $fakultete[$fak_id]['kratica']);

admin/survey/modules/mod_360/class.Survey360.php

@@ -1,8 +1,8 @@
 <?php
 
-define("TEMP_FOLDER", "admin/survey/modules/mod_360/temp", true);
+define("TEMP_FOLDER", "admin/survey/modules/mod_360/temp");
-define("SCRIPT_FOLDER", "admin/survey/modules/mod_360/R", true);
+define("SCRIPT_FOLDER", "admin/survey/modules/mod_360/R");
-define("RESULTS_FOLDER", "admin/survey/modules/mod_360/results", true);
+define("RESULTS_FOLDER", "admin/survey/modules/mod_360/results");
 
 class Survey360{
 

admin/survey/modules/mod_360_1KA/class.Survey3601ka.php

@@ -1,8 +1,8 @@
 <?php
 
-define("TEMP_FOLDER", "admin/survey/modules/mod_360_1KA/temp", true);
+define("TEMP_FOLDER", "admin/survey/modules/mod_360_1KA/temp");
-define("SCRIPT_FOLDER", "admin/survey/modules/mod_360_1KA/R", true);
+define("SCRIPT_FOLDER", "admin/survey/modules/mod_360_1KA/R");
-define("RESULTS_FOLDER", "admin/survey/modules/mod_360_1KA/results", true);
+define("RESULTS_FOLDER", "admin/survey/modules/mod_360_1KA/results");
 
 class Survey3601ka{
 

admin/survey/modules/mod_BORZA/class.SurveyBORZA.php

@@ -1,8 +1,8 @@
 <?php
 
-define("TEMP_FOLDER", "admin/survey/modules/mod_BORZA/temp", true);
+define("TEMP_FOLDER", "admin/survey/modules/mod_BORZA/temp");
-define("SCRIPT_FOLDER", "admin/survey/modules/mod_BORZA/R", true);
+define("SCRIPT_FOLDER", "admin/survey/modules/mod_BORZA/R");
-define("RESULTS_FOLDER", "admin/survey/modules/mod_BORZA/results", true);
+define("RESULTS_FOLDER", "admin/survey/modules/mod_BORZA/results");
 
 class SurveyBORZA{
 

admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R

@@ -4,6 +4,18 @@
 # Poročilo "KLIMA KAKOVOSTI"
 ################################
 
+#----------------- ENCODING 1KA STREŽNNIK ----------------#
+# Nastavimo encoding za potrebe strežnika
+# Pogosto se na 1KA strežniku pokvarijo šumniki
+# zato šumniki (v PDF poročilu) lokalno delajo
+# na strežniku pa ne
+# Torej v kolikor želimo, da se v angleški različici
+#' izpišemo šumniki je to @NUJNO @POTREBNO!!!
+Sys.setlocale(category = "LC_ALL", locale = "slovenian")
+#--------------- //ENCODING 1KA STREŽNNIK// --------------#
+
+
+
 #----------------------------------------------------#
 # Passing arguments to an R script from command lines
 params <- commandArgs(trailingOnly=TRUE)
@@ -63,6 +75,7 @@ data <-
     sep = ";",
     header = T,
     fill = T,
+    encoding = 'UTF-8',
     stringsAsFactors = FALSE
   )
 if (data[1, 1] == ("Ustreznost") |
@@ -118,10 +131,10 @@ table$perc <- paste0(table$perc , "\\%", sep="")
 # Name of rows
 rownames(table) <- c(oddelek_length$group,"Total")
 # Name of rows
-colnames(table) <- c('Frequency', 'Prcentage')
+colnames(table) <- c('Frequency', 'Percentage')
 # Latex Table
 table.tex <- capture.output(Hmisc::latex(table,
-                                         rowlabel="Quality climate",
+                                         rowlabel="Quality Climate",
                                          file="", 
                                          where="H",
                                          rowlabel.just="p{6.5cm}",
@@ -926,6 +939,23 @@ customer <-
     "Dear Customer!",
     paste0("Dear ", data$ime, "!")
   )
+
+# Mali č
+organisation <- gsub("\u010D", "č", organisation, fixed = TRUE)
+# Velik Č
+organisation <- gsub("\u010C", "Č", organisation, fixed = TRUE)
+# Mali ž
+organisation <- gsub("\u017E", "ž", organisation, fixed = TRUE)
+# Velik Ž
+organisation <- gsub("\u017D", "Ž", organisation, fixed = TRUE)
+# Mali š
+organisation <- gsub("\u0161", "š", organisation, fixed = TRUE)
+# Velik Š
+organisation <- gsub("\u0160", "š", organisation, fixed = TRUE)
+# Mali đ
+organisation <- gsub("\u0111", "đ", organisation, fixed = TRUE)
+# Velik đ
+organisation <- gsub("\u0110", "Đ", organisation, fixed = TRUE)
 #--------------------- //ORGANIZATION INFORMATION// ------------------------#
 
 

admin/survey/modules/mod_EVOLI/R/Functions_QC/my_functions_QC_dan.R

@@ -0,0 +1,79 @@
+
+#------------------------------------ Load some usefull functions ------------------------------------#
+# Ustvarimo svojo funkcijo, ki vedno števila z 0.5 zaokrožila navzgor
+# (glej "Variables and syntax Quality Climate 22072019 - FDV (1)".xlsx)
+round2 = function(x) {
+  x <- round(x, 1)
+  # Najprej rekodiramo rezultate kot želi 
+  # stranka: glej file 
+  # "Variables and syntax Quality Climate 22072019 - FDV (1).xlsx"
+  x <- ifelse(x >= 4.9, 5, 
+              ifelse(x >=4.1 & x <= 4.8, 4, ifelse(
+                x >= 3.1 & x <= 4.0, 3, ifelse(
+                  x >= 2.1 & x <= 3.0, 2, ifelse(
+                    x >= 1.3 & x <= 2.0, 1, NA
+                  )
+                )
+              )
+              )
+  )
+  x 
+}
+
+
+
+#prepare data for plot
+prep.dat <- function(df, variable) {
+  df <- round2(rowMeans(df[, variable], na.rm = TRUE) / 4 * 5)
+  df <- data.frame(prop.table(table(df)) * 100) 
+  names(df)[1] <- "Frequency"
+  names(df)[2] <- "Prcentage"
+  # Check if there is no labels
+  # We want to show values from 1 - 5
+  # Therefore is some is missing we will 
+  # create it and assign it 0
+  # if (nrow(df) < 5) {
+  # miss <- 1:5
+  # # Check diff
+  # dif <- setdiff(miss, df[,1])
+  # # Check how many data we are missing
+  # miss.dummy <- df[1:length(dif),]
+  # # Clone data
+  # miss.dummy$Frekvens <- dif
+  # # # Add zeero
+  # miss.dummy$Procent <- 0
+  # # Finally Rbind
+  # df <- rbind(miss.dummy, df)
+  # # And order
+  # df <- df[order(df$Frekvens),]
+  # }
+  return(df)
+}
+
+
+# name po katerih bomo razvrstili stolpce v grafu
+labScore <- function(df, labelord) {
+  df$label <- ifelse(df$Frequency == 1,
+                     "Meget utilfredsstillende",
+                     ifelse(
+                       df$Frequency == 2,
+                       "Utilfredsstillende",
+                       ifelse(
+                         df$Frequency == 3,
+                         "Gennemsnitlig",
+                         ifelse(
+                           df$Frequency == 4,
+                           "Meget tilfredsstillende",
+                           ifelse(df$Frequency == 5, "S\u00E6rdeles tilfredsstillende", NA)
+                         )
+                       )
+                     )) 
+  
+  # Imena po katerih bomo razvrstili stolpce v grafih
+  df$name <- labelord
+  
+  return(df)
+  
+}
+
+#---------------------------------- //Load some usefull functions// ----------------------------------#

admin/survey/modules/mod_EVOLI/class.SurveyEmployMeter.php

@@ -2,9 +2,9 @@
 
 include_once 'definition.php';
 
-define("TEMP_FOLDER", "admin/survey/modules/mod_EVOLI/temp", true);
+define("TEMP_FOLDER", "admin/survey/modules/mod_EVOLI/temp");
-define("SCRIPT_FOLDER", "admin/survey/modules/mod_EVOLI/R", true);
+define("SCRIPT_FOLDER", "admin/survey/modules/mod_EVOLI/R");
-define("RESULTS_FOLDER", "admin/survey/modules/mod_EVOLI/results", true);
+define("RESULTS_FOLDER", "admin/survey/modules/mod_EVOLI/results");
 
 class SurveyEmployMeter{
 

admin/survey/modules/mod_EVOLI/class.SurveyEvoli.php

@@ -2,9 +2,9 @@
 
 include_once 'definition.php';
 
-define("TEMP_FOLDER", "admin/survey/modules/mod_EVOLI/temp", true);
+define("TEMP_FOLDER", "admin/survey/modules/mod_EVOLI/temp");
-define("SCRIPT_FOLDER", "admin/survey/modules/mod_EVOLI/R", true);
+define("SCRIPT_FOLDER", "admin/survey/modules/mod_EVOLI/R");
-define("RESULTS_FOLDER", "admin/survey/modules/mod_EVOLI/results", true);
+define("RESULTS_FOLDER", "admin/survey/modules/mod_EVOLI/results");
 
 class SurveyEvoli{