may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into release/produkcija

Browse Source
This commit is contained in:
pero1203 2022-07-20 11:59:03 +02:00
commit 08dc54807b
219 changed files with 9671 additions and 3610 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
admin/survey/Branching.php
View File

@ -215,49 +215,6 @@ class Branching {
$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
$full_view = true;
echo '<div class="floatLeft">';
# skrčen / razširjen
if ($this->expanded) {
echo '<span title="'.$lang['srv_expanded_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=0"><span class="faicon expanded"></span>'.$lang['srv_expanded_0_short'].'</a></span> ';
$sqle = sisplet_query("SELECT count(*) AS c FROM srv_branching WHERE ank_id='$this->anketa'");
$rowe = mysqli_fetch_array($sqle);
if ($rowe['c'] > 15 && !isset($_COOKIE['expanded']))
echo '<span class="expanded-tooltip top">'.$lang['srv_expaned_text'].' <a href="#" onclick="$(this).closest(\'.expanded-tooltip\').hide(); var d = new Date(); d.setDate(d.getDate()+30); document.cookie=\'expanded=1;expires=\'+d.toUTCString(); return false;" class="close">'.$lang['srv_zapri'].'</a><span class="arrow"></span></span>';
} else {
echo '<span title="'.$lang['srv_expanded_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=1"><span class="faicon compress"></span>'.$lang['srv_expanded_0_short'].'</a></span> ';
}
echo Help::display('srv_branching_expanded');
echo '</div>';
echo '<div class="floatRight">';
# find & replace
if ($row['locked'] == 0) {
echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace'].'" ><span class="faicon replace"></span></a>';
}
if ($row['locked'] == 0 && $full_view == true) {
echo '<a href="#" onclick="javascript:pagebreak_all(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span></a> '."\n";
}
# Hrošč je viden samo če imamo ife in razširjen pogled
if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
echo '<a href="#" onclick="check_pogoji(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span></a> '."\n";
}
if ($row['locked'] == 0 && $full_view == true) {
echo '<a href="#" onclick="prestevilci(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span></a>' . Help :: display('srv_grupe_recount_branching') ."\n";
}
if ($has_if == true && $full_view == true || ($has_if == true && $this->expanded == false)) {
echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span></a>'."\n";
echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span></a>'."\n";
}
echo '</div>';
// prikaz blokov kot zavihke
echo '<div class="blockSwitch">';
$sql = sisplet_query("SELECT i.* FROM srv_if i, srv_branching b WHERE i.tab='1' AND i.tip='1' AND i.id=b.element_if AND b.ank_id='$this->anketa' ORDER BY b.parent, b.vrstni_red");
@ -323,20 +280,6 @@ class Branching {
$this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type");
$hierarhija = SurveyInfo::getInstance()->checkSurveyModule('hierarhija');
// Toolbox napredne nastavitve (prestevilci, dodaj prelome, debug...)
if($this->survey_type > 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija') ){
echo '<div id="toolbox_advanced_settings" class="toolbox">';
echo '<div class="toolbox_item"><span class="item_icon faicon wheel_32"></span> <span class="item_text">'.$lang['srv_advanced_settings_title'].'</span></div>';
$this->toolbox_add_advanced_settings();
echo '</div>';
echo '<div class="toolbox_border"></div>';
}
echo '<div id="toolbox_basic" class="toolbox '.($this->survey_type==1?' forma':'').($hierarhija ? ' toolbox-hierarhija' : '').'">';
@ -596,97 +539,6 @@ class Branching {
echo '</div>';
}
/**
* prikaze popup z vsemi tipi vprasanj
*
*/
function toolbox_add_advanced_settings() {
global $lang;
global $admin_type;
global $site_url;
global $global_user_id;
$row = SurveyInfo::getInstance()->getSurveyRow();
# preverimo ali imamo ife. Če so, izpisujemo vse ikonce
$sql_query = sisplet_query("SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'");
$row_query = mysqli_fetch_array($sql_query);
$has_if = (int)$row_query['if_count'] > 0 ? true : false;
# ali prikazujemo vse ikonice ali samo "simpl" ikonice
$sql_query_fv = sisplet_query("SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'");
$row_query_fv = mysqli_fetch_array($sql_query_fv);
$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
$full_view = true;
echo '<div id="toolbox_advanced_settings_holder" class="toolbox_expand">';
echo '<div class="toolbox_expand_title"><span class="faicon wheel_32"></span>'.$lang['srv_advanced_settings_title'].'</div>';
echo '<div class="toolbox_expand_segment">';
// Razsiri / skrci
if($this->survey_type > 1){
if($this->expanded) {
echo '<p class="segment_option">';
echo '<a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=0" title="'.$lang['srv_expanded_0'].'">';
echo '<span class="faicon compress"></span>';
echo $lang['srv_expand_0'];
echo '</a>';
echo '</p>';
}
else {
echo '<p class="segment_option">';
echo '<a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=1" title="'.$lang['srv_expanded_1'].'">';
echo '<span class="faicon expand"></span>';
echo $lang['srv_expand_1'];
echo '</a>';
echo '</p>';
}
}
/*if ($has_if == true) {
echo '<p class="segment_option">';
echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span>'.$lang['srv_expand'].'</a>'."\n";
echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span>'.$lang['srv_collapse'].'</a>'."\n";
echo '</p>';
}*/
# find & replace
if ($row['locked'] == 0) {
echo '<p class="segment_option">';
echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace_words'].'" ><span class="faicon replace"></span>'.$lang['srv_find_replace_words'].'</a>';
echo '</p>';
}
if ($row['locked'] == 0 && $full_view == true) {
echo '<p class="segment_option">';
echo '<a href="#" onclick="javascript:pagebreak_all(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
echo '</p>';
}
# Hrošč je viden samo če imamo ife in razširjen pogled
if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
echo '<p class="segment_option">';
echo '<a href="#" onclick="javascript:check_pogoji(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span>'.$lang['srv_check_pogoji'].'</a> '."\n";
echo '</p>';
}
if ($row['locked'] == 0 && $full_view == true) {
echo '<p class="segment_option">';
echo '<a href="#" onclick="prestevilci(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching') ."\n";
echo '</p>';
}
echo '</div>';
echo '</div>';
}
/**
* preview
*
@ -1775,6 +1627,119 @@ class Branching {
echo '</div>';
}
// Napredne nastavitve v sredini zgoraj
echo '<div class="top_center_settings">';
echo '<div class="left_settings">';
// Arhiviraj - ENKLIK ARHIV
echo '<div class="button" onclick="oneClickArchive();">';
echo '<span class="faicon arhiv blue"></span>';
echo $lang['srv_analiza_arhiviraj'];
echo '</div>';
// Napredne nastavitve dropdown
$row = SurveyInfo::getInstance()->getSurveyRow();
# preverimo ali imamo ife. Če so, izpisujemo vse ikonce
$sql_select = "SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'";
$sql_query = sisplet_query($sql_select);
$row_query = mysqli_fetch_array($sql_query);
$has_if = (int)$row_query['if_count'] > 0 ? true : false;
# ali prikazujemo vse ikonice ali samo "simpl" ikonice
$sql_select_fv = "SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'";
$sql_query_fv = sisplet_query($sql_select_fv);
$row_query_fv = mysqli_fetch_array($sql_query_fv);
$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
$full_view = true;
echo '<div id="top_napredne_holder">';
echo '<div id="top_napredne_gumb" class="button" onclick="toggleSurveyTopSettings();">';
echo $lang['srv_quick_settings_napredno'];
echo '<span id="top_napredne_icon" class="faicon fa-angle-down blue left"></span>';
echo '</div>';
echo '<div id="top_napredne_dropdown" class="displayNone">';
#odpri vse - zapri vse
if ($has_if == true && $full_view == true || ($has_if == true && $this->expanded == false)) {
echo '<p class="segment_option">';
echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); toggleSurveyTopSettings(); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span>'.$lang['srv_expand'].'</a>'."\n";
echo '</p>';
echo '<p class="segment_option">';
echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); toggleSurveyTopSettings(); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span>'.$lang['srv_collapse'].'</a>'."\n";
echo '</p>';
}
# find & replace
if ($row['locked'] == 0) {
echo '<p class="segment_option">';
echo '<a href="#" onclick="find_replace(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_find_replace_words'].'" ><span class="faicon replace"></span>'.$lang['srv_find_replace_words'].'</a>';
echo '</p>';
}
#prelom strani
if ($row['locked'] == 0 && $full_view == true) {
echo '<p class="segment_option">';
echo '<a href="#" onclick="javascript:pagebreak_all(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
echo '</p>';
}
# Hrošč je viden samo če imamo ife in razširjen pogled
if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
echo '<p class="segment_option">';
echo '<a href="#" onclick="javascript:check_pogoji(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span>'.$lang['srv_check_pogoji'].'</a> '."\n";
echo '</p>';
}
#prestevilci
if ($row['locked'] == 0 && $full_view == true) {
echo '<p class="segment_option">';
echo '<a href="#" onclick="prestevilci(); toggleSurveyTopSettings(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching') ."\n";
echo '</p>';
}
echo '</div>';
//Klik izven razprith nastavitev - zapremo okno
echo '<script>
$(document).mouseup(function(e){
var container = $("#top_napredne_dropdown");
if (!container.is(e.target) && container.has(e.target).length === 0){
$("#top_napredne_dropdown").addClass("displayNone");
$("#top_napredne_gumb").removeClass("border_blue");
$("#top_napredne_icon").addClass("fa-angle-down");
$("#top_napredne_icon").removeClass("fa-angle-up");
}
});
</script>';
echo '</div>';
echo '</div>'; //left_settings
echo '<div class="right_settings">';
$url0 = "'" . "index.php?anketa=".$this->anketa."&a=branching&change_mode=1&what=expanded&value=0" . "'";
$url1 = "'" . "index.php?anketa=".$this->anketa."&a=branching&change_mode=1&what=expanded&value=1" . "'";
// Razširi
echo '<div title="'.$lang['srv_expanded_1'].'" class="square '.($this->expanded ? 'active':'').'" onClick="window.location='.$url1.';return false;">';
echo '<span class="faicon expand"></span>';
echo '</div>';
echo '<div class="line"></div>';
//Skrči
echo '<div title="'.$lang['srv_expanded_0'].'" class="square '.($this->expanded ? '':'active').'" onClick="window.location='.$url0.';return false;">';
echo '<span class="faicon compress"></span>';
echo '</div>';
echo '</div>'; //right_settings
echo '</div>'; //top_center_settings
echo '<ul class="first '.($this->locked?'locked':'').'">';
@ -2133,7 +2098,7 @@ class Branching {
}
// zadnji spremenljivki v ifu, tudi dodamo PB izven pagebreaka (da se doda, tam kjer se potem prikaže)
if ($rows['pagebreak'] == 0 AND (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
if ($rows['pagebreak'] == 0 && (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1" spr_pb="'.$spr.'">';
echo ' <div class="pb_new" title="'.$lang['srv_add_pagebreak'].'">';
echo ' <div class="pb_page_hover"><span class="faicon paragraph"></span>'.$lang['srv_add_pagebreak'].'</div>';
@ -6215,7 +6180,7 @@ class Branching {
if ($admin_type <= $question_comment && $question_comment != '') {
// Dodaj komentar
echo ' <span class="floatRight spaceLeft"><a href="#" id="surveycomment_'.$if_id.'_0" class="surveycomment" type="'.($block==1 ? '6' : '5').'" subtype="'.($block==1 ? 'blok_admin_add' : 'if_admin_add').'" spremenljivka="'.$if_id.'" view="0" onclick="return false;" title="'.$lang['srv_question_comment'].'"> ';
echo ' <span class="comment_inline"><a href="#" id="surveycomment_'.$if_id.'_0" class="surveycomment" type="'.($block==1 ? '6' : '5').'" subtype="'.($block==1 ? 'blok_admin_add' : 'if_admin_add').'" spremenljivka="'.$if_id.'" view="0" onclick="return false;" title="'.$lang['srv_question_comment'].'"> ';
//echo '<img src="img_' . $this->skin . '/comment.png" alt="'.$lang['srv_question_comment'].'" title="'.$lang['srv_question_comment'].'" > ';
echo '<span class="faicon inline_comment"></span> ';
echo $lang['srv_add_comment'];

19
admin/survey/SurveyAdmin.php
View File

@ -3750,6 +3750,14 @@ class SurveyAdmin
}
}
// kolektor modul
if ($_GET['a'] == 'kolektor') {
echo ' <div id="kolektor">';
$kolektor = new Kolektor();
$kolektor->display();
echo ' </div>';
}
// Konec moje_ankete_edit
echo '</div>';
}
@ -5956,7 +5964,7 @@ class SurveyAdmin
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;">';
}
echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
echo '<div id="srv_active" class="switch_anketa anketa_on"></div>';
echo '</a>';
}
@ -5975,14 +5983,7 @@ class SurveyAdmin
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;">';
}
if ((int)$_last_active > 0) {
# anketa je zaključena
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
else {
# anketa je neaktivna
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
echo '<div id="srv_inactive" class="switch_anketa anketa_off"></div>';
echo '</a>';
}

31
admin/survey/SurveyAdminAjax.php
View File

@ -4303,10 +4303,10 @@ class SurveyAdminAjax {
}
echo ' <div id="spremenljivka_preview">';
if ( $_POST['spremenljivka'] == -1 ) {
\App\Controllers\BodyController::getInstance()->displayIntroduction();
\App\Controllers\BodyController::getInstance()->displayIntroductionContent();
}
elseif ( $_POST['spremenljivka'] == -2 ) {
\App\Controllers\BodyController::getInstance()->displayKonec();
\App\Controllers\BodyController::getInstance()->displayKonecContent();
}
elseif ( $_POST['spremenljivka'] == -3 ) {
\App\Controllers\StatisticController::displayStatistika();
@ -6942,6 +6942,7 @@ class SurveyAdminAjax {
}
echo '</p>';
}
#piškotki
echo '<p><span>'.$lang['srv_cookie'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie'].'"><span class="qs_data as_link">'.$lang['srv_cookie_'.$row['cookie']].'</span></a></p>';
echo '<p><span>'.$lang['srv_cookie_return'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie_return'].'"><span class="qs_data as_link">'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</span></a></p>';
@ -7238,6 +7239,32 @@ class SurveyAdminAjax {
}
echo '</div>';
}
// Enklikarhiv popup
private function ajax_oneClickArchive(){
global $lang;
$anketa = $_POST['anketa'];
echo '<h2>'.$lang['srv_analiza_arhiviraj'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
echo '<div class="popup_content">';
echo '<p class="bottom16">'.$lang['srv_questionnaire_archives_text_popup'].'</p>';
echo '<div class="setting_holder">';
echo $lang['srv_questionnaire_archives_note'].':';
echo '<input class="large w400" name="intro_opomba" id="intro_opomba" type="text"/>';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="popupClose(); return false;">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">'.$lang['srv_backup_button'].'</button>';
echo '</div>';
}
}
?>

36
admin/survey/SurveyAdminSettings.php
View File

@ -2673,7 +2673,7 @@ class SurveyAdminSettings {
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">';
}
echo '<div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div>';
echo '<div id="srv_active" class="switch_anketa anketa_on"></div>';
echo '</a>';
}
@ -2692,14 +2692,7 @@ class SurveyAdminSettings {
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">';
}
if ((int)$_last_active > 0) {
# anketa je zaključena
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
else {
# anketa je neaktivna
echo '<div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div>';
}
echo '<div id="srv_inactive" class="switch_anketa anketa_off"></div>';
echo '</a>';
}
@ -5927,8 +5920,8 @@ class SurveyAdminSettings {
return $total;
}
$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
$skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s';
$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
$skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'<span class="time_text">s</span>';
if ($samo_izracunaj_skupini_cas == 1)
return $skupni_cas;
@ -5956,7 +5949,7 @@ class SurveyAdminSettings {
echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
echo '<td class="right time">';
echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
echo ($time[0]<60?round($time[0],1).'<span class="time_text">s</span> ':round($time[0]/60,1).'<span class="time_text">min</span> ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'<span class="time_text">s</span> ':round($time[1]/60,1).'<span class="time_text">min</span> ').'</span>';
echo '</td>';
echo '<td class="graph_cell">';
@ -6037,7 +6030,7 @@ class SurveyAdminSettings {
echo '</tr>';
}
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td></tr>';
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($neto_total, 60), 0).'<span class="time_text">s</span> / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td></tr>';
echo '</table>';
echo '<div class="tabela_trajanje_legenda">';
@ -6070,7 +6063,7 @@ class SurveyAdminSettings {
echo '<td class="nowrap">'.$block_labels_by_number[$vrstni_red+1].'</td>';
echo '<td class="right time">';
echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
echo ($time[0]<60?round($time[0],1).'<span class="time_text">s</span> ':round($time[0]/60,1).'<span class="time_text">min</span> ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'<span class="time_text">s</span> ':round($time[1]/60,1).'<span class="time_text">min</span> ').'</span>';
echo '</td>';
echo '<td class="graph_cell">';
@ -6083,7 +6076,7 @@ class SurveyAdminSettings {
echo '</tr>';
}
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</td><td></td><td></td><td></td></tr>';
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($totalb, 60), 0).'<span class="time_text">s</span></td><td></td><td></td><td></td></tr>';
echo '</table>';
@ -6155,7 +6148,7 @@ class SurveyAdminSettings {
}
}
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td></tr>';
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($neto_total, 60), 0).'<span class="time_text">s</span> / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td></tr>';
echo '</table>';
echo '<div class="tabela_trajanje_legenda">';
@ -6648,12 +6641,12 @@ class SurveyAdminSettings {
if ($max == 0) return;
if ($samo_izracunaj_skupini_cas == 1)
return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
// izpis
$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
$predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0);
$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
$predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total_predvideni, 60), 0);
echo '<fieldset><legend>'.$lang['srv_total_trajanje'].'</legend>';
echo '<p class="semi-bold">'.$lang['srv_dejansko_trajanje_real'].':</p>';
@ -6668,6 +6661,7 @@ class SurveyAdminSettings {
echo '<tr>';
echo '<th>'.$lang['srv_casi_po_straneh_stran'].'</th>';
echo '<th colspan="2">'.$lang['srv_neto_v_cas'];
if ($_GET['predvideni'] == 1) {
echo ' / '.$lang['srv_testiranje_predvidenicas_1'];
}
@ -6684,14 +6678,14 @@ class SurveyAdminSettings {
echo '<tr>';
echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
echo '<td class="right time">'.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ');
echo '<td class="right time">'.($time<60 ? round($time,1).'<span class="time_text">s</span> ' : round($time/60,1).'<span class="time_text">min</span> ');
if ($_GET['predvideni'] == 1) {
if ($rezanje_preskocene == 1)
$time = $expected_time[$vrstni_red][0];
else
$time = $expected_time[$vrstni_red][1];
echo '<span class="gray"> / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').'</span>';
echo '<span class="gray"> / '.($time<60 ? round($time,1).'<span class="time_text">s</span> ' : round($time/60,1).'<span class="time_text">min</span> ').'</span>';
}
echo '</td>';

16
admin/survey/classes/class.GDPR.php
View File

@ -1540,20 +1540,20 @@ class GDPR{
$naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
$naslov .= '<ul>';
$naslov .= ' <ul>';
if($user_settings['name'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_name'].'</li>';
$naslov .= ' <li>'.$lang['srv_gdpr_intro_name'].'</li> ';
if($user_settings['email'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_email'].'</li>';
$naslov .= ' <li>'.$lang['srv_gdpr_intro_email'].'</li> ';
if($user_settings['location'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_location'].'</li>';
$naslov .= ' <li>'.$lang['srv_gdpr_intro_location'].'</li> ';
if($user_settings['phone'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_phone'].'</li>';
$naslov .= ' <li>'.$lang['srv_gdpr_intro_phone'].'</li> ';
if($user_settings['web'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>';
$naslov .= ' <li>'.$lang['srv_gdpr_intro_web'].'</li> ';
if($user_settings['other'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>';
$naslov .= '</ul>';
$naslov .= ' <li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li> ';
$naslov .= '</ul> ';
$naslov .= '<p>'.$lang['srv_gdpr_intro2'];
$naslov .= ' '.$lang['srv_gdpr_intro3'].'</p>';

3
admin/survey/classes/class.SurveyCheck.php
View File

@ -84,9 +84,10 @@ class SurveyCheck {
// Dobimo stevilo odgovorov na anketo
$stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount();
$stevilo_odgovorov_limit = AppSettings::getInstance()->getSetting('app_limits-response_count_limit');
// Obvestilo (mail adminu) posljemo pri dosezeni stevilki
if($stevilo_odgovorov == AppSettings::getInstance()->getSetting('app_limits-response_count_limit')){
if($stevilo_odgovorov > 0 && $stevilo_odgovorov % $stevilo_odgovorov_limit === 0){
$this->sendAlert($alert_type='limit_responses', $stevilo_odgovorov);
// Deaktiviramo anketo, ce je aktivna ?

260
admin/survey/classes/class.SurveyDiagnostics.php
View File

@ -197,28 +197,42 @@ class SurveyDiagnostics
if ($total < 120) { # 2min
$time = $lang['srv_diagnostic_time_1'];
$time_chart = 20;
} else if ($total < 300) { # 5min
$time = $lang['srv_diagnostic_time_2'];
$time_chart = 40;
} else if ($total < 900) { # 15 min
$time = $lang['srv_diagnostic_time_3'];
$time_chart = 60;
} else if ($total < 1800) { # 30 min
$time = $lang['srv_diagnostic_time_4'];
$time_chart = 80;
} else { #> 30 min
$time = $lang['srv_diagnostic_time_5'];
$time_chart = 100;
}
$excess = 100 - $time_chart;
$display_length = "'[".$time_chart.",".$excess."]'"; //array za chart
# Kompleksnost
if ((int)($this->cnt_blocks + $this->cnt_conditions) == 0) {
$kompleksnost = $lang['srv_diagnostic_complexity_1'];
$complex_chart = 20;
} else if ((int)($this->cnt_blocks + $this->cnt_conditions) == 1) {
$kompleksnost = $lang['srv_diagnostic_complexity_2'];
$complex_chart = 40;
} else if ((int)($this->cnt_blocks + $this->cnt_conditions) < 10) {
$kompleksnost = $lang['srv_diagnostic_complexity_3'];
$complex_chart = 60;
} else if ((int)($this->cnt_blocks + $this->cnt_conditions) < 50) {
$kompleksnost = $lang['srv_diagnostic_complexity_4'];
$complex_chart = 80;
} else {
$kompleksnost = $lang['srv_diagnostic_complexity_5'];
$complex_chart = 100;
}
$excess = 100 - $complex_chart;
$display_complex = "'[".$complex_chart.",".$excess."]'"; //array za chart
echo '<h2>'.$lang['srv_testiranje_diagnostika'].'</h2>';
@ -458,95 +472,107 @@ class SurveyDiagnostics
echo '<div class="lastnosti_wrapper">';
echo '<div class="lastnosti_left">';
echo '<table class="srv_diagnostic_results">';
echo '<tr>';
echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
echo '<td>';
echo $time.'&nbsp&nbsp';
if($lang['id'] == '1')
$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
else
$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
echo '<td>'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
echo '<td>'.(int)$this->cnt_spremenljivka.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
echo '<td>'.(int)$this->cnt_hidden.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
echo '<td>'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
echo '<td>'.(int)$this->cnt_conditions.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
echo '<td>'.(int)$this->cnt_blocks.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
echo '<td>'.(int)$this->globina.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
echo '<td>';
echo $kompleksnost.'&nbsp&nbsp';
if($lang['id'] == '1')
$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
else
$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
echo '</a>';
echo '</tr>';
echo '</table>';
echo '</div>';
echo '<div class="lastnosti_right">';
# Trajanje - linki
echo '<table class="srv_diagnostic_results">';
echo '<tr>';
echo '<th>'.$lang['srv_info_duration'].'</th>';
echo '<th></th>';
echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_testiranje_predvidenicas'].'</td>';
echo '<td>'.$skupni_cas.'</td>';
echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'"></a></td>';
echo '</tr>';
echo '<div class="box">';
echo '<div class="title">'.$lang['srv_neto_v_cas'].'</div>';
// Dejansko trajanje
$sas = new SurveyAdminSettings();
$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
echo '<tr>';
echo '<td>'.$lang['srv_testiranje_cas'].'</td>';
echo '<td>'.$dejanski_cas.'</td>';
echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'"></a></td>';
echo '</tr>';
echo '<p class="time">'.$dejanski_cas.'</p>';
if ($sas->testiranje_cas(1) == null)
echo $lang['srv_data_no_data'];
else
echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'">'.$lang['srv_testiranje_cas_info'].'</a>';
echo '</div>'; #box
echo '</table>';
//Ocena trajanja
echo '<div class="box">';
echo '<div class="title">'.$lang['srv_testiranje_predvidenicas'].'</div>';
echo '<p class="time">'.$skupni_cas.'</p>';
echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas">'.$lang['srv_testiranje_predvidenicas_info'].'</a>';
echo '</div>'; #box
echo '</div>'; #lastnosti_left
echo '<div class="lastnosti_middle">';
// Dolžina ankete
if($lang['id'] == '1')
$link_time = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
else
$link_time = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
echo '<div class="box">';
echo '<div class="title">'.$lang['srv_diagnostic_1_element_5'].'</div>';
echo '<div class="diagnostic_graph">';
echo '<div class="circle">';
echo '<canvas id="survey_length"></canvas>';
echo '</div>';
echo '<script type="text/javascript"> diagnosticsChart(\'survey_length\','.$display_length.'); </script>';
echo '<div class="other_text">';
echo '<p class="desc">'.$time.'</p>';
echo '<a '.$link_time.'>'.$lang['srv_diagnostic_time_extra'].'</a>';
echo '</div>';
echo '</div>';
echo '</div>'; #box
// Kompleksnost ankete
if($lang['id'] == '1')
$link_complex = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
else
$link_complex = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
echo '<div class="box">';
echo '<div class="title">'.$lang['srv_diagnostic_1_element_4'].'</div>';
echo '<div class="diagnostic_graph">';
echo '<div class="circle">';
echo '<canvas id="survey_complex"></canvas>';
echo '</div>';
echo '<script type="text/javascript"> diagnosticsChart(\'survey_complex\','.$display_complex.'); </script>';
echo '<div class="other_text">';
echo '<p class="desc">'.$kompleksnost.'</p>';
echo '<a '.$link_complex.'>'.$lang['srv_diagnostic_complexity_extra'].'</a>';
echo '</div>';
echo '</div>';
echo '</div>'; #box
echo '</div>'; #lastnosti_middle
//Ostale lastnosti ankete
echo '<div class="lastnosti_right">';
echo '<div class="box">';
echo '<div class="vertical_section">';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_9'].':</div>';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_5'].':</div>';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_5a'].':</div>';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_8'].':</div>';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_2'].':</div>';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_3'].':</div>';
echo '<div class="item">'.$lang['srv_diagnostic_4_element_4'].':</div>';
echo '</div>';
echo '<div class="vertical_section second">';
echo '<div class="item">'.(int)SurveyInfo::getSurveyGroupCount() . ' ' . ((int)SurveyInfo::getSurveyGroupCount() == 1 ? $lang['page']: $lang['srv_diagnostics_strani']).'</div>';
echo '<div class="item">'.(int)$this->cnt_spremenljivka . ' ' . ((int)$this->cnt_spremenljivka == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_spremenljivka == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_spremenljivka > 4 || (int)$this->cnt_spremenljivka == 0 ? $lang['srv_info_questions1'] : $lang['srv_info_questions3']) )).'</div>';
echo '<div class="item">'.(int)$this->cnt_hidden . ' '. ((int)$this->cnt_hidden == 1 ? $lang['srv_hidden_text'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_hidden_text2'] : ((int)$this->cnt_hidden > 4 || (int)$this->cnt_hidden == 0 ? $lang['srv_hidden_text4'] : $lang['srv_hidden_text3']) )). ' ' . ((int)$this->cnt_hidden == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_hidden > 4 || (int)$this->cnt_hidden == 0 ? $lang['srv_info_questions1'] : $lang['srv_info_questions3']) )).'</div>';
echo '<div class="item">'.(int)SurveyInfo::getSurveyVariableCount() . ' ' . ((int)SurveyInfo::getSurveyVariableCount() == 1 ? $lang['srv_spremenljivka'] : ((int)SurveyInfo::getSurveyVariableCount() == 2 ? $lang['srv_spremenljivka2'] : ((int)SurveyInfo::getSurveyVariableCount() > 4 || (int)SurveyInfo::getSurveyVariableCount() == 0 ? $lang['srv_spremenljivka4'] : $lang['srv_spremenljivka3']) )).'</div>';
echo '<div class="item">'.(int)$this->cnt_conditions . ' ' . ((int)$this->cnt_conditions == 1 ? $lang['srv_pogoj'] : ((int)$this->cnt_conditions == 2 ? $lang['srv_pogoj2'] : ((int)$this->cnt_conditions > 4 || (int)$this->cnt_conditions == 0 ? $lang['srv_pogoj4'] : $lang['srv_pogoj3']) )).'</div>';
echo '<div class="item">'.(int)$this->cnt_blocks . ' ' . ((int)$this->cnt_blocks == 1 ? $lang['srv_blok'] : ((int)$this->cnt_blocks == 2 ? $lang['srv_blok2'] : ((int)$this->cnt_blocks > 4 || (int)$this->cnt_blocks == 0 ? $lang['srv_blok4'] : $lang['srv_blok3']) )).'</div>';
echo '<div class="item">'.(int)$this->globina.'</div>';
echo '</div>';
echo '</div>'; #box
echo '</div>'; #lastnosti_right
echo '</div>'; #lastnosti_wrapper
// KOMENATRJI
# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished
@ -560,33 +586,49 @@ class SurveyDiagnostics
) > 0 ) {
echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
echo '<table class="srv_diagnostic_results">';
echo '<tr>';
echo '<th>'.$lang['srv_diagnostic_4_element_0'].'</th>';
echo '<th>'.$lang['srv_diagnostic_unresolved'].'</th>';
echo '<th>'.$lang['srv_diagnostic_all'].'</th>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_1'].'</td>';
echo '<td>'.(int)$commentsUnresolved.'</td>';
echo '<td>'.(int)$commentsAll.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_1a'].'</td>';
echo '<td>'.(int)$commentsUserSurveyUnresolved.'</td>';
echo '<td>'.(int)$commentsUserSurveyAll.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_6'].'</td>';
echo '<td>'.(int)$commentsQuestionUnresolved.'</td>';
echo '<td>'.(int)$commentsQuestionAll.'</td>';
echo '</tr>';
echo '<tr>';
echo '<td>'.$lang['srv_diagnostic_4_element_7'].'</td>';
echo '<td>'.(int)$commentsUserUnresolved.'</td>';
echo '<td>'.(int)$commentsUser.'</td>';
echo '</tr>';
echo '</table>';
echo '<div class="komentarji_wrapper">';
echo '<div class="komentarji_left">';
echo '<div class="title">'.$lang['srv_testiranje_komentarji_anketa'].'</div>';
echo '<div class="comment_count">';
echo '<div>'.$lang['srv_admin_comment2'].'</div>';
echo '<div><span class="semi-bold">'.(int)$commentsUnresolved.'/'.(int)$commentsAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '</div>';
echo '<div class="comment_count">';
echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
echo '<div><span class="semi-bold">'.(int)$commentsUserSurveyUnresolved.'/'.(int)$commentsUserSurveyAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '</div>';
$b = new Branching($this->anketa['id']);
$id = $b->anketa;
echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji_anketa">'.$lang['srv_testiranje_komentarji_anketa_link'].'</a>';
echo '</div>'; #komentarji_left
echo '<div class="komentarji_right">';
echo '<div class="title">'.$lang['srv_testiranje_komentarji_title'].'</div>';
echo '<div class="comment_count">';
echo '<div>'.$lang['srv_admin_comment2'].'</div>';
echo '<div><span class="semi-bold">'.(int)$commentsQuestionUnresolved.'/'.(int)$commentsQuestionAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '</div>';
echo '<div class="comment_count">';
echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
echo '<div><span class="semi-bold">'.(int)$commentsUserUnresolved.'/'.(int)$commentsUser.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
echo '</div>';
echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji">'.$lang['srv_testiranje_komentarji_title_link'].'</a>';
echo '</div>'; #komentarji_right
echo '</div>'; #komentarji_wrapper
}
echo '</div>'; # id="srv_diagnostic"
@ -728,7 +770,7 @@ class SurveyDiagnostics
$sas = new SurveyAdminSettings();
$total = $sas->testiranje_predvidenicas(2);
$this->time = array( $total,
(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'
(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>'
);
if ($total >= TIME_SOFT_LIMIT) {

24
admin/survey/classes/class.SurveyList.php
View File

@ -606,6 +606,10 @@ class SurveyList {
$css_1 = 'off';
$css_10 = 'on';
}
if ($_GET['a'] == 'kolektor') {
$css_1 = 'off';
$css_11 = 'on';
}
echo '<div id="firstNavigation" class="frontpage">';
@ -697,6 +701,15 @@ class SurveyList {
echo '</li>';
}
# kolektor modul - samo na njihovi instalaciji
if (Common::checkModule('kolektor') == '1') {
echo '<li class="active_'.$css_11.'">';
echo '<a href="index.php?a=kolektor" title="Kolektor">';
echo '<div class="smaller-singlebutton-'.$css_11.'">Kolektor</div>';
echo '</a>';
echo '</li>';
}
echo '</ol>';
// genialno, rewrite se nismo ucili...
@ -1557,9 +1570,9 @@ class SurveyList {
// Stikalo za folderje
if($this->show_folders == 1)
echo ' <div class="switch_folders on"><span class="switch_folders_content">ON</span></div>';
echo ' <div class="switch_folders on"></div>';
else
echo ' <div class="switch_folders off"><span class="switch_folders_content">OFF</span></div>';
echo ' <div class="switch_folders off"></div>';
echo '</div>';
}
@ -1869,6 +1882,11 @@ class SurveyList {
$stringSurveyList .= "LEFT OUTER JOIN srv_vrednost AS sv ON sv.spr_id = ss.id ";
}
// Ce iscemo po imenu ankete moramo dodat se tabele srv_nice_links za lepe linke
if($this->isSearch == 1 && $this->searchSettings['stype'] == '0'){
$stringSurveyList .= "LEFT OUTER JOIN srv_nice_links AS nl ON sa.id = nl.ank_id ";
}
$stringSurveyList .= "WHERE sa.backup='0' AND sa.id>0 AND active >= '0' AND invisible = '0' ";
//$stringSurveyList .= $this->getFolderCondition();
@ -2537,7 +2555,7 @@ class SurveyList {
}
// Search po naslovu
else{
$result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."'))";
$result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."') OR LOWER(nl.link) LIKE LOWER('".$search_text."'))";
}
// Search po statusu (aktivne, neaktivne)

3
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -94,6 +94,7 @@ class SurveyStaticHtml
echo '</div>';
echo '<div class="content">';
if($i != 7)
echo ' <img src="../../../public/img/analysis_previews/'.$preview_files[$i].'">';
echo '</div>';
@ -657,10 +658,12 @@ class SurveyStaticHtml
}
# break
if ($admin_type == 0) {
echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
echo '</li>';
}
}
echo '</ul>';
}

208
admin/survey/classes/class.Vprasanje.php
View File

@ -405,12 +405,7 @@ class Vprasanje {
if ( in_array($row['tip'], array(8)) ) {
echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
$this->edit_vrednost_datum();
// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
$this->edit_alert_show_missing();
$this->edit_vrednost_missing();
echo '</fieldset>';
}
@ -463,11 +458,9 @@ class Vprasanje {
// manjkajoce vrednosti - besedilo
if ( in_array($row['tip'], array(21)) ) {
echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
$this->edit_vrednost_besedilo();
// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
$this->edit_alert_show_missing();
echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
$this->edit_vrednost_missing();
echo '</fieldset>';
}
@ -475,28 +468,41 @@ class Vprasanje {
if (in_array($row['tip'], array(1,2,3,6,16,19,20,24)))
$this->edit_other_field();
if ( in_array($row['tip'], array(7, 18, 20)) ) {
if ( in_array($row['tip'], array(7, 18, 20, 21)) ) {
// ce je izbrano stevilo in ne drsnik
// ce je izbrano stevilo in ne drsnik - omejitve vnosa
if ($row['ranking_k'] == 0){
echo '<fieldset><legend>'.$lang['srv_num_limits'].'</legend>';
echo '<fieldset>';
//echo ' <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
echo ' <legend>'.$lang['srv_num_limits'].'</legend>';
//echo ' <div class="fieldset_holder" style="display:none;">';
echo ' <div class="fieldset_holder">';
if ($row['tip'] != 21)
$this->edit_number();
$this->edit_limit();
echo ' </div>';
echo '</fieldset>';
}
}
if ($row['tip'] == 7) {
echo '<fieldset>';
//echo ' <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
echo ' <legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
echo '<fieldset><legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
$this->edit_vrednost_number();
// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
$this->edit_alert_show_missing();
//echo ' <div class="fieldset_holder" style="display:none;">';
echo ' <div class="fieldset_holder">';
$this->edit_vrednost_missing();
echo ' </div>';
echo '</fieldset>';
}
}
if ( in_array($row['tip'], array(22)) ) {
$this->edit_compute();
@ -506,11 +512,7 @@ class Vprasanje {
$this->edit_name_generator();
}
if ( in_array($row['tip'], array(7,18,20, 21)) ) {
if ($row['ranking_k'] == 0){ //ce je izbrano stevilo in ne drsnik
$this->edit_limit();
}
}
}
}
}
@ -1760,7 +1762,7 @@ class Vprasanje {
echo '<label>'.$lang['srv_question_type'].':</label>';
echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val());">';
echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val(), \'0\');">';
echo '<option value="1"' . ($row['tip'] == 1 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_radio'] . '</option>';
echo '<option value="2"' . ($row['tip'] == 2 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_checkbox'] . '</option>';
@ -2728,24 +2730,28 @@ class Vprasanje {
$already_set_mv[$row_grid_mv['other']] = $row_grid_mv['naslov'];
}
if (count($missing_values) > 0) {
foreach ($missing_values AS $mv_key => $mv_text) {
echo '<div id="missing_settings_holder">';
echo '<div class="vprasanje_setting_holder">';
echo ' <div class="vprasanje_setting_line">';
echo ' <div class="vprasanje_setting_line inline">';
foreach ($missing_values AS $mv_key => $mv_text) {
echo ' <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked="checked"' : '').' onChange="vrednost_new_dodatne(\'' . $row['id'] . '\', \''.$mv_key.'\', \''.$row['tip'].'\', this.checked); show_alert_missing();" id="missing_value_'.$mv_key.'">';
echo ' <label for="missing_value_'.$mv_key.'" class="pointer">'. $mv_text . '</label> ';
}
echo ' </div>';
echo '</div>';
}
}
// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
if ($row['tip'] <= 2)
$this->edit_alert_show_missing();
echo '</div>';
}
}
}
@ -2898,8 +2904,8 @@ class Vprasanje {
echo '</p>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="vrednost_save(\''.$vrednost.'\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_potrdi'].'</button>';
echo ' <button class="medium white-blue" onClick="vrednost_cancel(); return false;">'.$lang['srv_close_profile'].'</button>';
echo ' <button class="medium blue" onclick="vrednost_save(\''.$vrednost.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
echo '</div>';
}
@ -3158,28 +3164,18 @@ class Vprasanje {
?><script> $('textarea[name=fastadd]').focus(); </script><?php
}
//editiranje vrednosti pri besedilu
function edit_vrednost_besedilo(){
// editiranje missing vrednosti pri besedilu, stevilu in datumu
function edit_vrednost_missing(){
global $lang;
$row = Cache::srv_spremenljivka($this->spremenljivka);
$spremenljivkaParams = new enkaParameters($row['params']);
$taSize = ($spremenljivkaParams->get('taSize') ? $spremenljivkaParams->get('taSize') : 1);
$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
//default sirina
if($taWidth == -1)
$taWidth = 30;
# manjkajoče vrednosti
//dodatne missing vrednosti (ne vem, zavrnil...)
# preberemo iz class.SurveyMissingValues
# preberemo missing vrednosti iz class.SurveyMissingValues - kateri so na voljo v anketi
$smv = new SurveyMissingValues($this->anketa);
# katere missinge imamo na voljo
$missing_values = $smv->GetUnsetValuesForSurvey();
#kateri missingi so nastavljeni
# kateri missingi so nastavljeni
$already_set_mv = array();
$sql_grid_mv = sisplet_query("SELECT naslov, other FROM srv_vrednost WHERE spr_id='".$this->spremenljivka."' AND other != 0");
while ($row_grid_mv = mysqli_fetch_array($sql_grid_mv)) {
@ -3187,36 +3183,41 @@ class Vprasanje {
}
if($row['tip'] == '7')
echo '<input type="hidden" name="edit_vrednost_number" value="1" />';
elseif($row['tip'] == '21')
echo '<input type="hidden" name="edit_vrednost_besedilo" value="1" />';
if (count($missing_values) > 0) {
foreach ($missing_values AS $mv_key => $mv_text) {
echo '<div id="missing_settings_holder">';
echo '<div class="vprasanje_setting_holder">';
echo ' <div class="vprasanje_setting_line">';
echo ' <div class="vprasanje_setting_line inline">';
foreach ($missing_values AS $mv_key => $mv_text) {
echo ' <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked="checked"' : '').' onChange="vrednost_new_dodatne(\'' . $row['id'] . '\', \''.$mv_key.'\', \''.$row['tip'].'\', this.checked); show_alert_missing();" id="missing_value_'.$mv_key.'">';
echo ' <label for="missing_value_'.$mv_key.'" class="pointer">'.$mv_text.'</label>';
}
echo ' </div>';
echo '</div>';
// naknaden prikaz missinga ne vem ob opozorilu (samo ce imamo vklopljeno opozorilo in missing ne vem)
$this->edit_alert_show_missing();
echo '</div>';
}
}
}
//editiranje vrednosti pri number
// editiranje missing vrednosti pri number
function edit_vrednost_number(){
global $lang;
$row = Cache::srv_spremenljivka($this->spremenljivka);
$spremenljivkaParams = new enkaParameters($row['params']);
$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
//default sirina
if($taWidth == -1)
$taWidth = 10;
//dodatne missing vrednosti (ne vem, zavrnil...)
# preberemo iz class.SurveyMissingValues
$smv = new SurveyMissingValues($this->anketa);
@ -3249,15 +3250,13 @@ class Vprasanje {
}
}
//editiranje vrednosti pri datumu
// editiranje missing vrednosti pri datumu
function edit_vrednost_datum(){
global $lang;
$row = Cache::srv_spremenljivka($this->spremenljivka);
$spremenljivkaParams = new enkaParameters($row['params']);
# manjkajoče vrednosti
//dodatne missing vrednosti (ne vem, zavrnil...)
# preberemo iz class.SurveyMissingValues
$smv = new SurveyMissingValues($this->anketa);
@ -4035,8 +4034,6 @@ class Vprasanje {
$onkeyup = $row['tip'] == 21 ? ' onkeyup="checkNumber(this, 4, 0, true);"' : '';
echo '<fieldset><legend>'.$lang['srv_num_reminder'].'</legend>';
echo '<input type="hidden" name="edit_number_limit" value="1" />';
@ -4122,17 +4119,12 @@ class Vprasanje {
echo ' </div>';
echo '</div>';
echo '</fieldset>';
}
// grid number
if ($row['tip'] == 20 && $row['ranking_k'] != 1) {
// zaenkrat sam za slider
echo '<fieldset><legend>'.$lang['srv_num_reminder'].'</legend>';
echo '<input type="hidden" name="edit_number_limit" value="1" />';
@ -4167,38 +4159,6 @@ class Vprasanje {
echo '</div>';
// Omejitve za 2. polje (ce ga imamo)
echo '<div class="vprasanje_setting_holder">';
echo ' <div id="num_limit2" class="vprasanje_setting_line" '.($row['size'] == 2 ? '' : ' style="display:none;"').'>';
echo ' <span>'.$lang['srv_num_field2'].':</span>';
echo ' </div>';
// spodnji limit
echo ' <div class="vprasanje_setting_line half-half">';
echo ' <span class="content" onClick="num_limit(\'num_min2\', \'num_useMin2\')">';
echo ' <input type="checkbox" value="1" id="num_useMin2" name="num_useMin2" '.($row['num_useMin2']==1 ? ' checked="checked"' : '').' >';
echo ' <label for="num_min2">'.$lang['srv_num_min'].'</label>';
echo ' </span>';
echo ' <span class="content">';
echo ' <input type="text" name="num_min2" id="num_min2" value="' . $row['num_min2'] . '" size="8" '.($row['num_useMin2'] == 0 ? ' disabled' : '').'></input>';
echo ' </span>';
echo ' </div>';
// zgornji limit
echo ' <div class="vprasanje_setting_line half-half">';
echo ' <span class="content" onClick="num_limit(\'num_max2\', \'num_useMax2\')">';
echo ' <input type="checkbox" value="1" id="num_useMax2" name="num_useMax2" '.($row['num_useMax2']==1 ? ' checked="checked"' : '').'>';
echo ' <label for="num_max2">'.$lang['srv_num_limit'].'</label>';
echo ' </span>';
echo ' <span class="content">';
echo ' <input type="text" name="num_max2" id="num_max2" value="' . $row['num_max2'] . '" size="8" '.($row['num_useMax2'] == 0 ? ' disabled' : '').'></input>';
echo ' </span>';
echo ' </div>';
echo '</div>';
// prikaz omejitve
echo '<div class="vprasanje_setting_holder">';
@ -4223,16 +4183,11 @@ class Vprasanje {
echo ' </div>';
echo '</div>';
echo '</fieldset>';
}
// grid slider
if ($row['tip'] == 20 && $row['ranking_k'] == 1) {
echo '<fieldset><legend>'.$lang['srv_num_reminder'].'</legend>';
echo '<input type="hidden" name="edit_number_limit" value="1" />';
echo '<div class="vprasanje_setting_holder">';
@ -4250,16 +4205,11 @@ class Vprasanje {
echo ' </div>';
echo '</div>';
echo '</fieldset>';
}
//omejitev za vsoto
if($row['tip'] == 18){
echo '<fieldset><legend>'.$lang['srv_vsota_reminder'].'</legend>';
echo '<input type="hidden" name="edit_vsota_limit" value="1" />';
//nastavitev tocne vsote
@ -4328,9 +4278,6 @@ class Vprasanje {
echo ' </div>';
echo '</div>';
echo '</fieldset>';
}
}
@ -7230,11 +7177,13 @@ class Vprasanje {
$return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
$return['output'] .= '<p>'.$lang['spremenljivka_delete_data_vre'].'</p>';
$return['output'] .= '<p>'.$lang['srv_brisivrednostconfirm_data'].'</p><br />';
$return['output'] .= '<p class="top16">'.$lang['srv_brisivrednostconfirm_data'].'</p>';
//ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
$return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_brisivrednost'].'</span></a></span>';
$return['output'] .= '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
$return['output'] .= '<div class="button_holder">';
$return['output'] .= '<button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
$return['output'] .= '<button class="medium blue" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_brisivrednost'].'</button>';
$return['output'] .= '</div>';
//$return['output'] .= '<p><a href="#" id="brisivrednostchecked" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_brisivrednost'].'</a> <a href="#" onclick="$(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
echo json_encode($return);
@ -7417,10 +7366,43 @@ class Vprasanje {
}
function ajax_change_tip () {
global $lang;
Common::getInstance()->Init($this->anketa);
Common::getInstance()->updateEditStamp();
$tip = $_POST['tip'];
$confirmed = (int)$_POST['confirmed'];
// preverimo, ce obstajajo ze podatki za spremenljivko - v tem primeru damo dodaten error
if($confirmed != '1'){
$return = array();
$sql = sisplet_query("SELECT count(*) AS count FROM srv_user WHERE ank_id='$this->anketa' AND deleted='0' AND preview='0'");
$row = mysqli_fetch_array($sql);
if ($row['count'] > 0) {
$return['error'] = 1;
$return['output'] = '<h2>'.$lang['srv_warning'].'</h2>';
$return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
$return['output'] .= '<p>'.$lang['spremenljivka_change_type_data'].'</p>';
$return['output'] .= '<p class="top16">'.$lang['srv_change_question_confirm_data'].'</p>';
//ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
$return['output'] .= '<div class="button_holder">';
$return['output'] .= '<button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
$return['output'] .= '<button class="medium blue" onClick="change_tip(\''.$this->spremenljivka.'\', \''.$tip.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_spremeni_tip_vprasanja'].'</button>';
$return['output'] .= '</div>';
echo json_encode($return);
return;
}
}
self::change_tip($this->spremenljivka, $tip);

4
admin/survey/classes/mobile/class.MobileSurveyAdmin.php
View File

@ -166,7 +166,7 @@ class MobileSurveyAdmin{
echo '<a href="#" class="srv_ico" onclick="anketa_active(\'' . $this->surveyAdminClass->anketa . '\',\'' . $row['active'] . '\'); return false;" title="' . $lang['srv_anketa_active'] . '">';
}
echo ' <div class="setting_icon"><div id="srv_active" class="switch_anketa anketa_on"><span class="switch_anketa_content">ON</span></div></div>';
echo ' <div class="setting_icon"><div id="srv_active" class="switch_anketa anketa_on"></div></div>';
echo ' <div class="setting_text">'.$lang['srv_anketa_active'].'</div>';
echo '</a>';
@ -187,7 +187,7 @@ class MobileSurveyAdmin{
echo '<a href="#" class="srv_ico" onclick="' . $anketa_active . ' return false;" title="' . $lang['srv_anketa_noactive'] . '">';
}
echo ' <div class="setting_icon"><div id="srv_inactive" class="switch_anketa anketa_off"><span class="switch_anketa_content">OFF</span></div></div>';
echo ' <div class="setting_icon"><div id="srv_inactive" class="switch_anketa anketa_off"></div></div>';
echo ' <div class="setting_text">'.$lang['srv_anketa_noactive'].'</div>';
echo '</a>';

12
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -7821,18 +7821,6 @@ class SurveyAnalysis {
self::Display();
echo '</div>';
echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/printer.png" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<span class="spaceRight floatRight printHide" style="margin-top:6px;">';
echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls"></span></a>';
echo '</span>';
echo '<br class="clr" />';
echo '</div>';
echo '</body>';
echo '</html>';
}

17
admin/survey/classes/surveyData/class.SurveyDataDisplay.php
View File

@ -3171,7 +3171,7 @@ class SurveyDataDisplay{
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '.container {margin-bottom:45px;} #dataTableScroller {display:none;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
@ -3227,9 +3227,6 @@ class SurveyDataDisplay{
'a'=>'list_xls',
'anketa'=>$anketa)));
echo '<div class="printHide" style="margin-top:6px; margin-bottom:60px;">';
echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
if (isset($properties['profile_id_status']))
{
@ -3272,18 +3269,6 @@ class SurveyDataDisplay{
echo '</div>';
echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/printer.png" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<span class="spaceRight floatRight printHide" style="margin-top:6px;">';
echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
echo '</span>';
echo '<br class="clr" />';
echo '</div>';
echo '</body>';
echo '</html>';
}

8
admin/survey/export/latexclasses/Analize/AnalizaMultiCrosstab.php
View File

@ -512,7 +512,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
$tabela .= "\\cline{".($colspan+1)."-".$steviloStolpcevParameterTabular."}"; //prekinjena horizontalna vrstica na vrhu tabele
}
$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v prvi vrstici
$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v prvi vrstici
//$tabela .= $this->tableRow($prvaVrsticaVert, 1, 0, 0, $steviloPodstolpcevV1); //izpis prve vrstice tabele
$tabela .= $this->tableRow($prvaVrsticaVert, 1, 0, 0, '', $export_format, $steviloPodstolpcevV1); //izpis prve vrstice tabele
@ -523,7 +523,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
//prekinjena horizontalna vrstica po prvi vrstici - konec
if(count($drugaVrsticaVert)){
$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v drugi vrstici
$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v drugi vrstici
if(count($steviloPodstolpcevV2)){
//$tabela .= $this->tableRow($drugaVrsticaVert, 1, 0, 0, $steviloPodstolpcevV2);
$tabela .= $this->tableRow($drugaVrsticaVert, 1, 0, 0, '', $export_format, $steviloPodstolpcevV2);
@ -539,7 +539,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
}
if(count($tretjaVrsticaVert)){
$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v drugi vrstici
$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v drugi vrstici
if(count($steviloPodstolpcevV3)){
//$tabela .= $this->tableRow($tretjaVrsticaVert, 1, 0, 0, $steviloPodstolpcevV3);
$tabela .= $this->tableRow($tretjaVrsticaVert, 1, 0, 0, '', $export_format, $steviloPodstolpcevV3);
@ -552,7 +552,7 @@ class AnalizaMultiCrosstab extends LatexAnalysisElement {
}
if(count($cetrtaVrsticaVert)){
$tabela .= $this->MultiColCellLatex($colspan, '', 1); //prazne celice v drugi vrstici
$tabela .= $this->MultiColCellLatex($colspan, '', 1, $export_format); //prazne celice v drugi vrstici
$tabela .= $this->tableRow($cetrtaVrsticaVert, 1);
}

12
admin/survey/export/latexclasses/class.LatexAnalysisElement.php
View File

@ -1516,9 +1516,10 @@ class LatexAnalysisElement{
}
//funkcija skrbi za izpis multicol celice
function MultiColCellLatex($steviloVmesnihStolpcevPodvrstic=null, $text='', $odZacetka=0){
function MultiColCellLatex($steviloVmesnihStolpcevPodvrstic=null, $text='', $odZacetka=0, $export_format=null){
$tabela = '';
//echo "steviloVmesnihStolpcevPodvrstic: $steviloVmesnihStolpcevPodvrstic</br>";
//echo "format: $export_format</br>";
if($steviloVmesnihStolpcevPodvrstic==1){ //ce je 1, ne sme biti multicolumn{1}, saj so drugace tezave z izpisom
$tabela .= " & ".$text." ";
}else{
@ -1526,10 +1527,19 @@ class LatexAnalysisElement{
$steviloArrayrulewidth = ($steviloVmesnihStolpcevPodvrstic-1);
if($odZacetka==0){
//$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{X|}{";//zacetek multicol
if($export_format=='pdf'){
$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{>{\hsize=\dimexpr".$steviloVmesnihStolpcevPodvrstic."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{";//zacetek multicol
}elseif($export_format=='rtf'){
$tabela .= " & \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{C|}{";//zacetek multicol
}
}else{
//$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{X|}{";//zacetek multicol
if($export_format=='pdf'){
$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{>{\hsize=\dimexpr".$steviloVmesnihStolpcevPodvrstic."\hsize+".$steviloTabColSep."\\tabcolsep+".$steviloArrayrulewidth."\arrayrulewidth\\relax}C|}{";//zacetek multicol
}elseif($export_format=='rtf'){
$tabela .= " \multicolumn{".$steviloVmesnihStolpcevPodvrstic."}{C|}{";//zacetek multicol
}
}
$tabela .= $text;
if($odZacetka==0){

41
admin/survey/export/latexclasses/class.LatexDocument.php
View File

@ -1359,6 +1359,10 @@ class LatexDocument{
return;
}
$findSpace = ' ';
$posSpace1 = strpos($text, $findSpace); //najdi pozicijo prvega presledka v besedilu
$posSpace2 = strripos($text, $findSpace); //najdi pozicijo zadnjega presledka v besedilu
//ureditev posebnih karakterjev za Latex http://www.cespedes.org/blog/85/how-to-escape-latex-special-characters, https://en.wikibooks.org/wiki/LaTeX/Special_Characters#Other_symbols
$text = str_replace('\\','\textbackslash{} ',$text);
//$text = str_replace('{','\{',$text);
@ -1410,6 +1414,43 @@ class LatexDocument{
//ureditev grskih crk - konec
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
$findAt = '@';
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
//echo $posSpace2Mail."</br>";
//najdi prvi simbol za v novo vrstico "br" po afni
//echo substr($text, $posAt) ."</br>";
$posNewLineMail = strpos(substr($text, $posAt), $findNewline); //najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
$posNewLineMail = $posNewLineMail+$posAt-1; //koncna pozicija, ce se gleda celotno besedilo
if($posSpace1Mail<$posNewLineMail){ //ce se po e-naslovu pojavi prej presledek
$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
}else{
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
}
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
$text = substr_replace($text, '}', $posKonec, 0);
//dodaj pred e-naslovom potrebno latex kodo za url
//substr_replace(string_name, replacement_string, start_pos, length)
$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
//echo $text."</br>";
}
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec
//RESEVANJE BESEDILA V CIRILICI
$contains_cyrillic = (bool) preg_match('/[\p{Cyrillic}]/u', $text); //ali je v besedilu cirilica?
if($contains_cyrillic){ // ce je cirilica v besedilu

20
admin/survey/export/latexclasses/class.LatexSurvey.php
View File

@ -1480,14 +1480,10 @@ class LatexSurvey{
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
$findAt = '@';
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
//echo "afna je: $posAt </br>";
//echo "Encoding: ".$text."</br>";
//najdi prvi presledek po afni
//echo substr($text, $posAt) ."</br>";
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
@ -1496,8 +1492,20 @@ class LatexSurvey{
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
//echo $posSpace2Mail."</br>";
//najdi prvi simbol za v novo vrstico "br" po afni
//echo substr($text, $posAt) ."</br>";
$posNewLineMail = strpos(substr($text, $posAt), $findNewline); //najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
$posNewLineMail = $posNewLineMail+$posAt-1; //koncna pozicija, ce se gleda celotno besedilo
if($posSpace1Mail<$posNewLineMail){ //ce se po e-naslovu pojavi prej presledek
$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
}else{
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
}
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
$text = substr_replace($text, '}', $posSpace1Mail, 0);
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
$text = substr_replace($text, '}', $posKonec, 0);
//dodaj pred e-naslovom potrebno latex kodo za url
//substr_replace(string_name, replacement_string, start_pos, length)

20
admin/survey/export/latexclasses/class.LatexSurveyElement.php
View File

@ -1058,14 +1058,10 @@ class LatexSurveyElement{
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
$findAt = '@';
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
//echo "afna je: $posAt </br>";
//echo "Encoding: ".$text."</br>";
//najdi prvi presledek po afni
//echo substr($text, $posAt) ."</br>";
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
@ -1074,8 +1070,20 @@ class LatexSurveyElement{
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
//echo $posSpace2Mail."</br>";
//najdi prvi simbol za v novo vrstico "br" po afni
//echo substr($text, $posAt) ."</br>";
$posNewLineMail = strpos(substr($text, $posAt), $findNewline); //najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
$posNewLineMail = $posNewLineMail+$posAt-1; //koncna pozicija, ce se gleda celotno besedilo
if($posSpace1Mail<$posNewLineMail){ //ce se po e-naslovu pojavi prej presledek
$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
}else{
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
}
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
$text = substr_replace($text, '}', $posSpace1Mail, 0);
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
$text = substr_replace($text, '}', $posKonec, 0);
//dodaj pred e-naslovom potrebno latex kodo za url
//substr_replace(string_name, replacement_string, start_pos, length)

5
admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
View File

@ -16,7 +16,8 @@
%\usepackage[allfiguresdraft]{draftfigure}
\usepackage{colortbl} %The pack­age al­lows rows and columns to be coloured, and even in­di­vid­ual cells
\usepackage{fancyhdr} % za ureditev glav in nog
\usepackage{montserrat} % za uporabo Montserrat pisave v dokumentu
%\usepackage{montserrat} % za uporabo Montserrat pisave v dokumentu
\usepackage[default]{sourcesanspro} % za uporabo Source Sans Pro pisave v dokumentu
\usepackage{multirow} % za spajanje vrstic v tabeli
\usepackage{hyperref}
\usepackage{tikz} % za risanje crt, ki oznacujejo stevilo klikov v Status
@ -51,7 +52,7 @@
%definiranje novih ukazov, funkcij, nastavitev potrebnih za izris dolocenih delov besedila
\linespread{1} % za razmik med vrsticami
\fontencoding{T1}\selectfont % za encode besedila
\renewcommand{\familydefault}{\sfdefault} % za izbiro novega fonta Montserrat
\renewcommand{\familydefault}{\sfdefault} % za izbiro izbranega fonta, trenutno Source Sans Pro
\color{besedilo} % za izbiro barve besedila
\newenvironment{analysis} % za ureditev prostora za izpis analize
{\parindent0pt \fontsize{10}{12} \selectfont }

5
admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
View File

@ -17,7 +17,8 @@
\usepackage{graphicx} % za prikazovanje slik in ostalih grafik
\usepackage{colortbl} %The pack­age al­lows rows and columns to be coloured, and even in­di­vid­ual cells
\usepackage{fancyhdr} % za ureditev glav in nog
\usepackage{montserrat} % za uporabo Montserrat pisave v dokumentu
%\usepackage{montserrat} % za uporabo Montserrat pisave v dokumentu
\usepackage[default]{sourcesanspro} % za uporabo Source Sans Pro pisave v dokumentu
\usepackage{multirow} % za spajanje vrstic v tabeli
\usepackage{hyperref}
\usepackage{tikz} % za risanje
@ -52,7 +53,7 @@
%\linespread{1.5} % za razmik med vrsticami
\linespread{1.2} % za razmik med vrsticami
\fontencoding{T1}\selectfont % za encode besedila
\renewcommand{\familydefault}{\sfdefault} % za izbiro novega fonta Montserrat
\renewcommand{\familydefault}{\sfdefault} % za izbiro izbranega fonta, trenutno Source Sans Pro
\renewcommand{\arraystretch}{1.5}
\color{besedilo} % za izbiro barve besedila
\newenvironment{analysis} % za ureditev prostora za izpis analize

5
admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
View File

@ -125,7 +125,8 @@
\usepackage{seqsplit} % za samodejno razbijanje dolgih besed v tabelah
\usepackage{url} %za razbijanje url-jev v tabelah
\urlstyle{same} %nastavitev, da je font URL isti kot je font ostalega besedila (http://ctan.ijs.si/tex-archive/macros/latex/contrib/url/url.pdf)
\usepackage{montserrat} % za uporabo Montserrat pisave v dokumentu
%\usepackage{montserrat} % za uporabo Montserrat pisave v dokumentu
\usepackage[default]{sourcesanspro} % za uporabo Source Sans Pro pisave v dokumentu
\usepackage{multirow} % za spajanje vrstic v tabeli
\usepackage[hidelinks]{hyperref}
\usepackage{tikz} % za risanje drsnikov
@ -158,7 +159,7 @@
\linespread{1.5} % za razmik med vrsticami
%\fontencoding{T1}\selectfont % za encode besedila
%\fontencoding{T2A,T1}\selectfont % za encode besedila
\renewcommand{\familydefault}{\sfdefault} % za izbiro novega fonta Montserrat
\renewcommand{\familydefault}{\sfdefault} % za izbiro izbranega fonta, trenutno Source Sans Pro
\color{besedilo} % za izbiro barve besedila
\newenvironment{absolutelynopagebreak} % za ureditev dela besedila, kjer ne sme biti odsek strani; za prepreciti prelome strani, kjer ni potrebno
{\par\nobreak\vfil\penalty0\vfilneg

4
admin/survey/minify/groupsConfig.php
View File

@ -96,6 +96,10 @@ return [
dirname(__FILE__).'/../script/DragDrop/dragdropInAdmin.js',
dirname(__FILE__).'/../script/custom_column_label_respondent.js',
dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js',
dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.js',
dirname(__FILE__).'/../script/Chartjs/chart.js', //source za chartjs grafe
dirname(__FILE__).'/../script/Chartjs.js',
dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js',

110
admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php Normal file
View File

@ -0,0 +1,110 @@
<?php
/*
VPRASANJA
- lahko razlicni userji aktivirajo razlicne faze iste stranke? Potem vidjo vse ankete te stranke?
- kaj povezuje ankete stranke - porjekt id? potem se ga vnese samo pri prvi anketi
- je lahko vec faz istocasno aktivnih (npr. anketa 1 in anketa 2)?
- kdaj se poslje sporocilo? ob 8h zjutraj?
- se lahko zacne sekvenca na npr. 2. anketi (oz. se preskoci anketo 2...?)
*/
class Kolektor {
var $sequence = array();
var $clients = array();
function __construct(){
global $site_url;
global $lang;
$this->prepareSequence();
$this->prepareClients();
}
private function prepareSequence(){
// Dobimo sekvenco anket
$sql = sisplet_query("SELECT * FROM kolektor_sequence");
$row = mysqli_fetch_array($sql);
$this->sequence = $row;
}
private function prepareClients(){
global $global_user_id;
global $admin_type;
// Admini vidijo vse kliente
if($admin_type == '0'){
$sql = sisplet_query("SELECT * FROM kolektor_client");
while($row = mysqli_fetch_array($sql)){
$this->clients[$row['id']] = $row;
}
}
else{
// Uporabnik vidi samo svoje kliente
$sql = sisplet_query("SELECT * FROM kolektor_client WHERE usr_id='".$global_user_id."'");
while($row = mysqli_fetch_array($sql)){
$this->clients[$row['id']] = $row;
}
}
}
// Osnovni pogled
public function display(){
echo 'kolektor';
$this->displayClientList();
}
public function displayClientList(){
echo '<div class="kolektor_clients_holder">';
echo ' <div class="kolektor_clients">';
// Loop cez vse stranke
foreach($this->clients as $client_id => $client){
echo ' <div class="kolektor_client">';
var_dump($client);
echo ' </div>';
}
echo ' </div>';
echo '</div>';
}
// Prikaze formo za dodajanje novega responsa
public function displayAddResponse(){
}
public function displayResponseDetails(){
}
}
?>

51
admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php Normal file
View File

@ -0,0 +1,51 @@
<?php
class KolektorNotifications {
function __construct(){
global $site_url;
global $lang;
}
// Loop cez vse response in posljemo notificatione glede na statuse
public function executeCronJob(){
}
private function sendNotification($response_id){
$response = new KolektorResponse($response_id);
// Status 0 - "prozeno" - preklopimo na status 1 "opozorilo 1"
if($response->getStatus() == 0){
}
// Status 1 - "opozorilo 1" - preklopimo na status 2 "opozorilo 3"
elseif($response->getStatus() == 1){
}
// Status 2 "opozorilo 3" - preklopimo na status 3 "neodgovorjeno"
elseif($response->getStatus() == 2){
}
// Posljemo mail
// Spremenimo status
}
}
?>

60
admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php Normal file
View File

@ -0,0 +1,60 @@
<?php
class KolektorResponse {
private $response = array();
function __construct($response_id){
global $site_url;
global $lang;
// Dobimo podatke responsa
$sql = sisplet_query("SELECT * FROM kolektor_survey_response WHERE id='".$response_id."'");
if(mysqli_num_rows($sql) == 0){
echo 'Napaka! Odgovor ne obstaja.';
return false;
}
$row = mysqli_fetch_array($sql);
$this->response = $row;
}
public function getStatus(){
return $this->response['status'];
}
// Dodajanje responsa
public static function addResponse($response_data){
// Dodaj respondenta v srv_user
// Poslji email z vabilom na anketo
// Dodaj respondenta v kolektor bazo
$sql = sisplet_query("INSERT INTO kolektor_survey_response
(ank_id, usr_id, inser_time, status, kolektor_client_id, respondent_id)
VALUES
('".$response_data['ank_id']."', '".$response_data['usr_id']."', NOW(), '0', '".$response_data['kolektor_client_id']."', '".$response_data['respondent_id']."')
");
$response_id = mysqli_insert_id($GLOBALS['connect_db']);
/*if($response = new KolektorResponse($response_id)){
return $response;
}
else{
echo 'Napaka pri dodajanju odgovora!';
return false;
}*/
}
}
?>

0
admin/survey/modules/mod_KOLEKTOR/css/style.css Normal file
View File

0
admin/survey/modules/mod_KOLEKTOR/script/script.js Normal file
View File

28
admin/survey/script/Chartjs.js Normal file
View File

@ -0,0 +1,28 @@
function diagnosticsChart(place,display) {
const data = {
datasets: [{
data: display,
backgroundColor: [
'rgb(229,229,229)',
'rgb(30, 136, 229)',
],
borderWidth: 0, //spacing between slices
}]
};
const config = {
type: 'doughnut',
data: data,
options: {
events: [], //no hover labels,animations,...
cutout: 30, //slice width
}
};
const myChart = new Chart(
document.getElementById(place),
config
);
}

13
admin/survey/script/Chartjs/chart.js Normal file
View File

File diff suppressed because one or more lines are too long

1
admin/survey/script/branching.js
View File

@ -536,6 +536,7 @@ function branching_mouseover(event) {
html_snippet = '<div class="spr_edit" id="edit_' + edit + '">' +
'<a title="' + (hidden == 1 ? lang['edit_show'] : lang['edit_hide']) + '" class="hide faicon ' + (hidden == 1 ? 'unhide_icon' : 'hide_icon') + '"></a>' +
'<a title="' + (edit == -1 ? lang['srv_editirajuvod'] : lang['srv_editirajzakljucek']) + '" class="faicon edit"></a>' +
'<a title="' + lang['srv_predogled_spremenljivka'] + '" class="monitor faicon"></a>'+
'</div>';
branchborder.prepend(html_snippet);

2
admin/survey/script/dataSettingProfiles.js
View File

@ -139,7 +139,7 @@ function dataSettingProfileAction(action) {
var chartPieZeros = $("#chartPieZeros").is(':checked') ? '1' : '0';
var hideEmpty = $("#hideEmpty").is(':checked') ? '1' : '0';
var hideAllSystem = $("#hideAllSystem").is(':checked') ? '1' : '0';
var numOpenAnswers = $("#numOpenAnswers").val();
var numOpenAnswers = $("#dsp_content #numOpenAnswers").val();
// var enableInspect = $('input[name="enableInspect"]:checked').val();
var dataPdfType = $('#dataPdfType').val();
var exportDataNumbering = $("#exportDataNumbering").is(':checked') ? '1' : '0';

16
admin/survey/script/script.js
View File

@ -5623,3 +5623,19 @@ function closeCommentQtip (box_id) {
function toggleGrafiColorWheel () {
$("#chart_custom_skin_cover").css("pointer-events", "auto");
}
function toggleSurveyTopSettings() {
$("#top_napredne_icon").toggleClass("fa-angle-down");
$("#top_napredne_icon").toggleClass("fa-angle-up");
$("#top_napredne_gumb").toggleClass("border_blue");
$("#top_napredne_dropdown").toggleClass("displayNone");
}
//Vprašalnik - enklikarhiv gumb
function oneClickArchive(){
$('#fade').fadeTo('slow', 1);
$('#general_popup').addClass('PopUpNarrow');
$('#general_popup').html('').fadeIn('slow');
$("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id});
}

31
admin/survey/script/vprasanje.js
View File

@ -596,9 +596,23 @@ function change_subtype_number (spremenljivka) {
vprasanje_fullscreen(spremenljivka);
});
}
function change_tip(spremenljivka, tip) {
function change_tip(spremenljivka, tip, confirmed) {
$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, confirmed: confirmed, anketa: srv_meta_anketa_id},
function (data) {
try {
var data_json = JSON.parse(data);
if (data_json.error == 1) {
$('#fade').fadeIn("fast");
$('#dropped_alert').html(data_json.output).fadeIn("fast").css('width', '600px');
return;
}
}
catch(e){}
$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, anketa: srv_meta_anketa_id}, function (data) {
vprasanje_fullscreen(spremenljivka, data, false, true);
vprasanje_save(true);
});
@ -1637,3 +1651,16 @@ function toggleCheckboxMinLimitReminder(spremenljivka, checkbox_min_limit){
$('#checkboxLimitReminder_' + spremenljivka).css('display', 'none'); //skrij nastavitve za opozorilo
}
}
// Fieldset toggle
function fieldsetToggle(element){
$(element).next('.fieldset_holder').slideToggle(function(){
//$('#vprasanje_edit').animate({scrollTop: $(this).offset().top}, 2000);
});
$(element).find('.faicon').toggleClass('arrow2_d').toggleClass('arrow2_u');
}

231
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [
{
"name": "composer/ca-bundle",
"version": "1.3.1",
"version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
"reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
"reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
"shasum": ""
},
"require": {
@ -64,7 +64,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.3.1"
"source": "https://github.com/composer/ca-bundle/tree/1.3.2"
},
"funding": [
{
@ -80,7 +80,7 @@
"type": "tidelift"
}
],
"time": "2021-10-28T20:44:15+00:00"
"time": "2022-05-24T11:56:16+00:00"
},
{
"name": "fgrosse/phpasn1",
@ -217,24 +217,24 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.5",
"version": "6.5.8",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"guzzlehttp/psr7": "^1.9",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.17.0"
"symfony/polyfill-intl-idn": "^1.17"
},
"require-dev": {
"ext-curl": "*",
@ -263,10 +263,40 @@
"MIT"
],
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Jeremy Lindblom",
"email": "jeremeamia@gmail.com",
"homepage": "https://github.com/jeremeamia"
},
{
"name": "George Mponos",
"email": "gmponos@gmail.com",
"homepage": "https://github.com/gmponos"
},
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
"homepage": "https://github.com/Nyholm"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com",
"homepage": "https://github.com/sagikazarmark"
},
{
"name": "Tobias Schultze",
"email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
}
],
"description": "Guzzle is a PHP HTTP client library",
@ -282,9 +312,23 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5"
"source": "https://github.com/guzzle/guzzle/tree/6.5.8"
},
"time": "2020-06-16T21:01:06+00:00"
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://github.com/Nyholm",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
"type": "tidelift"
}
],
"time": "2022-06-20T22:16:07+00:00"
},
{
"name": "guzzlehttp/promises",
@ -313,12 +357,12 @@
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -372,16 +416,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.8.3",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"shasum": ""
},
"require": {
@ -402,7 +446,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@ -462,7 +506,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.3"
"source": "https://github.com/guzzle/psr7/tree/1.9.0"
},
"funding": [
{
@ -478,7 +522,7 @@
"type": "tidelift"
}
],
"time": "2021-10-05T13:56:00+00:00"
"time": "2022-06-20T21:43:03+00:00"
},
{
"name": "maxmind-db/reader",
@ -547,16 +591,16 @@
},
{
"name": "maxmind/web-service-common",
"version": "v0.8.1",
"version": "v0.9.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/web-service-common-php.git",
"reference": "32f274051c543fc865e5a84d3a2c703913641ea8"
"reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8",
"reference": "32f274051c543fc865e5a84d3a2c703913641ea8",
"url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
"reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
"shasum": ""
},
"require": {
@ -566,7 +610,8 @@
"php": ">=7.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.*",
"friendsofphp/php-cs-fixer": "3.*",
"phpstan/phpstan": "*",
"phpunit/phpunit": "^8.0 || ^9.0",
"squizlabs/php_codesniffer": "3.*"
},
@ -591,9 +636,9 @@
"homepage": "https://github.com/maxmind/web-service-common-php",
"support": {
"issues": "https://github.com/maxmind/web-service-common-php/issues",
"source": "https://github.com/maxmind/web-service-common-php/tree/v0.8.1"
"source": "https://github.com/maxmind/web-service-common-php/tree/v0.9.0"
},
"time": "2020-11-02T17:00:53+00:00"
"time": "2022-03-28T17:43:20+00:00"
},
{
"name": "minishlink/web-push",
@ -707,16 +752,16 @@
},
{
"name": "paragonie/sodium_compat",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
"reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
"reference": "ac994053faac18d386328c91c7900f930acadf1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
"reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
"reference": "ac994053faac18d386328c91c7900f930acadf1e",
"shasum": ""
},
"require": {
@ -787,9 +832,9 @@
],
"support": {
"issues": "https://github.com/paragonie/sodium_compat/issues",
"source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
"source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
},
"time": "2021-08-10T02:43:50+00:00"
"time": "2022-03-23T19:32:04+00:00"
},
{
"name": "paypal/paypal-checkout-sdk",
@ -888,16 +933,16 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.5.4",
"version": "v6.6.3",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285"
"reference": "9400f305a898f194caff5521f64e5dfa926626f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c0d9f7dd3c2aa247ca44791e9209233829d82285",
"reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3",
"reference": "9400f305a898f194caff5521f64e5dfa926626f3",
"shasum": ""
},
"require": {
@ -909,8 +954,8 @@
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
"php-parallel-lint/php-console-highlighter": "^0.5.0",
"php-parallel-lint/php-parallel-lint": "^1.3.1",
"php-parallel-lint/php-console-highlighter": "^1.0.0",
"php-parallel-lint/php-parallel-lint": "^1.3.2",
"phpcompatibility/php-compatibility": "^9.3.5",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.6.2",
@ -954,7 +999,7 @@
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"support": {
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.4"
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3"
},
"funding": [
{
@ -962,7 +1007,7 @@
"type": "github"
}
],
"time": "2022-02-17T08:19:04+00:00"
"time": "2022-06-20T09:21:02+00:00"
},
{
"name": "psr/http-message",
@ -1208,16 +1253,16 @@
},
{
"name": "stripe/stripe-php",
"version": "v7.114.0",
"version": "v7.128.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
"reference": "63be231686c6874befb5b3a47fb8effb4c30b78b"
"reference": "c704949c49b72985c76cc61063aa26fefbd2724e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/63be231686c6874befb5b3a47fb8effb4c30b78b",
"reference": "63be231686c6874befb5b3a47fb8effb4c30b78b",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/c704949c49b72985c76cc61063aa26fefbd2724e",
"reference": "c704949c49b72985c76cc61063aa26fefbd2724e",
"shasum": ""
},
"require": {
@ -1262,22 +1307,22 @@
],
"support": {
"issues": "https://github.com/stripe/stripe-php/issues",
"source": "https://github.com/stripe/stripe-php/tree/v7.114.0"
"source": "https://github.com/stripe/stripe-php/tree/v7.128.0"
},
"time": "2022-02-15T22:48:31+00:00"
"time": "2022-05-05T17:18:02+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.24.0",
"version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "749045c69efb97c70d25d7463abba812e91f3a44"
"reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
"reference": "749045c69efb97c70d25d7463abba812e91f3a44",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
"reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
"shasum": ""
},
"require": {
@ -1291,7 +1336,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -1335,7 +1380,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
},
"funding": [
{
@ -1351,20 +1396,20 @@
"type": "tidelift"
}
],
"time": "2021-09-14T14:02:44+00:00"
"time": "2022-05-24T11:49:31+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.24.0",
"version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
"reference": "219aa369ceff116e673852dce47c3a41794c14bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
"reference": "219aa369ceff116e673852dce47c3a41794c14bd",
"shasum": ""
},
"require": {
@ -1376,7 +1421,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -1419,7 +1464,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
},
"funding": [
{
@ -1435,20 +1480,20 @@
"type": "tidelift"
}
],
"time": "2021-02-19T12:13:01+00:00"
"time": "2022-05-24T11:49:31+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.24.0",
"version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
"reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
"reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
"shasum": ""
},
"require": {
@ -1457,7 +1502,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -1495,7 +1540,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
},
"funding": [
{
@ -1511,7 +1556,7 @@
"type": "tidelift"
}
],
"time": "2021-05-27T09:17:38+00:00"
"time": "2022-05-24T11:49:31+00:00"
},
{
"name": "web-token/jwt-core",
@ -2476,16 +2521,16 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.24.0",
"version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
"reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
"reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
"reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
"shasum": ""
},
"require": {
@ -2500,7 +2545,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -2539,7 +2584,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
},
"funding": [
{
@ -2555,20 +2600,20 @@
"type": "tidelift"
}
],
"time": "2021-11-30T18:21:41+00:00"
"time": "2022-05-24T11:49:31+00:00"
},
{
"name": "symfony/polyfill-php80",
"version": "v1.24.0",
"version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
"reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
"reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
"reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
"shasum": ""
},
"require": {
@ -2577,7 +2622,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -2622,7 +2667,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
},
"funding": [
{
@ -2638,20 +2683,20 @@
"type": "tidelift"
}
],
"time": "2021-09-13T13:58:33+00:00"
"time": "2022-05-10T07:21:04+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v4.4.37",
"version": "v4.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "e74eee4ec02de71db3d60151aa5b203c990556df"
"reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e74eee4ec02de71db3d60151aa5b203c990556df",
"reference": "e74eee4ec02de71db3d60151aa5b203c990556df",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/742aab50ad097bcb62d91fccb613f66b8047d2ca",
"reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca",
"shasum": ""
},
"require": {
@ -2711,7 +2756,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v4.4.37"
"source": "https://github.com/symfony/var-dumper/tree/v4.4.42"
},
"funding": [
{
@ -2727,7 +2772,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:41:36+00:00"
"time": "2022-05-21T10:00:54+00:00"
}
],
"aliases": [],

