diff --git a/admin/exportclases/class.pdfIzvoz.php b/admin/exportclases/class.pdfIzvoz.php index 262b2e8ae..292a805ea 100644 --- a/admin/exportclases/class.pdfIzvoz.php +++ b/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 diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index f8c84d9a2..ab16ece70 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -5043,7 +5043,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++) { diff --git a/admin/survey/Glasovanje.php b/admin/survey/Glasovanje.php index 51bffbed0..6f42b6e93 100644 --- a/admin/survey/Glasovanje.php +++ b/admin/survey/Glasovanje.php @@ -2,7 +2,7 @@ global $site_path; -define('NEW_LINE', "\n", true); +define('NEW_LINE', "\n"); class Glasovanje { diff --git a/admin/survey/R/class.SurveyAnalysisR.php b/admin/survey/R/class.SurveyAnalysisR.php index b42a4c27e..0a21388b3 100644 --- a/admin/survey/R/class.SurveyAnalysisR.php +++ b/admin/survey/R/class.SurveyAnalysisR.php @@ -9,8 +9,8 @@ * */ -define("DATA_FOLDER", "admin/survey/R/TempData", true); -define("SCRIPT_FOLDER", "admin/survey/R/script", true); +define("DATA_FOLDER", "admin/survey/R/TempData"); +define("SCRIPT_FOLDER", "admin/survey/R/script"); class SurveyAnalysisR { diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 9cf037a1e..ed364fc79 100644 --- a/admin/survey/SurveyAdmin.php +++ b/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_SPSS", "spss", true); -define("M_IZVOZI_txt", "txt", true); +define("M_IZVOZI_EXCEL", "excel"); +define("M_IZVOZI_SPSS", "spss"); +define("M_IZVOZI_txt", "txt"); -define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf", true); -define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf", true); +define("A_REPORT_VPRASALNIK_PDF", "vprasalnik_pdf"); +define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf"); -define("M_REPORT_TEXT", "text", true); -define("M_REPORT_GRAPHICAL", "graphical", true); -define("M_REPORT_TOTAL", "total", true); +define("M_REPORT_TEXT", "text"); +define("M_REPORT_GRAPHICAL", "graphical"); +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); @@ -2689,7 +2689,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(); diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index 4891ce366..d60ad9e31 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/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; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 420dd98c0..25b45ccae 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -5668,14 +5668,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; @@ -8151,16 +8151,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 diff --git a/admin/survey/classes/class.SurveyAapor.php b/admin/survey/classes/class.SurveyAapor.php index 0386402e9..55dde7004 100644 --- a/admin/survey/classes/class.SurveyAapor.php +++ b/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']; diff --git a/admin/survey/classes/class.SurveyAnalysis.php b/admin/survey/classes/class.SurveyAnalysis.php index 85b7af054..c14cc02f0 100644 --- a/admin/survey/classes/class.SurveyAnalysis.php +++ b/admin/survey/classes/class.SurveyAnalysis.php @@ -9,8 +9,8 @@ * " -> \x22 */ -define("EXPORT_FOLDER", "admin/survey/SurveyData", true); -#define(EXPORT_FOLDER, "tmp", true); +define("EXPORT_FOLDER", "admin/survey/SurveyData"); + 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_LIMIT2", 2.00, true); -define("RESIDUAL_COLOR_LIMIT3", 3.00, true); +define("RESIDUAL_COLOR_LIMIT1", 1.00); +define("RESIDUAL_COLOR_LIMIT2", 2.00); +define("RESIDUAL_COLOR_LIMIT3", 3.00); -DEFINE (STR_DLMT, '|', true); -DEFINE (NEW_LINE, "\n", true); -DEFINE (TMP_EXT, '.tmp', true); -DEFINE (DAT_EXT, '.dat', true); +DEFINE (STR_DLMT, '|'); +DEFINE (NEW_LINE, "\n"); +DEFINE (TMP_EXT, '.tmp'); +DEFINE (DAT_EXT, '.dat'); class SurveyAnalysis { @@ -1387,11 +1387,7 @@ class SurveyAnalysis { break; case 27: # heatmap - //echo ''; - //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 diff --git a/admin/survey/classes/class.SurveyAnalysisArchive.php b/admin/survey/classes/class.SurveyAnalysisArchive.php index 2cc81022e..eddcb3dea 100644 --- a/admin/survey/classes/class.SurveyAnalysisArchive.php +++ b/admin/survey/classes/class.SurveyAnalysisArchive.php @@ -21,8 +21,8 @@ */ -define("SAA_FOLDER", "AnalysisArchive", true); -define("DEFAULT_DURATION", " +3 month", true); // privzet čas trajanja athiva +define("SAA_FOLDER", "AnalysisArchive"); +define("DEFAULT_DURATION", " +3 month"); // privzet čas trajanja athiva class SurveyAnalysisArchive { diff --git a/admin/survey/classes/class.SurveyBreak.php b/admin/survey/classes/class.SurveyBreak.php index 59b37975c..d863c97cb 100644 --- a/admin/survey/classes/class.SurveyBreak.php +++ b/admin/survey/classes/class.SurveyBreak.php @@ -8,8 +8,8 @@ * */ -define("EXPORT_FOLDER", "admin/survey/SurveyData", true); -define("BREAK_OPTION_LIMIT", 15, true); +define("EXPORT_FOLDER", "admin/survey/SurveyData"); +define("BREAK_OPTION_LIMIT", 15); class SurveyBreak { diff --git a/admin/survey/classes/class.SurveyChart.php b/admin/survey/classes/class.SurveyChart.php index 8f14a1ab9..e6e077ffb 100644 --- a/admin/survey/classes/class.SurveyChart.php +++ b/admin/survey/classes/class.SurveyChart.php @@ -4,7 +4,7 @@ * @date Februar 2011 */ -define("SAA_FOLDER", "AnalysisArchive", true); +define("SAA_FOLDER", "AnalysisArchive"); class SurveyChart { diff --git a/admin/survey/classes/class.SurveyCrosstabs.php b/admin/survey/classes/class.SurveyCrosstabs.php index 7206cd8d2..b0ada1f68 100644 --- a/admin/survey/classes/class.SurveyCrosstabs.php +++ b/admin/survey/classes/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_LIMIT2", 2.00, true); -define("RESIDUAL_COLOR_LIMIT3", 3.00, true); +define("RESIDUAL_COLOR_LIMIT1", 1.00); +define("RESIDUAL_COLOR_LIMIT2", 2.00); +define("RESIDUAL_COLOR_LIMIT3", 3.00); define("AUTO_HIDE_ZERRO_VALUE", 20); # nad koliko kategorij skrivamo ničelne vrednosti @session_start(); diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php index cf0dc88b9..47329191d 100644 --- a/admin/survey/classes/class.SurveyDiagnostics.php +++ b/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_IN_BLOCK_LIMIT", 15, true); # priporočeno število spremenljivk na blok -define("SUB_Q_IN_GRID_LIMIT", 8, true); # priporočeno število podvprašanj na grid -define("SPR_UNAPROPRIATE_START_LIMIT", 30, true); # koliko % spremenljivk preverjamo na pravilen začetek -define("SPR_REMINDER_ON_MGRID_LIMIT", 10, true); # koliko % spremenljivk preverjamo na pravilen začetek -define("TIME_SOFT_LIMIT", 120, true); # čas izpolnjevanja 2 minuti priporočilo -define("TIME_HARD_LIMIT", 900, true); # čas izpolnjevanja 15 minut opozorilo +define("SPR_ON_PAGE_LIMIT", 8); # priporočeno število spremenljivk na stran +define("SPR_IN_BLOCK_LIMIT", 15); # priporočeno število spremenljivk na blok +define("SUB_Q_IN_GRID_LIMIT", 8); # priporočeno število podvprašanj na grid +define("SPR_UNAPROPRIATE_START_LIMIT", 30); # 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); # čas izpolnjevanja 2 minuti priporočilo +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_IN_BLOCK", "DIAG_SPR_IN_BLOCK", true); # 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_REMINDER_ON_IF", "DIAG_REMINDER_ON_IF", true); # 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_UNAPROPRIATE_START", "DIAG_UNAPROPRIATE_START", true); # 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_VARIABLENAMES", "DIAG_INVALID_VARIABLENAMES", true); # Ali so varable podvojene -define("DIAG_INVALID_VALIDATIONS", "DIAG_INVALID_VALIDATIONS", true); # Ali so napacne validacije na spremenljivkah -define("DIAG_TIME_SOFT_LIMIT", "DIAG_TIME_SOFT_LIMIT", true); # predolga anketa 1 -define("DIAG_TIME_HARD_LIMIT", "DIAG_TIME_HARD_LIMIT", true); # predolga anketa 2 +define("DIAG_SPR_ON_PAGE", "DIAG_SPR_ON_PAGE"); # Zaznali smo preveč spremenljivk na stran +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"); # Zaznali smo preveč podvprašanj v gridu +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"); # Reminder na spremenljvko z veliko podvprašanji +define("DIAG_UNAPROPRIATE_START", "DIAG_UNAPROPRIATE_START"); # ali imamo na začetku ankete neprimerna vprašanja +define("DIAG_INVALID_CONDITIONS", "DIAG_INVALID_CONDITIONS"); # Ali so napake v ifih +define("DIAG_INVALID_VARIABLENAMES", "DIAG_INVALID_VARIABLENAMES"); # Ali so varable podvojene +define("DIAG_INVALID_VALIDATIONS", "DIAG_INVALID_VALIDATIONS"); # Ali so napacne validacije na spremenljivkah +define("DIAG_TIME_SOFT_LIMIT", "DIAG_TIME_SOFT_LIMIT"); # predolga anketa 1 +define("DIAG_TIME_HARD_LIMIT", "DIAG_TIME_HARD_LIMIT"); # predolga anketa 2 class SurveyDiagnostics { diff --git a/admin/survey/classes/class.SurveyExport.php b/admin/survey/classes/class.SurveyExport.php index f1f93d8f6..844ad0c59 100644 --- a/admin/survey/classes/class.SurveyExport.php +++ b/admin/survey/classes/class.SurveyExport.php @@ -11,13 +11,12 @@ * */ -DEFINE (NEW_LINE, "\n", true); -DEFINE (TMP_EXT, '.tmp', true); -DEFINE (STR_DLMT, '|', true); -DEFINE (DAT_EXT, '.dat', true); +DEFINE (NEW_LINE, "\n"); +DEFINE (TMP_EXT, '.tmp'); +DEFINE (STR_DLMT, '|'); +DEFINE (DAT_EXT, '.dat'); -#define("EXPORT_FOLDER", "tmp", true); -define("EXPORT_FOLDER", "admin/survey/SurveyData", true); +define("EXPORT_FOLDER", "admin/survey/SurveyData"); class SurveyExport { diff --git a/admin/survey/classes/class.SurveyInpect.php b/admin/survey/classes/class.SurveyInpect.php index e9066c487..2aa62210d 100644 --- a/admin/survey/classes/class.SurveyInpect.php +++ b/admin/survey/classes/class.SurveyInpect.php @@ -5,10 +5,10 @@ * */ -define('SI_DEFAULT_PROFILE', false, true); -define('SI_GOTO_ANALIZE', 0, true); -define('SI_GOTO_VPOGLED', 1, true); -define('SI_GOTO_PODATKI', 2, true); +define('SI_DEFAULT_PROFILE', false); +define('SI_GOTO_ANALIZE', 0); +define('SI_GOTO_VPOGLED', 1); +define('SI_GOTO_PODATKI', 2); class SurveyInspect { diff --git a/admin/survey/classes/class.SurveyInvitationsNew.php b/admin/survey/classes/class.SurveyInvitationsNew.php index ce2f8aa25..f8dd41e7d 100644 --- a/admin/survey/classes/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/class.SurveyInvitationsNew.php @@ -9,10 +9,10 @@ * */ -define('GROUP_PAGINATE', 4, true); # po kolko strani grupira pri paginaciji -define('REC_ON_PAGE', 10, true); # kolko zapisov na stran pri urejanju respondentov -define('REC_ON_SEND_PAGE', 20, true); # kolko zapisov na stran pri pošiljanju -define('NOTIFY_INFO1KA', 5, true); # Nad koliko emaili obveščamo info@1ka.si +define('GROUP_PAGINATE', 4); # po kolko strani grupira pri paginaciji +define('REC_ON_PAGE', 10); # kolko zapisov na stran pri urejanju respondentov +define('REC_ON_SEND_PAGE', 20); # kolko zapisov na stran pri pošiljanju +define('NOTIFY_INFO1KA', 5); # Nad koliko emaili obveščamo info@1ka.si set_time_limit(2400); # 30 minut class SurveyInvitationsNew { diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index 534081e00..8f775d879 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/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_TYPE', 1, true); # privzeto: sortiranje padajoče -define('SRV_LIST_REC_PER_PAGE', 25, true); # 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_SUB_FOLDERS', true, true); # privzeto: ali poizvedujemo po poddirektorijih -define('SRV_LIST_CHECK_DOSTOP', true, true); # ali preverja dostop na nivoju ankete -define('SRV_LIST_GROUP_PAGINATE', 5, true); # po kolko strani grupira pri paginaciji -define('SRV_LIST_UPDATE_TIME_LIMIT', 900, true); # na koliko minut updejtamo: 15min = 60s*15 +define('SRV_LIST_ORDER_BY', 16); # privzeto: sortiranje po stolpcu 1 +define('SRV_LIST_ORDER_TYPE', 1); # privzeto: sortiranje padajoče +define('SRV_LIST_REC_PER_PAGE', 25); # privzeto: koliko zapisov na stran prikažemo +define('SRV_LIST_GET_AS_LIST', true); # privzeto: ali lovimo kot seznam ali kot drevo folderjev +define('SRV_LIST_GET_SUB_FOLDERS', true); # privzeto: ali poizvedujemo po poddirektorijih +define('SRV_LIST_CHECK_DOSTOP', true); # ali preverja dostop na nivoju ankete +define('SRV_LIST_GROUP_PAGINATE', 5); # po kolko strani grupira pri paginaciji +define('SRV_LIST_UPDATE_TIME_LIMIT', 900); # na koliko minut updejtamo: 15min = 60s*15 if(session_id() == '') {session_start();} @@ -3047,7 +3047,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 +3061,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 +3091,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 +3122,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 +3147,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); diff --git a/admin/survey/classes/class.SurveyMeans.php b/admin/survey/classes/class.SurveyMeans.php index 895c049fb..0775dfdba 100644 --- a/admin/survey/classes/class.SurveyMeans.php +++ b/admin/survey/classes/class.SurveyMeans.php @@ -8,7 +8,7 @@ * */ -define("EXPORT_FOLDER", "admin/survey/SurveyData", true); +define("EXPORT_FOLDER", "admin/survey/SurveyData"); class SurveyMeans{ diff --git a/admin/survey/classes/class.SurveyMultiCrosstabs.php b/admin/survey/classes/class.SurveyMultiCrosstabs.php index 0aca0df8d..758c0f6f1 100644 --- a/admin/survey/classes/class.SurveyMultiCrosstabs.php +++ b/admin/survey/classes/class.SurveyMultiCrosstabs.php @@ -1,8 +1,8 @@ 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) diff --git a/admin/survey/classes/class.SurveySimpleMailInvitation.php b/admin/survey/classes/class.SurveySimpleMailInvitation.php index d850ca938..b548c1328 100644 --- a/admin/survey/classes/class.SurveySimpleMailInvitation.php +++ b/admin/survey/classes/class.SurveySimpleMailInvitation.php @@ -5,7 +5,8 @@ * */ -define("SIMPLE_MAIL_QUOTA", 20, true); +define("SIMPLE_MAIL_QUOTA", 20); + class SurveySimpleMailInvitation { public $sid; # id ankete diff --git a/admin/survey/classes/class.SurveyStatistic.php b/admin/survey/classes/class.SurveyStatistic.php index e217491c1..ca2b4bf28 100644 --- a/admin/survey/classes/class.SurveyStatistic.php +++ b/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']; diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php index 383258571..947ce80ea 100644 --- a/admin/survey/classes/class.SurveyStatusProfiles.php +++ b/admin/survey/classes/class.SurveyStatusProfiles.php @@ -6,7 +6,7 @@ */ session_start(); -DEFINE (STR_DLMT, "|", true); +DEFINE (STR_DLMT, "|"); class SurveyStatusProfiles { diff --git a/admin/survey/classes/class.SurveyTTest.php b/admin/survey/classes/class.SurveyTTest.php index 26efd2204..c49657371 100644 --- a/admin/survey/classes/class.SurveyTTest.php +++ b/admin/survey/classes/class.SurveyTTest.php @@ -8,9 +8,9 @@ * */ -define("EXPORT_FOLDER", "admin/survey/SurveyData", true); -define("BC_PRECISION", 20, true); -define("R_FOLDER", "admin/survey/R", true); +define("EXPORT_FOLDER", "admin/survey/SurveyData"); +define("BC_PRECISION", 20); +define("R_FOLDER", "admin/survey/R"); class SurveyTTest { diff --git a/admin/survey/classes/class.SurveyTableChart.php b/admin/survey/classes/class.SurveyTableChart.php index c0d21ba86..3fc576d18 100644 --- a/admin/survey/classes/class.SurveyTableChart.php +++ b/admin/survey/classes/class.SurveyTableChart.php @@ -4,7 +4,7 @@ * @date April 2012 */ -define("SAA_FOLDER", "AnalysisArchive", true); +define("SAA_FOLDER", "AnalysisArchive"); class SurveyTableChart { diff --git a/admin/survey/classes/class.SurveyTelephone.php b/admin/survey/classes/class.SurveyTelephone.php index 1d66b1597..825e5e054 100644 --- a/admin/survey/classes/class.SurveyTelephone.php +++ b/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('REC_ON_PAGE', 50, true); # kolko zapisov na stran pri urejanju respondentov -define('REC_ON_SEND_PAGE', 20, true); # kolko zapisov na stran pri pošiljanju +define('GROUP_PAGINATE', 4); # po kolko strani grupira pri paginaciji +define('REC_ON_PAGE', 50); # kolko zapisov na stran pri urejanju respondentov +define('REC_ON_SEND_PAGE', 20); # kolko zapisov na stran pri pošiljanju set_time_limit(2400); # 30 minut diff --git a/admin/survey/classes/class.SurveyVariablesProfiles.php b/admin/survey/classes/class.SurveyVariablesProfiles.php index 332405c97..15ad1103c 100644 --- a/admin/survey/classes/class.SurveyVariablesProfiles.php +++ b/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 { diff --git a/admin/survey/classes/class.SurveyZankaProfiles.php b/admin/survey/classes/class.SurveyZankaProfiles.php index fecaba8ff..cac04d57d 100644 --- a/admin/survey/classes/class.SurveyZankaProfiles.php +++ b/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 { diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php index f25d710a0..c56e7458a 100644 --- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php +++ b/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_SPR_LIMIT', 'spr_limit', true); -define('VAR_CUR_REC_PAGE', 'cur_rec_page', true); -define('VAR_SPR_PAGE', 'spr_page', true); -define('VAR_ORDER', 'order', true); -define('VAR_EDIT', 'edit', true); -define('VAR_PRINT', 'print', true); -define('VAR_MONITORING', 'monitoring', true); -define('VAR_CODING', 'coding', true); -define('VAR_DATA', 'view_data', true); -define('VAR_META', 'view_meta', true); -define('VAR_CIRCLES', 'view_circles', true); -define('VAR_METAFULL', 'view_fullmeta', true); -define('VAR_SHOW_SYSTEM', 'view_system', true); -define('VAR_SORT_SEQ', 'sort_seq', true); -define('VAR_SORT_TYPE', 'sort_type', true); -define('VAR_PDF_TYPE', 'type', true); -define('VAR_RELEVANCE', 'view_relevance', true); +define('VAR_REC_ON_PAGE', 'rec_on_page'); +define('VAR_SPR_LIMIT', 'spr_limit'); +define('VAR_CUR_REC_PAGE', 'cur_rec_page'); +define('VAR_SPR_PAGE', 'spr_page'); +define('VAR_ORDER', 'order'); +define('VAR_EDIT', 'edit'); +define('VAR_PRINT', 'print'); +define('VAR_MONITORING', 'monitoring'); +define('VAR_CODING', 'coding'); +define('VAR_DATA', 'view_data'); +define('VAR_META', 'view_meta'); +define('VAR_CIRCLES', 'view_circles'); +define('VAR_METAFULL', 'view_fullmeta'); +define('VAR_SHOW_SYSTEM', 'view_system'); +define('VAR_SORT_SEQ', 'sort_seq'); +define('VAR_SORT_TYPE', 'sort_type'); +define('VAR_PDF_TYPE', 'type'); +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('SRV_LIST_GROUP_PAGINATE', 4, true); # po kolko strani grupira pri paginaciji +define('VAR_EMAIL', 'email'); +define('SRV_LIST_GROUP_PAGINATE', 4); # po kolko strani grupira pri paginaciji global $site_path; diff --git a/admin/survey/definition.php b/admin/survey/definition.php index 5b4e2d74d..964668707 100644 --- a/admin/survey/definition.php +++ b/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_AKRONIM_MAXLENGTH', '100', true); # KOLIKO ZNAKOV LAHKO VSEBUJE AKRONIM ANKETE - define('ANKETA_NOTE_MAXLENGTH', '250', true); # KOLIKO ZNAKOV LAHKO VSEBUJE OPIS ANKETE + define('ANKETA_NASLOV_MAXLENGTH', '40'); # KOLIKO ZNAKOV LAHKO VSEBUJE INTERNO IME ANKETE + define('ANKETA_AKRONIM_MAXLENGTH', '100'); # KOLIKO ZNAKOV LAHKO VSEBUJE AKRONIM 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_OSNOVNI", "NAVI_STATUS_OSNOVNI", true); - define("NAVI_STATUS_TRAJANJE", "NAVI_STATUS_TRAJANJE", true); - define("NAVI_AAPOR","AAPOR",true); - define("NAVI_UREJANJE", "NAVI_UREJANJE", true); - define("NAVI_TESTIRANJE", "NAVI_TESTIRANJE", true); - define("NAVI_TESTIRANJE_KOMENTARJI", "NAVI_TESTIRANJE_KOMENTARJI", true); - define("NAVI_TESTIRANJE_PREDVIDENI", "NAVI_TESTIRANJE_PREDVIDENI", true); - define("NAVI_TESTIRANJE_CAS", "NAVI_TESTIRANJE_CAS", true); - define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI", true); - define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", true); - define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", true); - define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING", true); - define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA", true); - define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA", true); - define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT", true); - define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE", true); - define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA", true); - define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE", true); - define("NAVI_OBJAVA", "NAVI_OBJAVA", true); - define("NAVI_ANALYSIS", "NAVI_ANALYSIS", true); - define("NAVI_RESULTS", "NAVI_RESULTS", true); - define("NAVI_ADVANCED", "NAVI_ADVANCED", true); - define("NAVI_UPORABNOST", "NAVI_UPORABNOST", true); - define("NAVI_HIERARHIJA_SUPERADMIN", "NAVI_HIERARHIJA_SUPERADMIN", true); - define("NAVI_HIERARHIJA", "NAVI_HIERARHIJA", true); - define("NAVI_KVIZ", "NAVI_KVIZ", true); - define("NAVI_VNOS", "NAVI_VNOS", true); - define("NAVI_PHONE", "NAVI_PHONE", true); - define("NAVI_360", "NAVI_360", true); - define("NAVI_SOCIAL_NETWORK", "NAVI_SOCIAL_NETWORK", true); - define("NAVI_SLIDESHOW", "NAVI_SLIDESHOW", true); - define("NAVI_STATISTIC_ANALYSIS", "NAVI_STATISTIC_ANALYSIS", true); - define("NAVI_ANALYSIS_LINKS", "NAVI_ANALYSIS_LINKS", true); - define("NAVI_ANALYSIS_TIMES", "NAVI_ANALYSIS_TIMES", true); - define("NAVI_DATA", "NAVI_DATA", true); - define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT", true); + define("NAVI_STATUS", "NAVI_STATUS"); + define("NAVI_STATUS_OSNOVNI", "NAVI_STATUS_OSNOVNI"); + define("NAVI_STATUS_TRAJANJE", "NAVI_STATUS_TRAJANJE"); + define("NAVI_AAPOR", "AAPOR"); + define("NAVI_UREJANJE", "NAVI_UREJANJE"); + define("NAVI_TESTIRANJE", "NAVI_TESTIRANJE"); + define("NAVI_TESTIRANJE_KOMENTARJI", "NAVI_TESTIRANJE_KOMENTARJI"); + define("NAVI_TESTIRANJE_PREDVIDENI", "NAVI_TESTIRANJE_PREDVIDENI"); + define("NAVI_TESTIRANJE_CAS", "NAVI_TESTIRANJE_CAS"); + define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI"); + define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY"); + define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD"); + define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING"); + define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA"); + define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA"); + define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT"); + define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE"); + define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA"); + define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE"); + define("NAVI_OBJAVA", "NAVI_OBJAVA"); + define("NAVI_ANALYSIS", "NAVI_ANALYSIS"); + define("NAVI_RESULTS", "NAVI_RESULTS"); + define("NAVI_ADVANCED", "NAVI_ADVANCED"); + define("NAVI_UPORABNOST", "NAVI_UPORABNOST"); + define("NAVI_HIERARHIJA_SUPERADMIN", "NAVI_HIERARHIJA_SUPERADMIN"); + define("NAVI_HIERARHIJA", "NAVI_HIERARHIJA"); + define("NAVI_KVIZ", "NAVI_KVIZ"); + define("NAVI_VNOS", "NAVI_VNOS"); + define("NAVI_PHONE", "NAVI_PHONE"); + define("NAVI_360", "NAVI_360"); + define("NAVI_SOCIAL_NETWORK", "NAVI_SOCIAL_NETWORK"); + define("NAVI_SLIDESHOW", "NAVI_SLIDESHOW"); + define("NAVI_STATISTIC_ANALYSIS", "NAVI_STATISTIC_ANALYSIS"); + define("NAVI_ANALYSIS_LINKS", "NAVI_ANALYSIS_LINKS"); + define("NAVI_ANALYSIS_TIMES", "NAVI_ANALYSIS_TIMES"); + define("NAVI_DATA", "NAVI_DATA"); + define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT"); # Dashboard - status - report - define("A_REPORTI", "reporti", true); - define("A_NONRESPONSE_GRAPH", "nonresponse_graph", true); - define("A_PARA_GRAPH", "para_graph", true); - define("A_USABLE_RESP", "usable_resp", true); - define("A_SPEEDER_INDEX", "speeder_index", true); - define("A_TEXT_ANALYSIS", "text_analysis", true); - define("A_GEOIP_LOCATION", "geoip_location", true); - define("A_EDITS_ANALYSIS", "edits_analysis", true); - define("A_UL_EVALVATION", "ul_evalvation", true); - define("A_REMINDER_TRACKING", "reminder_tracking", true); - define("A_REMINDER_TRACKING_RECNUM", "recnum", true); - define("A_REMINDER_TRACKING_VAR", "vars", true); + define("A_REPORTI", "reporti"); + define("A_NONRESPONSE_GRAPH", "nonresponse_graph"); + define("A_PARA_GRAPH", "para_graph"); + define("A_USABLE_RESP", "usable_resp"); + define("A_SPEEDER_INDEX", "speeder_index"); + define("A_TEXT_ANALYSIS", "text_analysis"); + define("A_GEOIP_LOCATION", "geoip_location"); + define("A_EDITS_ANALYSIS", "edits_analysis"); + define("A_UL_EVALVATION", "ul_evalvation"); + define("A_REMINDER_TRACKING", "reminder_tracking"); + define("A_REMINDER_TRACKING_RECNUM", "recnum"); + define("A_REMINDER_TRACKING_VAR", "vars"); #urejanje - define("A_BRANCHING", "branching", true); - define("A_SETTINGS", "nastavitve", true); - define("A_NAGOVORI", "nagovori", true); - define("A_ALERT", "alert", true); - define("A_TESTIRANJE", "testiranje", true); - define("A_ARHIVI", "arhivi", true); - define("A_TRACKING", "tracking", true); - define("A_TRACKING_HIERARHIJA", "tracking-hierarhija", true); - define("A_GLASOVANJE", "glasovanja", true); + define("A_BRANCHING", "branching"); + define("A_SETTINGS", "nastavitve"); + define("A_NAGOVORI", "nagovori"); + define("A_ALERT", "alert"); + define("A_TESTIRANJE", "testiranje"); + define("A_ARHIVI", "arhivi"); + define("A_TRACKING", "tracking"); + define("A_TRACKING_HIERARHIJA", "tracking-hierarhija"); + define("A_GLASOVANJE", "glasovanja"); # TESTIRANJE - define('M_TESTIRANJE_REVIEW', 'pregled', true); - define('M_TESTIRANJE_DIAGNOSTIKA', 'diagnostika', true); - define('M_TESTIRANJE_KOMENTARJI', 'komentarji', true); - define('M_TESTIRANJE_KOMENTARJI_ANKETA', 'komentarji_anketa', true); - define('M_TESTIRANJE_VNOSI', 'testnipodatki', true); - define('M_TESTIRANJE_TRAJANJE', 'trajanje', true); - define('M_TESTIRANJE_PREDVIDENI', 'predvidenicas', true); - define("M_TESTIRANJE_CAS", "cas", true); + define('M_TESTIRANJE_REVIEW', 'pregled'); + define('M_TESTIRANJE_DIAGNOSTIKA', 'diagnostika'); + define('M_TESTIRANJE_KOMENTARJI', 'komentarji'); + define('M_TESTIRANJE_KOMENTARJI_ANKETA', 'komentarji_anketa'); + define('M_TESTIRANJE_VNOSI', 'testnipodatki'); + define('M_TESTIRANJE_TRAJANJE', 'trajanje'); + define('M_TESTIRANJE_PREDVIDENI', 'predvidenicas'); + define("M_TESTIRANJE_CAS", "cas"); # objava - define('A_VABILA', 'vabila', true); - define('A_EMAIL', 'email', true); - define('A_INVITATIONS', 'invitations', true); - define('M_INVITATIONS_STATUS', 'inv_status', true); - define('M_INVITATIONS_SETTINGS', 'inv_settings', true); - define('M_INVITATIONS', 'vabila', true); + define('A_VABILA', 'vabila'); + define('A_EMAIL', 'email'); + define('A_INVITATIONS', 'invitations'); + define('M_INVITATIONS_STATUS', 'inv_status'); + define('M_INVITATIONS_SETTINGS', 'inv_settings'); + 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_1KA', '360_stopinj_1ka', true); + define('A_360', '360_stopinj'); + define('A_360_1KA', '360_stopinj_1ka'); # SA- HIERARHIJA - define('A_HIERARHIJA', 'hierarhija', true); #izgradnja hierarhije - define('M_ADMIN_UREDI_SIFRANTE', 'uredi-sifrante', true); #hierarhija - uredi šifrante za kasnejšo izgradno - define('M_ADMIN_UVOZ_SIFRANTOV', 'uvoz-sifrantov', true); #hierarhija - uvoz sifrantov - define('M_ADMIN_UPLOAD_LOGO', 'upload-logo', true); #hierarhija - upload logo - define('M_ADMIN_IZVOZ_SIFRANTOV', 'izvoz-sifrantov', true); #hierarhija - izvoz sifrantov - define('M_UREDI_UPORABNIKE', 'uredi-uporabnike', true); #hierarhija - uredi uporabnike - define('M_ADMIN_AKTIVACIJA', 'aktivacija-strukture-ankete', true); #aktivacija hierarhije - define('M_ADMIN_KOPIRANJE', 'kopiranje-strukture-in-uporabnikov', true); #kopiranje hierarhije - define('M_ANALIZE', 'analize', true); #hierarhija analize - define('M_HIERARHIJA_STATUS', 'status', true); #hierarhija - statusi + define('A_HIERARHIJA', 'hierarhija'); #izgradnja hierarhije + define('M_ADMIN_UREDI_SIFRANTE', 'uredi-sifrante'); #hierarhija - uredi šifrante za kasnejšo izgradno + define('M_ADMIN_UVOZ_SIFRANTOV', 'uvoz-sifrantov'); #hierarhija - uvoz sifrantov + define('M_ADMIN_UPLOAD_LOGO', 'upload-logo'); #hierarhija - upload logo + define('M_ADMIN_IZVOZ_SIFRANTOV', 'izvoz-sifrantov'); #hierarhija - izvoz sifrantov + define('M_UREDI_UPORABNIKE', 'uredi-uporabnike'); #hierarhija - uredi uporabnike + define('M_ADMIN_AKTIVACIJA', 'aktivacija-strukture-ankete'); #aktivacija hierarhije + define('M_ADMIN_KOPIRANJE', 'kopiranje-strukture-in-uporabnikov'); #kopiranje hierarhije + define('M_ANALIZE', 'analize'); #hierarhija analize + define('M_HIERARHIJA_STATUS', 'status'); #hierarhija - statusi # REZULTATI #analize - define('A_ANALYSIS', 'analysis', true); - define('M_ANALYSIS_DESCRIPTOR', 'descriptor', true); - define('M_ANALYSIS_FREQUENCY', 'frequency', true); - define('M_ANALYSIS_SUMMARY', 'sumarnik', true); - define('M_ANALYSIS_SUMMARY_NEW', 'sums_new', true); - define('M_ANALYSIS_CROSSTAB', 'crosstabs', true); - define("M_ANALYSIS_MULTICROSSTABS", "multicrosstabs", true); - define('M_ANALYSIS_MEANS', 'means', true); - define('M_ANALYSIS_MEANS_HIERARHY', 'hierarhy-means', true); - define('M_ANALYSIS_TTEST', 'ttest', true); - define('M_ANALYSIS_BREAK', 'break', true); - define('M_ANALYSIS_STATISTICS', 'statistics', true); - define('M_ANALYSIS_ARCHIVE', 'anal_arch', true); - define("M_ANALYSIS_LINKS", "analysis_links", true); - define("M_ANALYSIS_CREPORT", "analysis_creport", true); - define("M_ANALYSIS_CHARTS", "charts", true); - define("M_ANALYSIS_PARA", "para", true); - define("M_ANALYSIS_NONRESPONSES", "nonresponses", true); - define("M_ANALYSIS_VIZUALIZACIJA", "vizualizacija", true); - define("M_ANALYSIS_360", "360_stopinj", true); - define("M_ANALYSIS_360_1KA", "360_stopinj_1ka", true); - define('M_ANALYSIS_HEATMAP', 'heatmap', true); + define('A_ANALYSIS', 'analysis'); + define('M_ANALYSIS_DESCRIPTOR', 'descriptor'); + define('M_ANALYSIS_FREQUENCY', 'frequency'); + define('M_ANALYSIS_SUMMARY', 'sumarnik'); + define('M_ANALYSIS_SUMMARY_NEW', 'sums_new'); + define('M_ANALYSIS_CROSSTAB', 'crosstabs'); + define("M_ANALYSIS_MULTICROSSTABS", "multicrosstabs"); + define('M_ANALYSIS_MEANS', 'means'); + define('M_ANALYSIS_MEANS_HIERARHY', 'hierarhy-means'); + define('M_ANALYSIS_TTEST', 'ttest'); + define('M_ANALYSIS_BREAK', 'break'); + define('M_ANALYSIS_STATISTICS', 'statistics'); + define('M_ANALYSIS_ARCHIVE', 'anal_arch'); + define("M_ANALYSIS_LINKS", "analysis_links"); + define("M_ANALYSIS_CREPORT", "analysis_creport"); + define("M_ANALYSIS_CHARTS", "charts"); + define("M_ANALYSIS_PARA", "para"); + define("M_ANALYSIS_NONRESPONSES", "nonresponses"); + define("M_ANALYSIS_VIZUALIZACIJA", "vizualizacija"); + define("M_ANALYSIS_360", "360_stopinj"); + define("M_ANALYSIS_360_1KA", "360_stopinj_1ka"); + define('M_ANALYSIS_HEATMAP', 'heatmap'); # vnosi - zbiranje podatkov - define('A_COLLECT_DATA', 'data', true); - define('M_COLLECT_DATA_VIEW', 'view', true); - define('M_COLLECT_DATA_VARIABLE_VIEW', 'variables', true); - define('M_COLLECT_DATA_EDIT', 'edit', true); - define('M_COLLECT_DATA_QUICKEDIT', 'quick_edit', true); - define('M_COLLECT_DATA_MONITORING', 'monitoring', true); - define('M_COLLECT_DATA_PRINT', 'print', true); - define('M_COLLECT_DATA_CALCULATION', 'calculation', true); - define('M_COLLECT_DATA_CODING', 'coding', true); - define('M_COLLECT_DATA_RECODING', 'recoding', true); - define('M_COLLECT_DATA_RECODING_DASHBOARD', 'recoding_dashboard', true); - define('A_COLLECT_DATA_EXPORT', 'export', true); - define('A_COLLECT_DATA_EXPORT_ALL', 'export_PDF', true); - define('M_EXPORT_EXCEL', 'excel', true); - define('M_EXPORT_EXCEL_XLS', 'excel_xls', true); - define('M_EXPORT_SPSS', 'spss', true); - define('M_EXPORT_SAV', 'sav', true); - define('M_EXPORT_TXT', 'txt', true); + define('A_COLLECT_DATA', 'data'); + define('M_COLLECT_DATA_VIEW', 'view'); + define('M_COLLECT_DATA_VARIABLE_VIEW', 'variables'); + define('M_COLLECT_DATA_EDIT', 'edit'); + define('M_COLLECT_DATA_QUICKEDIT', 'quick_edit'); + define('M_COLLECT_DATA_MONITORING', 'monitoring'); + define('M_COLLECT_DATA_PRINT', 'print'); + define('M_COLLECT_DATA_CALCULATION', 'calculation'); + define('M_COLLECT_DATA_CODING', 'coding'); + define('M_COLLECT_DATA_RECODING', 'recoding'); + define('M_COLLECT_DATA_RECODING_DASHBOARD', 'recoding_dashboard'); + define('A_COLLECT_DATA_EXPORT', 'export'); + define('A_COLLECT_DATA_EXPORT_ALL', 'export_PDF'); + define('M_EXPORT_EXCEL', 'excel'); + define('M_EXPORT_EXCEL_XLS', 'excel_xls'); + define('M_EXPORT_SPSS', 'spss'); + define('M_EXPORT_SAV', 'sav'); + define('M_EXPORT_TXT', 'txt'); # dodatne nastavitve - define('A_ADVANCED', 'advanced', true); - define('A_UPORABNOST', 'uporabnost', true); - define('A_HIERARHIJA_SUPERADMIN', 'hierarhija_superadmin', true); - define('A_KVIZ', 'kviz', true); - define('A_VNOS', 'vnos', true); - define('A_PHONE', 'telefon', true); # Telefon - define('T_PHONE', 'telefon', true); # Telefon - define('A_SOCIAL_NETWORK', 'social_network', true); - define('A_SLIDESHOW', 'slideshow', true); - define('A_ADVANCED_PARADATA', 'advanced_paradata', true); - define('A_JSON_SURVEY_EXPORT', 'json_survey_export', true); + define('A_ADVANCED', 'advanced'); + define('A_UPORABNOST', 'uporabnost'); + define('A_HIERARHIJA_SUPERADMIN', 'hierarhija_superadmin'); + define('A_KVIZ', 'kviz'); + define('A_VNOS', 'vnos'); + define('A_PHONE', 'telefon'); # Telefon + define('T_PHONE', 'telefon'); # Telefon + define('A_SOCIAL_NETWORK', 'social_network'); + define('A_SLIDESHOW', 'slideshow'); + define('A_ADVANCED_PARADATA', 'advanced_paradata'); + 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_MISSING', 'missing', true); # urejanje ankete - manjkajoče vrednosti - define('A_TEMA', 'tema', true); # urejanje ankete - manjkajoče vrednosti - define('A_COOKIE', 'piskot', true); # urejanje ankete - manjkajoče vrednosti - define("A_KOMENTARJI", "komentarji", true); # urejanje ankete - komentarjivrednosti - define("A_KOMENTARJI_ANKETA", "komentarji_anketa", true); # urejanje ankete - komentarjivrednosti - define("A_TRAJANJE", "trajanje", true); # urejanje ankete - komentarjivrednosti - define("A_TRAJANJE_PREDVIDENI", "predvidenicas", true); # urejanje ankete - komentarjivrednosti - define("A_TRAJANJE_CAS", "cas", true); # urejanje ankete - komentarjivrednosti - define('A_UREJANJE', 'urejanje', true); # urejanje ankete - komentarjivrednosti - define('A_DOSTOP', 'dostop', true); # urejanje ankete - manjkajoče vrednosti - define('A_JEZIK', 'jezik', true); # urejanje ankete - manjkajoče vrednosti - define('A_PREVAJANJE', 'prevajanje', true); # urejanje ankete - manjkajoče vrednosti - define('A_FORMA', 'forma', true); # urejanje ankete - manjkajoče vrednosti - define('A_METADATA', 'metadata', true); # urejanje ankete - prikaz metapodatkov - define('A_MOBILESETTINGS', 'mobile_settings', true); # urejanje ankete - nastavitve prikaza pri mobitelih - define('A_PRIKAZ', 'prikaz', true); # prikaz podatkov in analiz - define('A_MAILING', 'advanced_email', true); # nastavitve email strežnika - define('A_SKUPINE', 'skupine', true); # skupine - define('A_EXPORTSETTINGS', 'export_settings', true); # nastavitve pdf/rtf izvozov - define('A_GDPR', 'gdpr_settings', true); # GDPR nastavitve posamezne ankete - define('A_LANGUAGE_TECHNOLOGY', 'language_technology', true); # skupine - define('A_LANGUAGE_TECHNOLOGY_OLD', 'language_technology_old', true); # skupine + define("A_OSNOVNI_PODATKI", "osn_pod"); # urejanje ankete - osnovni podatki + define('A_MISSING', 'missing'); # urejanje ankete - manjkajoče vrednosti + define('A_TEMA', 'tema'); # urejanje ankete - manjkajoče vrednosti + define('A_COOKIE', 'piskot'); # urejanje ankete - manjkajoče vrednosti + define("A_KOMENTARJI", "komentarji"); # urejanje ankete - komentarjivrednosti + define("A_KOMENTARJI_ANKETA", "komentarji_anketa"); # urejanje ankete - komentarjivrednosti + define("A_TRAJANJE", "trajanje"); # urejanje ankete - komentarjivrednosti + define("A_TRAJANJE_PREDVIDENI", "predvidenicas"); # urejanje ankete - komentarjivrednosti + define("A_TRAJANJE_CAS", "cas"); # urejanje ankete - komentarjivrednosti + define('A_UREJANJE', 'urejanje'); # urejanje ankete - komentarjivrednosti + define('A_DOSTOP', 'dostop'); # urejanje ankete - manjkajoče vrednosti + define('A_JEZIK', 'jezik'); # urejanje ankete - manjkajoče vrednosti + define('A_PREVAJANJE', 'prevajanje'); # urejanje ankete - manjkajoče vrednosti + define('A_FORMA', 'forma'); # urejanje ankete - manjkajoče vrednosti + define('A_METADATA', 'metadata'); # urejanje ankete - prikaz metapodatkov + define('A_MOBILESETTINGS', 'mobile_settings'); # urejanje ankete - nastavitve prikaza pri mobitelih + define('A_PRIKAZ', 'prikaz'); # prikaz podatkov in analiz + define('A_MAILING', 'advanced_email'); # nastavitve email strežnika + define('A_SKUPINE', 'skupine'); # skupine + define('A_EXPORTSETTINGS', 'export_settings'); # nastavitve pdf/rtf izvozov + define('A_GDPR', 'gdpr_settings'); # GDPR nastavitve posamezne ankete + define('A_LANGUAGE_TECHNOLOGY', 'language_technology'); # skupine + define('A_LANGUAGE_TECHNOLOGY_OLD', 'language_technology_old'); # skupine ##### NAVIGACIJA #### # profili mankjajočih vrednosti - define('MISSING_TYPE_SUMMARY', '0', true); - define('MISSING_TYPE_DESCRIPTOR', '1', true); - define('MISSING_TYPE_FREQUENCY', '2', true); - define('MISSING_TYPE_CROSSTAB', '3', true); + define('MISSING_TYPE_SUMMARY', '0'); + define('MISSING_TYPE_DESCRIPTOR', '1'); + define('MISSING_TYPE_FREQUENCY', '2'); + define('MISSING_TYPE_CROSSTAB', '3'); # za vnose ali analize in kreacijo datotek - define('EXPORT_FOLDER', 'admin/survey/SurveyData', true); - define('VALID_USER_LIMIT_STRING', ' AND u.last_status IN (5,6) ', true); - define('ALLOW_CREATE_LIMIT', 80, true); # 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_TIME_LIMIT', 10, true); # 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('ONLY_VALID_LIMIT', 3000, true); # nad koliko respondentov lovimo samo ustrezne - define('MAX_USER_PER_LOOP', 250, true); - define('FILE_STATUS_OK', '1', true); # datoteka je ažurna - define('FILE_STATUS_OLD', '0', true); # datoteka je stara - define('FILE_STATUS_NO_FILE', '-1', true); # datoteka ne obstaja - define('FILE_STATUS_NO_DATA', '-2', true); # v bazi nipodatkov - define('FILE_STATUS_SRV_DELETED', '-3', true); # Anketa je bila izbrisana + define('EXPORT_FOLDER', 'admin/survey/SurveyData'); + define('VALID_USER_LIMIT_STRING', ' AND u.last_status IN (5,6) '); + define('ALLOW_CREATE_LIMIT', 80); # prvih 100 userjev vedno spustimo skozi + 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); # Na koliko sekund pustimo da se generira inkrementalno s progressbarom + define('AUTO_CREATE_PREVENT_LIMIT', 1000); # Koliko je meja, ko avtomatsko sploh ne generiramo datoteke s podatki + define('ONLY_VALID_LIMIT', 3000); # nad koliko respondentov lovimo samo ustrezne + define('MAX_USER_PER_LOOP', 250); + define('FILE_STATUS_OK', '1'); # datoteka je ažurna + define('FILE_STATUS_OLD', '0'); # datoteka je stara + define('FILE_STATUS_NO_FILE', '-1'); # datoteka ne obstaja + define('FILE_STATUS_NO_DATA', '-2'); # v bazi nipodatkov + 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('RELEVANCE_FIELD', '$2', true); - define('EMAIL_FIELD', '$3', true); - define('STATUS_FIELD', '$4', true); - define('LURKER_FIELD', '$5', true); - define('TIME_FIELD', '$6', true); - define('MOD_REC_FIELD', '$7', true); - define('ITIME_FIELD', '$8', true); + define('USER_ID_FIELD', '$1'); + define('RELEVANCE_FIELD', '$2'); + define('EMAIL_FIELD', '$3'); + define('STATUS_FIELD', '$4'); + define('LURKER_FIELD', '$5'); + define('TIME_FIELD', '$6'); + define('MOD_REC_FIELD', '$7'); + define('ITIME_FIELD', '$8'); - define('SCP_DEFAULT_PROFILE', 1, true); - define('SSP_DEFAULT_PROFILE', 2, true); #ustrezni + define('SCP_DEFAULT_PROFILE', 1); + 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_AVERAGE', 1, true); # stevilo digitalnih mest za povprecje - define('NUM_DIGIT_DEVIATION', 2, true); # stevilo digitalnih mest za odklon - define('NUM_DIGIT_RESIDUAL', 3, true); # stevilo digitalnih mest za residuale - define('NUM_DIGIT_PERCENT_MAX', 6, true); # max stevilo digitalnih mest za odstotek - define('NUM_DIGIT_AVERAGE_MAX', 6, true); # max stevilo digitalnih mest za povprecje - define('NUM_DIGIT_DEVIATION_MAX', 6, true); # max stevilo digitalnih mest za odklon - define('NUM_DIGIT_RESIDUAL_MAX', 6, true); # max stevilo digitalnih mest za residual + define('NUM_DIGIT_PERCENT', 0); # stevilo digitalnih mest za odstotek + define('NUM_DIGIT_AVERAGE', 1); # stevilo digitalnih mest za povprecje + define('NUM_DIGIT_DEVIATION', 2); # stevilo digitalnih mest za odklon + define('NUM_DIGIT_RESIDUAL', 3); # stevilo digitalnih mest za residuale + define('NUM_DIGIT_PERCENT_MAX', 6); # max stevilo digitalnih mest za odstotek + define('NUM_DIGIT_AVERAGE_MAX', 6); # max stevilo digitalnih mest za povprecje + define('NUM_DIGIT_DEVIATION_MAX', 6); # max stevilo digitalnih mest za odklon + 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_DLMT', "|", true); - define ('DAT_EXT', '.dat', true); - define ('TMP_EXT', '.tmp', true); + define ('STR_OTHER_TEXT', '_text'); + define ('STR_DLMT', "|"); + define ('DAT_EXT', '.dat'); + define ('TMP_EXT', '.tmp'); define ('PIPE_CHAR', "\x7C",true); - define ('STR_LESS_THEN', '\x3C', true); - define ('STR_GREATER_THEN', '\x3E', true); - define ('STR_EQUALS', '\x3D', true); + define ('STR_LESS_THEN', '\x3C'); + define ('STR_GREATER_THEN', '\x3E'); + define ('STR_EQUALS', '\x3D'); ?> \ No newline at end of file diff --git a/admin/survey/export/export_definitions.php b/admin/survey/export/export_definitions.php index 2c629e15c..cd1fbba95 100644 --- a/admin/survey/export/export_definitions.php +++ b/admin/survey/export/export_definitions.php @@ -5,15 +5,15 @@ define('IS_WINDOWS', (DIRECTORY_SEPARATOR === '\\') ? TRUE : FALSE); define('IS_LINUX', (DIRECTORY_SEPARATOR === '\\') ? FALSE : TRUE); -define("M_ANALIZA_DESCRIPTOR", "descriptor", true); -define("M_ANALIZA_FREQUENCY", "frequency", true); -define("M_ANALIZA_CROSSTAB", "crosstabs", true); -define("M_ANALIZA_STATISTICS", "statistics", true); -define("M_ANALIZA_SUMS", "sums", true); +define("M_ANALIZA_DESCRIPTOR", "descriptor"); +define("M_ANALIZA_FREQUENCY", "frequency"); +define("M_ANALIZA_CROSSTAB", "crosstabs"); +define("M_ANALIZA_STATISTICS", "statistics"); +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_COMMENT","pdf_comment",true); @@ -36,62 +36,62 @@ define("M_REPORT_PDF_TEAMMETER","pdf_teammeter",true); define("M_REPORT_PDF_MFDPS","pdf_mfpds",true); define("M_REPORT_PDF_HEATMAP_IMAGE","heatmap_image_pdf",true); -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_ACTIVITY", "pdf_gdpr_activity", true); +define("A_GDPR_PDF_INDIVIDUAL", "pdf_gdpr_individual"); +define("A_GDPR_PDF_ACTIVITY", "pdf_gdpr_activity"); /*RTF*/ -define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf", true); -define("A_REPORT_RTF_RESULTS", "rtf_results", true); -define("A_REPORT_RTF_COMMENT","rtf_comment",true); +define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf"); +define("A_REPORT_RTF_RESULTS", "rtf_results"); +define("A_REPORT_RTF_COMMENT", "rtf_comment"); -define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf", true); -define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf", true); -define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf", true); -define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf", true); -define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf", true); +define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf"); +define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf"); +define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf"); +define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf"); +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("A_GDPR_RTF_INDIVIDUAL", "rtf_gdpr_individual", true); -define("A_GDPR_RTF_ACTIVITY", "rtf_gdpr_activity", true); +define("A_GDPR_RTF_INDIVIDUAL", "rtf_gdpr_individual"); +define("A_GDPR_RTF_ACTIVITY", "rtf_gdpr_activity"); /*XLS*/ -define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls", true); -define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls", true); -define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls", true); -define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls", true); +define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls"); +define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls"); +define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls"); +define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls"); -define("A_REPORT_XLS_LIST", "list_xls", true); -define("A_REPORT_XLS_USABLE", "usable_xls", true); -define("A_REPORT_XLS_SPEEDER", "speeder_xls", true); -define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls", true); -define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv", true); -define("A_LANGUAGE_TECHNOLOGY_XLS", "lt_excel", true); +define("A_REPORT_XLS_LIST", "list_xls"); +define("A_REPORT_XLS_USABLE", "usable_xls"); +define("A_REPORT_XLS_SPEEDER", "speeder_xls"); +define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls"); +define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv"); +define("A_LANGUAGE_TECHNOLOGY_XLS", "lt_excel"); /*PPT*/ -define("M_REPORT_ANALIZA_PPT_CHARTS", "charts_ppt", true); -define("M_REPORT_ANALIZA_PPT_HEATMAP_IMAGE","heatmap_image_ppt",true); +define("M_REPORT_ANALIZA_PPT_CHARTS", "charts_ppt"); +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"); ?> \ No newline at end of file diff --git a/admin/survey/export/latexclasses/Analize/AnalizaBreak.php b/admin/survey/export/latexclasses/Analize/AnalizaBreak.php index 6b8bcbbea..b8c23b480 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaBreak.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/Analize/AnalizaCReport.php b/admin/survey/export/latexclasses/Analize/AnalizaCReport.php index 47da9e740..6e0ca2310 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaCReport.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + 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); diff --git a/admin/survey/export/latexclasses/Analize/AnalizaCharts.php b/admin/survey/export/latexclasses/Analize/AnalizaCharts.php index 62c436992..0a6e41e77 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaCharts.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/Analize/AnalizaCrosstab.php b/admin/survey/export/latexclasses/Analize/AnalizaCrosstab.php index 78140a712..01e1932e0 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaCrosstab.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + 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; diff --git a/admin/survey/export/latexclasses/Analize/AnalizaDesc.php b/admin/survey/export/latexclasses/Analize/AnalizaDesc.php index 2548fba14..a2252e108 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaDesc.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/Analize/AnalizaFreq.php b/admin/survey/export/latexclasses/Analize/AnalizaFreq.php index 3a333ed59..24b1f8324 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaFreq.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/Analize/AnalizaMean.php b/admin/survey/export/latexclasses/Analize/AnalizaMean.php index 0e896739e..3dc136e25 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaMean.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php b/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php index ec614f514..156a3c2c0 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + 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; diff --git a/admin/survey/export/latexclasses/Analize/AnalizaSums.php b/admin/survey/export/latexclasses/Analize/AnalizaSums.php index f81860375..2a6225f59 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaSums.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + 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."
"; - 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[] = ''; diff --git a/admin/survey/export/latexclasses/Analize/AnalizaTTest.php b/admin/survey/export/latexclasses/Analize/AnalizaTTest.php index 539fd225d..ff17dc420 100644 --- a/admin/survey/export/latexclasses/Analize/AnalizaTTest.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php b/admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php index 5c2a9e9fb..1443e99cc 100644 --- a/admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php @@ -10,8 +10,8 @@ *****************************************/ -define("PIC_SIZE", "\includegraphics[width=10cm]", true); //slika sirine 50mm -define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip class BesediloLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/Vprasanja/GridMultipleLatex.php b/admin/survey/export/latexclasses/Vprasanja/GridMultipleLatex.php index 0b60d28e1..d1f2f144f 100644 --- a/admin/survey/export/latexclasses/Vprasanja/GridMultipleLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/GridMultipleLatex.php @@ -10,9 +10,9 @@ *****************************************/ -define("PIC_SIZE", "\includegraphics[width=10cm]", true); //slika sirine 50mm -define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip -define("RADIO_BTN_SIZE", 0.13, true); +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip +define("RADIO_BTN_SIZE", 0.13); class GridMultipleLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/Vprasanja/HeatmapLatex.php b/admin/survey/export/latexclasses/Vprasanja/HeatmapLatex.php index 8bd7f1ea1..97870f19e 100644 --- a/admin/survey/export/latexclasses/Vprasanja/HeatmapLatex.php +++ b/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("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip -define("RADIO_BTN_SIZE", 0.13, true); +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip +define("RADIO_BTN_SIZE", 0.13); class HeatmapLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php b/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php index 77acc2d3f..a5368d848 100644 --- a/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php +++ b/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 { diff --git a/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php b/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php index 34e28e40b..5ef456e12 100644 --- a/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php +++ b/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 { diff --git a/admin/survey/export/latexclasses/Vprasanja/MultiGridLatex.php b/admin/survey/export/latexclasses/Vprasanja/MultiGridLatex.php index 63f38140c..5e19269b0 100644 --- a/admin/survey/export/latexclasses/Vprasanja/MultiGridLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/MultiGridLatex.php @@ -10,18 +10,15 @@ *****************************************/ -define("PIC_SIZE", "\includegraphics[width=10cm]", true); //slika sirine 50mm -define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip -define("RADIO_BTN_SIZE", 0.13, true); -//define("U_SHAPE_WIDTH", 4, true); -define("U_SHAPE_WIDTH_U", 4, true); -define("U_SHAPE_WIDTH_OKVIR", 3.62, true); -//define("U_SHAPE_WIDTH_TEXT_U", 2.1, true); -define("U_SHAPE_WIDTH_TEXT_U", 2.2, true); -define("U_SHAPE_WIDTH_TEXT_OKVIR", 1.81, true); -//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 +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip +define("RADIO_BTN_SIZE", 0.13); +define("U_SHAPE_WIDTH_U", 4); +define("U_SHAPE_WIDTH_OKVIR", 3.62); +define("U_SHAPE_WIDTH_TEXT_U", 2.2); +define("U_SHAPE_WIDTH_TEXT_OKVIR", 1.81); +define("MAXSTEVILOSTOLPCEV", 21); //max Stevilo Stolpcev za prvo vrstico pod Drsnikom, zaradi tezav z izrisom, ce je teh vec kot toliko +define("VAS_SIZE", 0.04); //VAS_SIZE class MultiGridLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/Vprasanja/NagovorLatex.php b/admin/survey/export/latexclasses/Vprasanja/NagovorLatex.php index a2b86f49b..779487829 100644 --- a/admin/survey/export/latexclasses/Vprasanja/NagovorLatex.php +++ b/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 { diff --git a/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php b/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php index 3dbe1f965..025a7f008 100644 --- a/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php +++ b/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("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip class RadioCheckboxSelectLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/Vprasanja/RazvrscanjeLatex.php b/admin/survey/export/latexclasses/Vprasanja/RazvrscanjeLatex.php index 7a7443493..9ef7df20c 100644 --- a/admin/survey/export/latexclasses/Vprasanja/RazvrscanjeLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/RazvrscanjeLatex.php @@ -10,9 +10,9 @@ *****************************************/ -define("PIC_SIZE", "\includegraphics[width=10cm]", true); //slika sirine 50mm -define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip -define("RADIO_BTN_SIZE", 0.13, true); +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip +define("RADIO_BTN_SIZE", 0.13); class RazvrscanjeLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/Vprasanja/SNImena.php b/admin/survey/export/latexclasses/Vprasanja/SNImena.php index 97b36f1f9..5ff63d990 100644 --- a/admin/survey/export/latexclasses/Vprasanja/SNImena.php +++ b/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 { diff --git a/admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php b/admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php index afbd84e92..ade06a602 100644 --- a/admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php @@ -10,9 +10,9 @@ *****************************************/ -define("PIC_SIZE", "\includegraphics[width=10cm]", true); //slika sirine 50mm -define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //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("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip +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 { diff --git a/admin/survey/export/latexclasses/Vprasanja/VsotaLatex.php b/admin/survey/export/latexclasses/Vprasanja/VsotaLatex.php index 857981a85..726d8fd4b 100644 --- a/admin/survey/export/latexclasses/Vprasanja/VsotaLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/VsotaLatex.php @@ -10,9 +10,9 @@ *****************************************/ -define("PIC_SIZE", "\includegraphics[width=10cm]", true); //slika sirine 50mm -define("ICON_SIZE", "\includegraphics[width=0.5cm]", true); //za ikone @ slikovni tip -define("RADIO_BTN_SIZE", 0.13, true); +define("PIC_SIZE", "\includegraphics[width=10cm]"); //slika sirine 50mm +define("ICON_SIZE", "\includegraphics[width=0.5cm]"); //za ikone @ slikovni tip +define("RADIO_BTN_SIZE", 0.13); class VsotaLatex extends LatexSurveyElement { diff --git a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php index 2b6f4f5b7..80ef91551 100644 --- a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php +++ b/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{ diff --git a/admin/survey/export/latexclasses/class.LatexDocument.php b/admin/survey/export/latexclasses/class.LatexDocument.php index 7dd3f0006..daa6a7f84 100644 --- a/admin/survey/export/latexclasses/class.LatexDocument.php +++ b/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_HEADER", 'width=1.75cm,height=1cm,keepaspectratio', true); -define("SINGLE_TABLE_WIDTH", 3000, true); -define("PAGE_TEXT_WIDTH", 10200, true); //17 cm, 170 mm, je 10200 twips, 1 mm je 60 twips +define("ENKA_LOGO_SIZE", 'width=3.51cm,height=2cm,keepaspectratio'); +define("ENKA_LOGO_SIZE_HEADER", 'width=1.75cm,height=1cm,keepaspectratio'); +define("SINGLE_TABLE_WIDTH", 3000); +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) diff --git a/admin/survey/export/latexclasses/class.LatexEditsAnalysis.php b/admin/survey/export/latexclasses/class.LatexEditsAnalysis.php index de67c7d72..0b2dd4a45 100644 --- a/admin/survey/export/latexclasses/class.LatexEditsAnalysis.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('FRAME_TEXT_WIDTH', 0.3); define ('FRAME_WIDTH', 480); diff --git a/admin/survey/export/latexclasses/class.LatexStatus.php b/admin/survey/export/latexclasses/class.LatexStatus.php index ae3a5467e..a4434a7de 100644 --- a/admin/survey/export/latexclasses/class.LatexStatus.php +++ b/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_DEVIATION", 2, true); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_AVERAGE", 2); // stevilo digitalnih mest za povprecje + define("NUM_DIGIT_DEVIATION", 2); // stevilo digitalnih mest za povprecje - define("M_ANALIZA_DESCRIPTOR", "descriptor", true); - define("M_ANALIZA_FREQUENCY", "frequency", true); + define("M_ANALIZA_DESCRIPTOR", "descriptor"); + define("M_ANALIZA_FREQUENCY", "frequency"); - define("FNT_FREESERIF", "freeserif", true); - define("FNT_FREESANS", "freesans", true); - define("FNT_HELVETICA", "helvetica", true); + define("FNT_FREESERIF", "freeserif"); + define("FNT_FREESANS", "freesans"); + define("FNT_HELVETICA", "helvetica"); - define("FNT_MAIN_TEXT", FNT_FREESANS, true); - define("FNT_QUESTION_TEXT", FNT_FREESANS, true); - define("FNT_HEADER_TEXT", FNT_FREESANS, true); + define("FNT_MAIN_TEXT", FNT_FREESANS); + define("FNT_QUESTION_TEXT", FNT_FREESANS); + define("FNT_HEADER_TEXT", FNT_FREESANS); - define("FNT_MAIN_SIZE", 10, true); - define("FNT_QUESTION_SIZE", 9, true); - define("FNT_HEADER_SIZE", 10, true); + define("FNT_MAIN_SIZE", 10); + define("FNT_QUESTION_SIZE", 9); + define("FNT_HEADER_SIZE", 10); - define("RADIO_BTN_SIZE", 3, true); - define("CHCK_BTN_SIZE", 3, true); - define("LINE_BREAK", 6, true); + define("RADIO_BTN_SIZE", 3); + define("CHCK_BTN_SIZE", 3); + define("LINE_BREAK", 6); define ('PDF_MARGIN_HEADER', 8); define ('PDF_MARGIN_FOOTER', 12); diff --git a/admin/survey/export/latexclasses/class.LatexSurvey.php b/admin/survey/export/latexclasses/class.LatexSurvey.php index 52b7d89eb..2ac2312b1 100644 --- a/admin/survey/export/latexclasses/class.LatexSurvey.php +++ b/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{ diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php index 1dc3493b8..1b9bfc36d 100644 --- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php +++ b/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("LINE_BREAK_AT", '7 cm', true); -define("RADIO_BTN_SIZE", 0.13, true); -define("CHCK_BTN_SIZE", 0.13, true); -define("PIC_SIZE_ANS", "\includegraphics[width=3cm]", true); //slika dolocene sirine -define("DROPDOWN_SIZE", 0.8, true); -define("VAS_SIZE", 0.04, true); //VAS_SIZE +define("MAX_STRING_LENGTH", 90); +define("LINE_BREAK_AT", '7 cm'); +define("RADIO_BTN_SIZE", 0.13); +define("CHCK_BTN_SIZE", 0.13); +define("PIC_SIZE_ANS", "\includegraphics[width=3cm]"); //slika dolocene sirine +define("DROPDOWN_SIZE", 0.8); +define("VAS_SIZE", 0.04); //VAS_SIZE class LatexSurveyElement{ diff --git a/admin/survey/export/xmlClasses/Vprasanja/BesediloXml.php b/admin/survey/export/xmlClasses/Vprasanja/BesediloXml.php index f19b92cff..70b0322a5 100644 --- a/admin/survey/export/xmlClasses/Vprasanja/BesediloXml.php +++ b/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 { diff --git a/admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php b/admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php index 1f6ceba28..312912484 100644 --- a/admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php +++ b/admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php @@ -7,8 +7,8 @@ * Datum: 10/2018 *****************************************/ -define("VARGRP_ELEMENT_TYPE", "multipleResp", true); -define("VARFORMAT_ELEMENT_TYPE", "numeric", true); +define("VARGRP_ELEMENT_TYPE", "multipleResp"); +define("VARFORMAT_ELEMENT_TYPE", "numeric"); class CheckboxXml extends XmlSurveyElement { diff --git a/admin/survey/export/xmlClasses/Vprasanja/MultiGridXml.php b/admin/survey/export/xmlClasses/Vprasanja/MultiGridXml.php index b25683b3c..35e9298cb 100644 --- a/admin/survey/export/xmlClasses/Vprasanja/MultiGridXml.php +++ b/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_MULTIRESP", "multipleResp", true); -define("VARFORMAT_ELEMENT_TYPE_GRID", "numeric", true); +define("VARGRP_ELEMENT_TYPE_GRID", "Grid"); +define("VARGRP_ELEMENT_TYPE_MULTIRESP", "multipleResp"); +define("VARFORMAT_ELEMENT_TYPE_GRID", "numeric"); class MultiGridXml extends XmlSurveyElement { diff --git a/admin/survey/export/xmlClasses/Vprasanja/RadioXml.php b/admin/survey/export/xmlClasses/Vprasanja/RadioXml.php index e49600894..615cc4749 100644 --- a/admin/survey/export/xmlClasses/Vprasanja/RadioXml.php +++ b/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 { diff --git a/admin/survey/export/xmlClasses/Vprasanja/SteviloXml.php b/admin/survey/export/xmlClasses/Vprasanja/SteviloXml.php index 6d5e752d4..cfe32fa66 100644 --- a/admin/survey/export/xmlClasses/Vprasanja/SteviloXml.php +++ b/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 { diff --git a/admin/survey/export/xmlClasses/class.XmlDocument.php b/admin/survey/export/xmlClasses/class.XmlDocument.php index 931243e0f..3c6f1ba7e 100644 --- a/admin/survey/export/xmlClasses/class.XmlDocument.php +++ b/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{ diff --git a/admin/survey/export/xmlClasses/class.XmlSurveyElement.php b/admin/survey/export/xmlClasses/class.XmlSurveyElement.php index f903d7dc4..6b830becb 100644 --- a/admin/survey/export/xmlClasses/class.XmlSurveyElement.php +++ b/admin/survey/export/xmlClasses/class.XmlSurveyElement.php @@ -9,12 +9,12 @@ include('../../vendor/autoload.php'); -define("MAX_STRING_LENGTH", 60, true); -define("LINE_BREAK_AT", '7 cm', true); -define("RADIO_BTN_SIZE", 0.13, true); -define("CHCK_BTN_SIZE", 0.13, true); -define("PIC_SIZE_ANS", "\includegraphics[width=3cm]", true); //slika dolocene sirine -define("DROPDOWN_SIZE", 0.8, true); +define("MAX_STRING_LENGTH", 60); +define("LINE_BREAK_AT", '7 cm'); +define("RADIO_BTN_SIZE", 0.13); +define("CHCK_BTN_SIZE", 0.13); +define("PIC_SIZE_ANS", "\includegraphics[width=3cm]"); //slika dolocene sirine +define("DROPDOWN_SIZE", 0.8); class XmlSurveyElement{ diff --git a/admin/survey/izvoz.php b/admin/survey/izvoz.php index b7c537827..225ebd3c4 100644 --- a/admin/survey/izvoz.php +++ b/admin/survey/izvoz.php @@ -22,14 +22,14 @@ else{ /****** DEFINITIONS ******/ -define("M_ANALIZA_DESCRIPTOR", "descriptor", true); -define("M_ANALIZA_FREQUENCY", "frequency", true); -define("M_ANALIZA_CROSSTAB", "crosstabs", true); -define("M_ANALIZA_STATISTICS", "statistics", true); -define("M_ANALIZA_SUMS", "sums", true); +define("M_ANALIZA_DESCRIPTOR", "descriptor"); +define("M_ANALIZA_FREQUENCY", "frequency"); +define("M_ANALIZA_CROSSTAB", "crosstabs"); +define("M_ANALIZA_STATISTICS", "statistics"); +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_COMMENT","pdf_comment",true); define("M_REPORT_ANALIZA_PDF_FREKVENCA","frequency",true); @@ -53,53 +53,53 @@ define("M_REPORT_PDF_MJU","pdf_mju",true); define("M_REPORT_PDF_MJU2","pdf_mju2",true); define("M_REPORT_BORZA","borza_chart",true); define("M_REPORT_PDF_HEATMAP_IMAGE","heatmap_image_pdf",true); -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_RTF_RESULTS", "rtf_results", true); +define("A_REPORT_VPRASALNIK_RTF", "vprasalnik_rtf"); +define("A_REPORT_RTF_RESULTS", "rtf_results"); define("A_REPORT_RTF_COMMENT","rtf_comment",true); -define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf", true); -define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf", true); -define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf", true); -define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf", true); -define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf", true); -define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf", true); -define("A_REPORT_RTF_LIST", "list_rtf", true); +define("M_REPORT_ANALIZA_RTF_FREKVENCA", "frequency_rtf"); +define("M_REPORT_ANALIZA_RTF_CROSSTAB_IZPIS", "crosstabs_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_MEAN_IZPIS", "mean_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_TTEST_IZPIS", "ttest_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_BREAK_IZPIS", "break_izpis_rtf"); +define("M_REPORT_ANALIZA_RTF_STAT", "statistics_rtf"); +define("M_REPORT_ANALIZA_RTF_SUMS", "sums_rtf"); +define("M_REPORT_ANALIZA_RTF_CHARTS", "charts_rtf"); +define("M_REPORT_ANALIZA_RTF_CREPORT", "creport_rtf"); +define("A_REPORT_RTF_LIST", "list_rtf"); define("M_REPORT_ANALIZA_RTF_HEATMAP_IMAGE","heatmap_image_rtf",true); /*XLS*/ -define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls", true); -define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls", true); -define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls", true); -define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls", true); -define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls", true); -define("A_REPORT_XLS_LIST", "list_xls", true); -define("A_REPORT_XLS_USABLE", "usable_xls", true); -define("A_REPORT_XLS_SPEEDER", "speeder_xls", true); -define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls", true); -define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv", true); -define("M_REPORT_CSV_MAZA_USERS", "maza_csv", true); -define("M_REPORT_CSV_ADVANCED_PARADATA", "advanced_paradata_csv", true); +define("M_REPORT_ANALIZA_XLS_STAT", "statistics_xls"); +define("M_REPORT_ANALIZA_XLS_FREKVENCA", "frequency_xls"); +define("M_REPORT_ANALIZA_XLS_CROSSTAB_IZPIS", "crosstabs_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_MULTICROSSTAB_IZPIS", "multicrosstabs_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_SUMS", "sums_xls"); +define("M_REPORT_ANALIZA_XLS_MEAN_IZPIS", "mean_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_TTEST_IZPIS", "ttest_izpis_xls"); +define("M_REPORT_ANALIZA_XLS_BREAK_IZPIS", "break_izpis_xls"); +define("A_REPORT_XLS_LIST", "list_xls"); +define("A_REPORT_XLS_USABLE", "usable_xls"); +define("A_REPORT_XLS_SPEEDER", "speeder_xls"); +define("A_REPORT_XLS_TEXT_ANALYSIS", "text_analysis_xls"); +define("A_REPORT_CSV_TEXT_ANALYSIS", "text_analysis_csv"); +define("M_REPORT_CSV_MAZA_USERS", "maza_csv"); +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); /*IMAGE*/ -define("M_REPORT_ANALIZA_HEATMAP_IMAGE", "heatmap_image", true); +define("M_REPORT_ANALIZA_HEATMAP_IMAGE", "heatmap_image"); diff --git a/admin/survey/modules/Evalvacija/class.Evalvacija.php b/admin/survey/modules/Evalvacija/class.Evalvacija.php index 282a11888..1a54ad2b1 100644 --- a/admin/survey/modules/Evalvacija/class.Evalvacija.php +++ b/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("SCRIPT_FOLDER", "admin/survey/modules/Evalvacija/R", true); -define("RESULTS_FOLDER", "admin/survey/modules/Evalvacija/results", true); -define("PDF_FOLDER", "admin/survey/modules/Evalvacija/pdf", true); +define("TEMP_FOLDER", "admin/survey/modules/Evalvacija/temp"); +define("SCRIPT_FOLDER", "admin/survey/modules/Evalvacija/R"); +define("RESULTS_FOLDER", "admin/survey/modules/Evalvacija/results"); +define("PDF_FOLDER", "admin/survey/modules/Evalvacija/pdf"); class Evalvacija{ diff --git a/admin/survey/modules/Evalvacija/class.GC.php b/admin/survey/modules/Evalvacija/class.GC.php index 2f3b189da..aebd5cdd9 100644 --- a/admin/survey/modules/Evalvacija/class.GC.php +++ b/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(WSDL_URL, "https://gcwserac.uni-lj.si/IntegrationUL/Services/GcService.asmx?WSDL", 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"); // 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(WSDL_URL, "https://gcwserac-test.uni-lj.si/IntegrationUL/Services/GcService.asmx?WSDL", 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"); class GC{ diff --git a/admin/survey/modules/mod_360/class.Survey360.php b/admin/survey/modules/mod_360/class.Survey360.php index e7ba93c04..6d8485606 100644 --- a/admin/survey/modules/mod_360/class.Survey360.php +++ b/admin/survey/modules/mod_360/class.Survey360.php @@ -1,8 +1,8 @@ functionality_package[$what]) && $this->functionality_package[$what] > $this->user_access['package_id']){ + $package_id = $this->getPackage(); + if(isset($this->functionality_package[$what]) && $this->functionality_package[$what] > $package_id){ return false; } - + return true; } diff --git a/function.php b/function.php index cb34a8e4e..25678e239 100644 --- a/function.php +++ b/function.php @@ -87,9 +87,9 @@ if (!$connect_db = mysqli_connect($mysql_server, $mysql_username, $mysql_passwor // mysql escaping used on all GPC variables function stripslashes_gpc(&$value) { - if (get_magic_quotes_gpc()) { + /*if (get_magic_quotes_gpc()) { $value = stripslashes($value); - } + }*/ $value = mysqli_real_escape_string($GLOBALS['connect_db'], $value); } diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php index e85985452..26c23775f 100644 --- a/main/survey/app/Controllers/InitClass.php +++ b/main/survey/app/Controllers/InitClass.php @@ -732,9 +732,14 @@ class InitClass extends Controller if (self::$global_user_id == 0) { $row1['id'] = 0; - } else { + } + else { $sql1 = sisplet_query("SELECT id, cookie FROM srv_user WHERE user_id = '" . self::$global_user_id . "' AND user_id > 0 AND ank_id = '" . get('anketa') . "'"); - $row1 = mysqli_fetch_array($sql1); + + if(mysqli_num_rows($sql1) > 0) + $row1 = mysqli_fetch_array($sql1); + else + $row1['id'] = 0; } // ce je izbrana povezava s sisplet userjem in da smo najdl cookie za trenutnega userja, potem nastavimo ta cookie diff --git a/main/survey/app/Controllers/Vprasanja/MultigridController.php b/main/survey/app/Controllers/Vprasanja/MultigridController.php index 478418d3a..b1915548c 100644 --- a/main/survey/app/Controllers/Vprasanja/MultigridController.php +++ b/main/survey/app/Controllers/Vprasanja/MultigridController.php @@ -1080,7 +1080,7 @@ class MultigridController extends Controller $mv_count = 0; # koliko je stolpcev z manjkajočimi vrednostmi # če polje other != 0 je grid kot missing - $sql_grid = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop, s.params 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"); + $sql_grid = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop, s.params 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"); if (!$sql_grid) echo mysqli_error($GLOBALS['connect_db']); while ($row_grid = mysqli_fetch_assoc($sql_grid)) { diff --git a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php index 192ae1b79..da579140f 100644 --- a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php +++ b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php @@ -142,7 +142,7 @@ class VprasanjaController extends Controller ) $evoli_teammeter = true; else - $evoli_teammeter = ¸false; + $evoli_teammeter = false; while ($row = mysqli_fetch_array($sql)) {