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

Popravljanje http na httpS

Browse Source
This commit is contained in:
May Doušak 2023-01-23 20:12:09 +01:00
parent 989ea21d33
commit e955fd976f
20 changed files with 92 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/SurveyAdmin.php
View File

@ -589,7 +589,7 @@ class SurveyAdmin
}
// GDPR popup za prejemanje obvestil - force ce ga se ni izpolnil - SAMO NA www.1ka.si, test.1ka.si in virtualkah
if ( ($site_url == 'http://test.1ka.si/'
if ( ($site_url == 'https://test.1ka.si/'
|| isWWW()
|| isAAI()
|| ($cookie_domain == '.1ka.si' && isVirtual()))
@ -6008,7 +6008,7 @@ class SurveyAdmin
if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) {
SurveySetting::getInstance()->Init($this->anketa);
$link = SurveySetting::getInstance()->getSurveyMiscSetting('uporabnost_link_' . $grupa);
if ($link == '') $link = 'http://';
if ($link == '') $link = 'https://';
echo ' Link: <input style="width:300px" type="text" id="uporabnost_link_' . $grupa . '" name="uporabnost_link" value="' . $link . '" onblur="save_edit_uporabnost_link(\'' . $row['id'] . '\', $(this).val());" />';
}
}

4
admin/survey/SurveyAdminSettings.php
View File

@ -4375,7 +4375,7 @@ class SurveyAdminSettings {
echo '<form action="index.php?anketa=' . $this->anketa . '&a=uporabnost" name="settingsanketa_'.$this->anketa.'" method="post">';
if ($row['uporabnost_link'] == '')
$row['uporabnost_link'] = 'http://';
$row['uporabnost_link'] = 'https://';
echo '<p class="bottom16">'.$lang['srv_vrsta_survey_note_4_3b'].'</p>';
@ -4413,7 +4413,7 @@ class SurveyAdminSettings {
while ($rowg = mysqli_fetch_array($sqlg)) {
$link = SurveySetting::getInstance()->getSurveyMiscSetting('uporabnost_link_'.$rowg['id']);
if ($link == '')
$link = 'http://';
$link = 'https://';
echo '<div class="setting_holder">';
echo '<p>'.$rowg['naslov'].':</p>';

2
admin/survey/api/api_test.php
View File

@ -17,7 +17,7 @@ $api_url = 'https://www.1ka.si/admin/survey/api/api.php';
$identifier = '3ccc9cbc90493d09';
$private_key = 'b8dbeceed3d0d7f80ca5d82ba352d9696c1804ff9b9d45272b8e99ea0a4987d6';
/*$api_url = 'http://localhost/admin/survey/api/api.php';
/*$api_url = 'https://localhost/admin/survey/api/api.php';
$identifier = '0d712128f7fe5707';
$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';*/

2
admin/survey/api/apidoc/api_project.js
View File

@ -13,7 +13,7 @@ define({
"generator": {
"name": "apidoc",
"time": "2019-09-13T10:02:30.341Z",
"url": "http://apidocjs.com",
"url": "https://apidocjs.com",
"version": "0.17.6"
}
});

2
admin/survey/api/apidoc/api_project.json
View File

@ -13,7 +13,7 @@
"generator": {
"name": "apidoc",
"time": "2019-09-13T10:02:30.341Z",
"url": "http://apidocjs.com",
"url": "https://apidocjs.com",
"version": "0.17.6"
}
}

130
admin/survey/classes/class.Common.php
View File

@ -1198,7 +1198,7 @@ class Common {
public static function getHelpUrl($subdomain, $podstran){
// Default help url
$help_url = 'http://www.1ka.si/d/sl/pomoc';
$help_url = 'https://www.1ka.si/d/sl/pomoc';
// Angleški vmesnik - usmerimo na english.1ka.si help
if($subdomain == 'english'){
@ -1343,19 +1343,19 @@ class Common {
// Napredni moduli
else if ($_GET['a'] == A_TELEPHONE) {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/advanced-modules/telephone-survey';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/advanced-modules/telephone-survey';
}
else if ($_GET['a'] == 'uporabnost') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/advanced-modules/website-evaluation-split-screen';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/advanced-modules/website-evaluation-split-screen';
}
else if ($_GET['a'] == 'vnos') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/advanced-modules/administrative-data-input';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/advanced-modules/administrative-data-input';
}
else if ($_GET['a'] == 'kviz') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/quiz';
}
else if ($_GET['a'] == 'slideshow') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/advanced-modules/slideshow';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/advanced-modules/slideshow';
}
else if ($_GET['a'] == 'social_network') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/social-networks';
@ -1363,7 +1363,7 @@ class Common {
// Oblika
else if ($_GET['a'] == 'tema') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/edit/design';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/edit/design';
}
else if ($_GET['a'] == 'theme-editor') {
if($_GET['t'] == 'css'){
@ -1419,25 +1419,25 @@ class Common {
// Komentarji
else if ($_GET['a'] == 'komentarji' || $_GET['a'] == 'komentarji_anketa') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing/comments';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing/comments';
}
// Testiranje
else if ($_GET['a'] == 'testiranje') {
if ($_GET['m'] == 'diagnostika') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
}
else if ($_GET['m'] == 'testnipodatki') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing/automatic-entries';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing/automatic-entries';
}
else if ($_GET['m'] == 'predvidenicas') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
}
else if ($_GET['m'] == 'cas') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
}
else {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing/diagnostics';
}
}
@ -1452,24 +1452,24 @@ class Common {
else if ($_GET['a'] == 'invitations') {
if ($_GET['m'] == 'add_recipients_view') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
} else if ($_GET['m'] == 'view_recipients') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
} else if ($_GET['m'] == 'view_message') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
} else if ($_GET['m'] == 'send_message') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
} else if ($_GET['m'] == 'view_archive') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/invitation-archives';
} else {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/publish/1ka-invitations';
}
}
// Podatki
else if ($_GET['a'] == 'data') {
if ($_GET['m'] == 'quick_edit') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/data/browse';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/data/browse';
} else if ($_GET['m'] == 'calculation') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/computed-values';
} else if ($_GET['m'] == 'coding') {
@ -1483,7 +1483,7 @@ class Common {
} else if ($_GET['m'] == 'merge') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/merging-data';
} else {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/data/browse';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/data/browse';
}
}
// Izvoz podatkov
@ -1504,16 +1504,16 @@ class Common {
// Analiza
else if ($_GET['a'] == 'analysis' && (in_array($_GET['m'], array('', 'sumarnik', 'ttest', 'para')))) {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/analysis/statistics';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/analysis/statistics';
}
else if ($_GET['a'] == 'analysis' && $_GET['m'] == 'charts') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/analysis/charts';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/analysis/charts';
}
else if ($_GET['a'] == 'analysis' && $_GET['m'] == 'anal_arch') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/analysis-archives';
}
else if ($_GET['a'] == 'analysis' && $_GET['m'] == 'analysis_links') {
$help_url = 'http://www.1ka.si/d/en/help/user-guide/analysis/reports';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/analysis/reports';
}
else if ($_GET['a'] == 'analysis' && $_GET['m'] == 'analysis_creport') {
$help_url = 'https://www.1ka.si/d/en/help/manuals/custom-reports';
@ -1606,25 +1606,25 @@ class Common {
else {
switch ($podstran) {
case NAVI_UREJANJE:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/edit';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/edit';
break;
case NAVI_OBJAVA:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/publish';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/publish';
break;
case NAVI_RESULTS:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/data';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/data';
break;
case NAVI_ANALYSIS:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/analysis';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/analysis';
break;
case NAVI_TESTIRANJE:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/testing';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/testing';
break;
case NAVI_STATUS:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/dashboard';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/dashboard';
break;
case NAVI_ADVANCED:
$help_url = 'http://www.1ka.si/d/en/help/user-guide/advanced-modules';
$help_url = 'https://www.1ka.si/d/en/help/user-guide/advanced-modules';
break;
default:
//$help_url = 'https://www.1ka.si/d/en/help/my-surveys';
@ -1787,19 +1787,19 @@ class Common {
// STATUS in podstrani
elseif($_GET['a']== 'reporti'){
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/povzetek/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/povzetek/?from1ka=1';
}elseif($_GET['a']== 'para_graph'){
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/parapodatki/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/parapodatki/?from1ka=1';
}elseif($_GET['a']== 'nonresponse_graph'){
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/neodgovor-spremenljivke/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/neodgovor-spremenljivke/?from1ka=1';
}elseif($_GET['a']== 'usable_resp'){
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/uporabni-respondenti/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/uporabni-respondenti/?from1ka=1';
}elseif($_GET['a']== 'speeder_index'){
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/indeks-hitrosti/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/indeks-hitrosti/?from1ka=1';
}elseif($_GET['a']== 'text_analysis'){
$help_url = '';
}elseif($_GET['a']== 'geoip_location'){
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/ip-lokacija/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/ip-lokacija/?from1ka=1';
}
// Obvescanje
@ -1814,19 +1814,19 @@ class Common {
// Napredni moduli
else if ($_GET['a'] == A_TELEPHONE) {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/telefonska-anketa/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/telefonska-anketa/?from1ka=1';
}
else if ($_GET['a'] == 'uporabnost') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/evalvacija-strani/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/evalvacija-strani/?from1ka=1';
}
else if ($_GET['a'] == 'vnos') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/vnos-vprasalnikov/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/vnos-vprasalnikov/?from1ka=1';
}
else if ($_GET['a'] == 'kviz') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/prirocniki/kviz';
}
else if ($_GET['a'] == 'slideshow') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/prezentacija/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/prezentacija/?from1ka=1';
}
else if ($_GET['a'] == 'social_network') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/prirocniki/socialna-omrezja';
@ -1834,7 +1834,7 @@ class Common {
// Oblika
else if ($_GET['a'] == 'tema') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/oblika/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/oblika/?from1ka=1';
}
else if ($_GET['a'] == 'theme-editor') {
if($_GET['t'] == 'css'){
@ -1847,45 +1847,45 @@ class Common {
// Komentarji
else if ($_GET['a'] == 'komentarji' || $_GET['a'] == 'komentarji_anketa') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/komentarji/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/komentarji/?from1ka=1';
}
// Testiranje
else if ($_GET['a'] == 'testiranje') {
if ($_GET['m'] == 'diagnostika') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
}
else if ($_GET['m'] == 'testnipodatki') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/avtomatski-vnosi/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/avtomatski-vnosi/?from1ka=1';
}
else if ($_GET['m'] == 'predvidenicas') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
}
else if ($_GET['m'] == 'cas') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
}
else {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/diagnostika/?from1ka=1';
}
}
// Vabila
else if ($_GET['a'] == 'vabila') {
if($_GET['m'] == 'url') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/povezava-url/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/povezava-url/?from1ka=1';
}else{
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/nastavitve-objave/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/nastavitve-objave/?from1ka=1';
}
}
else if ($_GET['a'] == 'invitations') {
if ($_GET['m'] == 'add_recipients_view') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
} else if ($_GET['m'] == 'view_recipients') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
} else if ($_GET['m'] == 'view_message') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
} else if ($_GET['m'] == 'send_message') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/1ka-vabila/?from1ka=1';
} else if ($_GET['m'] == 'view_archive') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/prirocniki/arhivi-vabil';
} else {
@ -1896,9 +1896,9 @@ class Common {
// Podatki
else if ($_GET['a'] == 'data') {
if ($_GET['m'] == 'quick_edit') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/pregledovanje/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/pregledovanje/?from1ka=1';
} else if ($_GET['m'] == 'calculation') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/izracuni/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/izracuni/?from1ka=1';
} else if ($_GET['m'] == 'coding') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/prirocniki/rocno-kodiranje';
} else if ($_GET['m'] == 'coding_auto') {
@ -1910,7 +1910,7 @@ class Common {
} else if ($_GET['m'] == 'merge') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/prirocniki/zdruzevanje-podatkov';
} else {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/pregledovanje/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/pregledovanje/?from1ka=1';
}
}
// Izvoz podatkov
@ -1931,10 +1931,10 @@ class Common {
// Analiza
else if ($_GET['a'] == 'analysis' && (in_array($_GET['m'], array('', 'sumarnik', 'ttest', 'para')))) {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/analize/statistike/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/analize/statistike/?from1ka=1';
}
else if ($_GET['a'] == 'analysis' && $_GET['m'] == 'charts') {
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/analize/grafi/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/analize/grafi/?from1ka=1';
}
else if ($_GET['a'] == 'analysis' && $_GET['m'] == 'anal_arch') {
$help_url = 'https://www.1ka.si/d/sl/pomoc/prirocniki/arhivi-analiz';
@ -2029,28 +2029,28 @@ class Common {
else {
switch ($podstran) {
case NAVI_STATUS;
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/povzetek/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/povzetek/?from1ka=1';
break;
case NAVI_UREJANJE:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/?from1ka=1';
break;
case NAVI_OBJAVA:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/objava/?from1ka=1';
break;
case NAVI_RESULTS:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/podatki/?from1ka=1';
break;
case NAVI_ANALYSIS:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/analize/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/analize/?from1ka=1';
break;
case NAVI_TESTIRANJE:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/?from1ka=1';
break;
case NAVI_STATUS:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/?from1ka=1';
break;
case NAVI_ADVANCED:
$help_url = 'http://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/?from1ka=1';
$help_url = 'https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/?from1ka=1';
break;
default:
//$help_url = 'https://www.1ka.si/d/sl/pomoc/moje-ankete';

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

@ -1860,7 +1860,7 @@ class GDPR{
$content .= 'Oddana prošnja se nanaša na naslednje osebne podatke:<br /><b>'.$note.'</b>';
$content .= '</p>';
$content .= '<p>Prosimo, da <b>v roku enega meseca</b> izvršite zahtevo in o tem obvestite respondenta na zgoraj navedeni elektronski naslov respondenta (<a href="http://eur-lex.europa.eu/legal-content/SL/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.SLV&toc=OJ:L:2016:119:FULL" target="_blank">Člen 19 uredbe GDPR</a>).</p>';
$content .= '<p>Prosimo, da <b>v roku enega meseca</b> izvršite zahtevo in o tem obvestite respondenta na zgoraj navedeni elektronski naslov respondenta (<a href="https://eur-lex.europa.eu/legal-content/SL/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.SLV&toc=OJ:L:2016:119:FULL" target="_blank">Člen 19 uredbe GDPR</a>).</p>';
$content .= '<p>V primeru, da tega po enem mesecu ne boste izvršili, vas bomo ponovno obvestili. Če se zahteva ne izvrši, si pridržujemo pravico, da anketo izbrišemo.</p>';

1
admin/survey/classes/class.SurveyAapor.php
View File

@ -161,7 +161,6 @@ class SurveyAapor {
echo '<br /><br/>';
echo 'Povezave:<br/>';
// echo '<a href="http://www.aapor.org/For_Researchers/4683.htm" target="_blank">';
echo '<a href="https://www.esomar.org/what-we-do/code-guidelines/AAPOR-Standard-Definitions-Final-Dispositions-of-Case-Codes-and-Outcome-Rates-for-Surveys" target="_blank">';
echo 'Standard Definitions – Final Dispositions of Case Codes and Outcome Rates for Surveys (PDF)';
echo '</a>';

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

@ -761,23 +761,23 @@ class SurveyList {
switch ($_GET['a']) {
case 'pregledovanje':
$help_url = 'http://' .$subdomain .'.1ka.si/c/790/Moja_anketa/?preid=795&from1ka=1';
$help_url = 'https://' .$subdomain .'.1ka.si/c/790/Moja_anketa/?preid=795&from1ka=1';
break;
case 'diagnostics':
if ($_GET['t'] == 'uporabniki') {
$help_url = 'http://' .$subdomain .'.1ka.si/c/904/Uporabniki/?preid=795&from1ka=1';
$help_url = 'https://' .$subdomain .'.1ka.si/c/904/Uporabniki/?preid=795&from1ka=1';
} else {
$help_url = 'http://' .$subdomain .'.1ka.si/c/795/Aktivnost/?preid=790&from1ka=1';
$help_url = 'https://' .$subdomain .'.1ka.si/c/795/Aktivnost/?preid=790&from1ka=1';
}
break;
case 'knjiznica':
$help_url = 'http://' .$subdomain .'.1ka.si/c/796/Knjiznica/?preid=795&from1ka=1';
$help_url = 'https://' .$subdomain .'.1ka.si/c/796/Knjiznica/?preid=795&from1ka=1';
break;
case 'nastavitve':
$help_url = 'http://' .$subdomain .'.1ka.si/c/797/Nastavitve/?preid=796&from1ka=1';
$help_url = 'https://' .$subdomain .'.1ka.si/c/797/Nastavitve/?preid=796&from1ka=1';
break;
default:
$help_url = 'http://' .$subdomain .'.1ka.si/c/790/Moja_anketa/?preid=795&from1ka=1';
$help_url = 'https://' .$subdomain .'.1ka.si/c/790/Moja_anketa/?preid=795&from1ka=1';
break;
}

4
admin/survey/classes/class.SurveyPostProcess.php
View File

@ -513,10 +513,6 @@ class SurveyPostProcess {
function ajax_edit_data_question() {
global $lang;
/*?>
<link rel="stylesheet" href="http://localhost/fdv/cms2/main/survey/skins/Modern.css" type="text/css" media="screen" />
<?*/
$spr_id = $_POST['spr_id'];
$usr_id = $_POST['usr_id'];

2
admin/survey/classes/htmlpurifier-4.3.0/library/HTMLPurifier/Config.php
View File

@ -473,7 +473,7 @@ class HTMLPurifier_Config
if (!$optimized) {
if (!is_null($this->get($type . '.DefinitionID'))) {
if ($this->chatty) {
$this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached. If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration. Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary). See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
$this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached. If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration. Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary). See <a href='https://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
} else {
$this->triggerError("Useless DefinitionID declaration", E_USER_WARNING);
}

2
admin/survey/classes/htmlpurifier-4.3.0/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
View File

@ -10,7 +10,7 @@ DEFAULT: false
</p>
<p>
This directive enables YouTube video embedding in HTML Purifier. Check
<a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
<a href="https://htmlpurifier.org/docs/enduser-youtube.html">this document
on embedding videos</a> for more information on what this filter does.
</p>
--# vim: et sw=4 sts=4

8
admin/survey/classes/htmlpurifier-4.3.0/library/HTMLPurifier/Filter/YouTube.php
View File

@ -7,7 +7,7 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
public function preFilter($html, $config, $context) {
$pre_regex = '#<object[^>]+>.+?'.
'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
'https://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
$pre_replace = '<span class="youtube-embed">\1</span>';
return preg_replace($pre_regex, $pre_replace, $html);
}
@ -24,10 +24,10 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
protected function postFilterCallback($matches) {
$url = $this->armorUrl($matches[1]);
return '<object width="425" height="350" type="application/x-shockwave-flash" '.
'data="http://www.youtube.com/'.$url.'">'.
'<param name="movie" value="http://www.youtube.com/'.$url.'"></param>'.
'data="https://www.youtube.com/'.$url.'">'.
'<param name="movie" value="https://www.youtube.com/'.$url.'"></param>'.
'<!--[if IE]>'.
'<embed src="http://www.youtube.com/'.$url.'"'.
'<embed src="https://www.youtube.com/'.$url.'"'.
'type="application/x-shockwave-flash"'.
'wmode="transparent" width="425" height="350" />'.
'<![endif]-->'.

2
admin/survey/classes/htmlpurifier-4.3.0/library/HTMLPurifier/HTMLModule/SafeObject.php
View File

@ -30,7 +30,7 @@ class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
'height' => 'Pixels#' . $max,
'data' => 'URI#embedded',
'codebase' => new HTMLPurifier_AttrDef_Enum(array(
'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0')),
'https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0')),
)
);
$object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();

2
admin/survey/classes/phpqrcode/bindings/tcpdf/qrcode.php
View File

@ -1238,7 +1238,7 @@ if (!class_exists('QRcode', false)) {
if (QR_FIND_FROM_RANDOM !== false) {
$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
for ($i = 0; $i < $howManuOut; ++$i) {
$remPos = rand (0, count($checked_masks)-1);
$remPos = random_int (0, count($checked_masks)-1);
unset($checked_masks[$remPos]);
$checked_masks = array_values($checked_masks);
}

2
admin/survey/classes/phpqrcode/phpqrcode.php
View File

@ -2766,7 +2766,7 @@
$howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
for ($i = 0; $i < $howManuOut; $i++) {
$remPos = rand (0, count($checked_masks)-1);
$remPos = random_int (0, count($checked_masks)-1);
unset($checked_masks[$remPos]);
$checked_masks = array_values($checked_masks);
}

2
admin/survey/classes/phpqrcode/qrmask.php
View File

@ -294,7 +294,7 @@
$howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
for ($i = 0; $i < $howManuOut; $i++) {
$remPos = rand (0, count($checked_masks)-1);
$remPos = random_int (0, count($checked_masks)-1);
unset($checked_masks[$remPos]);
$checked_masks = array_values($checked_masks);
}

2
admin/survey/index.php
View File

@ -255,7 +255,7 @@
global $keep_domain;
if ($originating_domain != '' && $keep_domain != '') {
return str_replace ($originating_domain, $keep_domain, str_replace ("https://" .$originating_domain, "http://" .$keep_domain, $buffer));
return str_replace ($originating_domain, $keep_domain, str_replace ("https://" .$originating_domain, "https://" .$keep_domain, $buffer));
}
return $buffer;

2
utils/ParseForm.php
View File

@ -187,7 +187,7 @@ echo "Na ossfet " .$this->arr_radio[$a][0] ." nastavljam vrednost " .$this->arr_
for ($a = 0; $a < sizeof($this->arr_checkbox); $a++) {
// Obkljukamo nakljucno kljukic
$kljukic = rand (1, sizeof($this->arr_checkbox[$a]));
$kljukic = random_int(1, sizeof($this->arr_checkbox[$a]));
for ($b = 0; $b < $kljukic; $b++) {
$checks .= "&" .$this->arr_checkbox[$a][0] ."=" .$this->arr_checkbox[$a][random_int(1, sizeof($this->arr_checkbox[$a])-1)];

2
utils/create_salt.php
View File

@ -87,7 +87,7 @@
$salt = "";
for ($l = 0; $l<256; $l++) {
$salt .= $nabor[rand (0, sizeof ($nabor)-1)];
$salt .= $nabor[random_int (0, sizeof ($nabor)-1)];
}
echo '<font face="courier" size="2">' .$salt .'</font>';