127
frontend/simple/classes/DisplayController.php
View File

@ -138,7 +138,7 @@ class DisplayController{
echo '</div>';
if(isAAI()){
// moblie nav ----------------------
echo '<div class="mobile">';
@ -179,17 +179,20 @@ class DisplayController{
}
echo '</span>';
if(isAAI()){
// AAI PRIJAVA
echo '<span class="menu_item ">';
echo '<a id="header-btn" href="'.$site_url.'/aai">'.$lang['AAI_prijava'].' </a> ';
echo '</span>';
}
echo '</div>';
echo '</div>';
echo '<script type="text/javascript" src="frontend/simple/script/nav-mobile.js"></script> ';
}
//---------------------------------------------------
// Navigacija
echo '<nav class=nav-desktop>';
@ -329,6 +332,28 @@ class DisplayController{
echo '</div>';
echo '</div>';
if(!isAAI()) {
// Stolpec 2
echo '<div class="col col2">';
echo ' <h2>'.$lang['simple_footer_company'].'</h2>';
echo ' <a href="https://www.1ka.si/">'.$lang['simple_footer_company_1ka'].' </a>';
echo '</div>';
// stolpec 3 - spremljajte nas
echo '<div class="col col3">';
echo ' <h2>'.$lang['simple_footer_about_follow'].'</h2>';
echo ' <div class= "social_logo_flex">';
echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/FB_blue_new.svg " alt="Facebook logo"> </a>';
echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_blue_new.svg" alt="Twitter logo"> </a>';
echo ' </div>';
echo '</div>';
}
// samo za AAI
if(isAAI()){
// Stolpec 2
echo '<div class="col col2">';
@ -391,9 +416,19 @@ class DisplayController{
echo '<div class="app_title">'.AppSettings::getInstance()->getSetting('app_settings-app_name').'</div>';
echo '<div class="landing_page_content"> ';
echo '<div class="landing_page_title"> TEST 1KA </div>';
// APP SUBTITLE
echo '<div class="app_subtitle">';
if(isVirtual())
echo $lang['app_virtual_domain'];
else
echo $lang['app_installation'];
echo '</div>';
// WHITE BOX FOR LOGIN / REGISTRATION
echo '<div class="landing_page_window">';
// Tabs - samo pri lastni instalaciji, pri virtualkah nimamo registracije
@ -431,15 +466,16 @@ class DisplayController{
}
echo '</div>';
// APP SUBTITLE
echo '<div class="app_subtitle">';
if(isVirtual())
echo $lang['app_virtual_domain'];
else
echo $lang['app_installation'];
echo '</div>';
// // APP SUBTITLE
// echo '<div class="app_subtitle">';
// if(isVirtual())
// echo $lang['app_virtual_domain'];
// else
// echo $lang['app_installation'];
// echo '</div>';
}
// Izris okna na prvi strani - AAI
@ -543,11 +579,11 @@ class DisplayController{
// Email
echo ' <label for="email" '.($error == 'email' ? 'class="red"': '').'>'.$lang['email'].'</label>';
echo ' <input id="em" '.($error == 'email' ? 'class="red"': '').' name="email" value="'.$email.'" size="30" placeholder="E-mail" onblur="CheckEmailFP();" type="text">';
echo ' <input id="em" '.($error == 'email' ? 'class="red"': '').' name="email" value="'.$email.'" size="30" placeholder="" onblur="CheckEmailFP();" type="text">';
// Password
echo ' <label for="pass" '.($error == 'password' ? 'class="red"': '').'>'.$lang['password'].'</label>';
echo ' <input '.($error == 'password' ? 'class="red"': '').' name="pass" placeholder="'.$lang['login_password'].'" type="password">';
echo ' <input '.($error == 'password' ? 'class="red"': '').' name="pass" placeholder="" type="password">';
// Error text
if($error != ''){
@ -563,11 +599,14 @@ class DisplayController{
echo ' </div>';
}
// Submit
echo ' <input name="submit" title="'.$lang['login'].'" value="'.$lang['next2'].'" type="submit">';
// Lost pass
echo ' <div class="lostpass"><a class="RegLastPage" href="#" onclick="LostPassword(\''.$lang['please_insert_email'].'\');">'.$lang['forgot_password'].'</a></div>';
// Submit
echo ' <input name="submit" title="'.$lang['login'].'" value="'.$lang['next1'].'" type="submit">';
// // Submit
// echo ' <input name="submit" title="'.$lang['login'].'" value="'.$lang['next1'].'" type="submit">';
echo '</form>';
}
@ -607,38 +646,35 @@ class DisplayController{
}
echo '<form name="register" id="register_form" class="register_form" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
echo ' <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
echo '<form name="register" id="register_form" class="register_form register_window" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
// Email
echo ' <label for="email" '.(isset($error['email']) ? 'class="red"' : '').''.$lang['email'].':</label>';
echo ' <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="'.$lang['email'].'" type="text">';
echo ' <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>';
echo ' <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="" type="text">';
// Ime
echo ' <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
echo ' <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="'.$lang['cms_register_user_nickname'].'" type="text">';
echo ' <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">';
// Geslo
echo ' <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
echo ' <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="" type="password">';
// Geslo2
echo ' <label for="p2" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['cms_register_user_repeat_password'].':</label>';
echo ' <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="" type="password">';
// Strinjam se s pogoji
$terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
echo ' <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
echo ' <input id="IAgree" type="checkbox" name="agree" value="1">';
echo ' <label for="IAgree"><div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</div></label>';
echo ' </div>';
// RECAPTCHA
if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
echo ' <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';
// Geslo
echo ' <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
echo ' <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="'.$lang['password'].'" type="password">';
// Geslo2
echo ' <label for="p2" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['cms_register_user_repeat_password'].':</label>';
echo ' <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="'.$lang['cms_register_user_repeat_password'].'" type="password">';
// Strinjam se s pogoji
//echo ' <input id="IAgree" type="hidden" name="agree" value="1">';
$terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
echo ' <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
echo ' <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
echo '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
echo ' <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span></div>';
echo ' </div>';
// Error text
if(!empty($error)){
@ -670,7 +706,11 @@ class DisplayController{
}
// Submit
echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
echo ' <input name="submit" value="'.$lang['register'].'" class="regfield" type="submit">';
// Lost pass
echo ' <div class="lostpass"><a class="RegLastPage" href="#" onclick="LostPassword(\''.$lang['please_insert_email'].'\');">'.$lang['forgot_password'].'</a></div>';
echo '</form>';
}
@ -722,6 +762,8 @@ class DisplayController{
echo ' <input name="submit" value="'.$lang['login'].'" class="regfield" type="submit">';
echo ' <span class="spaceLeft">'.str_replace('#URL#', $site_url.$this->root.'index.php?a=register', $lang['cms_login_registration_link']).'</span>';
echo ' </form>';
echo '</div>';
@ -839,8 +881,8 @@ class DisplayController{
$terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
echo ' <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
echo ' <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
echo '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use']).'</label>';
echo ' <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span></div>';
echo '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</label>';
echo ' </div>';
// Strinjam se s posiljanjem mailov (gdpr)
@ -850,7 +892,7 @@ class DisplayController{
echo ' <div id="checkbox_explain_text_holder" class="checkbox_explain_text_holder"> '.$lang['cms_register_gdpr_agree_explain'].'</div>';
echo ' </div>';*/
echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
echo ' <input name="submit" value="'.$lang['next2'].'" class="regfield" type="submit">';
echo ' <span class="have_account spaceLeft">'.str_replace('#URL#', $site_url.$this->root.'index.php?a=login', $lang['cms_register_login_link']).'</span>';
echo ' </form>';
@ -1132,3 +1174,4 @@ class DisplayController{
setcookie("simple_frontend_cookie", "1", time() + (60*60*24*90), "/");
}
}

39
frontend/simple/css/aai.css
View File

@ -277,6 +277,7 @@ footer {
padding-top: 105px;
}
footer h2 {
color: #343434 !important;
text-transform: uppercase;
font-weight: 700;
font-size: 18px;
@ -289,9 +290,11 @@ footer .footer_content {
width: 95%;
margin: auto;
padding: 0px;
justify-content: space-between;
}
footer .footer_content .col {
max-width: 254px;
margin-right: unset;
}
footer .footer_content .col span {
font-weight: 400;
@ -324,6 +327,10 @@ footer .col a {
line-height: 26px;
}
footer .footer_content .col3 .social_logo_flex a:first-of-type {
margin-right: 0px;
}
.social_logo_flex img {
margin-right: 20px;
}
@ -491,7 +498,6 @@ input[type=button]:hover,
header .logo {
width: auto;
}
.hero-container {
display: flex;
flex-direction: column-reverse;
@ -518,17 +524,14 @@ input[type=button]:hover,
max-width: 280px;
margin: auto;
}
.register_holder {
margin-top: 70px;
margin-bottom: 70px;
}
.pomembne_povezave {
padding-top: 68px;
padding-bottom: 70px;
}
.povezave {
display: grid;
grid-template-columns: 1fr 1fr;
@ -547,15 +550,12 @@ input[type=button]:hover,
.povezave .col:last-child {
margin-right: 25px;
}
.title {
margin-bottom: 0px;
}
#povezave-btn {
margin: 0px auto;
}
footer {
padding: 70px 0px 0px 0px;
}
@ -597,20 +597,16 @@ input[type=button]:hover,
body.landing_page #main .main_content {
padding: 0px;
}
body #main .main_content h1 {
font-size: 50px;
}
header .logo a img {
max-height: 29px;
max-width: 95px;
}
header .logo a img:last-of-type {
margin-left: 12px;
}
.hero-container {
padding-top: 50px;
}
@ -629,27 +625,22 @@ input[type=button]:hover,
.hero-container img {
max-width: 80%;
}
.register_holder {
margin-top: 50px;
margin-bottom: 46px;
}
body #main .main_content .register_holder h1 {
text-align: unset;
padding: 0px;
}
.pomembne_povezave {
padding-top: 46px;
padding-bottom: 46px;
}
.title {
margin-bottom: 49px;
margin-top: 0px;
}
.povezave {
display: flex;
flex-direction: column;
@ -661,7 +652,6 @@ input[type=button]:hover,
.povezave .col p {
min-height: unset;
}
.povezave .col:nth-of-type(1),
.povezave .col:nth-of-type(3),
.povezave .col:nth-of-type(2),
@ -669,20 +659,16 @@ input[type=button]:hover,
margin: auto;
margin-bottom: 30px;
}
.povezave .col:nth-of-type(4) {
margin-bottom: 0px;
}
/* --------------HAMBURGER---------------------------------- */
.nav-desktop {
display: none;
}
.mobile {
display: block;
}
#nav-icon3 {
width: 38px;
height: 20px;
@ -726,42 +712,35 @@ input[type=button]:hover,
#nav-icon3 span:nth-child(4) {
top: 18px;
}
#nav-icon3.open span:nth-child(1) {
top: 9px;
width: 0%;
left: 50%;
}
#nav-icon3.open span:nth-child(2) {
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
#nav-icon3.open span:nth-child(3) {
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
transform: rotate(-45deg);
}
#nav-icon3.open span:nth-child(4) {
top: 9px;
width: 0%;
left: 50%;
}
#links {
display: none;
}
/* */
.aai a {
color: #333333;
}
#links.open {
position: absolute;
top: 100px;
@ -771,9 +750,8 @@ input[type=button]:hover,
align-items: center;
width: 100%;
height: 700px;
background-color: white;
background-color: rgb(255, 255, 255);
}
#links .menu_item {
font-size: 30px;
margin-top: 30px;
@ -781,7 +759,6 @@ input[type=button]:hover,
#links .menu_item a {
font-size: 16px;
}
footer {
margin: 0px;
padding: 0px;

862
frontend/simple/css/style.css
View File

@ -1,3 +1,4 @@
@charset "UTF-8";
/*
Created on : 28.3.2020
Author : Peter Hrvatin
@ -5,6 +6,7 @@
/* BARVE */
/* FONTI */
@import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
.thin {
font-weight: 300;
}
@ -102,8 +104,9 @@ input[type=email] {
box-sizing: border-box;
height: 55px;
padding: 8px 18px;
font-size: 17px;
font-size: 16px;
color: #333;
font-family: "Source Sans Pro", "sans-serif";
background-color: white;
border: 1px solid #cccccc;
}
@ -142,11 +145,10 @@ header nav {
display: flex;
align-self: flex-end;
font-size: 17px;
text-transform: uppercase;
font-weight: 600;
}
header nav span.menu_item {
margin-left: 40px;
margin-left: 32px;
border-bottom: 3px transparent solid;
}
header nav span.menu_item a {
@ -158,22 +160,18 @@ header nav span.menu_item a {
header nav span.menu_item a:hover {
color: #1e88e5;
}
header nav span.menu_item.active {
border-bottom: 3px #1e88e5 solid;
body.landing_page #main {
background-color: #F8F8F8;
}
#main {
background-color: #f7f7f7;
}
#main .main_content {
body.landing_page #main .main_content {
max-width: 1400px;
min-height: 769px;
margin: 0 auto;
padding: 30px 20px 60px 20px;
padding: 70px 20px 0px 20px;
}
footer .footer_content {
display: flex;
justify-content: space-between;
max-width: 1400px;
margin: 0 auto;
padding: 70px 20px;
@ -183,6 +181,8 @@ footer .footer_content .col {
flex-direction: column;
box-sizing: border-box;
width: 33%;
max-width: 290px;
margin-right: 25px;
}
footer .footer_content .col span, footer .footer_content .col div.follow {
padding: 8px 0;
@ -278,7 +278,6 @@ body.register #main,
body.login #main,
body.login_noEmail #main {
height: auto;
min-height: 940px;
background-image: url("../img/landing_page_image.jpg");
background-position: top;
}
@ -312,7 +311,7 @@ body.login #main .landing_page_window,
body.login_noEmail #main .landing_page_window {
z-index: 999;
width: 600px;
margin: 20px auto;
margin: 25px auto;
background-color: white;
}
body.landing_page #main .landing_page_window .tabs,
@ -444,7 +443,7 @@ body.register #main .landing_page_window label,
body.login #main .landing_page_window label,
body.login_noEmail #main .landing_page_window label {
margin: 15px 0 5px 0;
font-size: 17px;
font-size: 16px;
font-weight: 600;
}
body.landing_page #main .landing_page_window .subtitle,
@ -460,7 +459,7 @@ body.login_noEmail #main .landing_page_window .agreement {
cursor: pointer;
display: flex;
align-items: baseline;
margin: 15px 0 5px 0;
margin: 16px 0 0 0;
}
body.landing_page #main .landing_page_window .agreement input,
body.register #main .landing_page_window .agreement input,
@ -496,8 +495,7 @@ body.landing_page #main .landing_page_window .g-recaptcha,
body.register #main .landing_page_window .g-recaptcha,
body.login #main .landing_page_window .g-recaptcha,
body.login_noEmail #main .landing_page_window .g-recaptcha {
width: 304px;
margin-top: 20px;
margin-top: 16px;
}
/*body.register{
@ -510,6 +508,10 @@ body.login_noEmail #main .landing_page_window .g-recaptcha {
display: none !important;
}
}*/
body {
font-family: "Source Sans Pro", "sans-serif";
}
/************GDPR OBRAZEC***************/
body.gdpr {
line-height: 26px;
@ -544,6 +546,9 @@ body.gdpr div.label {
/******************************/
/************REGISTRACIJSKI OBRAZEC***************/
body.register .register_holder {
background-color: red;
}
body.register .register_holder .subtitle {
padding: 0;
margin: 0;
@ -717,23 +722,125 @@ body.reset_password_activate div.label {
/******************************/
/* Mobile prilagoditve */
.mobile {
display: none;
}
@media screen and (max-width: 700px) {
header nav {
flex-direction: column-reverse;
align-self: auto;
justify-content: space-evenly;
height: 100%;
text-align: right;
font-size: 14px;
#main .main_content {
min-height: unset;
}
header nav span.menu_item {
line-height: 18px;
/* --------------HAMBURGER---------------------------------- */
.nav-desktop {
display: none;
}
header nav span.menu_item.active {
border-bottom: 2px #1e88e5 solid;
.mobile {
display: block;
}
header nav span.menu_item a {
line-height: 18px;
#nav-icon3 {
width: 38px;
height: 20px;
position: relative;
bottom: 8px;
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-o-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-transition: 0.5s ease-in-out;
-moz-transition: 0.5s ease-in-out;
-o-transition: 0.5s ease-in-out;
transition: 0.5s ease-in-out;
cursor: pointer;
}
#nav-icon3 span {
display: block;
position: absolute;
height: 5px;
width: 100%;
background: #1E88E5;
border-radius: 9px;
opacity: 1;
left: 0;
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-o-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-transition: 0.25s ease-in-out;
-moz-transition: 0.25s ease-in-out;
-o-transition: 0.25s ease-in-out;
transition: 0.25s ease-in-out;
}
#nav-icon3 span:nth-child(1) {
top: 0px;
}
#nav-icon3 span:nth-child(2),
#nav-icon3 span:nth-child(3) {
top: 9px;
}
#nav-icon3 span:nth-child(4) {
top: 18px;
}
#nav-icon3.open span:nth-child(1) {
top: 9px;
width: 0%;
left: 50%;
}
#nav-icon3.open span:nth-child(2) {
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
#nav-icon3.open span:nth-child(3) {
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
transform: rotate(-45deg);
}
#nav-icon3.open span:nth-child(4) {
top: 9px;
width: 0%;
left: 50%;
}
#links {
display: none;
}
/* */
.aai a {
color: #333333;
}
#links.open {
position: absolute;
top: 72px;
left: 0px;
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
height: 100vh;
background-color: white;
}
#links .menu_item {
font-size: 30px;
margin-top: 30px;
}
#links .menu_item a {
font-size: 16px;
color: #333333;
}
#links .menu_item a:hover {
color: #1E88E5;
}
body #main .main_content {
@ -761,7 +868,7 @@ body #main .main_content input[type=password] {
body #main .main_content input[type=button] {
display: block;
width: 100%;
margin: 20px auto !important;
margin: 20px 0px !important;
}
body #main .main_content .have_account {
display: block;
@ -832,7 +939,8 @@ body.register #main .main_content .landing_page_window input[type=submit],
body.register #main .main_content .landing_page_window input[type=button],
body.login_noEmail #main .main_content .landing_page_window input[type=submit],
body.login_noEmail #main .main_content .landing_page_window input[type=button] {
margin: 30px auto !important;
margin: 16px auto !important;
width: 100%;
}
body.landing_page #main .main_content .app_subtitle,
body.login #main .main_content .app_subtitle,
@ -869,12 +977,25 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
}
footer .footer_content {
flex-direction: column;
padding: 20px 0;
padding: 50px 0;
text-align: center;
}
footer .footer_content .col {
max-width: unset;
width: 100%;
}
footer .footer_content .col span {
padding: 0px 0px 12px 0px;
}
footer .footer_content .col span:last-of-type {
padding: 0px 0px 12px 0px !important;
}
footer .footer_content .col h2 {
padding-top: 12px;
}
footer .footer_content .col a {
padding-bottom: 12px;
}
footer .footer_content .col .follow {
justify-content: center;
}
@ -889,6 +1010,679 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
margin: 0 0 20px 0;
text-align: center;
}
body #main .main_content .register_holder h1 {
font-size: 50px;
font-weight: 300;
line-height: 62px;
margin: 20px 0px;
text-align: left;
}
}
/*
Author : Nejc Kovač
Urejanje landing page
*/
/* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */
body.landing_page #main {
background-image: none;
}
header {
height: unset;
padding-top: 12px;
padding-left: 0px;
padding-right: 0px;
max-width: 1160px;
width: 95%;
margin: auto;
font-family: "Source Sans Pro", "sans-serif";
}
header nav {
font-weight: 400;
}
header .logo a img {
height: 45px;
}
.nav-desktop {
align-items: center;
padding-bottom: 19px;
}
header nav span.lang_switch .flag img {
padding-right: 8px;
}
.flag img {
padding-right: 8px;
}
.flag {
display: flex;
align-items: unset;
}
header nav span.menu_item {
border-bottom: unset;
}
.app_title {
display: none;
}
.landing_page_content {
font-family: "Source Sans Pro", "sans-serif";
text-align: center;
color: #333333;
padding-bottom: 70px;
}
.landing_page_content .landing_page_title {
font-weight: 300;
font-size: 50px;
line-height: 63px;
}
body.landing_page #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.landing_page #main .landing_page_window {
border: 1px solid #C4C4C4;
max-width: 400px;
width: unset;
min-height: 327px;
}
body.landing_page #main .landing_page_window #login_holder .login_form {
padding: 25px 25px;
position: unset;
}
body.landing_page #main .landing_page_window .tabs .tab {
font-size: 16px;
font-weight: 600;
color: #777777;
background-color: #F8F8F8;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.landing_page #main .landing_page_window .tabs .tab.active {
color: #1E88E5;
background-color: #FFFFFF;
}
body.landing_page #main .landing_page_window label {
text-align: left;
font-size: 16px;
margin: 15px 0px 4px 0px;
}
body.landing_page #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
.landing_page_window input[type=text] {
padding: 0px;
padding-left: 8px;
height: 38px;
max-width: 354px;
width: 100%;
border: 1px solid #C4C4C4;
}
.landing_page_window input[type=password] {
padding: 0px;
padding-left: 8px;
height: 38px;
max-width: 354px;
width: 100%;
border: 1px solid #C4C4C4;
}
body.landing_page #main .landing_page_window input[type=submit] {
align-self: unset;
width: unset;
max-width: 354px;
margin: 16px 0px;
font-weight: 700;
padding: 12.5px 0px;
line-height: 20px;
font-family: "Source Sans Pro", "sans-serif";
}
body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: #1e88e5;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a {
font-weight: 400;
}
/* REGISTRACIJA */
body.landing_page #main .landing_page_window .register_window {
padding: 25px 23px !important;
}
body.landing_page #main .landing_page_window .register_window a {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: #1e88e5;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.landing_page #main .landing_page_window .agreement input {
height: 18px;
width: 18px;
margin: 0px 9px 4px 0px;
align-self: normal;
}
body.landing_page #main .landing_page_window .register_window .checkbox_text_holder {
font-weight: 400;
margin-bottom: 0px;
}
body.landing_page #main .landing_page_window .register_window .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: #1e88e5;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
footer .footer_content {
max-width: 1160px;
width: 95%;
margin: auto;
padding: 70px 0px 70px 0px;
}
footer .footer_content h2 {
font-family: "Source Sans Pro", "sans-serif";
color: #1e88e5;
text-transform: uppercase;
font-size: 18px;
line-height: 26px;
font-weight: 700;
margin: 0px;
padding-bottom: 12px;
}
footer .footer_content .col a:hover {
color: #4ca0ea;
}
#main footer .footer_content col {
max-width: 290px;
}
footer .footer_content .col1-flex {
display: flex;
flex-direction: column;
}
footer .footer_content .col span {
padding: 0px 0px 12px 0px;
}
footer .footer_content .col span:last-of-type {
padding: 0px;
}
footer .footer_content .col a {
color: #333333;
font-weight: 400;
font-size: 18px;
line-height: 26px;
font-family: "Source Sans Pro", "sans-serif";
}
footer .footer_content .col3 .social_logo_flex a:first-of-type {
margin-right: 20px;
}
body.login_noEmail #main {
background-image: none;
background-color: #F8F8F8;
}
body.login_noEmail #main .main_content {
padding-top: 70px;
min-height: 769px;
}
body.login_noEmail #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.login_noEmail #main .landing_page_window {
max-width: 400px;
border: 1px solid #C4C4C4;
}
body.landing_page #main .landing_page_window .tabs .tab,
body.register #main .landing_page_window .tabs .tab,
body.login #main .landing_page_window .tabs .tab,
body.login_noEmail #main .landing_page_window .tabs .tab {
background-color: #F8F8F8;
color: #888888;
font-size: 16px;
font-weight: 600;
color: #777777;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.login_noEmail #main .landing_page_window .tabs .tab.active {
background-color: #ffffff;
color: #1e88e5;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form {
text-align: left;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form label:first-of-type {
margin-top: 0px;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: #1e88e5;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass a {
font-weight: 400;
}
body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder {
margin-top: 16px;
}
body.login_noEmail #main .landing_page_window input[type=submit] {
width: 100%;
max-width: 100%;
margin: 16px 0px;
font-family: "Source Sans Pro", "sans-serif";
}
body.landing_page #main .landing_page_window #registration_holder,
body.register #main .landing_page_window #registration_holder,
body.login #main .landing_page_window #registration_holder,
body.login_noEmail #main .landing_page_window #registration_holder {
text-align: left;
}
body.login_noEmail #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
body.login #main {
background-image: none;
background-color: #F8F8F8;
}
body.login #main .main_content {
padding-top: 70px;
min-height: 769px;
}
body.login #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.login #main .landing_page_window {
max-width: 400px;
border: 1px solid #C4C4C4;
}
body.login #main .landing_page_window .tabs .tab {
background-color: #F8F8F8;
font-size: 16px;
font-weight: 600;
color: #777777;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.login #main .landing_page_window .tabs .tab.active {
background-color: #ffffff;
color: #1e88e5;
}
body.login #main .landing_page_window #login_holder .login_form {
text-align: left;
}
body.login #main .landing_page_window #login_holder .login_form label:first-of-type {
margin-top: 0px;
}
body.login #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: #1e88e5;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.login #main .landing_page_window #login_holder .login_form .lostpass a {
font-weight: 400;
}
body.login #main .landing_page_window .error_holder {
margin-top: 16px;
}
body.login #main .landing_page_window input[type=submit] {
width: 100%;
max-width: 100%;
margin: 16px 0px;
font-family: "Source Sans Pro", "sans-serif";
}
body.login #main .landing_page_window #registration_holder {
text-align: left;
}
body.login #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
body.register #main {
background-image: none;
background-color: #F8F8F8;
}
body.register #main .main_content {
padding-top: 70px;
min-height: 769px;
}
body.register #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.register #main .landing_page_window {
max-width: 400px;
border: 1px solid #C4C4C4;
}
body.register #main .landing_page_window .tabs .tab {
background-color: #F8F8F8;
color: #888888;
font-size: 16px;
font-weight: 600;
color: #777777;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.register #main .landing_page_window .tabs .tab.active {
background-color: #ffffff;
color: #1e88e5;
}
body.register #main .landing_page_window #login_holder .login_form {
text-align: left;
}
body.register #main .landing_page_window #login_holder .login_form label:first-of-type {
margin-top: 0px;
}
body.register #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: #1e88e5;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.register #main .landing_page_window #login_holder .login_form .lostpass a {
font-weight: 400;
}
body.register #main .landing_page_window .error_holder {
margin-top: 0px;
}
body.register #main .landing_page_window input[type=submit] {
width: 100%;
max-width: 100%;
margin: 16px 0px;
font-family: "Source Sans Pro", "sans-serif";
}
body.register #main .landing_page_window #registration_holder {
text-align: left;
}
body.register #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
.register_email input[type=button] {
font-family: "Source Sans Pro", "sans-serif";
}
body.reset_password {
color: #333;
}
body.reset_password input[type=button] {
font-family: "Source Sans Pro", "sans-serif";
}
/* GDPR ZAHTEVEK -------------------------------------- */
#main {
background-color: #FFFFFF;
}
body.gdpr {
line-height: 20px;
color: #343434;
}
.gdpr #main .main_content {
padding: 0px;
font-family: "Source Sans Pro", "sans-serif" !important;
}
.register_holder {
max-width: 810px;
width: 95%;
margin: 70px auto 70px auto;
}
.register_holder h1 {
font-size: 50px;
font-weight: 300;
line-height: 62px;
margin: 20px 0px;
}
.register_holder p {
font-weight: 400;
line-height: 26px;
margin: 20px 0px;
}
.register_holder p a {
color: #1e88e5;
}
body.gdpr div.label {
display: block;
line-height: unset;
font-weight: 600;
width: 200px;
line-height: unset;
}
body #main .main_content .register_holder .label {
line-height: 20px;
padding-bottom: 4px;
}
body.gdpr .input_field div.label label {
line-height: unset;
padding-bottom: 4px;
}
.regfield {
height: 38px;
max-width: 245px;
width: 95%;
border: 1px solid #C4C4C4;
border-radius: 0px;
padding: 0px;
padding-left: 8px;
margin: 0px;
font-family: "Source Sans Pro", "sans-serif";
font-size: 16px;
}
body .gdpr form p:first-of-type {
font-weight: 600;
}
body.gdpr div.input_field {
padding: 10px 0px;
}
/* Elektronski naslov: */
body.gdpr div.input_field:first-of-type {
padding-top: 0px;
}
/* URL ankete: */
body.gdpr div.input_field:nth-of-type(3) {
padding-bottom: 0px;
}
/* Želim podati zahtevo za: */
form p:first-of-type {
margin: 20px 0px 6px 0px;
}
body.gdpr div.zahtevek {
padding: 6px 0px;
}
body.gdpr div.zahtevek:last-of-type {
padding-bottom: 0px;
}
body.gdpr div.zahtevek label input {
margin-right: 2px;
margin-left: 0px;
height: 18px;
width: 18px;
vertical-align: -3px;
border-radius: 0px;
}
/* tekst nad poljem za opis */
form p:nth-of-type(2) {
margin: 20px 0px;
}
form .opis {
font-weight: 600;
margin: 0px 0px 4px 0px;
line-height: normal;
}
#gdpr-note {
padding-left: 8px;
margin: 0px;
width: 100%;
border-radius: 0px;
font-size: 16px;
font-family: "Source Sans Pro", "sans-serif";
}
.register_holder p:last-of-type {
margin: 18px 0px 20px 0px;
line-height: 26px;
}
input[type=submit],
button,
input[type=button],
.button {
font-weight: 600;
font-size: 16px;
line-height: 26px;
height: 50px;
max-width: 320px;
width: 95%;
padding: 0px;
color: #FFFFFF;
background-color: #1e88e5;
border: 1px solid #1e88e5;
transition: 0.3s ease-out;
}
input[type=submit]:hover,
button:hover,
input[type=button]:hover,
.button:hover {
color: #1e88e5;
background-color: white;
border: 1px solid #1e88e5;
}
/* -------------------------------------- */
/*# sourceMappingURL=style.css.map */

62
lang/1.php
View File

@ -558,6 +558,8 @@ $lang = array (
"base_displaylabel" => "Pregled",
"base_alternative" => "Alternativni napisi",
"next1" => "Naprej",
"next2" => "Prijava",
"register" => "Registracija",
"vpisal" => "Vpisal",
"spremenil" => "Spremenil",
"show_menu" => "Prika&#382;i menu",
@ -1641,6 +1643,7 @@ $lang = array (
"cms_register_mandatory_field" => "Odgovor je obvezen",
"cms_search" => "Iskanje",
"cms_register_user_terms_of_use" => "Strinjam se s pogoji uporabe! <strong><a href='https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' target='_blank'>Splošni pogoji uporabe.</a></strong>",
"cms_register_user_terms_of_use2" => "Strinjam se s <a href='#'>pogoji uporabe! </a> ",
"cms_register_gdpr_agree" => "Strinjam se, da mi na zgoraj navedeni elektronski naslov enkrat letno pošljete pomembna obvestila (pomembne informacije o novostih 1KA, vabilo na dogodek).",
"cms_register_gdpr_agree_explain" => "Vaš email bomo uporabljali in hranili zgolj za potrebe uporabe uporabniškega imena v orodju 1KA in ga bom skrbno varovali v skladu s predpisi.
Vašega emaila ne bomo pod nobenimi pogoji posredovali tretjim osebam ali ga uporabljali v druge namene.
@ -1866,6 +1869,7 @@ $lang = array (
"srv_novavrednost_grid" => "Novo podvpra&#353;anje",
"srv_brisivrednost" => "Izbri&#353;i kategorijo",
"srv_brisispremenljivko" => "Izbriši vprašanje",
"srv_spremeni_tip_vprasanja" => "Spremeni tip vprašanja",
"srv_anketalist" => "Seznam anket",
"srv_grupe" => "Anketa na ve&#269;ih straneh",
"srv_grupe_recount" => "Pre&#353;tevil&#269;i",
@ -1911,8 +1915,8 @@ $lang = array (
"srv_anketa_href_text" => "Delite povezavo do ankete na vaši spletni strani.",
"srv_anketa_href_count" => "HTML koda s števcem ogledov",
"srv_anketa_href_count_text" => "Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ",
"srv_anketa_href_friends" => "QR koda",
"srv_anketa_href_friends_text" => "Delite povezavo do ankete s QR kodo.",
"srv_anketa_href_friends" => "Delite s prijatelji",
"srv_anketa_href_friends_text" => "Delite povezavo do ankete s prijatelji na družbenih medijih (Facebook, Twitter, Linkedin, itd.)",
"srv_anketa_href_ijs" => "iFrame - JavaScript verzija",
"srv_anketa_href_ijs_text" => "Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
"srv_anketa_href_ijs_text2" => "Tu lahko skopirate kodo vaše ankete (Javascript verzija) in jo vdelate v vašo spletno stran.",
@ -1936,6 +1940,7 @@ $lang = array (
"srv_brisispremenljivkoconfirm_data" => "Ali ste prepričani, da želite izbrisati vprašanje in s tem tudi podatke?",
"srv_brisivrednostconfirm" => "Ali ste prepričani, da želite izbrisati odgovor?",
"srv_brisivrednostconfirm_data" => "Ali ste prepričani, da želite izbrisati odgovor in s tem tudi podatke?",
"srv_change_question_confirm_data" => "Ali ste prepričani, da želite spremeniti tip vprašanja?",
"srv_brisiifconfirm" => "Ali ste prepričani, da želite odstraniti pogoj?",
"srv_brisiifconfirm_all" => "Ali ste prepričani, da želite odstraniti pogoj in vsa vprašanja znotraj pogoja?",
"srv_brisiblockconfirm" => "Ali ste prepričani, da želite odstraniti blok?",
@ -2178,6 +2183,9 @@ $lang = array (
"srv_visible_on" => "Vidno",
"srv_visible_off" => "Skrito",
"srv_hidden_text" => "Skrito",
"srv_hidden_text2" => "Skriti",
"srv_hidden_text3" => "Skrita",
"srv_hidden_text4" => "Skritih",
"srv_system_text" => "Sistemsko",
"srv_visible_dostop" => "Vprašanje je vidno",
"srv_previewalert" => "Trenutno ste v predogledu ankete!<br>Odgovori se <b class=\"red\">ne bodo shranili</b> v bazo!",
@ -2426,8 +2434,8 @@ $lang = array (
"srv_knjiznica_add" => "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",
"srv_knjiznica_copy" => "&#268;e &#382;elite kopirati vpra&#154;anje, ga označite z ikono COPY",
"srv_deleteall" => "Izbri&#154;i vse vnose",
"srv_expand" => "Odpri vse",
"srv_collapse" => "Zapri vse",
"srv_expand" => "Odpri vse bloke in pogoje",
"srv_collapse" => "Zapri vse bloke in pogoje",
"srv_copy_tourl" => "Kopiraj anketo na spletno stran",
"srv_copy_tourl_1" => "Kopiraj anketo med strežniki",
"srv_copy" => "Kopiraj",
@ -3533,8 +3541,10 @@ $lang = array (
"srv_bottom_archive" => "Arhiviranje",
"srv_info_name" => "Ime ankete",
"srv_info_note" => "Opomba",
"srv_info_questions" => "Vpra&#353;anj",
"srv_info_questions" => "Vprašanj",
"srv_info_questions1" => "Vprašanj",
"srv_info_questions2" => "Vprašanji",
"srv_info_questions3" => "Vprašanja",
"srv_info_variables" => "Spremenljivk",
"srv_info_pages" => "Strani",
"srv_info_answers" => "Odgovorov",
@ -3583,7 +3593,9 @@ $lang = array (
"srv_forum_go" => "Ogled celotne teme v forumu",
"srv_forum_back" => "Nazaj na urejanje ankete",
"srv_admin_comment" => "Komentarji urednikov",
"srv_admin_comment2" => "Urednikov",
"srv_repondent_comment" => "Komentarji respondentov",
"srv_repondent_comment2" => "Respondentov",
"srv_add_comment_toggle" => "Dodaj nov komentar",
"srv_add_comment" => "Dodaj komentar",
"srv_view_comment" => "Poglej komentarje",
@ -4014,8 +4026,10 @@ $lang = array (
"srv_lang_rem_confirm" => "Ali ste prepri&#269;ani, da &#382;elite odstraniti ta prevod?",
"srv_testiranje" => "Testiranje",
"srv_testiranje_oblivanje" => "Testni podatki",
"srv_testiranje_cas" => "Dejanski &#269;asi",
"srv_testiranje_cas" => "Dejanski časi",
"srv_testiranje_cas_info" => "Več informacij o dejanskem trajanju",
"srv_testiranje_predvidenicas" => "Ocenjevanje trajanja",
"srv_testiranje_predvidenicas_info" => "Več informacij o ocenjevanju trajanja",
"srv_testiranje_predvidenicas_1" => "Predvideno trajanje",
"srv_collectData" => "Priprava podatkov",
"srv_testiranje_komentarji" => "Komentarji",
@ -4024,6 +4038,7 @@ $lang = array (
"spremenljivka_delete_in_if" => "Spremenljivke ne morete zbrisati, ker se pojavi v vsaj enem od pogojev",
"spremenljivka_delete_data" => "Vaša anketa vsebuje odgovore respondentov. Z brisanjem vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da vprašanja ne izbrišete, temveč vprašanje označite, da ni vidno za respondente. To storite v zavihku \"Napredno\" pri urejanju vprašanja.",
"spremenljivka_delete_data_vre" => "Vaša anketa vsebuje odgovore respondentov. Z brisanjem odgovorov vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da odgovora ne izbrišete, temveč ga skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",
"spremenljivka_change_type_data" => "Vaša anketa vsebuje odgovore respondentov. S spremembo tipa vprašanja boste izbrisali morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da ustvarite novo vprašanje, obstoječe vprašanje pa skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",
"if_delete_data" => "Vaša anketa vsebuje odgovore respondentov. Z brisanjem pogoja in vseh vprašanj znotraj pogoja boste izbrisali tudi morebitne odgovore na ta vprašanja.<br><br>Če ne želite zgubiti podatkov, predlagamo, da pogoja z vprašanji ne izbrišete, temveč v nastavitvah pogoja označite, da vsebine pogoja ne prikaže.",
"oid_auth_rejected" => "Avtentikacija je bila zavrnjena",
"google_auth_rejected" => "Avtentikacija preko ponudnika google je bila zavrnjena.",
@ -4220,6 +4235,7 @@ $lang = array (
"srv_archival_version_q" => "Arhivske verzije vpra&#353;alnika",
"srv_questionnaire_archives" => "Arhivi vprašalnika",
"srv_questionnaire_archives_text" => "Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
"srv_questionnaire_archives_text_popup" => "Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate v zavihku 'UREJANJE' - 'Arhiv'. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
"srv_questionnaire_archives_note" => "Opomba k arhivski verziji",
"srv_questionnaire_archives_date" => "Datum arhiviranja",
"srv_questionnaire_archives_by" => "Arhiviral/-a",
@ -4284,7 +4300,13 @@ $lang = array (
"srv_basic" => "Osnovno",
"srv_advanced" => "Napredne mo&#382;nosti",
"srv_pogoj" => "Pogoj",
"srv_pogoj2" => "Pogoja",
"srv_pogoj3" => "Pogoji",
"srv_pogoj4" => "Pogojev",
"srv_blok" => "Blok",
"srv_blok2" => "Bloka",
"srv_blok3" => "Bloki",
"srv_blok4" => "Blokov",
"srv_calc" => "Kalkulacija",
"srv_quota" => "Kvota",
"srv_zanka" => "Zanka",
@ -4396,6 +4418,9 @@ $lang = array (
"srv_export_replace1" => "Znak:",
"srv_export_replace2" => " v tekstu zamenjaj z:",
"srv_spremenljivka" => "Spremenljivka",
"srv_spremenljivka2" => "Spremenljivki",
"srv_spremenljivka3" => "Spremenljivke",
"srv_spremenljivka4" => "Spremenljivk",
"srv_vrednost" => "Vrednost",
"srv_vrednost_default" => "Prednastavljena vrednost",
"srv_your_base_lang" => "Va&#353; osnovni jezik je",
@ -5123,6 +5148,7 @@ $lang = array (
'srv_inv_archive_cnt_succsess' => "Uspešno poslanih",
'srv_inv_archive_cnt_error' => "Napak",
'srv_inv_archive_comment' => "Komentar",
'srv_inv_archive_comment2' => "komentarjev",
'srv_inv_archive_sender' => "Poslal/-a",
'srv_inv_archive_email_address' => "Email prejemnika",
'srv_inv_archive_status' => "Status",
@ -5349,7 +5375,9 @@ $lang = array (
"srv_testiranje_diagnostika_base" => "Osnovna diagnostika",
"srv_testiranje_komentarji" => "Komentarji",
"srv_testiranje_komentarji_anketa" => "Komentarji na anketo",
"srv_testiranje_komentarji_anketa_link" => "Oglej si komentarje na anketo",
"srv_testiranje_komentarji_title" => "Komentarji na vprašanja",
"srv_testiranje_komentarji_title_link" => "Oglej si komentarje na vprašanja",
"srv_testiranje_komentar_q_title" => "Komentar na vprašanje",
"srv_testiranje_komentar_q_all_title" => "Komentarji na vprašanje",
"srv_testiranje_komentar_q_resp_all_title" => "Komentarji respondentov na vprašanje",
@ -5400,7 +5428,7 @@ $lang = array (
"srv_grid_defaults_3_5" => "Zelo mi je všeč",
"srv_diagnostic_bad_start_words" => array('spol', 'starost', 'rojstva', 'izobrazba', 'šola'),
"srv_diagnostic_1_element_0" => 'Predviden čas:',
"srv_diagnostic_1_element_4" => 'Kompleksnost:',
"srv_diagnostic_1_element_4" => 'Kompleksnost ankete',
"srv_diagnostic_1_element_1" => 'Število vprašanj na strani',
"srv_diagnostic_1_element_2" => 'Število vprašanj v bloku',
"srv_diagnostic_1_element_3" => 'Število podvprašanj v tabeli',
@ -5412,13 +5440,13 @@ $lang = array (
"srv_diagnostic_4_element_0" => 'Komentarji',
"srv_diagnostic_4_element_1" => 'na anketo',
"srv_diagnostic_4_element_1a" => 'respondentov na anketo',
"srv_diagnostic_4_element_2" => 'Število pogojev',
"srv_diagnostic_4_element_3" => 'Število blokov',
"srv_diagnostic_4_element_2" => 'Pogojev',
"srv_diagnostic_4_element_3" => 'Blokov',
"srv_diagnostic_4_element_4" => 'Nivo gnezdenja',
"srv_diagnostic_4_element_9" => 'Število strani',
"srv_diagnostic_4_element_5" => 'Število vprašanj',
"srv_diagnostic_4_element_5a" => 'Število skritih vprašanj',
"srv_diagnostic_4_element_8" => 'Število spremenljivk',
"srv_diagnostic_4_element_9" => 'Strani',
"srv_diagnostic_4_element_5" => 'Vprašanj',
"srv_diagnostic_4_element_5a" => 'Skritih vprašanj',
"srv_diagnostic_4_element_8" => 'Spremenljivk',
"srv_diagnostic_4_element_6" => 'na vprašanja',
"srv_diagnostic_4_element_7" => 'respondetov na vprašanja',
"srv_diagnostic_5_element_1" => 'Preverjanje pogojev, kalkulacij in zank',
@ -5434,11 +5462,13 @@ $lang = array (
"srv_diagnostic_time_5" => 'Zelo dolga anketa',
"srv_diagnostic_time_6" => 'Obsežna anketa',
"srv_diagnostic_time_7" => 'Zelo obsežna anketa',
"srv_diagnostic_time_extra" => 'Več informacij o dolžini ankete',
"srv_diagnostic_complexity_1" => 'Zelo enostavna anketa',
"srv_diagnostic_complexity_2" => 'Enostavna anketa',
"srv_diagnostic_complexity_3" => 'Zahtevna anketa',
"srv_diagnostic_complexity_4" => 'Kompleksna anketa',
"srv_diagnostic_complexity_5" => 'Zelo kompleksna anketa',
"srv_diagnostic_complexity_extra" => 'Več informacij o težavnosti ankete',
"srv_diagnostic_noComments" => 'Niste uporabili komentarjev',
"srv_diagnostic_note" => 'Uspešno ste izdelali anketo.',
"srv_diagnostic_note_1" => 'Vaša anketa ima',
@ -5460,6 +5490,7 @@ $lang = array (
"srv_podvprasanja" => 'Podvprašanja',
"srv_manjkajoce_vrednosti" => 'Manjkajoče vrednosti',
"srv_manjkajoce_vrednosti2" => 'Nevsebinski in manjkajoči odgovori',
"srv_manjkajoce_vrednosti_toggle" => 'Dodaj nevsebinske in manjkajoče odgovore',
"srv_nastavitve_stevila" => 'Nastavitve števila',
"srv_ostale_nastavitve" => 'Ostale nastavitve',
"srv_prikaz_nastavitve" => 'Prikaz podatkov',
@ -6639,7 +6670,7 @@ $lang = array (
'srv_vprasanje_upload_fotografija' => 'Fotografiranje',
'srv_vprasanje_upload_limit_title' => 'Omejitve uploada datoteke',
'srv_vprasanje_upload_limit' => 'Omejitev velikosti datoteke je <b>16 MB</b>',
'srv_vprasanje_upload_limit_type' => 'Uporabnik lahko naloži datoteke tipa:<br />"jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"',
'srv_vprasanje_upload_limit_type' => 'Uporabnik lahko naloži datoteke tipa:<br />"jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"',
'srv_vprasanje_delete_line_map' => 'Izbriši linijo',
'srv_vprasanje_delete_point_map' => 'Izbriši',
'srv_vprasanje_delete_line_confirm_map' => 'Ste prepričani, da želite izbrisati to linijo?',
@ -8040,6 +8071,7 @@ $lang = array (
'simple_footer_namestitev' => "Namestitev omogočajo",
'simple_footer_company' => "Organizacija",
'simple_footer_company_1ka' => "1KA ENKLIK ANKETA",
'simple_footer_company_contact' => "Kontakt",
'simple_footer_company_web' => "Spletna stran",
@ -8283,7 +8315,7 @@ $lang = array (
'srv_gdpr_drupal_q1_answer6' => '<b>Preklic</b> privolitve v obdelavo osebnih podatkov v določeni anketi',
'srv_gdpr_drupal_q2_note' => 'Prosimo, čim bolj natančno opišite, na osnovi katerih podatkov lahko identificiramo vaš vnos v anketi (npr. email, ime, komentar, specifične kombinacije odgovorov) in za kateri podatek oziroma podatke želite oddati zahtevek za izbris, spremembo ali vpogled. ',
'srv_gdpr_drupal_check' => 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
'srv_gdpr_drupal_end' => 'S klikom na Potrdi bo vaša zahteva poslana avtorju raziskave.',
'srv_gdpr_drupal_end' => 'S klikom na "POTRDI" bo vaša zahteva poslana avtorju raziskave.',
'users_gdpr_title' => 'GDPR soglasje',
'users_gdpr1' => 'Da',
'users_gdpr0' => 'Ne',

62
lang/2.php
View File

@ -545,6 +545,8 @@ $lang = array (
"base_displaylabel" => "View",
"base_alternative" => "Alternative labels",
"next1" => "Next",
"next2" => "Login",
"register" => "Register",
"vpisal" => "Posted by",
"spremenil" => "Changed by",
"show_menu" => "Show menu",
@ -1627,6 +1629,7 @@ $lang = array (
"cms_register_mandatory_field" => "Mandatory field",
"cms_search" => "Search",
"cms_register_user_terms_of_use" => "I agree to user agreement! <strong><a href='https://www.1ka.si/d/en/about/terms-of-use' target='_blank'>General terms of use.</a></strong>",
"cms_register_user_terms_of_use2" => "I agree to <a href='#'>user agreement! </a> ",
"cms_register_gdpr_agree" => "I agree that you send me notifications to the above-mentioned email address (important information about 1KA, 1KA evaluation, event invitation - once a year).",
"cms_register_gdpr_agree_explain" => "We will use and store your email only for the purposes of using the 1KA username and will carefully protect it in accordance with the regulations.
We will not pass on your email to third parties under any circumstances or use it for other purposes. We will keep your email as long as your account on 1KA is active.
@ -1849,6 +1852,7 @@ $lang = array (
"srv_novavrednost_grid" => "New Sub-question",
"srv_brisivrednost" => "Delete category",
"srv_brisispremenljivko" => "Delete question",
"srv_spremeni_tip_vprasanja" => "Change question type",
"srv_anketalist" => "Survey list",
"srv_grupe" => "Pages",
"srv_grupe_recount" => "Enumerate pages",
@ -1904,8 +1908,8 @@ $lang = array (
"srv_anketa_href_text" => "Share the link to the survey on your website.",
"srv_anketa_href_count" => "HTML code with view counter",
"srv_anketa_href_count_text" => "Share the link to the survey on your website and keep track of the number of views of the survey link. ",
"srv_anketa_href_friends" => "QR code",
"srv_anketa_href_friends_text" => "Share the link to the survey with a QR code.",
"srv_anketa_href_friends" => "Share with friends",
"srv_anketa_href_friends_text" => "Share the survey link with friends on social media (Facebook, Twitter, Linkedin etc.) ",
"srv_anketa_href_ijs" => "iFrame - JavaScript version",
"srv_anketa_href_ijs_text" => "Embed the survey on your website so that respondents can complete the survey on your website.",
"srv_anketa_href_ijs_text2" => "You can copy the code of your survey (Javascript version) and embed it into your own website.",
@ -1924,6 +1928,7 @@ $lang = array (
"srv_brisispremenljivkoconfirm_data" => "Are you sure you want to delete the question and responses for this question?",
"srv_brisivrednostconfirm" => "Are you sure you want to delete the answer?",
"srv_brisivrednostconfirm_data" => "Are you sure you want to delete the answer and responses for this answer?",
"srv_change_question_confirm_data" => "Are you sure you want to change question type?",
"srv_brisiifconfirm" => "Are you sure you want to delete this condition?",
"srv_brisiifconfirm_all" => "Are you sure you want to delete this condition and all questions inside this condition?",
"srv_brisiblockconfirm" => "Are you sure you want to delete this block?",
@ -2068,7 +2073,7 @@ $lang = array (
"srv_remind_checkbox_min_violated_soft" => "The minimal number of answers have not been chosen. Do you want to proceed?",
"srv_remind_num_soft" => "You have exceeded the number limit. Do you want to proceed?",
"srv_remind_preview" => "You can turn off alert and condition checking in settings in the top right corner (+).",
"srv_alert_show_missing" => "Show option \"Don\'t know\" on alert",
"srv_alert_show_missing" => "Show option \"Don't know\" on alert",
"srv_alert_show_missing_98" => "Show option \"Refused\" on alert",
"srv_alert_show_missing_97" => "Show option \"Invalid\" on alert",
"srv_alert_upload_size" => "Uploaded file is too large! Maximum file size is 16 MB.",
@ -2165,6 +2170,9 @@ $lang = array (
"srv_visible_on" => "Visible",
"srv_visible_off" => "Not visible",
"srv_hidden_text" => "hidden",
"srv_hidden_text2" => "hidden",
"srv_hidden_text3" => "hidden",
"srv_hidden_text4" => "hidden",
"srv_system_text" => "system",
"srv_visible_dostop" => "Question is visible",
"srv_previewalert" => "You are currently in survey preview mode! Answers will not be saved!",
@ -2407,8 +2415,8 @@ $lang = array (
"srv_knjiznica_add" => "To add a question to a library, drag it to this field",
"srv_knjiznica_copy" => "To copy a question, click on COPY icon",
"srv_deleteall" => "Delete all inserts",
"srv_expand" => "Expand all",
"srv_collapse" => "Collapse all",
"srv_expand" => "Expand all blocks and conditions",
"srv_collapse" => "Collapse all blocks and conditions",
"srv_copy_tourl" => "Copy survey to webpage",
"srv_copy_tourl_1" => "Copy survey between servers",
"srv_copy" => "Copy",
@ -3503,7 +3511,9 @@ $lang = array (
"srv_info_name" => "Survey name",
"srv_info_note" => "Note",
"srv_info_questions" => "Questions",
"srv_info_questions1" => "N. of questions",
"srv_info_questions1" => "Questions",
"srv_info_questions2" => "Questions",
"srv_info_questions3" => "Questions",
"srv_info_variables" => "Variables",
"srv_info_pages" => "Pages",
"srv_info_answers" => "Answers",
@ -3985,12 +3995,16 @@ $lang = array (
"srv_testiranje" => "Test", // ime glavne navigacije 3. nivoja (gc 8.3.2012)
"srv_testiranje_oblivanje" => "Test data",
"srv_testiranje_cas" => "Actual time",
"srv_testiranje_cas_info" => "More info about actual time",
"srv_testiranje_predvidenicas" => "Estimated duration",
"srv_testiranje_predvidenicas_info" => "More info about estimated duration",
"srv_testiranje_predvidenicas_1" => "Expected duration",
"srv_collectData" => "Data preparation",
"srv_testiranje_komentarji" => "Comments",
"srv_testiranje_komentarji_anketa" => "Survey comments",
"srv_testiranje_komentarji_anketa_link" => "View survey comments",
"srv_testiranje_komentarji_title" => "Question comments",
"srv_testiranje_komentarji_title_link" => "View question comments",
"srv_testiranje_komentar_q_title" => "Question comment",
"srv_testiranje_komentar_q_all_title" => "Question comments",
"srv_testiranje_komentar_q_resp_all_title" => "Respondnet question comments",
@ -4005,6 +4019,7 @@ $lang = array (
"spremenljivka_delete_in_if" => "Question cannot be deleted, because it appears in at least on of the conditions",
"spremenljivka_delete_data" => "This survey already has some data collected. With deleting this question, you will also be deleting question data.",
"spremenljivka_delete_data_vre" => "This survey already has some data collected. With deleting this answer, you will also be deleting question data.",
"spremenljivka_change_type_data" => "This survey already has some data collected. With changing of question type, you will also be deleting question data.",
"if_delete_data" => "This survey already has some data collected. With deleting this condition and all questions inside condition, you will also be deleting question data.",
"oid_auth_rejected" => "Authentication has been rejected",
"google_auth_rejected" => "Google rejected authentication.",
@ -4199,6 +4214,7 @@ $lang = array (
"srv_archival_version_q" => "Questionnaire archive",
"srv_questionnaire_archives" => "Questionnaire archive",
"srv_questionnaire_archives_text" => "Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire in the list below. Each archive version of the questionnaire can be activated. When activated, the archive version is automatically created as a new survey.",
"srv_questionnaire_archives_text_popup" => "Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire. Each archive version of the questionnaire can be activated from the 'EDIT' - 'Archive' tab. When activated, the archive version is automatically created as a new survey.",
"srv_questionnaire_archives_note" => "Archive version note",
"srv_questionnaire_archives_date" => "Archive date",
"srv_questionnaire_archives_by" => "Archived by",
@ -4263,7 +4279,13 @@ $lang = array (
"srv_basic" => "Basic",
"srv_advanced" => "Advanced options",
"srv_pogoj" => "Condition",
"srv_pogoj2" => "Conditions",
"srv_pogoj3" => "Conditions",
"srv_pogoj4" => "Conditions",
"srv_blok" => "Block",
"srv_blok2" => "Blocks",
"srv_blok3" => "Blocks",
"srv_blok4" => "Blocks",
"srv_calc" => "Calculation",
"srv_quota" => "Quota",
"srv_zanka" => "Loop",
@ -4374,6 +4396,9 @@ $lang = array (
"srv_export_replace1" => "Character:",
"srv_export_replace2" => " in text replaced by:",
"srv_spremenljivka" => "Variable",
"srv_spremenljivka2" => "Variables",
"srv_spremenljivka3" => "Variables",
"srv_spremenljivka4" => "Variables",
"srv_vrednost" => "Value",
"srv_vrednost_default" => "Preset value",
"srv_your_base_lang" => "Your basic language is",
@ -5092,6 +5117,7 @@ $lang = array (
'srv_inv_archive_cnt_succsess' => "Successfully sent",
'srv_inv_archive_cnt_error' => "Errors",
'srv_inv_archive_comment' => "Comment",
'srv_inv_archive_comment2' => "comments",
'srv_inv_archive_sender' => "Sender",
'srv_inv_archive_email_address' => "Respondent email",
'srv_inv_archive_status' => "Status",
@ -5381,11 +5407,11 @@ $lang = array (
"srv_metadata_time" => 'Hide input and edit time',
"srv_diagnostic_bad_start_words" => array('gender', 'old', 'birth', 'education', 'school'),
"srv_diagnostic_1_element_0" => 'Estimated duration:',
"srv_diagnostic_1_element_4" => 'Complexity:',
"srv_diagnostic_1_element_4" => 'Survey complexity',
"srv_diagnostic_1_element_1" => 'Number of questions per page',
"srv_diagnostic_1_element_2" => 'Number of questions in a block',
"srv_diagnostic_1_element_3" => 'Number of sub-questions in a table',
"srv_diagnostic_1_element_5" => 'Duration type',
"srv_diagnostic_1_element_5" => 'Survey duration',
"srv_diagnostic_2_element_1" => 'Inappropriate questions at the beginning of the survey',
"srv_diagnostic_2_element_2" => 'Check the options for shortening the questionnaire',
"srv_diagnostic_3_element_1" => 'Questions, upon which conditions are based, should display a notification',
@ -5393,13 +5419,13 @@ $lang = array (
"srv_diagnostic_4_element_0" => 'Comments',
"srv_diagnostic_4_element_1" => 'Number of editor survey comments',
"srv_diagnostic_4_element_1a" => 'Number of respondent survey comments',
"srv_diagnostic_4_element_2" => 'Number of conditions',
"srv_diagnostic_4_element_3" => 'Number of blocks',
"srv_diagnostic_4_element_2" => 'Conditions',
"srv_diagnostic_4_element_3" => 'Blocks',
"srv_diagnostic_4_element_4" => 'Levels of nesting',
"srv_diagnostic_4_element_9" => 'Number of pages',
"srv_diagnostic_4_element_5" => 'Number of questions',
"srv_diagnostic_4_element_5a" => 'Number of hidden questions',
"srv_diagnostic_4_element_8" => 'Number of variables',
"srv_diagnostic_4_element_9" => 'Pages',
"srv_diagnostic_4_element_5" => 'Questions',
"srv_diagnostic_4_element_5a" => 'Hidden questions',
"srv_diagnostic_4_element_8" => 'Variables',
"srv_diagnostic_4_element_6" => 'Number of editors in a questionnaire',
"srv_diagnostic_4_element_7" => 'Number of respondents in a questionnaire',
"srv_diagnostic_5_element_1" => 'Error in conditions, calculations and loops',
@ -5415,11 +5441,13 @@ $lang = array (
"srv_diagnostic_time_5" => 'Very long survey',
"srv_diagnostic_time_6" => 'Extensive survey',
"srv_diagnostic_time_7" => 'Very extensive survey',
"srv_diagnostic_time_extra" => 'More info about survey length',
"srv_diagnostic_complexity_1" => 'Very simple survey',
"srv_diagnostic_complexity_2" => 'Simple survey',
"srv_diagnostic_complexity_3" => 'Difficult survey',
"srv_diagnostic_complexity_4" => 'Complex survey',
"srv_diagnostic_complexity_5" => 'Very complex survey',
"srv_diagnostic_complexity_extra" => 'More info about survey complexity',
"srv_diagnostic_noComments" => 'You have not used comments',
"srv_diagnostic_note" => 'You have successfully created the survey.',
"srv_diagnostic_note_1" => 'Your survey has',
@ -5436,6 +5464,7 @@ $lang = array (
"srv_podvprasanja" => 'Subquestions',
"srv_manjkajoce_vrednosti" => 'Missing values',
"srv_manjkajoce_vrednosti2" => 'Nonsubstantive and missing responses',
"srv_manjkajoce_vrednosti_toggle" => 'Add nonsubstantive and missing responses',
"srv_nastavitve_stevila" => 'Number settings',
"srv_ostale_nastavitve" => 'Other settings',
"srv_vprasanje_tracking" => 'Question archiving',
@ -6522,7 +6551,7 @@ $lang = array (
'srv_vprasanje_upload_fotografija' => 'Take a picture',
'srv_vprasanje_upload_limit_title' => 'File upload limits',
'srv_vprasanje_upload_limit' => 'Filesize limit is 16 MB',
'srv_vprasanje_upload_limit_type' => 'Respondent can upload file types: "jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"',
'srv_vprasanje_upload_limit_type' => 'Respondent can upload file types: "jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"',
'srv_vprasanje_delete_line_map' => 'Delete line',
'srv_vprasanje_delete_point_map' => 'Delete',
'srv_vprasanje_delete_line_confirm_map' => 'Are you sure you want to delete this line?',
@ -7924,6 +7953,7 @@ $lang = array (
'simple_footer_namestitev' => "Installation enabled by",
'simple_footer_company' => "Organization",
'simple_footer_company_1ka' => "1KA ONECLICK SURVEY",
'simple_footer_company_contact' => "Contact",
'simple_footer_company_web' => "Website",
@ -8182,7 +8212,7 @@ GDPR introduction preview",
'srv_gdpr_drupal_q1_answer6' => '<b>Withdrawal</b> of consent of processing of personal data in a specific survey',
'srv_gdpr_drupal_q2_note' => 'Please describe as accurately as possible, on the basis of which data can we identify your survey entry (e.g., email, name, comment, specific combination of answers), and for which data you want to file a request for deletion, change or insight.',
'srv_gdpr_drupal_check' => 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
'srv_gdpr_drupal_end' => 'By clicking Submit, your request will be sent to the author of the survey.',
'srv_gdpr_drupal_end' => 'By clicking "SUBMIT", your request will be sent to the author of the survey.',
'srv_gdpr_notification_title' => "Dear user of 1KA tool,",
'srv_gdpr_notification_title_aai' => "Dear user of 1KA.ARNES.SI tool,",
'srv_gdpr_notification_text1' => "As part of the development process of 1KA tool, we continually improve existing functionalities and develop new ones. We believe that new functionalities are interesting to you and you want to be informed about them, also about our annual event, the Web Survey Day.",

70
main/survey/app/Controllers/AjaxController.php
View File

@ -10,6 +10,7 @@ namespace App\Controllers;
// Osnovni razredi
use App\Controllers\StatisticController as Statistic;
use App\Controllers\Vprasanja\VprasanjaController as Vprasanja;
use App\Controllers\LanguageController as Language;
use App\Models\Model;
use Common;
use Branching;
@ -23,52 +24,77 @@ use AppSettings;
class AjaxController extends Controller
{
//ajax zahteve
public function __construct()
{
public function __construct(){
if(empty($_GET['a'])){
return '';
}
// inicializiramo jezik za multilang anketo
Language::getInstance()->multilang_init();
if ($_GET['a'] == 'accept_droppable') {
$this->ajax_accept_droppable();
} elseif ($_GET['a'] == 'accept_ranking') {
}
elseif ($_GET['a'] == 'accept_ranking') {
$this->ajax_accept_ranking();
} elseif ($_GET['a'] == 'accept_dragdrop1') {
}
elseif ($_GET['a'] == 'accept_dragdrop1') {
$this->ajax_accept_dragdrop1();
} elseif ($_GET['a'] == 'get_dragdrop1_data') {
}
elseif ($_GET['a'] == 'get_dragdrop1_data') {
$this->ajax_get_dragdrop1_data();
} elseif ($_GET['a'] == 'delete_dragdrop1_data') {
}
elseif ($_GET['a'] == 'delete_dragdrop1_data') {
$this->ajax_delete_dragdrop1_data();
} elseif ($_GET['a'] == 'delete_dragdrop2_data') {
}
elseif ($_GET['a'] == 'delete_dragdrop2_data') {
$this->ajax_delete_dragdrop2_data();
} elseif ($_GET['a'] == 'accept_dragdrop_grid') {
}
elseif ($_GET['a'] == 'accept_dragdrop_grid') {
$this->ajax_accept_dragdrop_grid();
} elseif ($_GET['a'] == 'accept_sortable_ranking') {
}
elseif ($_GET['a'] == 'accept_sortable_ranking') {
$this->ajax_accept_sortable_ranking();
} elseif ($_GET['a'] == 'edit_size') {
}
elseif ($_GET['a'] == 'edit_size') {
$this->ajax_edit_size();
} elseif ($_GET['a'] == 'dodaj_ime') {
}
elseif ($_GET['a'] == 'dodaj_ime') {
$this->ajax_dodaj_ime();
} elseif ($_GET['a'] == 'spol') {
}
elseif ($_GET['a'] == 'spol') {
$this->ajax_glasovanje_spol();
} elseif ($_GET['a'] == 'vote_spol') {
}
elseif ($_GET['a'] == 'vote_spol') {
$this->ajax_glasovanje_vote_spol();
} elseif ($_GET['a'] == 'captcha') {
}
elseif ($_GET['a'] == 'captcha') {
$this->ajax_captcha();
} elseif ($_GET['a'] == 'skin') {
}
elseif ($_GET['a'] == 'skin') {
$this->ajax_skin();
} elseif ($_GET['a'] == 'grupa_for_if') {
}
elseif ($_GET['a'] == 'grupa_for_if') {
$this->ajax_grupa_for_if();
} elseif ($_GET['a'] == 'enable_comments') {
}
elseif ($_GET['a'] == 'enable_comments') {
$this->ajax_enable_comments();
} elseif ($_GET['a'] == 'continue_later') {
}
elseif ($_GET['a'] == 'continue_later') {
$this->ajax_continue_later();
} elseif ($_GET['a'] == 'continue_later_send') {
}
elseif ($_GET['a'] == 'continue_later_send') {
$this->ajax_continue_later_send();
} elseif ($_GET['a'] == 'usr_id_data') {
}
elseif ($_GET['a'] == 'usr_id_data') {
$this->ajax_delete_signature_data();
}elseif ($_GET['a'] == 'get_tip_opozorila') {
}
elseif ($_GET['a'] == 'get_tip_opozorila') {
$this->ajax_get_tip_opozorila();
} // genericna resitev za vse nadaljne
}
// genericna resitev za vse nadaljne
else {
$ajax = 'ajax_' . $_GET['a'];
if (method_exists($this, $ajax))

2
main/survey/app/Models/SaveSurvey.php
View File

@ -799,7 +799,7 @@ class SaveSurvey extends Model
$file_allowed = true;
// Preverimo ce je file type dovoljen (prava koncnica)
if( !in_array(strtolower($ext), array("jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx")) ){
if( !in_array(strtolower($ext), array("jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx")) ){
$file_allowed = false;
}

2
main/survey/js/script.js
View File

@ -1916,7 +1916,7 @@ function checkUpload(upload, id){
// File extensions allowed
let extAllowed = ["jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"];
let extAllowed = ["jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"];
// Get file ext
let fileNameFull = upload.files[0].name;

3933
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

6
public/img/icons/lock_yellow.svg Normal file
View File

@ -0,0 +1,6 @@
<svg width="13" height="14" viewBox="0 0 13 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.76 6.16H10.57V2.24C10.57 1.00275 9.56725 0 8.33 0H3.99C2.75275 0 1.75 1.00275 1.75 2.24V6.16H0.56C0.25025 6.16 0 6.41025 0 6.72V13.44C0 13.7498 0.25025 14 0.56 14H11.76C12.0697 14 12.32 13.7498 12.32 13.44V6.72C12.32 6.41025 12.0697 6.16 11.76 6.16ZM6.65 10.3075V11.235C6.65 11.312 6.587 11.375 6.51 11.375H5.81C5.733 11.375 5.67 11.312 5.67 11.235V10.3075C5.52554 10.2038 5.41772 10.0569 5.36205 9.88802C5.30638 9.71912 5.30574 9.53692 5.36022 9.36764C5.41469 9.19835 5.52148 9.05072 5.6652 8.94599C5.80892 8.84126 5.98217 8.78483 6.16 8.78483C6.33783 8.78483 6.51108 8.84126 6.6548 8.94599C6.79852 9.05072 6.90531 9.19835 6.95978 9.36764C7.01426 9.53692 7.01362 9.71912 6.95795 9.88802C6.90228 10.0569 6.79446 10.2038 6.65 10.3075ZM9.31 6.16H3.01V2.24C3.01 1.69925 3.44925 1.26 3.99 1.26H8.33C8.87075 1.26 9.31 1.69925 9.31 2.24V6.16Z" fill="#FFC700"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 974 B

5
public/img/icons/toggle_active.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="95" height="35" viewBox="0 0 95 35" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="94.0625" height="35" rx="17.5" fill="#1E88E5"/>
<rect x="2.1875" y="2.1875" width="30.625" height="30.625" rx="15.3125" fill="white"/>
<path d="M52.7513 27.315C51.3163 27.315 50.0388 26.9475 48.9188 26.2125C47.8163 25.4775 46.95 24.4362 46.32 23.0887C45.7075 21.7412 45.4013 20.1487 45.4013 18.3112C45.4013 16.4737 45.7075 14.8987 46.32 13.5862C46.95 12.2562 47.8163 11.2412 48.9188 10.5412C50.0388 9.82375 51.3163 9.465 52.7513 9.465C54.2038 9.465 55.4813 9.82375 56.5838 10.5412C57.6863 11.2412 58.5525 12.2562 59.1825 13.5862C59.8125 14.8987 60.1275 16.4737 60.1275 18.3112C60.1275 20.1487 59.8125 21.7412 59.1825 23.0887C58.5525 24.4362 57.6863 25.4775 56.5838 26.2125C55.4813 26.9475 54.2038 27.315 52.7513 27.315ZM52.7513 25.3987C53.7838 25.3987 54.6763 25.11 55.4288 24.5325C56.1988 23.9375 56.7938 23.115 57.2138 22.065C57.6338 20.9975 57.8438 19.7462 57.8438 18.3112C57.8438 16.1762 57.38 14.4875 56.4525 13.245C55.525 12.0025 54.2913 11.3812 52.7513 11.3812C51.2113 11.3812 49.9775 12.0025 49.05 13.245C48.1225 14.4875 47.6588 16.1762 47.6588 18.3112C47.6588 19.7462 47.8688 20.9975 48.2888 22.065C48.7088 23.115 49.3038 23.9375 50.0738 24.5325C50.8438 25.11 51.7363 25.3987 52.7513 25.3987ZM63.8304 27V9.78H66.0879L72.3091 20.595L74.1729 24.165H74.2779C74.2254 23.29 74.1641 22.3887 74.0941 21.4612C74.0416 20.5162 74.0154 19.5887 74.0154 18.6787V9.78H76.0891V27H73.8316L67.5841 16.1587L65.7204 12.615H65.6154C65.6854 13.4725 65.7466 14.3562 65.7991 15.2662C65.8691 16.1762 65.9041 17.0862 65.9041 17.9962V27H63.8304Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

5
public/img/icons/toggle_inactive.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="95" height="35" viewBox="0 0 95 35" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="94.0628" height="35.0001" rx="17.5001" fill="#CCCCCC"/>
<rect x="61.2502" y="2.1875" width="30.6251" height="30.6251" rx="15.3125" fill="white"/>
<path d="M21.2341 26.4763C19.9187 26.4763 18.7476 26.1394 17.7209 25.4656C16.7103 24.7919 15.9162 23.8374 15.3387 22.6022C14.7773 21.367 14.4966 19.9072 14.4966 18.2228C14.4966 16.5384 14.7773 15.0947 15.3387 13.8915C15.9162 12.6724 16.7103 11.7419 17.7209 11.1003C18.7476 10.4426 19.9187 10.1137 21.2341 10.1137C22.5655 10.1137 23.7366 10.4426 24.7472 11.1003C25.7578 11.7419 26.5519 12.6724 27.1294 13.8915C27.7069 15.0947 27.9957 16.5384 27.9957 18.2228C27.9957 19.9072 27.7069 21.367 27.1294 22.6022C26.5519 23.8374 25.7578 24.7919 24.7472 25.4656C23.7366 26.1394 22.5655 26.4763 21.2341 26.4763ZM21.2341 24.7197C22.1805 24.7197 22.9987 24.455 23.6885 23.9256C24.3943 23.3802 24.9397 22.6262 25.3247 21.6637C25.7097 20.6852 25.9022 19.5382 25.9022 18.2228C25.9022 16.2657 25.4771 14.7177 24.6269 13.5787C23.7767 12.4397 22.6457 11.8703 21.2341 11.8703C19.8224 11.8703 18.6915 12.4397 17.8413 13.5787C16.991 14.7177 16.5659 16.2657 16.5659 18.2228C16.5659 19.5382 16.7584 20.6852 17.1434 21.6637C17.5284 22.6262 18.0739 23.3802 18.7797 23.9256C19.4855 24.455 20.3037 24.7197 21.2341 24.7197ZM31.39 26.1875V10.4025H40.4856V12.0868H33.3872V17.4287H39.4028V19.1131H33.3872V26.1875H31.39ZM43.2803 26.1875V10.4025H52.3759V12.0868H45.2775V17.4287H51.2931V19.1131H45.2775V26.1875H43.2803Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

11
public/img/social/FB_blue_new.svg Normal file
View File

@ -0,0 +1,11 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_2_149)">
<path d="M20 40C31.0457 40 40 31.0457 40 20C40 8.95431 31.0457 0 20 0C8.95431 0 0 8.95431 0 20C0 31.0457 8.95431 40 20 40Z" fill="#0059AB"/>
<path d="M12.897 10.6743C12.3088 10.6761 11.7453 10.9105 11.3294 11.3264C10.9135 11.7423 10.6791 12.3058 10.6773 12.894V27.0999C10.6791 27.6881 10.9135 28.2516 11.3294 28.6675C11.7453 29.0834 12.3088 29.3178 12.897 29.3196H20.3694C20.4173 29.3276 20.4662 29.3276 20.5142 29.3196H23.033C23.0809 29.3276 23.1298 29.3276 23.1778 29.3196H27.103C27.6911 29.3178 28.2547 29.0834 28.6706 28.6675C29.0864 28.2516 29.3209 27.6881 29.3227 27.0999V12.894C29.3209 12.3058 29.0864 11.7423 28.6706 11.3264C28.2547 10.9105 27.6911 10.6761 27.103 10.6743H12.897ZM12.897 11.5622H27.103C27.2781 11.5613 27.4517 11.5951 27.6137 11.6618C27.7757 11.7284 27.9228 11.8265 28.0467 11.9503C28.1705 12.0741 28.2686 12.2213 28.3352 12.3833C28.4018 12.5453 28.4357 12.7188 28.4348 12.894V27.0999C28.4357 27.2751 28.4018 27.4487 28.3352 27.6106C28.2686 27.7726 28.1705 27.9198 28.0467 28.0436C27.9228 28.1675 27.7757 28.2655 27.6137 28.3321C27.4517 28.3988 27.2781 28.4326 27.103 28.4318H23.5515V22.2167H25.2475L25.8692 19.1091H23.5515V18.2212C23.5515 17.9737 23.575 17.9544 23.6581 17.9004C23.9056 17.7997 24.1729 17.7575 24.4394 17.7773H25.7712V15.2775L25.518 15.157C24.7557 14.8333 23.9358 14.6675 23.1076 14.6697C22.6623 14.655 22.2195 14.7424 21.8131 14.9251C21.4067 15.1079 21.0476 15.3812 20.7631 15.7241C20.2328 16.4458 19.9637 17.3264 20 18.2212V19.1091H18.6682V22.2167H20V28.4318H12.897C12.7218 28.4326 12.5483 28.3988 12.3863 28.3322C12.2243 28.2655 12.0772 28.1675 11.9533 28.0436C11.8295 27.9198 11.7314 27.7726 11.6648 27.6106C11.5982 27.4487 11.5643 27.2751 11.5652 27.0999V12.894C11.5643 12.7188 11.5982 12.5453 11.6648 12.3833C11.7314 12.2213 11.8295 12.0741 11.9533 11.9503C12.0772 11.8265 12.2243 11.7284 12.3863 11.6618C12.5483 11.5951 12.7218 11.5613 12.897 11.5622ZM23.1075 15.5576C23.7141 15.5451 24.3172 15.6508 24.8833 15.8689V16.8894H24.4394C24.0007 16.8517 23.5606 16.9443 23.1743 17.1556C23.0082 17.2776 22.8747 17.4386 22.7856 17.6245C22.6966 17.8104 22.6547 18.0153 22.6636 18.2212V19.997H24.7853L24.5191 21.3288H22.6636V28.4318H20.8879V21.3288H19.5561V19.997H20.8879V18.2212C20.8547 17.5284 21.055 16.8445 21.4567 16.279C21.654 16.0354 21.907 15.8428 22.1942 15.7172C22.4815 15.5917 22.7947 15.537 23.1075 15.5576Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_2_149">
<rect width="40" height="40" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

11
public/img/social/twitter_blue_new.svg Normal file
View File

@ -0,0 +1,11 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_2_152)">
<path d="M20 40C31.0457 40 40 31.0457 40 20C40 8.95431 31.0457 0 20 0C8.95431 0 0 8.95431 0 20C0 31.0457 8.95431 40 20 40Z" fill="#0059AB"/>
<path d="M24.9941 11.462C23.6854 11.4633 22.4307 11.9837 21.5054 12.909C20.5801 13.8344 20.0596 15.0891 20.0583 16.3977C20.0692 16.5597 20.0882 16.7212 20.1152 16.8813C18.4973 16.736 16.9245 16.2699 15.4886 15.5105C14.0526 14.751 12.7823 13.7132 11.7515 12.4576C11.7051 12.399 11.645 12.3526 11.5765 12.3225C11.508 12.2924 11.4332 12.2796 11.3586 12.2852C11.2842 12.2907 11.2123 12.3146 11.1494 12.3546C11.0864 12.3946 11.0343 12.4495 10.9977 12.5145C10.5094 13.3436 10.2797 14.2995 10.338 15.2599C10.3963 16.2203 10.7399 17.1415 11.3248 17.9054C11.2075 17.8539 11.0795 17.8254 10.9692 17.7632C10.9002 17.7264 10.8228 17.7081 10.7446 17.71C10.6664 17.7119 10.59 17.7339 10.5227 17.774C10.4555 17.814 10.3998 17.8707 10.3609 17.9386C10.322 18.0065 10.3013 18.0832 10.3007 18.1615V18.2184C10.3063 19.013 10.5046 19.7945 10.8787 20.4956C11.2528 21.1968 11.7915 21.7966 12.4485 22.2437C12.4343 22.2446 12.42 22.2446 12.4058 22.2437C12.3291 22.2303 12.2501 22.2368 12.1766 22.2627C12.1031 22.2886 12.0374 22.3329 11.986 22.3915C11.9346 22.4501 11.8991 22.5209 11.8829 22.5972C11.8668 22.6734 11.8705 22.7525 11.8938 22.8269C12.1504 23.606 12.5968 24.309 13.1927 24.8726C13.7887 25.4363 14.5154 25.8428 15.3075 26.0557C13.6904 27.0196 11.801 27.4245 9.93087 27.2079C9.82749 27.1942 9.72254 27.2164 9.63355 27.2707C9.54456 27.3251 9.47693 27.4084 9.44196 27.5066C9.40699 27.6049 9.4068 27.7121 9.44142 27.8105C9.47604 27.9089 9.54337 27.9924 9.63217 28.0471C11.7527 29.4129 14.2219 30.1388 16.7442 30.138C18.5946 30.1729 20.4304 29.8055 22.125 29.0614C23.8195 28.3173 25.3323 27.2141 26.5587 25.8281C28.7212 23.3627 29.9275 20.2033 29.9582 16.924C29.9582 16.7942 29.9475 16.668 29.944 16.5399C30.7843 15.9102 31.5148 15.1461 32.106 14.2783C32.162 14.1959 32.1894 14.0973 32.184 13.9978C32.1786 13.8983 32.1407 13.8033 32.0761 13.7274C32.0115 13.6515 31.9238 13.5989 31.8264 13.5777C31.7291 13.5564 31.6274 13.5677 31.5371 13.6098C31.3024 13.7147 31.0286 13.7253 30.7832 13.8089C31.1173 13.3813 31.377 12.9004 31.5513 12.3865C31.579 12.2984 31.5793 12.204 31.552 12.1157C31.5248 12.0275 31.4713 11.9497 31.3988 11.8925C31.3262 11.8354 31.238 11.8017 31.1458 11.7959C31.0536 11.7902 30.9619 11.8126 30.8828 11.8602C30.0922 12.3219 29.2325 12.6533 28.3367 12.8417C27.4392 11.9724 26.2434 11.4788 24.9941 11.462ZM24.9941 12.3723C25.5464 12.3725 26.0927 12.4863 26.5992 12.7065C27.1057 12.9267 27.5616 13.2487 27.9384 13.6525C27.9928 13.7083 28.0605 13.7494 28.1352 13.7718C28.2098 13.7942 28.289 13.7972 28.3651 13.7805C28.9491 13.6644 29.5206 13.4929 30.072 13.2684C29.757 13.6971 29.3607 14.0596 28.9056 14.3352C28.8055 14.3842 28.7269 14.4682 28.6845 14.5713C28.6422 14.6744 28.6392 14.7894 28.676 14.8946C28.7128 14.9997 28.7869 15.0878 28.8843 15.142C28.9816 15.1962 29.0955 15.2128 29.2043 15.1886C29.6437 15.1011 30.0763 14.9823 30.4987 14.833C30.1107 15.2538 29.6819 15.635 29.2185 15.971C29.1565 16.0163 29.107 16.0766 29.0747 16.1462C29.0423 16.2159 29.0282 16.2926 29.0336 16.3692C29.0407 16.5542 29.0478 16.7372 29.0478 16.924C29.0133 19.978 27.8883 22.9191 25.8759 25.2165C24.7379 26.51 23.331 27.5391 21.7536 28.232C20.1763 28.9248 18.4666 29.2647 16.7442 29.2277C14.9914 29.2278 13.2592 28.8493 11.6662 28.1182C13.5284 27.9902 15.3107 27.312 16.7868 26.1696C16.8596 26.1114 16.9127 26.0323 16.9391 25.9429C16.9655 25.8536 16.9639 25.7583 16.9344 25.6699C16.9049 25.5816 16.8491 25.5044 16.7744 25.4487C16.6997 25.3931 16.6097 25.3617 16.5166 25.3588C15.807 25.3405 15.1151 25.1332 14.5125 24.7581C13.9098 24.383 13.4183 23.8538 13.0886 23.2252H13.1597C13.6015 23.2268 14.0416 23.1694 14.4683 23.0545C14.5656 23.0265 14.6507 22.9668 14.7103 22.885C14.7699 22.8031 14.8005 22.7037 14.7972 22.6025C14.7939 22.5013 14.757 22.4041 14.6923 22.3262C14.6276 22.2484 14.5387 22.1943 14.4398 22.1726C13.6493 22.0042 12.9283 21.6 12.3722 21.0134C11.8161 20.4268 11.4509 19.6853 11.3248 18.8869C11.7857 19.059 12.2701 19.1597 12.7614 19.1856C12.8622 19.1916 12.9622 19.164 13.0456 19.107C13.1289 19.05 13.191 18.9669 13.2219 18.8708C13.2529 18.7747 13.251 18.671 13.2165 18.576C13.1821 18.4811 13.1171 18.4003 13.0317 18.3464C12.4796 17.9777 12.0271 17.4784 11.7145 16.8928C11.4018 16.3072 11.2386 15.6534 11.2395 14.9896C11.2513 14.4905 11.3575 13.9982 11.5524 13.5387C13.8787 16.1279 17.1374 17.6882 20.6131 17.877C20.6834 17.8807 20.7536 17.8681 20.8183 17.8404C20.8831 17.8127 20.9406 17.7704 20.9865 17.717C21.0319 17.6632 21.0643 17.5995 21.081 17.531C21.0976 17.4625 21.0981 17.391 21.0824 17.3223C21.0092 17.0195 20.971 16.7093 20.9687 16.3977C20.9676 15.8688 21.0709 15.3449 21.2728 14.856C21.4748 14.3671 21.7712 13.9229 22.1452 13.5489C22.5192 13.1749 22.9634 12.8784 23.4523 12.6765C23.9412 12.4746 24.4651 12.3712 24.9941 12.3723Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_2_152">
<rect width="40" height="40" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

1
resources/sass/admin_new/basic/icons/question_edit.scss
View File

@ -32,7 +32,6 @@ a.faicon.edit::before{
}
a.faicon.addif::before{
font-family: $font_family;
font-size: 18px;
font-weight: 900;
content: "IF";
}

2
resources/sass/admin_new/components/header/navigation.scss
View File

@ -182,7 +182,7 @@ header{
height: 41px;
margin-left: 16px;
border-bottom: 1px $gray solid;
border-bottom: 1px transparent solid;
a {
padding: 12px 16px;

63
resources/sass/admin_new/components/header/top_line.scss
View File

@ -328,62 +328,15 @@ header #top_line{
width: 46px;
height: 16px;
.switch_anketa_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 12px;
background-color: $blue;
border-radius: 16px;
&.anketa_on{
background-image: url("../../public/img/icons/toggle_active.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.switch_anketa_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
}
.switch_anketa.anketa_on{
.switch_anketa_content{
padding-left: 20px;
background-color: $blue;
}
.switch_anketa_content:before{
left: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $dark-blue;
}
}
}
.switch_anketa.anketa_off{
.switch_anketa_content{
padding-left: 6px;
background-color: $dark-gray;
}
.switch_anketa_content:before{
right: 1px;
}
&:hover{
.switch_anketa_content{
background-color: darken($dark-gray, 5%);
}
&.anketa_off{
background-image: url("../../public/img/icons/toggle_inactive.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
}

93
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -129,99 +129,6 @@ div.setting_holder {
}
}
//Preview spremenljivka
div#fullscreen {
div#preview_spremenljivka {
div#spremenljivka_preview {
div.spremenljivka {
div.naslov {
p {
font-size: 18px !important;
font-weight: $semi-bold;
//Opomba na vprašanje
&.spremenljivka_info {
color: $very-dark-gray;
font-size: 14px !important;
font-weight: $regular;
margin-top: 16px;
}
}
margin-bottom: 16px;
padding-bottom: 0;
}
div.variable_holder {
margin-top: 0;
div.variabla {
padding: 0;
}
table {
td {
border: none;
&.category {
label {
margin-right: 0; //za centriranje radio buttonov v tabelah
}
textarea {
height: 30px !important;
width: 100% !important;
outline: 1px solid $dark-gray;
}
}
}
//Tabele
&.grid_table {
tr:nth-child(2n+1) {
background-color: $light-gray;
}
}
//Razvršanje
&.ranking_table {
td {
div.dropzone {
border-top: 1px solid $gray;
}
}
}
//Fotografiraj
&.text_vrednost {
td {
div.fotoresults_delete {
margin-left: 27px;
font-size: 14px!important;
color: $very-dark-gray;
margin-top: 16px;
}
div {
input.sig_clear_button {
margin-bottom: 16px;
}
}
}
}
}
}
}
}
}
}
//Komentarji
div.qtip_comment {

2
resources/sass/admin_new/mobile/pages/publish.scss
View File

@ -10,7 +10,7 @@
// Url ankete in kopiranje url-ja
.input_box {
width: auto;
max-width: 300px;
}
}

64
resources/sass/admin_new/pages/my_surveys/top_filters.scss
View File

@ -245,64 +245,16 @@
width: 41px;
height: 16px;
.switch_folders_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 10px;
font-weight: 400;
line-height: 13px;
background-color: $blue;
border-radius: 16px;
&.on{
background-image: url("../../public/img/icons/toggle_active.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.switch_folders_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
}
.switch_folders.on{
.switch_folders_content{
padding-left: 20px;
background-color: $blue;
}
.switch_folders_content:before{
left: 1px;
}
&:hover{
.switch_folders_content{
background-color: $dark-blue;
}
}
}
.switch_folders.off{
.switch_folders_content{
padding-left: 6px;
background-color: $very-dark-gray2;
}
.switch_folders_content:before{
right: 1px;
}
&:hover{
.switch_folders_content{
background-color: $very-dark-gray;
}
&.off{
background-image: url("../../public/img/icons/toggle_inactive.svg");
background-size: 100% 100%;
background-repeat: no-repeat;
}
}
}

7
resources/sass/admin_new/pages/survey_edit/branching.scss
View File

@ -118,7 +118,8 @@ $branching_main_size_small: calc(100% - 525px);
display: flex;
align-items: center;
width: 140px;
white-space: nowrap;
padding-right: 16px;
font-size: 16px;
font-weight: 600;
@ -130,7 +131,9 @@ $branching_main_size_small: calc(100% - 525px);
.pb_page_hover{
display: none;
align-items: center;
width: 200px;
white-space: nowrap;
padding-right: 16px;
font-weight: 400;
font-size: 12px;

1
resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss
View File

@ -55,6 +55,7 @@
width: auto;
margin-left: 8px;
padding-right: 0px;
font-weight: 600;
font-size: 10px;

5
resources/sass/admin_new/pages/survey_edit/conditions.scss
View File

@ -712,3 +712,8 @@ and open the template in the editor.
}
}
}
//Inline komentarji pri IF in BLOK
.comment_inline {
margin-left: 16px;
}

408
resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
View File

@ -26,7 +26,9 @@ $progress_bar_background: black;
* USED FROM: template.css
*/
#preview_spremenljivka {
//Preview spremenljivka
#fullscreen {
#preview_spremenljivka {
@include popup_general();
overflow-x: hidden;
@ -35,6 +37,410 @@ $progress_bar_background: black;
max-height: 500px;
width: 60vw;
#spremenljivka_preview {
.spremenljivka {
box-sizing: border-box;
width: 100%;
margin: 0;
padding: 24px 0;
color: $black;
.naslov {
margin: 0 0 24px 0;
p {
margin: 0;
font-weight: 700;
font-size: 20px;
}
.spremenljivka_info{
margin-top: 4px;
color:#a9a9a9;
font-size: 14px;
font-weight: 400;
}
}
.variable_holder {
height: auto !important;
.variabla{
padding: 0 0 16px 0;
font-size: 16px;
&:last-child{
padding-bottom: 0;
}
}
}
input[type="text"], textarea, select{
margin: 0;
padding: 5px 7px;
min-width: 100px;
border-radius: 3px;
border: 1px #3e3e3e solid;
background-color: #fff;
}
/* awesome radio in checkboxi */
/* custom checkbox and radio buttons */
/* Obstoječe skrijemo*/
input[type="checkbox"], input[type="radio"] {
//display: none !important;
opacity: 0;
position: absolute !important;
width: 30px;
height: 24px;
}
input[type="checkbox"] + span.enka-checkbox-radio:before,
input[type="radio"] + span.enka-checkbox-radio:before,
input[type="radio"] + span.enka-custom-radio:before,
input[type="radio"] + span.enka-vizualna-skala::before{
font-family: "Font Awesome 5 Free";
display: inline-block;
font-weight: 400;
}
/* Disabled radio / checkbox */
input[type="checkbox"]:disabled + span.enka-checkbox-radio:before,
input[type="radio"]:disabled + span.enka-checkbox-radio:before{
opacity: 0.5;
}
input[type="checkbox"] + span.enka-checkbox-radio,
input[type="radio"] + span.enka-checkbox-radio {
font-size: 15px;
-webkit-text-stroke: 0.35px;
}
/* checkbox */
input[type="checkbox"] + span.enka-checkbox-radio:before {
content: "\f0c8";
letter-spacing: 10px;
}
input[type="checkbox"]:checked + span.enka-checkbox-radio:before {
content: "\f14a";
}
/* radio */
input[type="radio"] + span.enka-checkbox-radio:before {
content: "\f111";
letter-spacing: 10px;
}
input[type="radio"]:checked + span.enka-checkbox-radio:before {
content: "\f192";
}
input[type="checkbox"] + span.enka-checkbox-radio,
input[type="radio"] + span.enka-checkbox-radio,
.custom_radio_picture.obarvan > label > span.enka-custom-radio:before,
.visual-radio-scale.checked .enka-vizualna-skala{
color: $blue;
font-size: 20px;
vertical-align: -1px;
}
input[type="text"]:focus,
input[type="number"]:focus,
input[type="email"]:focus,
input[type="password"]:focus,
textarea:focus{
border-color: $blue;
}
table.grid_table{
margin: 0;
tr{
td,
th{
border: 0;
}
td.category{
text-align: center;
label{
margin: 0;
}
span.enka-checkbox-radio:before{
letter-spacing: 0 !important;
}
}
&:nth-child(2n+1){
background-color: #F1F8FD;
}
}
}
table.text_vrednost {
table-layout: fixed;
text-align: left;
width: 100%;
border-spacing: 0;
margin: 0;
tr{
td,
th{
border: 0;
}
}
}
.width_5 {
width: 5%;
}
.width_10 {
width: 10%;
}
.width_15 {
width: 15%;
}
.width_20 {
width: 20%;
}
.width_25 {
width: 25%;
}
.width_30 {
width: 30%;
}
.width_33 {
width: 33.3%;
}
.width_35 {
width: 35%;
}
.width_40 {
width: 40%;
}
.width_45 {
width: 45%;
}
.width_50 {
width: 50%;
}
.width_55 {
width: 55%;
}
.width_60 {
width: 60%;
}
.width_65 {
width: 65%;
}
.width_70 {
width: 70%;
}
.width_75 {
width: 75%;
}
.width_80 {
width: 80%;
}
.width_85 {
width: 85%;
}
.width_90 {
width: 90%;
}
.width_95 {
width: 95%;
}
.width_100 {
width: 100%;
}
.frame_dropping_titles {
width: 230px;
padding: 5px;
margin: 0px auto 0px auto;
height: 15px;
text-align: center;
background-color: white;
border-top: 1px solid $gray;
border-left: 1px solid $gray;
border-right: 1px solid $gray;
}
.frame_dropping {
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
height: 15px;
text-indent: -25px;
background-color: $light-gray2;
border: 1px solid $gray;
}
table.ranking_table {
width: 100%;
table-layout: fixed;
border-spacing: 0;
td {
width: 45%;
padding: 5px;
vertical-align: top;
}
td.middle {
width: 10%;
vertical-align: top;
text-align: center;
}
ul {
list-style: none;
margin: 0;
padding: 0;
}
}
td.middle {
img {
display: block;
margin: 50% 0 0 20px;
}
}
.ranking {
width: 230px;
padding: 5px;
margin: 0 auto 10px auto;
border: 1px solid black;
height: 15px;
text-align: center;
overflow: hidden;
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.ranking_long {
width: 230px;
padding: 5px;
margin: 0 auto 10px auto;
border: 1px solid black;
height: 15px;
text-align: center;
overflow: hidden;
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.handle {
width: 230px;
padding: 5px;
margin: 0 auto 10px auto;
border: 1px solid black;
height: 15px;
text-align: center;
overflow: hidden;
}
.handle_long {
width: 230px;
padding: 5px;
margin: 0 auto 10px auto;
border: 1px solid black;
height: 15px;
text-align: center;
overflow: hidden;
}
.ime {
width: 230px;
padding: 5px;
margin: 0 auto 10px auto;
border: 1px solid black;
height: 15px;
text-align: center;
overflow: hidden;
}
.izbran {
width: 230px;
padding: 5px;
margin: 0 auto 10px auto;
border: 1px solid black;
height: 15px;
text-align: center;
overflow: hidden;
}
.frame_ranking {
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
border: 1px dashed black;
height: 15px;
text-indent: -25px;
font-weight: bold;
}
.dropholder {
position: relative;
padding-top: 11px;
.dropzone {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
}
.dropzone {
border-top: 1px solid black;
min-height: 100px;
padding-top: 10px;
}
.moving {
cursor: pointer;
margin-left: auto;
margin-right: auto;
width: 230px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.frame_moving {
width: 230px;
padding: 5px;
margin: 0px auto 10px auto;
border: 1px dashed black;
height: 15px;
text-indent: -25px;
font-weight: bold;
}
ul.sorting {
list-style: none;
margin: 0;
padding: 0;
}
.sortholder {
margin: 0 auto;
width: 250px;
padding: 5px;
}
.sortzone {
position: absolute;
margin: 0 auto 0 auto;
width: 250px;
}
}
}
}
}
////// - stari styling
#preview_spremenljivka {
.buttons_holder{
margin-top: 30px;
}

5
resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
View File

@ -168,6 +168,10 @@
text-transform: none;
background-color: transparent;
.faicon{
margin-right: 4px;
}
}
}
@ -221,6 +225,7 @@
&.inline{
justify-content: space-between;
flex-wrap: wrap;
.content{

9
resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
View File

@ -112,10 +112,17 @@ div.spr,
}
// IF na vprasanje zaenkrat skrijemo
.faicon.addif{
a.faicon.addif{
&:before{
font-size: 18px;
}
&.user_access_locked{
display: none;
}
}
}

2
resources/sass/admin_new/pages/survey_edit/survey_edit.scss
View File

@ -11,6 +11,8 @@
@import "conditions";
@import "library";
@import "jquery";
@import "top_center_settings";
// Urejanje -> Nastavitve
@import "survey_settings/survey_settings";

118
resources/sass/admin_new/pages/survey_edit/top_center_settings.scss Normal file
View File

@ -0,0 +1,118 @@
.top_center_settings {
display: flex;
flex-direction: row;
margin-bottom: 20px;
width: 100%;
justify-content: space-between;
.left_settings,
.right_settings {
display: flex;
flex-direction: row;
.button {
border: 1px solid $gray;
box-sizing: border-box;
border-radius: 2px;
padding: 5px 16px;
font-size: 14px;
margin-right: 8px;
cursor: pointer;
transition: 0.2s;
&.border_blue {
border-color: $blue;
}
span.faicon {
font-size: 14px;
margin-right: 8px;
transition: 0.2s;
&.left {
margin: 0 0 0 8px;
}
}
}
#top_napredne_holder {
position: relative;
#top_napredne_dropdown {
position: absolute;
z-index: 99;
width: auto;
padding: 8px 0;
background: $white;
border: 1px solid $gray;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
top: 32px;
.segment_option{
cursor: pointer;
white-space: nowrap;
padding: 5px 16px;
font-size: 14px;
line-height: 18px;
transition: 0.2s;
&:hover{
background-color: $light-gray;
}
a:not(.help),
a:hover:not(.help){
color: $black;
text-decoration: none;
.faicon{
margin-right: 8px;
&:before{
font-size: 14px;
color: $blue;
}
}
}
}
}
}
.square {
width: 28px;
height: 28px;
border-radius: 2px;
border: 1px solid $gray;
color: $very-dark-gray;
background-color: $white;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
&.active {
border-color: $blue;
color: $blue;
background-color: $light-blue;
}
}
.line {
border-left: 1px solid $dark-gray2;
margin: 0 8px;
height: 28px;
}
}
}

252
resources/sass/admin_new/pages/survey_objava/pregled.scss
View File

@ -36,74 +36,6 @@ div#vabila {
p {
margin-right: 12px;
}
// Gumb za aktivacijo ankete - kopirano iz headerja
.switch_anketa {
position: relative;
display: block;
width: 46px;
height: 16px;
.switch_anketa_content {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 12px;
background-color: $blue;
border-radius: 16px;
}
.switch_anketa_content:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
bottom: 1px;
background-color: white;
border-radius: 50%;
}
}
.switch_anketa.anketa_on{
.switch_anketa_content{
padding-left: 20px;
background-color: $blue;
}
.switch_anketa_content:before{
left: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $dark-blue;
}
}
}
.switch_anketa.anketa_off{
.switch_anketa_content{
padding-left: 6px;
background-color: $very-dark-gray2;
}
.switch_anketa_content:before{
right: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $very-dark-gray;
}
}
}
}
}
@ -192,6 +124,7 @@ div#vabila {
// Nice URL - gumb
#nice_url_button{
margin: 0 0 0 32px;
}
// Nice URL - dodajanje
@ -252,15 +185,18 @@ div#vabila {
// Več načinov deljenja ankete
div.more {
display: flex;
flex-direction: row;
flex-wrap: wrap;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
column-gap: 32px;
row-gap: 14px;
gap: 16px 32px;
div.more_block {
height: auto;
width: 298px;
width: 100%;
max-width: 298px;
background-color: $white;
border: 1px solid $gray;
@ -312,6 +248,10 @@ div#vabila {
}
}
.mail_yellow{
margin-left: 32px;
}
a.help {
color: inherit;
text-decoration: none;
@ -321,6 +261,18 @@ div#vabila {
}
}
// div.more_block:first-of-type{
// .more_title{
// color: #FFC700;
// }
// span.faicon.empty{
// color: #FFC700;
// }
// }
}
}
@ -388,3 +340,157 @@ div#general_popup {
}
}
}
@media screen and (max-width: 1130px) {
.more {
grid-template-columns: 1fr 1fr !important;
column-gap: 32px;
row-gap: 14px;
.more_block{
// max-width: 470px !important;
max-width: 92% !important;
}
}
}
@media screen and (max-width: 1025px){
#vabila{
.copy_survey_url_holder{
.input_box{
width: 300px;
}
}
.button_holder {
display: unset;
#nice_url_button {
margin: 16px 0px !important;
}
#nice_url_holder {
margin: 16px 0px !important;
flex-direction: row;
}
}
}
}
@media screen and (max-width: 850px) {
.page_vabila{
#vabila{
.button_holder{
#nice_url_holder {
flex-direction: row !important;
.url{
margin-top: 9px;
}
.buttons{
margin: 9px 0px 0px 0px !important;
}
}
}
}
}
div#vabila div.more div.more_block {
width: 89% !important;
}
}
@media screen and (max-width: 725px) {
h2 {
font-size: 20px !important ;
}
}
@media screen and (max-width: 660px) {
.page_vabila{
#vabila{
.more{
grid-template-columns: 1fr !important;
.more_block{
width: 100% !important;
max-width: 93% !important;
#text {
width: 100%;
}
}
}
}
}
}
@media screen and (max-width: 500px) {
.page_vabila{
#vabila{
.button_holder{
#nice_url_holder {
flex-direction: column !important;
}
}
}
}
}

175
resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
View File

@ -59,19 +59,180 @@ div#srv_diagnostic {
}
}
div.lastnosti_wrapper {
.lastnosti_wrapper {
display: flex;
flex-direction: row;
align-items: flex-start;
align-items: space-between;
gap: 32px;
div.lastnosti_left,
div.lastnosti_right {
width: 50%;
.lastnosti_left,
.lastnosti_middle {
width: 33%;
display: flex;
flex-direction: column;
gap: 16px;
.box {
border: 1px solid $gray;
border-radius: 2px;
padding: 16px;
display: flex;
flex-direction: column;
box-sizing: border-box;
min-height: 150px;
font-size: 14px !important;
.title {
text-transform: uppercase;
font-weight: $semi-bold;
margin-bottom: 16px;
}
.diagnostic_graph {
display: flex;
flex-direction: row;
margin-top: -8px;
.circle {
height: 88px;
width: 88px;
margin-right: 16px;
}
.other_text {
display: flex;
flex-direction: column;
justify-content: flex-end;
.desc {
margin-bottom: 16px;
}
a {
text-decoration: none;
font-size: 14px !important;
white-space: nowrap;
margin-bottom: 10px;
}
}
}
.time {
font-size: 32px;
margin-bottom: 12px;
span.time_text {
font-size: 14px !important;
}
}
a {
text-decoration: none;
font-size: 14px !important;
white-space: nowrap;
}
}
}
.lastnosti_right {
width: 33%;
.box {
border: 1px solid $gray;
border-radius: 2px;
display: flex;
flex-direction: row;
box-sizing: border-box;
height: 100%;
.vertical_section {
display: flex;
flex-direction: column;
box-sizing: border-box;
justify-content: space-between;
.item {
font-size: 14px !important;
padding: 13px 16px;
white-space:nowrap;
&:not(:last-of-type) {
border-bottom: 1px solid $gray;
}
}
&.second {
width: 100%;
.item {
font-weight: $semi-bold;
text-transform: lowercase;
}
}
}
}
}
div.input_box {
}
.komentarji_wrapper {
display: flex;
flex-direction: row;
gap: 32px;
.komentarji_left,
.komentarji_right {
width: 50%;
border: 1px solid $gray;
border-radius: 2px;
padding: 16px;
display: flex;
flex-direction: column;
box-sizing: border-box;
.title {
text-transform: uppercase;
font-weight: $semi-bold;
margin-bottom: 16px;
}
.comment_count {
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
padding-bottom: 8px;
border-bottom: 1px solid $gray;
margin-bottom: 8px;
&:last-of-type {
padding-bottom: 0;
border-bottom: none;
margin-bottom: 16px;
}
}
a {
text-decoration: none;
font-size: 14px !important;
white-space: nowrap;
}
}
}
.input_box {
display: flex;
width: 300px;
@ -88,7 +249,7 @@ div#srv_diagnostic {
}
}
div.button_holder {
.button_holder {
align-items: center;
margin-bottom: 0;
button {

7
resources/sass/frontend_simple/aai.scss
View File

@ -339,6 +339,7 @@ footer {
padding-top: 105px;
h2 {
color: #343434 !important;
text-transform: uppercase;
font-weight: 700;
font-size: 18px;
@ -353,9 +354,11 @@ footer {
width: 95%;
margin: auto;
padding: 0px;
justify-content: space-between;
.col {
max-width: 254px;
margin-right: unset;
span {
font-weight: 400;
@ -398,6 +401,10 @@ footer {
}
}
footer .footer_content .col3 .social_logo_flex a:first-of-type{
margin-right: 0px;
}
.social_logo_flex img {
margin-right: 20px;

3
resources/sass/frontend_simple/basic/basic.scss
View File

@ -91,8 +91,9 @@ input[type="email"]{
height: 55px;
padding: 8px 18px;
font-size: 17px;
font-size: 16px;
color: $color_text_dark;
font-family: $SansPro_font;
background-color: white;
border: 1px solid $color_border;

2
resources/sass/frontend_simple/basic/colors.scss
View File

@ -5,11 +5,13 @@ $color_blue: #1e88e5;
$color_text: #535050;
$color_text_light: #979797;
$color_text_dark: #333;
$color_text_black: #343434;
$border_color: #646464;
$color_background: #ffffff;
$color_background_dark: #f7f7f7;
$color_background_grey: #F8F8F8;
$color_background_very_dark: #e6e6e6;
$color_border: #cccccc;

1
resources/sass/frontend_simple/basic/fonts.scss
View File

@ -5,6 +5,7 @@
$font: 'Montserrat', sans-serif;
$SansPro_font: "Source Sans Pro", "sans-serif";
.thin{

195
resources/sass/frontend_simple/basic/mobile.scss
View File

@ -1,32 +1,160 @@
/* Mobile prilagoditve */
.mobile{
display: none;
}
@media screen and (max-width: 700px) {
header{
nav{
flex-direction: column-reverse;
align-self: auto;
justify-content: space-evenly;
#main .main_content {
min-height: unset;
height: 100%;
text-align: right;
font-size: 14px;
span.menu_item{
line-height: 18px;
&.active{
border-bottom: 2px $color_blue solid;
}
a{
line-height: 18px;
// header{
// nav{
// flex-direction: column-reverse;
// align-self: auto;
// justify-content: space-evenly;
// height: 100%;
// text-align: right;
// font-size: 14px;
// span.menu_item{
// line-height: 18px;
// &.active{
// border-bottom: 2px $color_blue solid;
// }
// a{
// line-height: 18px;
// }
// }
// }
// }
/* --------------HAMBURGER---------------------------------- */
.nav-desktop {
display: none;
}
.mobile {
display: block;
}
#nav-icon3 {
width: 38px;
height: 20px;
position: relative;
bottom: 8px;
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-o-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-transition: .5s ease-in-out;
-moz-transition: .5s ease-in-out;
-o-transition: .5s ease-in-out;
transition: .5s ease-in-out;
cursor: pointer;
span {
display: block;
position: absolute;
height: 5px;
width: 100%;
background: #1E88E5;
border-radius: 9px;
opacity: 1;
left: 0;
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-o-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-transition: .25s ease-in-out;
-moz-transition: .25s ease-in-out;
-o-transition: .25s ease-in-out;
transition: .25s ease-in-out;
}
span:nth-child(1) {
top: 0px;
}
span:nth-child(2),
span:nth-child(3) {
top: 9px;
}
span:nth-child(4) {
top: 18px;
}
}
#nav-icon3.open span:nth-child(1) {
top: 9px;
width: 0%;
left: 50%;
}
#nav-icon3.open span:nth-child(2) {
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
#nav-icon3.open span:nth-child(3) {
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
transform: rotate(-45deg);
}
#nav-icon3.open span:nth-child(4) {
top: 9px;
width: 0%;
left: 50%;
}
#links {
display: none;
}
/* */
.aai a {
color: #333333;
}
#links.open {
position: absolute;
top: 72px;
left: 0px;
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
height: 100vh;
background-color: rgb(255, 255, 255);
}
#links .menu_item {
font-size: 30px;
margin-top: 30px;
a {
font-size: 16px;
color: #333333 ;
}
a:hover{
color: #1E88E5;
}
}
//-------------------------------------------------------------------
body{
#main{
.main_content{
@ -58,7 +186,7 @@
input[type="button"]{
display: block;
width: 100%;
margin: 20px auto !important;
margin: 20px 0px !important;
}
.have_account{
@ -115,7 +243,8 @@
input[type="submit"],
input[type="button"]{
margin: 30px auto !important;
margin: 16px auto !important;
width: 100%;
}
}
@ -154,13 +283,29 @@
.footer_content{
flex-direction: column;
padding: 20px 0;
padding: 50px 0;
text-align: center;
.col{
max-width: unset;
width: 100%;
span{
padding: 0px 0px 12px 0px;
}
span:last-of-type{
padding: 0px 0px 12px 0px !important;
}
h2{
padding-top: 12px;
}
a{
padding-bottom: 12px;
}
.follow{
justify-content: center;
}
@ -182,4 +327,14 @@
text-align: center;
}
}
// GDPR ------------------------------
body #main .main_content .register_holder h1{
font-size: 50px;
font-weight: 300;
line-height: 62px;
margin: 20px 0px;
text-align: left;
}
}

591
resources/sass/frontend_simple/basic/popravki.scss Normal file
View File

@ -0,0 +1,591 @@
$SansPro_font: "Source Sans Pro", "sans-serif";
$max_sirina: (1160px);
$black: #333333;
$light_blue: #4ca0ea;
$blue: #1e88e5;
$input_border: 1px solid #C4C4C4;
@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
/*
Author : Nejc Kovač
Urejanje landing page
*/
/* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */
body.landing_page #main {
background-image: none;
}
header {
height: unset;
padding-top: 12px;
padding-left: 0px;
padding-right: 0px;
max-width: 1160px;
width: 95%;
margin: auto;
font-family: $SansPro_font;
}
header nav{
font-weight: 400;
}
header .logo a img {
height: 45px;
}
.nav-desktop {
align-items: center;
padding-bottom: 19px;
}
header nav span.lang_switch .flag img {
padding-right: 8px;
}
.flag img{
padding-right: 8px;
}
.flag {
display: flex;
align-items: unset;
}
header nav span.menu_item{
border-bottom: unset;
}
.app_title{
display: none;
}
.landing_page_content {
font-family: "Source Sans Pro", "sans-serif";
text-align: center;
color: #333333;
padding-bottom: 70px;
}
.landing_page_content .landing_page_title {
font-weight: 300;
font-size: 50px;
line-height: 63px;
}
body.landing_page #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.landing_page #main .landing_page_window {
border: 1px solid #C4C4C4;
max-width: 400px;
width: unset;
min-height: 327px;
}
body.landing_page #main .landing_page_window #login_holder .login_form {
padding: 25px 25px;
position: unset;
}
body.landing_page #main .landing_page_window .tabs .tab {
font-size: 16px;
font-weight: 600;
color: #777777;
background-color: #F8F8F8;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.landing_page #main .landing_page_window .tabs .tab.active {
color: #1E88E5;
background-color: #FFFFFF;
}
body.landing_page #main .landing_page_window label {
text-align: left;
font-size: 16px;
margin: 15px 0px 4px 0px;
}
body.landing_page #main .landing_page_window label:first-of-type{
margin-top: 0px;
}
.landing_page_window input[type="text"] {
padding: 0px;
padding-left: 8px;
height: 38px;
max-width: 354px;
width: 100%;
border: $input_border;
}
.landing_page_window input[type="password"] {
padding: 0px;
padding-left: 8px;
height: 38px;
max-width: 354px;
width: 100%;
border: $input_border;
}
body.landing_page #main .landing_page_window input[type="submit"] {
align-self: unset;
width: unset;
max-width: 354px;
margin: 16px 0px;
font-weight: 700;
padding: 12.5px 0px;
line-height: 20px;
font-family: $SansPro_font;
}
body.landing_page #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: $blue;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a {
font-weight: 400;
}
/* REGISTRACIJA */
body.landing_page #main .landing_page_window .register_window {
padding: 25px 23px !important;
}
body.landing_page #main .landing_page_window .register_window a {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: $blue;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
body.landing_page #main .landing_page_window .agreement input{
height: 18px;
width: 18px;
margin: 0px 9px 4px 0px;
align-self: normal;
}
body.landing_page #main .landing_page_window .register_window .checkbox_text_holder{
font-weight: 400;
margin-bottom: 0px;
}
body.landing_page #main .landing_page_window .register_window .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: $blue;
font-weight: 400;
font-size: 16px;
line-height: 20px;
}
footer .footer_content {
max-width: $max_sirina;
width: 95%;
margin: auto;
padding: 70px 0px 70px 0px;
}
footer .footer_content h2 {
font-family: $SansPro_font;
color: $blue;
text-transform: uppercase;
font-size: 18px;
line-height: 26px;
font-weight: 700;
margin: 0px;
padding-bottom: 12px;
}
footer .footer_content .col a:hover{
color: $light_blue;
}
#main footer .footer_content col {
max-width: 290px;
}
footer .footer_content .col1-flex{
display: flex;
flex-direction: column;
}
footer .footer_content .col span{
padding: 0px 0px 12px 0px;
}
footer .footer_content .col span:last-of-type{
padding: 0px;
}
footer .footer_content .col a {
color: $black;
font-weight: 400;
font-size: 18px;
line-height: 26px;
font-family: $SansPro_font;
}
footer .footer_content .col3 .social_logo_flex a:first-of-type{
margin-right: 20px;
}
//------------- POPRAVKI ( napačno geslo, elektronski naslov etc.)--------------------------
// napačen EMAIL------------
body.login_noEmail #main{
background-image: none;
background-color: $color_background_grey;
}
body.login_noEmail #main .main_content{
padding-top: 70px;
min-height: 769px;
}
body.login_noEmail #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.login_noEmail #main .landing_page_window{
max-width: 400px;
border: 1px solid #C4C4C4;
}
body.landing_page #main .landing_page_window .tabs .tab,
body.register #main .landing_page_window .tabs .tab,
body.login #main .landing_page_window .tabs .tab,
body.login_noEmail #main .landing_page_window .tabs .tab {
background-color: $color_background_grey;
color: #888888;
font-size: 16px;
font-weight: 600;
color: #777777;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.login_noEmail #main .landing_page_window .tabs .tab.active{
background-color: $color_background;
color: $color_blue;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form {
text-align: left;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form label:first-of-type{
margin-top: 0px;
}
body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: $blue;
font-weight: 400;
font-size: 16px;
line-height: 20px;
a {
font-weight: 400;
}
}
body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder {
margin-top: 16px;
}
body.login_noEmail #main .landing_page_window input[type=submit]{
width: 100%;
max-width: 100%;
margin: 16px 0px;
font-family: $SansPro_font;
}
// napačen EMAIL - registracija
body.landing_page #main .landing_page_window #registration_holder,
body.register #main .landing_page_window #registration_holder,
body.login #main .landing_page_window #registration_holder,
body.login_noEmail #main .landing_page_window #registration_holder {
text-align: left;
}
body.login_noEmail #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
// NAPAČNO GESLO -------------------------------------
body.login #main{
background-image: none;
background-color: $color_background_grey;
}
body.login #main .main_content{
padding-top: 70px;
min-height: 769px;
}
body.login #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.login #main .landing_page_window{
max-width: 400px;
border: 1px solid #C4C4C4;
}
body.login #main .landing_page_window .tabs .tab {
background-color: $color_background_grey;
font-size: 16px;
font-weight: 600;
color: #777777;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.login #main .landing_page_window .tabs .tab.active{
background-color: $color_background;
color: $color_blue;
}
body.login #main .landing_page_window #login_holder .login_form {
text-align: left;
}
body.login #main .landing_page_window #login_holder .login_form label:first-of-type{
margin-top: 0px;
}
body.login #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: $blue;
font-weight: 400;
font-size: 16px;
line-height: 20px;
a {
font-weight: 400;
}
}
body.login #main .landing_page_window .error_holder {
margin-top: 16px;
}
body.login #main .landing_page_window input[type=submit]{
width: 100%;
max-width: 100%;
margin: 16px 0px;
font-family: $SansPro_font;
}
// napačno geslo - registracija
body.login #main .landing_page_window #registration_holder {
text-align: left;
}
body.login #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
// REGISTER ----------------------
body.register #main{
background-image: none;
background-color: $color_background_grey;
}
body.register #main .main_content{
padding-top: 70px;
min-height: 769px;
}
body.register #main .app_subtitle {
text-shadow: unset;
color: #333333;
font-weight: 400;
line-height: 26px;
font-size: 18px;
margin-top: 25px;
margin-bottom: 24px;
}
body.register #main .landing_page_window{
max-width: 400px;
border: 1px solid #C4C4C4;
}
body.register #main .landing_page_window .tabs .tab {
background-color: $color_background_grey;
color: #888888;
font-size: 16px;
font-weight: 600;
color: #777777;
height: 39px;
display: flex;
justify-content: center;
align-items: center;
}
body.register #main .landing_page_window .tabs .tab.active{
background-color: $color_background;
color: $color_blue;
}
body.register #main .landing_page_window #login_holder .login_form {
text-align: left;
}
body.register #main .landing_page_window #login_holder .login_form label:first-of-type{
margin-top: 0px;
}
body.register #main .landing_page_window #login_holder .login_form .lostpass {
position: unset;
text-align: left;
text-decoration-line: underline;
text-decoration-color: $blue;
font-weight: 400;
font-size: 16px;
line-height: 20px;
a {
font-weight: 400;
}
}
body.register #main .landing_page_window .error_holder {
margin-top: 0px;
}
body.register #main .landing_page_window input[type=submit]{
width: 100%;
max-width: 100%;
margin: 16px 0px;
font-family: $SansPro_font;
}
// napačno geslo - registracija
body.register #main .landing_page_window #registration_holder {
text-align: left;
}
body.register #main .landing_page_window label:first-of-type {
margin-top: 0px;
}
// ------REGISTER_EMAIL----------------------------------
.register_email input[type="button"] {
font-family: $SansPro_font;
}
// ------RESET PASSWORD----------------------------------
body.reset_password{
color: #333;
input[type="button"]{
font-family: $SansPro_font;
}
}

180
resources/sass/frontend_simple/modules/GDPR.scss Normal file
View File

@ -0,0 +1,180 @@
/* GDPR ZAHTEVEK -------------------------------------- */
#main {
background-color: #FFFFFF;
}
body.gdpr {
line-height: 20px;
color: $color_text_black;
}
.gdpr #main .main_content {
padding: 0px;
font-family: "Source Sans Pro", "sans-serif" !important;
}
.register_holder{
max-width: 810px;
width: 95%;
margin: 70px auto 70px auto;
h1 {
font-size: 50px;
font-weight: 300;
line-height: 62px;
margin: 20px 0px;
}
p {
font-weight: 400;
line-height: 26px;
margin: 20px 0px;
a {
color: #1e88e5;
}
}
}
body.gdpr div.label {
display: block;
line-height: unset;
font-weight: 600;
width: 200px;
line-height: unset;
}
body #main .main_content .register_holder .label {
line-height: 20px;
padding-bottom: 4px;
}
body.gdpr .input_field div.label label {
line-height: unset;
padding-bottom: 4px;
}
.regfield {
height: 38px;
max-width: 245px;
width: 95%;
border: 1px solid #C4C4C4;
border-radius: 0px;
padding: 0px;
padding-left: 8px;
margin: 0px;
font-family: $SansPro_font;
font-size: 16px;
}
body .gdpr form p:first-of-type{
font-weight: 600;
}
body.gdpr div.input_field{
padding: 10px 0px;
}
/* Elektronski naslov: */
body.gdpr div.input_field:first-of-type {
padding-top: 0px;
}
/* URL ankete: */
body.gdpr div.input_field:nth-of-type(3){
padding-bottom: 0px;
}
/* Želim podati zahtevo za: */
form p:first-of-type {
margin: 20px 0px 6px 0px;
}
body.gdpr div.zahtevek {
padding: 6px 0px;
}
body.gdpr div.zahtevek:last-of-type {
padding-bottom: 0px;
}
body.gdpr div.zahtevek label{
}
body.gdpr div.zahtevek label input {
margin-right: 2px;
margin-left: 0px;
height: 18px;
width: 18px;
vertical-align: -3px;
border-radius: 0px;
}
/* tekst nad poljem za opis */
form p:nth-of-type(2){
margin: 20px 0px;
}
form .opis {
font-weight: 600;
margin: 0px 0px 4px 0px;
line-height: normal;
}
#gdpr-note {
padding-left: 8px;
margin: 0px;
width: 100%;
border-radius: 0px;
font-size: 16px;
font-family: $SansPro_font;
}
.register_holder p:last-of-type {
margin: 18px 0px 20px 0px;
line-height: 26px;
}
input[type=submit],
button,
input[type=button],
.button {
font-weight: 600;
font-size: 16px;
line-height: 26px;
height: 50px;
max-width: 320px;
width: 95%;
padding: 0px;
color: #FFFFFF;
background-color: #1e88e5;
border: 1px solid #1e88e5;
transition: .3s ease-out;
&:hover {
color: #1e88e5;
background-color: white;
border: 1px solid #1e88e5;
}
}
/* -------------------------------------- */

6
resources/sass/frontend_simple/modules/footer.scss
View File

@ -1,8 +1,9 @@
footer{
.footer_content{
display: flex;
justify-content: space-between;
// justify-content: space-between;
max-width: 1400px;
margin: 0 auto;
@ -14,6 +15,9 @@ footer{
box-sizing: border-box;
width: 33%;
max-width: 290px;
margin-right: 25px;
span, div.follow{
padding: 8px 0;

6
resources/sass/frontend_simple/modules/header.scss
View File

@ -25,11 +25,11 @@ header{
align-self: flex-end;
font-size: 17px;
text-transform: uppercase;
// text-transform: uppercase;
font-weight: 600;
span.menu_item{
margin-left: 40px;
margin-left:32px;
border-bottom: 3px transparent solid;
@ -46,7 +46,7 @@ header{
}
&.active{
border-bottom: 3px $color_blue solid;
// border-bottom: 3px $color_blue solid;
}
}
}

11
resources/sass/frontend_simple/modules/landing_page.scss
View File

@ -5,7 +5,7 @@ body.login_noEmail{
#main{
height: auto;
min-height: 940px;
// min-height: 940px;
background-image: url("../img/landing_page_image.jpg");
background-position: top;
@ -36,7 +36,7 @@ body.login_noEmail{
z-index: 999;
width: 600px;
margin: 20px auto;
margin: 25px auto;
background-color: white;
@ -141,7 +141,7 @@ body.login_noEmail{
label{
margin: 15px 0 5px 0;
font-size: 17px;
font-size: 16px;
font-weight: 600;
}
@ -155,7 +155,7 @@ body.login_noEmail{
display: flex;
align-items: baseline;
margin: 15px 0 5px 0;
margin: 16px 0 0 0;
input{
margin-right: 10px;
@ -184,8 +184,7 @@ body.login_noEmail{
}
.g-recaptcha{
width: 304px;
margin-top: 20px;
margin-top: 16px;
}
}
}

7
resources/sass/frontend_simple/modules/main.scss
View File

@ -1,9 +1,10 @@
#main{
background-color: $color_background_dark;
body.landing_page #main{
background-color: $color_background_grey;
.main_content{
max-width: 1400px;
min-height: 769px;
margin: 0 auto;
padding: 30px 20px 60px 20px;
padding: 70px 20px 0px 20px;
}
}

7
resources/sass/frontend_simple/modules/pages.scss
View File

@ -1,3 +1,7 @@
body {
font-family: $SansPro_font;
}
/************GDPR OBRAZEC***************/
body.gdpr{
line-height: 26px;
@ -40,8 +44,11 @@ body.gdpr{
/************REGISTRACIJSKI OBRAZEC***************/
body.register{
.register_holder{
background-color: red;
.subtitle{
padding: 0;
margin: 0;

8
resources/sass/frontend_simple/style.scss
View File

@ -26,3 +26,11 @@
// Mobile popravki
@import "./basic/mobile.scss";
// popravki - Nejc Kovac
@import "./basic/popravki.scss";
// GDPR
@import "./modules/GDPR.scss";

60
sql/update2.sql
View File

@ -9592,3 +9592,63 @@ UPDATE misc SET value='22.03.31' WHERE what="version";
ALTER TABLE srv_data_upload CHANGE filename filename VARCHAR(50) character set utf8 NOT NULL;
UPDATE misc SET value='22.06.14' WHERE what="version";
## MODUL ZA KOLEKTOR
INSERT INTO srv_module (module_name, active) VALUES ('kolektor', '0');
#UPDATE srv_module SET active='1' WHERE module_name = 'kolektor';
CREATE TABLE kolektor_sequence(
id INT(11) NOT NULL auto_increment,
ank1_id INT(11) NOT NULL DEFAULT '0',
ank2_id INT(11) NOT NULL DEFAULT '0',
ank3_id INT(11) NOT NULL DEFAULT '0',
ank4_id INT(11) NOT NULL DEFAULT '0',
ank5_id INT(11) NOT NULL DEFAULT '0',
ank6_id INT(11) NOT NULL DEFAULT '0',
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE kolektor_client(
id INT(11) NOT NULL auto_increment,
usr_id INT(11) NOT NULL DEFAULT 0,
insert_time DATETIME(3) NOT NULL,
CONSTRAINT fk_kolektor_client_usr_id FOREIGN KEY (usr_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE,
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE kolektor_survey_response(
id INT(11) NOT NULL auto_increment,
ank_id INT(11) NOT NULL DEFAULT 0,
usr_id INT(11) NOT NULL DEFAULT 0,
insert_time DATETIME(3) NOT NULL,
status ENUM('0','1','2','3','4') NOT NULL DEFAULT '0',
kolektor_client_id INT(11) NOT NULL DEFAULT 0,
respondent_id INT(11) NOT NULL DEFAULT 0,
respondent_email VARCHAR(100) NOT NULL DEFAULT '',
respondent_funkcija VARCHAR(100) NOT NULL DEFAULT '',
respondent_projekt_id VARCHAR(100) NOT NULL DEFAULT '',
respondent_remote_activation ENUM('0','1') NOT NULL DEFAULT '0',
respondent_message TEXT NOT NULL DEFAULT '',
CONSTRAINT fk_kolektor_survey_response_ank_id FOREIGN KEY (ank_id) REFERENCES srv_anketa (id) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT fk_kolektor_survey_response_usr_id FOREIGN KEY (usr_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT fk_kolektor_survey_response_kolektor_client_id FOREIGN KEY (kolektor_client_id) REFERENCES kolektor_client (id) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT fk_kolektor_survey_response_respondent_id FOREIGN KEY (respondent_id) REFERENCES srv_user (id) ON DELETE CASCADE ON UPDATE CASCADE,
PRIMARY KEY (id),
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE kolektor_survey_response_alert(
kolektor_survey_response_id INT(11) NOT NULL,
alert_time DATETIME(3) NOT NULL,
status ENUM('0','1','2','3','4') NOT NULL,
CONSTRAINT kolektor_survey_response_alert_kolektor_survey_response_id FOREIGN KEY (kolektor_survey_response_id) REFERENCES kolektor_survey_response (id) ON DELETE CASCADE ON UPDATE CASCADE,
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE kolektor_podjetje_funkcija(
id INT(11) NOT NULL auto_increment,
text VARCHAR(255) NOT NULL DEFAULT '',
order_number INT(11) NOT NULL DEFAULT 0,
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
UPDATE misc SET value='22.07.13' WHERE what="version";

24
vendor/composer/autoload_classmap.php vendored
View File

@ -240,6 +240,7 @@ return array(
'GuzzleHttp\\Psr7\\StreamWrapper' => $vendorDir . '/guzzlehttp/psr7/src/StreamWrapper.php',
'GuzzleHttp\\Psr7\\UploadedFile' => $vendorDir . '/guzzlehttp/psr7/src/UploadedFile.php',
'GuzzleHttp\\Psr7\\Uri' => $vendorDir . '/guzzlehttp/psr7/src/Uri.php',
'GuzzleHttp\\Psr7\\UriComparator' => $vendorDir . '/guzzlehttp/psr7/src/UriComparator.php',
'GuzzleHttp\\Psr7\\UriNormalizer' => $vendorDir . '/guzzlehttp/psr7/src/UriNormalizer.php',
'GuzzleHttp\\Psr7\\UriResolver' => $vendorDir . '/guzzlehttp/psr7/src/UriResolver.php',
'GuzzleHttp\\Psr7\\Utils' => $vendorDir . '/guzzlehttp/psr7/src/Utils.php',
@ -558,6 +559,9 @@ return array(
'Jose\\Component\\Signature\\Signature' => $vendorDir . '/web-token/jwt-signature/Signature.php',
'Jose\\Component\\Signature\\Util\\RSA' => $vendorDir . '/web-token/jwt-signature/Util/RSA.php',
'KalkulacijaLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php',
'Kolektor' => $baseDir . '/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php',
'KolektorNotifications' => $baseDir . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php',
'KolektorResponse' => $baseDir . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php',
'KvotaLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php',
'LatexAnalysis' => $baseDir . '/admin/survey/export/latexclasses/class.LatexAnalysis.php',
'LatexAnalysisElement' => $baseDir . '/admin/survey/export/latexclasses/class.LatexAnalysisElement.php',
@ -610,6 +614,7 @@ return array(
'Notifications' => $baseDir . '/admin/survey/classes/class.Notifications.php',
'PHPMailer\\PHPMailer\\Exception' => $vendorDir . '/phpmailer/phpmailer/src/Exception.php',
'PHPMailer\\PHPMailer\\OAuth' => $vendorDir . '/phpmailer/phpmailer/src/OAuth.php',
'PHPMailer\\PHPMailer\\OAuthTokenProvider' => $vendorDir . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
'PHPMailer\\PHPMailer\\PHPMailer' => $vendorDir . '/phpmailer/phpmailer/src/PHPMailer.php',
'PHPMailer\\PHPMailer\\POP3' => $vendorDir . '/phpmailer/phpmailer/src/POP3.php',
'PHPMailer\\PHPMailer\\SMTP' => $vendorDir . '/phpmailer/phpmailer/src/SMTP.php',
@ -698,6 +703,7 @@ return array(
'Stripe\\ApiOperations\\NestedResource' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/NestedResource.php',
'Stripe\\ApiOperations\\Request' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Request.php',
'Stripe\\ApiOperations\\Retrieve' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Retrieve.php',
'Stripe\\ApiOperations\\Search' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Search.php',
'Stripe\\ApiOperations\\Update' => $vendorDir . '/stripe/stripe-php/lib/ApiOperations/Update.php',
'Stripe\\ApiRequestor' => $vendorDir . '/stripe/stripe-php/lib/ApiRequestor.php',
'Stripe\\ApiResource' => $vendorDir . '/stripe/stripe-php/lib/ApiResource.php',
@ -716,6 +722,7 @@ return array(
'Stripe\\BitcoinTransaction' => $vendorDir . '/stripe/stripe-php/lib/BitcoinTransaction.php',
'Stripe\\Capability' => $vendorDir . '/stripe/stripe-php/lib/Capability.php',
'Stripe\\Card' => $vendorDir . '/stripe/stripe-php/lib/Card.php',
'Stripe\\CashBalance' => $vendorDir . '/stripe/stripe-php/lib/CashBalance.php',
'Stripe\\Charge' => $vendorDir . '/stripe/stripe-php/lib/Charge.php',
'Stripe\\Checkout\\Session' => $vendorDir . '/stripe/stripe-php/lib/Checkout/Session.php',
'Stripe\\Collection' => $vendorDir . '/stripe/stripe-php/lib/Collection.php',
@ -756,6 +763,11 @@ return array(
'Stripe\\ExchangeRate' => $vendorDir . '/stripe/stripe-php/lib/ExchangeRate.php',
'Stripe\\File' => $vendorDir . '/stripe/stripe-php/lib/File.php',
'Stripe\\FileLink' => $vendorDir . '/stripe/stripe-php/lib/FileLink.php',
'Stripe\\FinancialConnections\\Account' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/Account.php',
'Stripe\\FinancialConnections\\AccountOwner' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php',
'Stripe\\FinancialConnections\\AccountOwnership' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php',
'Stripe\\FinancialConnections\\Session' => $vendorDir . '/stripe/stripe-php/lib/FinancialConnections/Session.php',
'Stripe\\FundingInstructions' => $vendorDir . '/stripe/stripe-php/lib/FundingInstructions.php',
'Stripe\\HttpClient\\ClientInterface' => $vendorDir . '/stripe/stripe-php/lib/HttpClient/ClientInterface.php',
'Stripe\\HttpClient\\CurlClient' => $vendorDir . '/stripe/stripe-php/lib/HttpClient/CurlClient.php',
'Stripe\\HttpClient\\StreamingClientInterface' => $vendorDir . '/stripe/stripe-php/lib/HttpClient/StreamingClientInterface.php',
@ -799,6 +811,7 @@ return array(
'Stripe\\RequestTelemetry' => $vendorDir . '/stripe/stripe-php/lib/RequestTelemetry.php',
'Stripe\\Review' => $vendorDir . '/stripe/stripe-php/lib/Review.php',
'Stripe\\SKU' => $vendorDir . '/stripe/stripe-php/lib/SKU.php',
'Stripe\\SearchResult' => $vendorDir . '/stripe/stripe-php/lib/SearchResult.php',
'Stripe\\Service\\AbstractService' => $vendorDir . '/stripe/stripe-php/lib/Service/AbstractService.php',
'Stripe\\Service\\AbstractServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/AbstractServiceFactory.php',
'Stripe\\Service\\AccountLinkService' => $vendorDir . '/stripe/stripe-php/lib/Service/AccountLinkService.php',
@ -824,6 +837,9 @@ return array(
'Stripe\\Service\\ExchangeRateService' => $vendorDir . '/stripe/stripe-php/lib/Service/ExchangeRateService.php',
'Stripe\\Service\\FileLinkService' => $vendorDir . '/stripe/stripe-php/lib/Service/FileLinkService.php',
'Stripe\\Service\\FileService' => $vendorDir . '/stripe/stripe-php/lib/Service/FileService.php',
'Stripe\\Service\\FinancialConnections\\AccountService' => $vendorDir . '/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php',
'Stripe\\Service\\FinancialConnections\\FinancialConnectionsServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php',
'Stripe\\Service\\FinancialConnections\\SessionService' => $vendorDir . '/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php',
'Stripe\\Service\\Identity\\IdentityServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Identity/IdentityServiceFactory.php',
'Stripe\\Service\\Identity\\VerificationReportService' => $vendorDir . '/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php',
'Stripe\\Service\\Identity\\VerificationSessionService' => $vendorDir . '/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php',
@ -869,10 +885,16 @@ return array(
'Stripe\\Service\\SubscriptionService' => $vendorDir . '/stripe/stripe-php/lib/Service/SubscriptionService.php',
'Stripe\\Service\\TaxCodeService' => $vendorDir . '/stripe/stripe-php/lib/Service/TaxCodeService.php',
'Stripe\\Service\\TaxRateService' => $vendorDir . '/stripe/stripe-php/lib/Service/TaxRateService.php',
'Stripe\\Service\\Terminal\\ConfigurationService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php',
'Stripe\\Service\\Terminal\\ConnectionTokenService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php',
'Stripe\\Service\\Terminal\\LocationService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/LocationService.php',
'Stripe\\Service\\Terminal\\ReaderService' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/ReaderService.php',
'Stripe\\Service\\Terminal\\TerminalServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php',
'Stripe\\Service\\TestHelpers\\RefundService' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php',
'Stripe\\Service\\TestHelpers\\Terminal\\ReaderService' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php',
'Stripe\\Service\\TestHelpers\\Terminal\\TerminalServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php',
'Stripe\\Service\\TestHelpers\\TestClockService' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php',
'Stripe\\Service\\TestHelpers\\TestHelpersServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php',
'Stripe\\Service\\TokenService' => $vendorDir . '/stripe/stripe-php/lib/Service/TokenService.php',
'Stripe\\Service\\TopupService' => $vendorDir . '/stripe/stripe-php/lib/Service/TopupService.php',
'Stripe\\Service\\TransferService' => $vendorDir . '/stripe/stripe-php/lib/Service/TransferService.php',
@ -895,9 +917,11 @@ return array(
'Stripe\\TaxCode' => $vendorDir . '/stripe/stripe-php/lib/TaxCode.php',
'Stripe\\TaxId' => $vendorDir . '/stripe/stripe-php/lib/TaxId.php',
'Stripe\\TaxRate' => $vendorDir . '/stripe/stripe-php/lib/TaxRate.php',
'Stripe\\Terminal\\Configuration' => $vendorDir . '/stripe/stripe-php/lib/Terminal/Configuration.php',
'Stripe\\Terminal\\ConnectionToken' => $vendorDir . '/stripe/stripe-php/lib/Terminal/ConnectionToken.php',
'Stripe\\Terminal\\Location' => $vendorDir . '/stripe/stripe-php/lib/Terminal/Location.php',
'Stripe\\Terminal\\Reader' => $vendorDir . '/stripe/stripe-php/lib/Terminal/Reader.php',
'Stripe\\TestHelpers\\TestClock' => $vendorDir . '/stripe/stripe-php/lib/TestHelpers/TestClock.php',
'Stripe\\ThreeDSecure' => $vendorDir . '/stripe/stripe-php/lib/ThreeDSecure.php',
'Stripe\\Token' => $vendorDir . '/stripe/stripe-php/lib/Token.php',
'Stripe\\Topup' => $vendorDir . '/stripe/stripe-php/lib/Topup.php',

24
vendor/composer/autoload_static.php vendored
View File

@ -444,6 +444,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'GuzzleHttp\\Psr7\\StreamWrapper' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/StreamWrapper.php',
'GuzzleHttp\\Psr7\\UploadedFile' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UploadedFile.php',
'GuzzleHttp\\Psr7\\Uri' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Uri.php',
'GuzzleHttp\\Psr7\\UriComparator' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriComparator.php',
'GuzzleHttp\\Psr7\\UriNormalizer' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriNormalizer.php',
'GuzzleHttp\\Psr7\\UriResolver' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriResolver.php',
'GuzzleHttp\\Psr7\\Utils' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Utils.php',
@ -762,6 +763,9 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Jose\\Component\\Signature\\Signature' => __DIR__ . '/..' . '/web-token/jwt-signature/Signature.php',
'Jose\\Component\\Signature\\Util\\RSA' => __DIR__ . '/..' . '/web-token/jwt-signature/Util/RSA.php',
'KalkulacijaLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/KalkulacijaLatex.php',
'Kolektor' => __DIR__ . '/../..' . '/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php',
'KolektorNotifications' => __DIR__ . '/../..' . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php',
'KolektorResponse' => __DIR__ . '/../..' . '/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php',
'KvotaLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/KvotaLatex.php',
'LatexAnalysis' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/class.LatexAnalysis.php',
'LatexAnalysisElement' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/class.LatexAnalysisElement.php',
@ -814,6 +818,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Notifications' => __DIR__ . '/../..' . '/admin/survey/classes/class.Notifications.php',
'PHPMailer\\PHPMailer\\Exception' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/Exception.php',
'PHPMailer\\PHPMailer\\OAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuth.php',
'PHPMailer\\PHPMailer\\OAuthTokenProvider' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
'PHPMailer\\PHPMailer\\PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/PHPMailer.php',
'PHPMailer\\PHPMailer\\POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/POP3.php',
'PHPMailer\\PHPMailer\\SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/SMTP.php',
@ -902,6 +907,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\ApiOperations\\NestedResource' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/NestedResource.php',
'Stripe\\ApiOperations\\Request' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Request.php',
'Stripe\\ApiOperations\\Retrieve' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Retrieve.php',
'Stripe\\ApiOperations\\Search' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Search.php',
'Stripe\\ApiOperations\\Update' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiOperations/Update.php',
'Stripe\\ApiRequestor' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiRequestor.php',
'Stripe\\ApiResource' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ApiResource.php',
@ -920,6 +926,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\BitcoinTransaction' => __DIR__ . '/..' . '/stripe/stripe-php/lib/BitcoinTransaction.php',
'Stripe\\Capability' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Capability.php',
'Stripe\\Card' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Card.php',
'Stripe\\CashBalance' => __DIR__ . '/..' . '/stripe/stripe-php/lib/CashBalance.php',
'Stripe\\Charge' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Charge.php',
'Stripe\\Checkout\\Session' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Checkout/Session.php',
'Stripe\\Collection' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Collection.php',
@ -960,6 +967,11 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\ExchangeRate' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ExchangeRate.php',
'Stripe\\File' => __DIR__ . '/..' . '/stripe/stripe-php/lib/File.php',
'Stripe\\FileLink' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FileLink.php',
'Stripe\\FinancialConnections\\Account' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/Account.php',
'Stripe\\FinancialConnections\\AccountOwner' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/AccountOwner.php',
'Stripe\\FinancialConnections\\AccountOwnership' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/AccountOwnership.php',
'Stripe\\FinancialConnections\\Session' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FinancialConnections/Session.php',
'Stripe\\FundingInstructions' => __DIR__ . '/..' . '/stripe/stripe-php/lib/FundingInstructions.php',
'Stripe\\HttpClient\\ClientInterface' => __DIR__ . '/..' . '/stripe/stripe-php/lib/HttpClient/ClientInterface.php',
'Stripe\\HttpClient\\CurlClient' => __DIR__ . '/..' . '/stripe/stripe-php/lib/HttpClient/CurlClient.php',
'Stripe\\HttpClient\\StreamingClientInterface' => __DIR__ . '/..' . '/stripe/stripe-php/lib/HttpClient/StreamingClientInterface.php',
@ -1003,6 +1015,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\RequestTelemetry' => __DIR__ . '/..' . '/stripe/stripe-php/lib/RequestTelemetry.php',
'Stripe\\Review' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Review.php',
'Stripe\\SKU' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SKU.php',
'Stripe\\SearchResult' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SearchResult.php',
'Stripe\\Service\\AbstractService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/AbstractService.php',
'Stripe\\Service\\AbstractServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/AbstractServiceFactory.php',
'Stripe\\Service\\AccountLinkService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/AccountLinkService.php',
@ -1028,6 +1041,9 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\Service\\ExchangeRateService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/ExchangeRateService.php',
'Stripe\\Service\\FileLinkService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FileLinkService.php',
'Stripe\\Service\\FileService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FileService.php',
'Stripe\\Service\\FinancialConnections\\AccountService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FinancialConnections/AccountService.php',
'Stripe\\Service\\FinancialConnections\\FinancialConnectionsServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FinancialConnections/FinancialConnectionsServiceFactory.php',
'Stripe\\Service\\FinancialConnections\\SessionService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/FinancialConnections/SessionService.php',
'Stripe\\Service\\Identity\\IdentityServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Identity/IdentityServiceFactory.php',
'Stripe\\Service\\Identity\\VerificationReportService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php',
'Stripe\\Service\\Identity\\VerificationSessionService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php',
@ -1073,10 +1089,16 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\Service\\SubscriptionService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SubscriptionService.php',
'Stripe\\Service\\TaxCodeService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TaxCodeService.php',
'Stripe\\Service\\TaxRateService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TaxRateService.php',
'Stripe\\Service\\Terminal\\ConfigurationService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/ConfigurationService.php',
'Stripe\\Service\\Terminal\\ConnectionTokenService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/ConnectionTokenService.php',
'Stripe\\Service\\Terminal\\LocationService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/LocationService.php',
'Stripe\\Service\\Terminal\\ReaderService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/ReaderService.php',
'Stripe\\Service\\Terminal\\TerminalServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Terminal/TerminalServiceFactory.php',
'Stripe\\Service\\TestHelpers\\RefundService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/RefundService.php',
'Stripe\\Service\\TestHelpers\\Terminal\\ReaderService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/ReaderService.php',
'Stripe\\Service\\TestHelpers\\Terminal\\TerminalServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/Terminal/TerminalServiceFactory.php',
'Stripe\\Service\\TestHelpers\\TestClockService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/TestClockService.php',
'Stripe\\Service\\TestHelpers\\TestHelpersServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TestHelpers/TestHelpersServiceFactory.php',
'Stripe\\Service\\TokenService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TokenService.php',
'Stripe\\Service\\TopupService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TopupService.php',
'Stripe\\Service\\TransferService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TransferService.php',
@ -1099,9 +1121,11 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779
'Stripe\\TaxCode' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TaxCode.php',
'Stripe\\TaxId' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TaxId.php',
'Stripe\\TaxRate' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TaxRate.php',
'Stripe\\Terminal\\Configuration' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/Configuration.php',
'Stripe\\Terminal\\ConnectionToken' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/ConnectionToken.php',
'Stripe\\Terminal\\Location' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/Location.php',
'Stripe\\Terminal\\Reader' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Terminal/Reader.php',
'Stripe\\TestHelpers\\TestClock' => __DIR__ . '/..' . '/stripe/stripe-php/lib/TestHelpers/TestClock.php',
'Stripe\\ThreeDSecure' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ThreeDSecure.php',
'Stripe\\Token' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Token.php',
'Stripe\\Topup' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Topup.php',

477
vendor/composer/ca-bundle/res/cacert.pem vendored
View File

@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
## Certificate data from Mozilla as of: Tue Oct 26 03:12:05 2021 GMT
## Certificate data from Mozilla as of: Tue Apr 26 03:12:05 2022 GMT
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
@ -13,8 +13,8 @@
## an Apache+mod_ssl webserver for SSL client authentication.
## Just configure this file as the SSLCACertificateFile.
##
## Conversion done with mk-ca-bundle.pl version 1.28.
## SHA256: bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f
## Conversion done with mk-ca-bundle.pl version 1.29.
## SHA256: 34a54d5191775c1bd37be6cfd3f09e831e072555dc3a2e51f4a2c4b0f8ada5cc
##
@ -39,28 +39,6 @@ hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
-----END CERTIFICATE-----
GlobalSign Root CA - R2
=======================
-----BEGIN CERTIFICATE-----
MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
-----END CERTIFICATE-----
Entrust.net Premium 2048 Secure Server CA
=========================================
-----BEGIN CERTIFICATE-----
@ -573,28 +551,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
-----END CERTIFICATE-----
Cybertrust Global Root
======================
-----BEGIN CERTIFICATE-----
MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
WL1WMRJOEcgh4LMRkWXbtKaIOM5V
-----END CERTIFICATE-----
ePKI Root Certification Authority
=================================
-----BEGIN CERTIFICATE-----
@ -1037,36 +993,6 @@ tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
-----END CERTIFICATE-----
EC-ACC
======
-----BEGIN CERTIFICATE-----
MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
5EI=
-----END CERTIFICATE-----
Hellenic Academic and Research Institutions RootCA 2011
=======================================================
-----BEGIN CERTIFICATE-----
@ -1737,20 +1663,6 @@ HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
-----END CERTIFICATE-----
GlobalSign ECC Root CA - R4
===========================
-----BEGIN CERTIFICATE-----
MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
-----END CERTIFICATE-----
GlobalSign ECC Root CA - R5
===========================
-----BEGIN CERTIFICATE-----
@ -2472,96 +2384,6 @@ AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
-----END CERTIFICATE-----
GTS Root R1
===========
-----BEGIN CERTIFICATE-----
MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
CFF1pkgl
-----END CERTIFICATE-----
GTS Root R2
===========
-----BEGIN CERTIFICATE-----
MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
+YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
o/DUhgkC
-----END CERTIFICATE-----
GTS Root R3
===========
-----BEGIN CERTIFICATE-----
MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
KaqW04MjyaR7YbPMAuhd
-----END CERTIFICATE-----
GTS Root R4
===========
-----BEGIN CERTIFICATE-----
MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
zPKwTdb+mciUqXWi4w==
-----END CERTIFICATE-----
UCA Global G2 Root
==================
-----BEGIN CERTIFICATE-----
@ -3230,3 +3052,296 @@ ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW
rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw
CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
-----END CERTIFICATE-----
Autoridad de Certificacion Firmaprofesional CIF A62634068
=========================================================
-----BEGIN CERTIFICATE-----
MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCRVMxQjBA
BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIw
QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1Ud
DgQWBBRlzeurNR4APn7VdMActHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4w
gZswgZgGBFUdIAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABCAG8AbgBhAG4A
bwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAwADEANzAOBgNVHQ8BAf8EBAMC
AQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9miWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL
4QjbEwj4KKE1soCzC1HA01aajTNFSa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDb
LIpgD7dvlAceHabJhfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1il
I45PVf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZEEAEeiGaP
cjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV1aUsIC+nmCjuRfzxuIgA
LI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2tCsvMo2ebKHTEm9caPARYpoKdrcd7b/+A
lun4jWq9GJAd/0kakFI3ky88Al2CdgtR5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH
9IBk9W6VULgRfhVwOEqwf9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpf
NIbnYrX9ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNKGbqE
ZycPvEJdvSRUDewdcAZfpLz6IHxV
-----END CERTIFICATE-----
vTrus ECC Root CA
=================
-----BEGIN CERTIFICATE-----
MIICDzCCAZWgAwIBAgIUbmq8WapTvpg5Z6LSa6Q75m0c1towCgYIKoZIzj0EAwMwRzELMAkGA1UE
BhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBS
b290IENBMB4XDTE4MDczMTA3MjY0NFoXDTQzMDczMTA3MjY0NFowRzELMAkGA1UEBhMCQ04xHDAa
BgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBSb290IENBMHYw
EAYHKoZIzj0CAQYFK4EEACIDYgAEZVBKrox5lkqqHAjDo6LN/llWQXf9JpRCux3NCNtzslt188+c
ToL0v/hhJoVs1oVbcnDS/dtitN9Ti72xRFhiQgnH+n9bEOf+QP3A2MMrMudwpremIFUde4BdS49n
TPEQo0IwQDAdBgNVHQ4EFgQUmDnNvtiyjPeyq+GtJK97fKHbH88wDwYDVR0TAQH/BAUwAwEB/zAO
BgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwMDaAAwZQIwV53dVvHH4+m4SVBrm2nDb+zDfSXkV5UT
QJtS0zvzQBm8JsctBp61ezaf9SXUY2sAAjEA6dPGnlaaKsyh2j/IZivTWJwghfqrkYpwcBE4YGQL
YgmRWAD5Tfs0aNoJrSEGGJTO
-----END CERTIFICATE-----
vTrus Root CA
=============
-----BEGIN CERTIFICATE-----
MIIFVjCCAz6gAwIBAgIUQ+NxE9izWRRdt86M/TX9b7wFjUUwDQYJKoZIhvcNAQELBQAwQzELMAkG
A1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xFjAUBgNVBAMTDXZUcnVzIFJv
b3QgQ0EwHhcNMTgwNzMxMDcyNDA1WhcNNDMwNzMxMDcyNDA1WjBDMQswCQYDVQQGEwJDTjEcMBoG
A1UEChMTaVRydXNDaGluYSBDby4sTHRkLjEWMBQGA1UEAxMNdlRydXMgUm9vdCBDQTCCAiIwDQYJ
KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL1VfGHTuB0EYgWgrmy3cLRB6ksDXhA/kFocizuwZots
SKYcIrrVQJLuM7IjWcmOvFjai57QGfIvWcaMY1q6n6MLsLOaXLoRuBLpDLvPbmyAhykUAyyNJJrI
ZIO1aqwTLDPxn9wsYTwaP3BVm60AUn/PBLn+NvqcwBauYv6WTEN+VRS+GrPSbcKvdmaVayqwlHeF
XgQPYh1jdfdr58tbmnDsPmcF8P4HCIDPKNsFxhQnL4Z98Cfe/+Z+M0jnCx5Y0ScrUw5XSmXX+6KA
YPxMvDVTAWqXcoKv8R1w6Jz1717CbMdHflqUhSZNO7rrTOiwCcJlwp2dCZtOtZcFrPUGoPc2BX70
kLJrxLT5ZOrpGgrIDajtJ8nU57O5q4IikCc9Kuh8kO+8T/3iCiSn3mUkpF3qwHYw03dQ+A0Em5Q2
AXPKBlim0zvc+gRGE1WKyURHuFE5Gi7oNOJ5y1lKCn+8pu8fA2dqWSslYpPZUxlmPCdiKYZNpGvu
/9ROutW04o5IWgAZCfEF2c6Rsffr6TlP9m8EQ5pV9T4FFL2/s1m02I4zhKOQUqqzApVg+QxMaPnu
1RcN+HFXtSXkKe5lXa/R7jwXC1pDxaWG6iSe4gUH3DRCEpHWOXSuTEGC2/KmSNGzm/MzqvOmwMVO
9fSddmPmAsYiS8GVP1BkLFTltvA8Kc9XAgMBAAGjQjBAMB0GA1UdDgQWBBRUYnBj8XWEQ1iO0RYg
scasGrz2iTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
AgEAKbqSSaet8PFww+SX8J+pJdVrnjT+5hpk9jprUrIQeBqfTNqK2uwcN1LgQkv7bHbKJAs5EhWd
nxEt/Hlk3ODg9d3gV8mlsnZwUKT+twpw1aA08XXXTUm6EdGz2OyC/+sOxL9kLX1jbhd47F18iMjr
jld22VkE+rxSH0Ws8HqA7Oxvdq6R2xCOBNyS36D25q5J08FsEhvMKar5CKXiNxTKsbhm7xqC5PD4
8acWabfbqWE8n/Uxy+QARsIvdLGx14HuqCaVvIivTDUHKgLKeBRtRytAVunLKmChZwOgzoy8sHJn
xDHO2zTlJQNgJXtxmOTAGytfdELSS8VZCAeHvsXDf+eW2eHcKJfWjwXj9ZtOyh1QRwVTsMo554Wg
icEFOwE30z9J4nfrI8iIZjs9OXYhRvHsXyO466JmdXTBQPfYaJqT4i2pLr0cox7IdMakLXogqzu4
sEb9b91fUlV1YvCXoHzXOP0l382gmxDPi7g4Xl7FtKYCNqEeXxzP4padKar9mK5S4fNBUvupLnKW
nyfjqnN9+BojZns7q2WwMgFLFT49ok8MKzWixtlnEjUwzXYuFrOZnk1PTi07NEPhmg4NpGaXutIc
SkwsKouLgU9xGqndXHt7CMUADTdA43x7VF8vhV929vensBxXVsFy6K2ir40zSbofitzmdHxghm+H
l3s=
-----END CERTIFICATE-----
ISRG Root X2
============
-----BEGIN CERTIFICATE-----
MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJV
UzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElT
UkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVT
MSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNS
RyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H
ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppb
d9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
HQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtF
cP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5
U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn
-----END CERTIFICATE-----
HiPKI Root CA - G1
==================
-----BEGIN CERTIFICATE-----
MIIFajCCA1KgAwIBAgIQLd2szmKXlKFD6LDNdmpeYDANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xGzAZBgNVBAMMEkhpUEtJ
IFJvb3QgQ0EgLSBHMTAeFw0xOTAyMjIwOTQ2MDRaFw0zNzEyMzExNTU5NTlaME8xCzAJBgNVBAYT
AlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEbMBkGA1UEAwwSSGlQS0kg
Um9vdCBDQSAtIEcxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9B5/UnMyDHPkvRN0
o9QwqNCuS9i233VHZvR85zkEHmpwINJaR3JnVfSl6J3VHiGh8Ge6zCFovkRTv4354twvVcg3Px+k
wJyz5HdcoEb+d/oaoDjq7Zpy3iu9lFc6uux55199QmQ5eiY29yTw1S+6lZgRZq2XNdZ1AYDgr/SE
YYwNHl98h5ZeQa/rh+r4XfEuiAU+TCK72h8q3VJGZDnzQs7ZngyzsHeXZJzA9KMuH5UHsBffMNsA
GJZMoYFL3QRtU6M9/Aes1MU3guvklQgZKILSQjqj2FPseYlgSGDIcpJQ3AOPgz+yQlda22rpEZfd
hSi8MEyr48KxRURHH+CKFgeW0iEPU8DtqX7UTuybCeyvQqww1r/REEXgphaypcXTT3OUM3ECoWqj
1jOXTyFjHluP2cFeRXF3D4FdXyGarYPM+l7WjSNfGz1BryB1ZlpK9p/7qxj3ccC2HTHsOyDry+K4
9a6SsvfhhEvyovKTmiKe0xRvNlS9H15ZFblzqMF8b3ti6RZsR1pl8w4Rm0bZ/W3c1pzAtH2lsN0/
Vm+h+fbkEkj9Bn8SV7apI09bA8PgcSojt/ewsTu8mL3WmKgMa/aOEmem8rJY5AIJEzypuxC00jBF
8ez3ABHfZfjcK0NVvxaXxA/VLGGEqnKG/uY6fsI/fe78LxQ+5oXdUG+3Se0CAwEAAaNCMEAwDwYD
VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ncX+l6o/vY9cdVouslGDDjYr7AwDgYDVR0PAQH/BAQD
AgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBQUfB13HAE4/+qddRxosuej6ip0691x1TPOhwEmSKsxBHi
7zNKpiMdDg1H2DfHb680f0+BazVP6XKlMeJ45/dOlBhbQH3PayFUhuaVevvGyuqcSE5XCV0vrPSl
tJczWNWseanMX/mF+lLFjfiRFOs6DRfQUsJ748JzjkZ4Bjgs6FzaZsT0pPBWGTMpWmWSBUdGSquE
wx4noR8RkpkndZMPvDY7l1ePJlsMu5wP1G4wB9TcXzZoZjmDlicmisjEOf6aIW/Vcobpf2Lll07Q
JNBAsNB1CI69aO4I1258EHBGG3zgiLKecoaZAeO/n0kZtCW+VmWuF2PlHt/o/0elv+EmBYTksMCv
5wiZqAxeJoBF1PhoL5aPruJKHJwWDBNvOIf2u8g0X5IDUXlwpt/L9ZlNec1OvFefQ05rLisY+Gpz
jLrFNe85akEez3GoorKGB1s6yeHvP2UEgEcyRHCVTjFnanRbEEV16rCf0OY1/k6fi8wrkkVbbiVg
hUbN0aqwdmaTd5a+g744tiROJgvM7XpWGuDpWsZkrUx6AEhEL7lAuxM+vhV4nYWBSipX3tUZQ9rb
yltHhoMLP7YNdnhzeSJesYAfz77RP1YQmCuVh6EfnWQUYDksswBVLuT1sw5XxJFBAJw/6KXf6vb/
yPCtbVKoF6ubYfwSUTXkJf2vqmqGOQ==
-----END CERTIFICATE-----
GlobalSign ECC Root CA - R4
===========================
-----BEGIN CERTIFICATE-----
MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYDVQQLExtHbG9i
YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
b2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgwMTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9i
YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
b2JhbFNpZ24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkW
ymOxuYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNVHQ8BAf8E
BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/+wpu+74zyTyjhNUwCgYI
KoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147bmF0774BxL4YSFlhgjICICadVGNA3jdg
UM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
-----END CERTIFICATE-----
GTS Root R1
===========
-----BEGIN CERTIFICATE-----
MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
UjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaM
f/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7raKb0
xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnWr4+w
B7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqMLnXW
nOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk
9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zq
kUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92wO1A
K/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om3xPX
V2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNuJLDW
cfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
AQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQAD
ggIBAJ+qQibbC5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuyh6f88/qBVRRi
ClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM47HLwEXWdyzRSjeZ2axfG34ar
J45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8JZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYci
NuaCp+0KueIHoI17eko8cdLiA6EfMgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5me
LMFrUKTX5hgUvYU/Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJF
fbdT6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ0E6yove+
7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm2tIMPNuzjsmhDYAPexZ3
FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bbbP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3
gm3c
-----END CERTIFICATE-----
GTS Root R2
===========
-----BEGIN CERTIFICATE-----
MIIFVzCCAz+gAwIBAgINAgPlrsWNBCUaqxElqjANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
UjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTukk3Lv
CvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo7JUl
e3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWIm8Wb
a96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5GmdFrS
+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbuak7M
kogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscszcTJG
r61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RWIr9q
S34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73VululycslaVNV
J1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy5okL
dWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
AQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEMBQAD
ggIBAB/Kzt3HvqGf2SdMC9wXmBFqiN495nFWcrKeGk6c1SuYJF2ba3uwM4IJvd8lRuqYnrYb/oM8
0mJhwQTtzuDFycgTE1XnqGOtjHsB/ncw4c5omwX4Eu55MaBBRTUoCnGkJE+M3DyCB19m3H0Q/gxh
swWV7uGugQ+o+MePTagjAiZrHYNSVc61LwDKgEDg4XSsYPWHgJ2uNmSRXbBoGOqKYcl3qJfEycel
/FVL8/B/uWU9J2jQzGv6U53hkRrJXRqWbTKH7QMgyALOWr7Z6v2yTcQvG99fevX4i8buMTolUVVn
jWQye+mew4K6Ki3pHrTgSAai/GevHyICc/sgCq+dVEuhzf9gR7A/Xe8bVr2XIZYtCtFenTgCR2y5
9PYjJbigapordwj6xLEokCZYCDzifqrXPW+6MYgKBesntaFJ7qBFVHvmJ2WZICGoo7z7GJa7Um8M
7YNRTOlZ4iBgxcJlkoKM8xAfDoqXvneCbT+PHV28SSe9zE8P4c52hgQjxcCMElv924SgJPFI/2R8
0L5cFtHvma3AH/vLrrw4IgYmZNralw4/KBVEqE8AyvCazM90arQ+POuV7LXTWtiBmelDGDfrs7vR
WGJB82bSj6p4lVQgw1oudCvV0b4YacCs1aTPObpRhANl6WLAYv7YTVWW4tAR+kg0Eeye7QUd5MjW
HYbL
-----END CERTIFICATE-----
GTS Root R3
===========
-----BEGIN CERTIFICATE-----
MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMw
HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjO
PQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout
736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24CejQjBA
MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP0/Eq
Er24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azT
L818+FsuVbu/3ZL3pAzcMeGiAjEA/JdmZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV
11RZt+cRLInUue4X
-----END CERTIFICATE-----
GTS Root R4
===========
-----BEGIN CERTIFICATE-----
MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQw
HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjO
PQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzu
hXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqjQjBA
MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV2Py1
PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/C
r8deVl5c1RxYIigL9zC2L7F8AjEA8GE8p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh
4rsUecrNIdSUtUlD
-----END CERTIFICATE-----
Telia Root CA v2
================
-----BEGIN CERTIFICATE-----
MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
AkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2
MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQK
DBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZI
hvcNAQEBBQADggIPADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ7
6zBqAMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9vVYiQJ3q
9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9lRdU2HhE8Qx3FZLgmEKn
pNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTODn3WhUidhOPFZPY5Q4L15POdslv5e2QJl
tI5c0BE0312/UqeBAMN/mUWZFdUXyApT7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW
5olWK8jjfN7j/4nlNW4o6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNr
RBH0pUPCTEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6WT0E
BXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63RDolUK5X6wK0dmBR4
M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZIpEYslOqodmJHixBTB0hXbOKSTbau
BcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGjYzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7W
xy+G2CQ5MB0GA1UdDgQWBBRyrOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYD
VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi0f6X+J8wfBj5
tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMMA8iZGok1GTzTyVR8qPAs5m4H
eW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBSSRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+C
y748fdHif64W1lZYudogsYMVoe+KTTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygC
QMez2P2ccGrGKMOF6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15
h2Er3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMtTy3EHD70
sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pTVmBds9hCG1xLEooc6+t9
xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAWysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQ
raVplI/owd8k+BsHMYeB2F326CjYSlKArBPuUBQemMc=
-----END CERTIFICATE-----
D-TRUST BR Root CA 1 2020
=========================
-----BEGIN CERTIFICATE-----
MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0EgMSAy
MDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAG
ByqGSM49AgEGBSuBBAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7
dPYSzuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0QVK5buXu
QqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/VbNafAkl1bK6CKBrqx9t
MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
bmV0L2NybC9kLXRydXN0X2JyX3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
AwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFWwKrY7RjEsK70Pvom
AjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHVdWNbFJWcHwHP2NVypw87
-----END CERTIFICATE-----
D-TRUST EV Root CA 1 2020
=========================
-----BEGIN CERTIFICATE-----
MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0EgMSAy
MDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAG
ByqGSM49AgEGBSuBBAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8
ZRCC/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rDwpdhQntJ
raOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3OqQo5FD4pPfsazK2/umL
MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
bmV0L2NybC9kLXRydXN0X2V2X3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
-----END CERTIFICATE-----

223
vendor/composer/installed.json vendored
View File

@ -2,17 +2,17 @@
"packages": [
{
"name": "composer/ca-bundle",
"version": "1.3.1",
"version_normalized": "1.3.1.0",
"version": "1.3.2",
"version_normalized": "1.3.2.0",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
"reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
"reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
"shasum": ""
},
"require": {
@ -26,7 +26,7 @@
"symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
},
"time": "2021-10-28T20:44:15+00:00",
"time": "2022-05-24T11:56:16+00:00",
"type": "library",
"extra": {
"branch-alias": {
@ -61,7 +61,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.3.1"
"source": "https://github.com/composer/ca-bundle/tree/1.3.2"
},
"funding": [
{
@ -220,25 +220,25 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.5",
"version_normalized": "6.5.5.0",
"version": "6.5.8",
"version_normalized": "6.5.8.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"guzzlehttp/psr7": "^1.9",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.17.0"
"symfony/polyfill-intl-idn": "^1.17"
},
"require-dev": {
"ext-curl": "*",
@ -248,7 +248,7 @@
"suggest": {
"psr/log": "Required for using the Log middleware"
},
"time": "2020-06-16T21:01:06+00:00",
"time": "2022-06-20T22:16:07+00:00",
"type": "library",
"extra": {
"branch-alias": {
@ -257,22 +257,52 @@
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"GuzzleHttp\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Jeremy Lindblom",
"email": "jeremeamia@gmail.com",
"homepage": "https://github.com/jeremeamia"
},
{
"name": "George Mponos",
"email": "gmponos@gmail.com",
"homepage": "https://github.com/gmponos"
},
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
"homepage": "https://github.com/Nyholm"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com",
"homepage": "https://github.com/sagikazarmark"
},
{
"name": "Tobias Schultze",
"email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
}
],
"description": "Guzzle is a PHP HTTP client library",
@ -286,6 +316,24 @@
"rest",
"web service"
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5.8"
},
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://github.com/Nyholm",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
"type": "tidelift"
}
],
"install-path": "../guzzlehttp/guzzle"
},
{
@ -377,17 +425,17 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.8.3",
"version_normalized": "1.8.3.0",
"version": "1.9.0",
"version_normalized": "1.9.0.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"shasum": ""
},
"require": {
@ -405,21 +453,21 @@
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"time": "2021-10-05T13:56:00+00:00",
"time": "2022-06-20T21:43:03+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.9-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -470,7 +518,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.3"
"source": "https://github.com/guzzle/psr7/tree/1.9.0"
},
"funding": [
{
@ -558,17 +606,17 @@
},
{
"name": "maxmind/web-service-common",
"version": "v0.8.1",
"version_normalized": "0.8.1.0",
"version": "v0.9.0",
"version_normalized": "0.9.0.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/web-service-common-php.git",
"reference": "32f274051c543fc865e5a84d3a2c703913641ea8"
"reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8",
"reference": "32f274051c543fc865e5a84d3a2c703913641ea8",
"url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
"reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
"shasum": ""
},
"require": {
@ -578,11 +626,12 @@
"php": ">=7.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.*",
"friendsofphp/php-cs-fixer": "3.*",
"phpstan/phpstan": "*",
"phpunit/phpunit": "^8.0 || ^9.0",
"squizlabs/php_codesniffer": "3.*"
},
"time": "2020-11-02T17:00:53+00:00",
"time": "2022-03-28T17:43:20+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -603,6 +652,10 @@
],
"description": "Internal MaxMind Web Service API",
"homepage": "https://github.com/maxmind/web-service-common-php",
"support": {
"issues": "https://github.com/maxmind/web-service-common-php/issues",
"source": "https://github.com/maxmind/web-service-common-php/tree/v0.9.0"
},
"install-path": "../maxmind/web-service-common"
},
{
@ -714,17 +767,17 @@
},
{
"name": "paragonie/sodium_compat",
"version": "v1.17.0",
"version_normalized": "1.17.0.0",
"version": "v1.17.1",
"version_normalized": "1.17.1.0",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
"reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
"reference": "ac994053faac18d386328c91c7900f930acadf1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
"reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
"reference": "ac994053faac18d386328c91c7900f930acadf1e",
"shasum": ""
},
"require": {
@ -738,7 +791,7 @@
"ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
"ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
},
"time": "2021-08-10T02:43:50+00:00",
"time": "2022-03-23T19:32:04+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -797,7 +850,7 @@
],
"support": {
"issues": "https://github.com/paragonie/sodium_compat/issues",
"source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
"source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
},
"install-path": "../paragonie/sodium_compat"
},
@ -904,17 +957,17 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.5.4",
"version_normalized": "6.5.4.0",
"version": "v6.6.3",
"version_normalized": "6.6.3.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285"
"reference": "9400f305a898f194caff5521f64e5dfa926626f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c0d9f7dd3c2aa247ca44791e9209233829d82285",
"reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3",
"reference": "9400f305a898f194caff5521f64e5dfa926626f3",
"shasum": ""
},
"require": {
@ -926,8 +979,8 @@
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
"php-parallel-lint/php-console-highlighter": "^0.5.0",
"php-parallel-lint/php-parallel-lint": "^1.3.1",
"php-parallel-lint/php-console-highlighter": "^1.0.0",
"php-parallel-lint/php-parallel-lint": "^1.3.2",
"phpcompatibility/php-compatibility": "^9.3.5",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.6.2",
@ -941,7 +994,7 @@
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
},
"time": "2022-02-17T08:19:04+00:00",
"time": "2022-06-20T09:21:02+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -973,7 +1026,7 @@
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"support": {
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.4"
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3"
},
"funding": [
{
@ -1217,17 +1270,17 @@
},
{
"name": "stripe/stripe-php",
"version": "v7.114.0",
"version_normalized": "7.114.0.0",
"version": "v7.128.0",
"version_normalized": "7.128.0.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
"reference": "63be231686c6874befb5b3a47fb8effb4c30b78b"
"reference": "c704949c49b72985c76cc61063aa26fefbd2724e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/63be231686c6874befb5b3a47fb8effb4c30b78b",
"reference": "63be231686c6874befb5b3a47fb8effb4c30b78b",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/c704949c49b72985c76cc61063aa26fefbd2724e",
"reference": "c704949c49b72985c76cc61063aa26fefbd2724e",
"shasum": ""
},
"require": {
@ -1242,7 +1295,7 @@
"phpunit/phpunit": "^5.7 || ^9.0",
"squizlabs/php_codesniffer": "^3.3"
},
"time": "2022-02-15T22:48:31+00:00",
"time": "2022-05-05T17:18:02+00:00",
"type": "library",
"extra": {
"branch-alias": {
@ -1274,23 +1327,23 @@
],
"support": {
"issues": "https://github.com/stripe/stripe-php/issues",
"source": "https://github.com/stripe/stripe-php/tree/v7.114.0"
"source": "https://github.com/stripe/stripe-php/tree/v7.128.0"
},
"install-path": "../stripe/stripe-php"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.24.0",
"version_normalized": "1.24.0.0",
"version": "v1.26.0",
"version_normalized": "1.26.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "749045c69efb97c70d25d7463abba812e91f3a44"
"reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
"reference": "749045c69efb97c70d25d7463abba812e91f3a44",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
"reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
"shasum": ""
},
"require": {
@ -1301,11 +1354,11 @@
"suggest": {
"ext-intl": "For best performance"
},
"time": "2021-09-14T14:02:44+00:00",
"time": "2022-05-24T11:49:31+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -1350,7 +1403,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
},
"funding": [
{
@ -1370,17 +1423,17 @@
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.24.0",
"version_normalized": "1.24.0.0",
"version": "v1.26.0",
"version_normalized": "1.26.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
"reference": "219aa369ceff116e673852dce47c3a41794c14bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
"reference": "219aa369ceff116e673852dce47c3a41794c14bd",
"shasum": ""
},
"require": {
@ -1389,11 +1442,11 @@
"suggest": {
"ext-intl": "For best performance"
},
"time": "2021-02-19T12:13:01+00:00",
"time": "2022-05-24T11:49:31+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -1437,7 +1490,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
},
"funding": [
{
@ -1457,27 +1510,27 @@
},
{
"name": "symfony/polyfill-php72",
"version": "v1.24.0",
"version_normalized": "1.24.0.0",
"version": "v1.26.0",
"version_normalized": "1.26.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
"reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
"reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"time": "2021-05-27T09:17:38+00:00",
"time": "2022-05-24T11:49:31+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.26-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -1516,7 +1569,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
},
"funding": [
{

64
vendor/composer/installed.php vendored
View File

@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '7ef2de91b37a2ff1ee48d8f7e529d3b34f2b754d',
'reference' => 'bdcf00e53774eee9bdd53d6213a3df5e7fd37b05',
'name' => '1ka/1ka.si',
'dev' => false,
),
@ -16,16 +16,16 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '7ef2de91b37a2ff1ee48d8f7e529d3b34f2b754d',
'reference' => 'bdcf00e53774eee9bdd53d6213a3df5e7fd37b05',
'dev_requirement' => false,
),
'composer/ca-bundle' => array(
'pretty_version' => '1.3.1',
'version' => '1.3.1.0',
'pretty_version' => '1.3.2',
'version' => '1.3.2.0',
'type' => 'library',
'install_path' => __DIR__ . '/./ca-bundle',
'aliases' => array(),
'reference' => '4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b',
'reference' => 'fd5dd441932a7e10ca6e5b490e272d34c8430640',
'dev_requirement' => false,
),
'fgrosse/phpasn1' => array(
@ -47,12 +47,12 @@
'dev_requirement' => false,
),
'guzzlehttp/guzzle' => array(
'pretty_version' => '6.5.5',
'version' => '6.5.5.0',
'pretty_version' => '6.5.8',
'version' => '6.5.8.0',
'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
'aliases' => array(),
'reference' => '9d4290de1cfd701f38099ef7e183b64b4b7b0c5e',
'reference' => 'a52f0440530b54fa079ce76e8c5d196a42cad981',
'dev_requirement' => false,
),
'guzzlehttp/promises' => array(
@ -65,12 +65,12 @@
'dev_requirement' => false,
),
'guzzlehttp/psr7' => array(
'pretty_version' => '1.8.3',
'version' => '1.8.3.0',
'pretty_version' => '1.9.0',
'version' => '1.9.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/psr7',
'aliases' => array(),
'reference' => '1afdd860a2566ed3c2b0b4a3de6e23434a79ec85',
'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
'dev_requirement' => false,
),
'maxmind-db/reader' => array(
@ -83,12 +83,12 @@
'dev_requirement' => false,
),
'maxmind/web-service-common' => array(
'pretty_version' => 'v0.8.1',
'version' => '0.8.1.0',
'pretty_version' => 'v0.9.0',
'version' => '0.9.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../maxmind/web-service-common',
'aliases' => array(),
'reference' => '32f274051c543fc865e5a84d3a2c703913641ea8',
'reference' => '4dc5a3e8df38aea4ca3b1096cee3a038094e9b53',
'dev_requirement' => false,
),
'minishlink/web-push' => array(
@ -110,12 +110,12 @@
'dev_requirement' => false,
),
'paragonie/sodium_compat' => array(
'pretty_version' => 'v1.17.0',
'version' => '1.17.0.0',
'pretty_version' => 'v1.17.1',
'version' => '1.17.1.0',
'type' => 'library',
'install_path' => __DIR__ . '/../paragonie/sodium_compat',
'aliases' => array(),
'reference' => 'c59cac21abbcc0df06a3dd18076450ea4797b321',
'reference' => 'ac994053faac18d386328c91c7900f930acadf1e',
'dev_requirement' => false,
),
'paypal/paypal-checkout-sdk' => array(
@ -137,12 +137,12 @@
'dev_requirement' => false,
),
'phpmailer/phpmailer' => array(
'pretty_version' => 'v6.5.4',
'version' => '6.5.4.0',
'pretty_version' => 'v6.6.3',
'version' => '6.6.3.0',
'type' => 'library',
'install_path' => __DIR__ . '/../phpmailer/phpmailer',
'aliases' => array(),
'reference' => 'c0d9f7dd3c2aa247ca44791e9209233829d82285',
'reference' => '9400f305a898f194caff5521f64e5dfa926626f3',
'dev_requirement' => false,
),
'psr/http-message' => array(
@ -188,39 +188,39 @@
'dev_requirement' => false,
),
'stripe/stripe-php' => array(
'pretty_version' => 'v7.114.0',
'version' => '7.114.0.0',
'pretty_version' => 'v7.128.0',
'version' => '7.128.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../stripe/stripe-php',
'aliases' => array(),
'reference' => '63be231686c6874befb5b3a47fb8effb4c30b78b',
'reference' => 'c704949c49b72985c76cc61063aa26fefbd2724e',
'dev_requirement' => false,
),
'symfony/polyfill-intl-idn' => array(
'pretty_version' => 'v1.24.0',
'version' => '1.24.0.0',
'pretty_version' => 'v1.26.0',
'version' => '1.26.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
'aliases' => array(),
'reference' => '749045c69efb97c70d25d7463abba812e91f3a44',
'reference' => '59a8d271f00dd0e4c2e518104cc7963f655a1aa8',
'dev_requirement' => false,
),
'symfony/polyfill-intl-normalizer' => array(
'pretty_version' => 'v1.24.0',
'version' => '1.24.0.0',
'pretty_version' => 'v1.26.0',
'version' => '1.26.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
'aliases' => array(),
'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8',
'reference' => '219aa369ceff116e673852dce47c3a41794c14bd',
'dev_requirement' => false,
),
'symfony/polyfill-php72' => array(
'pretty_version' => 'v1.24.0',
'version' => '1.24.0.0',
'pretty_version' => 'v1.26.0',
'version' => '1.26.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php72',
'aliases' => array(),
'reference' => '9a142215a36a3888e30d0a9eeea9766764e96976',
'reference' => 'bf44a9fd41feaac72b074de600314a93e2ae78e2',
'dev_requirement' => false,
),
'web-token/jwt-core' => array(

14
vendor/guzzlehttp/guzzle/CHANGELOG.md vendored
View File

@ -1,5 +1,19 @@
# Change Log
## 6.5.8 - 2022-06-20
* Fix change in port should be considered a change in origin
* Fix `CURLOPT_HTTPAUTH` option not cleared on change of origin
## 6.5.7 - 2022-06-09
* Fix failure to strip Authorization header on HTTP downgrade
* Fix failure to strip the Cookie header on change in host or HTTP downgrade
## 6.5.6 - 2022-05-25
* Fix cross-domain cookie leakage
## 6.5.5 - 2020-06-16
* Unpin version constraint for `symfony/polyfill-intl-idn` [#2678](https://github.com/guzzle/guzzle/pull/2678)

10
vendor/guzzlehttp/guzzle/LICENSE vendored
View File

@ -1,4 +1,12 @@
Copyright (c) 2011-2018 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
The MIT License (MIT)
Copyright (c) 2011 Michael Dowling <mtdowling@gmail.com>
Copyright (c) 2012 Jeremy Lindblom <jeremeamia@gmail.com>
Copyright (c) 2014 Graham Campbell <hello@gjcampbell.co.uk>
Copyright (c) 2015 Márk Sági-Kazár <mark.sagikazar@gmail.com>
Copyright (c) 2015 Tobias Schultze <webmaster@tubo-world.de>
Copyright (c) 2016 Tobias Nyholm <tobias.nyholm@gmail.com>
Copyright (c) 2016 George Mponos <gmponos@gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

37
vendor/guzzlehttp/guzzle/README.md vendored
View File

@ -1,8 +1,9 @@
Guzzle, PHP HTTP client
=======================
![Guzzle](.github/logo.png?raw=true)
# Guzzle, PHP HTTP client
[![Latest Version](https://img.shields.io/github/release/guzzle/guzzle.svg?style=flat-square)](https://github.com/guzzle/guzzle/releases)
[![Build Status](https://img.shields.io/travis/guzzle/guzzle.svg?style=flat-square)](https://travis-ci.org/guzzle/guzzle)
[![Build Status](https://img.shields.io/github/workflow/status/guzzle/guzzle/CI?label=ci%20build&style=flat-square)](https://github.com/guzzle/guzzle/actions?query=workflow%3ACI)
[![Total Downloads](https://img.shields.io/packagist/dt/guzzlehttp/guzzle.svg?style=flat-square)](https://packagist.org/packages/guzzlehttp/guzzle)
Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
@ -38,15 +39,18 @@ $promise->wait();
## Help and docs
- [Documentation](http://guzzlephp.org/)
- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
We use GitHub issues only to discuss bugs and new features. For support please refer to:
- [Documentation](https://docs.guzzlephp.org)
- [Stack Overflow](https://stackoverflow.com/questions/tagged/guzzle)
- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](https://slack.httplug.io/)
- [Gitter](https://gitter.im/guzzle/guzzle)
## Installing Guzzle
The recommended way to install Guzzle is through
[Composer](http://getcomposer.org).
[Composer](https://getcomposer.org/).
```bash
# Install Composer
@ -75,16 +79,19 @@ composer update
## Version Guidance
| Version | Status | Packagist | Namespace | Repo | Docs | PSR-7 | PHP Version |
|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >= 5.3.3 |
| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >= 5.4 |
| 5.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >= 5.4 |
| 6.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >= 5.5 |
|---------|----------------|---------------------|--------------|---------------------|---------------------|-------|--------------|
| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >=5.3.3,<7.0 |
| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >=5.4,<7.0 |
| 5.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >=5.4,<7.4 |
| 6.x | Security fixes | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >=5.5,<8.0 |
| 7.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes | >=7.2.5,<8.2 |
[guzzle-3-repo]: https://github.com/guzzle/guzzle3
[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
[guzzle-6-repo]: https://github.com/guzzle/guzzle
[guzzle-3-docs]: http://guzzle3.readthedocs.org
[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
[guzzle-6-repo]: https://github.com/guzzle/guzzle/tree/6.5
[guzzle-7-repo]: https://github.com/guzzle/guzzle
[guzzle-3-docs]: https://guzzle3.readthedocs.io/
[guzzle-5-docs]: https://docs.guzzlephp.org/en/5.3/
[guzzle-6-docs]: https://docs.guzzlephp.org/en/6.5/
[guzzle-7-docs]: https://docs.guzzlephp.org/en/latest/

39
vendor/guzzlehttp/guzzle/composer.json vendored
View File

@ -14,18 +14,48 @@
"homepage": "http://guzzlephp.org/",
"license": "MIT",
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Jeremy Lindblom",
"email": "jeremeamia@gmail.com",
"homepage": "https://github.com/jeremeamia"
},
{
"name": "George Mponos",
"email": "gmponos@gmail.com",
"homepage": "https://github.com/gmponos"
},
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
"homepage": "https://github.com/Nyholm"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com",
"homepage": "https://github.com/sagikazarmark"
},
{
"name": "Tobias Schultze",
"email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
}
],
"require": {
"php": ">=5.5",
"ext-json": "*",
"symfony/polyfill-intl-idn": "^1.17.0",
"symfony/polyfill-intl-idn": "^1.17",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1"
"guzzlehttp/psr7": "^1.9"
},
"require-dev": {
"ext-curl": "*",
@ -36,7 +66,10 @@
"psr/log": "Required for using the Log middleware"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"extra": {
"branch-alias": {

5
vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php vendored
View File

@ -240,6 +240,11 @@ class CookieJar implements CookieJarInterface
if (0 !== strpos($sc->getPath(), '/')) {
$sc->setPath($this->getCookiePathFromRequest($request));
}
if (!$sc->matchesDomain($request->getUri()->getHost())) {
continue;
}
// Note: At this point `$sc->getDomain()` being a public suffix should
// be rejected, but we don't want to pull in the full PSL dependency.
$this->setCookie($sc);
}
}

11
vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php vendored
View File

@ -333,12 +333,19 @@ class SetCookie
*/
public function matchesDomain($domain)
{
$cookieDomain = $this->getDomain();
if (null === $cookieDomain) {
return true;
}
// Remove the leading '.' as per spec in RFC 6265.
// http://tools.ietf.org/html/rfc6265#section-5.2.3
$cookieDomain = ltrim($this->getDomain(), '.');
$cookieDomain = ltrim(strtolower($cookieDomain), '.');
$domain = strtolower($domain);
// Domain not set or exact match.
if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
if ('' === $cookieDomain || $domain === $cookieDomain) {
return true;
}

21
vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php vendored
View File

@ -94,6 +94,14 @@ class RedirectMiddleware
$this->guardMax($request, $options);
$nextRequest = $this->modifyRequest($request, $options, $response);
// If authorization is handled by curl, unset it if URI is cross-origin.
if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && defined('\CURLOPT_HTTPAUTH')) {
unset(
$options['curl'][\CURLOPT_HTTPAUTH],
$options['curl'][\CURLOPT_USERPWD]
);
}
if (isset($options['allow_redirects']['on_redirect'])) {
call_user_func(
$options['allow_redirects']['on_redirect'],
@ -141,7 +149,7 @@ class RedirectMiddleware
}
/**
* Check for too many redirects
* Check for too many redirects.
*
* @return void
*
@ -190,7 +198,7 @@ class RedirectMiddleware
$modify['body'] = '';
}
$uri = $this->redirectUri($request, $response, $protocols);
$uri = self::redirectUri($request, $response, $protocols);
if (isset($options['idn_conversion']) && ($options['idn_conversion'] !== false)) {
$idnOptions = ($options['idn_conversion'] === true) ? IDNA_DEFAULT : $options['idn_conversion'];
$uri = Utils::idnUriConvert($uri, $idnOptions);
@ -210,16 +218,17 @@ class RedirectMiddleware
$modify['remove_headers'][] = 'Referer';
}
// Remove Authorization header if host is different.
if ($request->getUri()->getHost() !== $modify['uri']->getHost()) {
// Remove Authorization and Cookie headers if URI is cross-origin.
if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $modify['uri'])) {
$modify['remove_headers'][] = 'Authorization';
$modify['remove_headers'][] = 'Cookie';
}
return Psr7\modify_request($request, $modify);
}
/**
* Set the appropriate URL on the request based on the location header
* Set the appropriate URL on the request based on the location header.
*
* @param RequestInterface $request
* @param ResponseInterface $response
@ -227,7 +236,7 @@ class RedirectMiddleware
*
* @return UriInterface
*/
private function redirectUri(
private static function redirectUri(
RequestInterface $request,
ResponseInterface $response,
array $protocols

22
vendor/guzzlehttp/psr7/CHANGELOG.md vendored
View File

@ -3,12 +3,30 @@
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
## 1.9.0 - 2022-06-20
### Added
- Added `UriComparator::isCrossOrigin` method
## 1.8.5 - 2022-03-20
### Fixed
- Correct header value validation
## 1.8.4 - 2022-03-20
### Fixed
- Validate header values properly
## 1.8.3 - 2021-10-05
### Fixed

24
vendor/guzzlehttp/psr7/README.md vendored
View File

@ -1,6 +1,6 @@
# PSR-7 Message Implementation
This repository contains a full [PSR-7](http://www.php-fig.org/psr/psr-7/)
This repository contains a full [PSR-7](https://www.php-fig.org/psr/psr-7/)
message implementation, several stream decorators, and some helpful
functionality like query string parsing.
@ -659,7 +659,7 @@ manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__to
`public static function fromParts(array $parts): UriInterface`
Creates a URI from a hash of [`parse_url`](http://php.net/manual/en/function.parse-url.php) components.
Creates a URI from a hash of [`parse_url`](https://www.php.net/manual/en/function.parse-url.php) components.
### `GuzzleHttp\Psr7\Uri::withQueryValue`
@ -684,6 +684,16 @@ associative array of key => value.
Creates a new URI with a specific query string value removed. Any existing query string values that exactly match the
provided key are removed.
## Cross-Origin Detection
`GuzzleHttp\Psr7\UriComparator` provides methods to determine if a modified URL should be considered cross-origin.
### `GuzzleHttp\Psr7\UriComparator::isCrossOrigin`
`public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool`
Determines if a modified URL should be considered cross-origin with respect to an original URL.
## Reference Resolution
`GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according
@ -809,14 +819,24 @@ This of course assumes they will be resolved against the same base URI. If this
equivalence or difference of relative references does not mean anything.
## Version Guidance
| Version | Status | PHP Version |
|---------|----------------|------------------|
| 1.x | Security fixes | >=5.4,<8.1 |
| 2.x | Latest | ^7.2.5 \|\| ^8.0 |
## Security
If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/psr7/security/policy) for more information.
## License
Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
## For Enterprise
Available as part of the Tidelift Subscription

7
vendor/guzzlehttp/psr7/composer.json vendored
View File

@ -63,11 +63,14 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.9-dev"
}
},
"config": {
"preferred-install": "dist",
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
}
}

66
vendor/guzzlehttp/psr7/src/MessageTrait.php vendored
View File

@ -157,17 +157,22 @@ trait MessageTrait
}
}
/**
* @param mixed $value
*
* @return string[]
*/
private function normalizeHeaderValue($value)
{
if (!is_array($value)) {
return $this->trimHeaderValues([$value]);
return $this->trimAndValidateHeaderValues([$value]);
}
if (count($value) === 0) {
throw new \InvalidArgumentException('Header value can not be an empty array.');
}
return $this->trimHeaderValues($value);
return $this->trimAndValidateHeaderValues($value);
}
/**
@ -178,13 +183,13 @@ trait MessageTrait
* header-field = field-name ":" OWS field-value OWS
* OWS = *( SP / HTAB )
*
* @param string[] $values Header values
* @param mixed[] $values Header values
*
* @return string[] Trimmed header values
*
* @see https://tools.ietf.org/html/rfc7230#section-3.2.4
*/
private function trimHeaderValues(array $values)
private function trimAndValidateHeaderValues(array $values)
{
return array_map(function ($value) {
if (!is_scalar($value) && null !== $value) {
@ -194,10 +199,20 @@ trait MessageTrait
));
}
return trim((string) $value, " \t");
$trimmed = trim((string) $value, " \t");
$this->assertValue($trimmed);
return $trimmed;
}, array_values($values));
}
/**
* @see https://tools.ietf.org/html/rfc7230#section-3.2
*
* @param mixed $header
*
* @return void
*/
private function assertHeader($header)
{
if (!is_string($header)) {
@ -210,5 +225,46 @@ trait MessageTrait
if ($header === '') {
throw new \InvalidArgumentException('Header name can not be empty.');
}
if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $header)) {
throw new \InvalidArgumentException(
sprintf(
'"%s" is not valid header name',
$header
)
);
}
}
/**
* @param string $value
*
* @return void
*
* @see https://tools.ietf.org/html/rfc7230#section-3.2
*
* field-value = *( field-content / obs-fold )
* field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
* field-vchar = VCHAR / obs-text
* VCHAR = %x21-7E
* obs-text = %x80-FF
* obs-fold = CRLF 1*( SP / HTAB )
*/
private function assertValue($value)
{
// The regular expression intentionally does not support the obs-fold production, because as
// per RFC 7230#3.2.4:
//
// A sender MUST NOT generate a message that includes
// line folding (i.e., that has any field-value that contains a match to
// the obs-fold rule) unless the message is intended for packaging
// within the message/http media type.
//
// Clients must not send a request with line folding and a server sending folded headers is
// likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting
// folding is not likely to break any legitimate use case.
if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/', $value)) {
throw new \InvalidArgumentException(sprintf('"%s" is not valid header value', $value));
}
}
}

55
vendor/guzzlehttp/psr7/src/UriComparator.php vendored Normal file
View File

@ -0,0 +1,55 @@
<?php
namespace GuzzleHttp\Psr7;
use Psr\Http\Message\UriInterface;
/**
* Provides methods to determine if a modified URL should be considered cross-origin.
*
* @author Graham Campbell
*/
final class UriComparator
{
/**
* Determines if a modified URL should be considered cross-origin with
* respect to an original URL.
*
* @return bool
*/
public static function isCrossOrigin(UriInterface $original, UriInterface $modified)
{
if (\strcasecmp($original->getHost(), $modified->getHost()) !== 0) {
return true;
}
if ($original->getScheme() !== $modified->getScheme()) {
return true;
}
if (self::computePort($original) !== self::computePort($modified)) {
return true;
}
return false;
}
/**
* @return int
*/
private static function computePort(UriInterface $uri)
{
$port = $uri->getPort();
if (null !== $port) {
return $port;
}
return 'https' === $uri->getScheme() ? 443 : 80;
}
private function __construct()
{
// cannot be instantiated
}
}

20
vendor/maxmind/web-service-common/CHANGELOG.md vendored
View File

@ -1,6 +1,26 @@
CHANGELOG
=========
0.9.0 (2022-03-28)
------------------
* Improved internal type hint usage.
0.8.1 (2020-11-02)
------------------
* We now correctly handle responses without a `Content-Type` header. In 0.8.0,
such responses could lead to a type error. In particular, this affected the
minFraud Report Transaction endpoint, which returns a response with no
content. Reported by Dmitry Malashko. GitHub #99 on
`maxmind/minfraud-api-php`.
0.8.0 (2020-10-01)
------------------
* PHP 7.2 or greater is now required.
* Added additional type hints.
0.7.0 (2020-05-06)
------------------

2
vendor/maxmind/web-service-common/README.md vendored
View File

@ -5,7 +5,7 @@ shared code between MaxMind's various web service client APIs.
## Requirements ##
The library requires PHP 5.6 or greater.
The library requires PHP 7.2 or greater.
There are several other dependencies as defined in the `composer.json` file.

9
vendor/maxmind/web-service-common/composer.json vendored
View File

@ -12,15 +12,16 @@
}
],
"require": {
"php": ">=5.6",
"php": ">=7.2",
"composer/ca-bundle": "^1.0.3",
"ext-curl": "*",
"ext-json": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.*",
"phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0",
"squizlabs/php_codesniffer": "3.*"
"friendsofphp/php-cs-fixer": "3.*",
"phpunit/phpunit": "^8.0 || ^9.0",
"squizlabs/php_codesniffer": "3.*",
"phpstan/phpstan": "*"
},
"autoload": {
"psr-4": {

6
vendor/maxmind/web-service-common/dev-bin/release.sh vendored
View File

@ -51,10 +51,6 @@ fi
git push
message="$version
$notes"
hub release create -m "$message" "$tag"
gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag"
git push --tags

7
vendor/maxmind/web-service-common/phpstan.neon vendored Normal file
View File

@ -0,0 +1,7 @@
parameters:
level: 6
paths:
- src
- tests
checkMissingIterableValueType: false

Some files were not shown because too many files have changed in this diff Show More