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

Merge branch 'master' into release/produkcija

Browse Source 
# Conflicts:
#	composer.lock
#	main/survey/app/Controllers/BodyController.php
#	resources/sass/admin/payments.scss
This commit is contained in:
pero1203 2020-12-05 12:36:28 +01:00
commit 6ff02df5e5
229 changed files with 8551 additions and 20928 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/BranchingAjax.php
View File

@ -182,7 +182,7 @@ class BranchingAjax {
$b->repare_vrstni_red();
Common::getInstance()->prestevilci($spremenljivka, $all);
Common::getInstance()->prestevilci($spremenljivka, $all=true);
// Zacasno shranimo zadnji ustvarjen if, da vemo katerega odpreti
echo '<input type="hidden" id="temp_new_if_id" name="temp_new_if_id" value="'.$if_id.'" />';

7
admin/survey/SurveyAdmin.php
View File

@ -720,13 +720,16 @@ class SurveyAdmin
// Preverimo trenuten paket uporabnika
$userAccess = UserAccess::getInstance($global_user_id);
if($userAccess->getPackage() != '3'){
$current_package = $userAccess->getPackage();
if($current_package != '3' && !$userAccess->userNotAuthor()){
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
$upgrade_url = $drupal_url.'izvedi-nakup/3/podatki';
$button_text = ($current_package == '2') ? $lang['srv_access_upgrade2'] : $lang['srv_access_upgrade'];
echo '<div class="upgrade_package">';
echo '<div class="buttonwrapper"><a class="ovalbutton ovalbutton_purple" href="'.$upgrade_url.'" target="_blank"><span>'.$lang['srv_access_upgrade'].'</span></a></div>';
echo '<div class="buttonwrapper"><a class="ovalbutton ovalbutton_purple" href="'.$upgrade_url.'" target="_blank"><span>'.$button_text.'</span></a></div>';
echo '</div>';
}
}

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

@ -55,7 +55,8 @@ class Common {
static function prestevilci ($spremenljivka = 0, $all = false, $force = false) {
// Preverimo ce imamo izklopljeno atomatsko prestevilcevanje
SurveySetting::getInstance()->Init(self::$anketa);
SurveySetting::getInstance()->Init(self::$anketa);
$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
if($enumerate == 0 && $all != true)
return;
@ -66,7 +67,6 @@ class Common {
$i = 1;
//sisplet_query("BEGIN");
$sql = sisplet_query("SELECT s.id, variable, variable_custom, s.tip AS tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".self::$anketa."' AND s.tip!='9' ORDER BY g.vrstni_red, s.vrstni_red");
// ce je vec kot 50 spremenljivk nimamo avtomatskega prestevilcevanja
@ -107,8 +107,6 @@ class Common {
$variable_array2 = $variable_array;
// Loop cez vsa vprasanja v anketi po vrstnem redu
//mysqli_data_seek($sql, 0);
//while ($row = mysqli_fetch_array($sql)) {
foreach($variable_array2 as $row) {
// Ce vprasanje nima custom variable jo lahko prestevilcimo
@ -141,8 +139,6 @@ class Common {
array_push($val_array, $row['id']);
}
//sisplet_query("COMMIT");
// prestevilcimo se variable znotraj posameznih vprasanja - prestevilci moramo poklicati sele za zgornjim INSERTom!
foreach ($val_array AS $key => $val) {
self::prestevilci($val);

277
admin/survey/classes/class.SurveyAktivnost.php
View File

@ -15,8 +15,7 @@ class SurveyAktivnost{
* @desc prikaze diagnostiko anket
*/
public function diagnostics() {
global $lang;
global $global_user_id, $admin_type;
global $lang, $global_user_id, $admin_type, $app_settings;
$sum = 0;
$sum_survey = 0;
@ -42,7 +41,7 @@ class SurveyAktivnost{
echo '<form id="diagnostics_form" action="index.php" method="get">';
echo '<input type="hidden" name="a" value="diagnostics" />';
$testdata = (isset($_GET['testdata']) && $_GET['testdata']=='1') ? 1 : 0;
$testdataauto = (isset($_GET['testdataauto']) && $_GET['testdataauto']=='1') ? 1 : 0;
$uvoz = (isset($_GET['uvoz']) && $_GET['uvoz']=='1') ? 1 : 0;
@ -53,7 +52,25 @@ class SurveyAktivnost{
$mailsent = (isset($_GET['mailsent']) && $_GET['mailsent']=='1') ? 1 : 0;
$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
if(isset($app_settings['commercial_packages']) && $app_settings['commercial_packages'] == true){
$package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
$package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
$package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
echo '<span>'.$lang['srv_narocilo_paket'].':</span>';
echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label></span>';
echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label></span>';
echo '<span class="spaceLeft spaceRight bold">|</span>';
}
echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label></span>';
echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
@ -163,25 +180,28 @@ class SurveyAktivnost{
$interval
) AS grupe, srv_anketa
WHERE grupe.ank_id=srv_anketa.id
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
GROUP BY grupe.ank_id
ORDER BY responses DESC
");
} elseif ($type == 'users') {
$filter = $this->diagnostics_get_user_settings();
$filter = $this->diagnostics_get_user_settings();
$filter_package = $this->diagnostics_get_user_package();
$filter_lang = $this->diagnostics_get_lang_filter();
$sql = sisplet_query("
SELECT COUNT(srv_user.id) AS responses, users.email, srv_user.ank_id, srv_anketa.naslov
FROM srv_user, srv_anketa, users
WHERE ".$filter." AND ".$filter_lang." srv_user.ank_id > '0'
AND srv_anketa.id=srv_user.ank_id
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
AND srv_anketa.insert_uid = users.id
SELECT COUNT(srv_user.id) AS responses, users.email, srv_user.ank_id, srv_anketa.naslov, user_access.package_id
FROM srv_user, srv_anketa, users
LEFT JOIN user_access
ON user_access.usr_id=users.id
WHERE ".$filter." AND ".$filter_lang." ".$filter_package." srv_user.ank_id > '0'
AND srv_anketa.id=srv_user.ank_id
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
AND srv_anketa.insert_uid = users.id
GROUP BY ank_id
ORDER BY responses DESC
");
@ -191,11 +211,11 @@ class SurveyAktivnost{
SELECT COUNT(srv_tracking_active.ank_id) AS responses, srv_tracking_active.ank_id, srv_anketa.naslov
FROM srv_tracking_active, srv_anketa
WHERE srv_anketa.id = srv_tracking_active.ank_id
AND (`get` LIKE '%analiza%' OR `get` LIKE '%analysis%' )
AND NOT (`get` LIKE '%charts%')
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
AND (`get` LIKE '%analiza%' OR `get` LIKE '%analysis%' )
AND NOT (`get` LIKE '%charts%')
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
GROUP BY ank_id
ORDER BY responses DESC
");
@ -206,11 +226,11 @@ class SurveyAktivnost{
SELECT COUNT(srv_tracking_active.ank_id) AS responses, srv_tracking_active.ank_id, srv_anketa.naslov
FROM srv_tracking_active, srv_anketa
WHERE srv_anketa.id = srv_tracking_active.ank_id
AND (`get` LIKE '%analiza%' OR `get` LIKE '%analysis%' )
AND (`get` LIKE '%charts%')
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
AND (`get` LIKE '%analiza%' OR `get` LIKE '%analysis%' )
AND (`get` LIKE '%charts%')
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
GROUP BY ank_id
ORDER BY responses DESC
");
@ -221,9 +241,9 @@ class SurveyAktivnost{
SELECT COUNT(srv_tracking_active.ank_id) AS responses, srv_tracking_active.ank_id, srv_anketa.naslov
FROM srv_tracking_active, srv_anketa
WHERE srv_anketa.id = srv_tracking_active.ank_id
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
GROUP BY ank_id
ORDER BY responses DESC
");
@ -234,9 +254,9 @@ class SurveyAktivnost{
SELECT COUNT(srv_invitations_recipients.id) AS responses, srv_invitations_recipients.ank_id, srv_anketa.naslov
FROM srv_invitations_recipients, srv_anketa
WHERE srv_anketa.id = srv_invitations_recipients.ank_id AND srv_invitations_recipients.sent = '1'
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
AND (srv_anketa.dostop >= '" . $admin_type . "' OR srv_anketa.id IN
(SELECT ank_id FROM srv_dostop WHERE uid='" . $global_user_id . "'))
$interval
GROUP BY ank_id
ORDER BY responses DESC
");
@ -255,7 +275,7 @@ class SurveyAktivnost{
while ($row = mysqli_fetch_array($sql)) {
if ($max == -1)
$max = max($row['responses'], $max)*1.3;
$max = max($row['responses'], $max)*1.3;
echo '<tr>';
echo '<td><a href="'.SurveyInfo::getSurveyLink($row['ank_id']).'?preview=on&pages=all" target="_blank">' . $row['naslov'] . '</a></td>';
@ -263,9 +283,7 @@ class SurveyAktivnost{
$sum = $sum + $row['responses'];
$sum_survey = $sum_survey + 1;
echo '<td style="width:60%"><div class="graph_lb" style="float: left; width:' . (round($row['responses'] / $max * 100, 0)) . '%">&nbsp;</div><div style="float:left">&nbsp;'.$row['responses'].'</div></td>';
echo '</tr>
';
//$sum_survey = sizeof($row);
echo '</tr>';
}
echo '<script type="text/javascript">
@ -284,21 +302,42 @@ class SurveyAktivnost{
global $lang;
$interval = $this->diagnostics_get_interval('month');
$filter = $this->diagnostics_get_user_settings();
$filter = $this->diagnostics_get_user_settings();
$filter_package = $this->diagnostics_get_user_package();
$filter_lang = $this->diagnostics_get_lang_filter();
$this->diagnostics_show_interval('time_span');
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, YEAR(insert_time) AS color, insert_time AS date FROM srv_anketa WHERE ".$filter_lang." insert_time > 0 AND YEAR(insert_time)>=2009 GROUP BY datedate ORDER BY insert_time ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, YEAR(insert_time) AS color, insert_time AS date
FROM srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE ".$filter_lang." ".$filter_package." insert_time > 0 AND YEAR(insert_time)>=2009
GROUP BY datedate
ORDER BY insert_time ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_survey'], 'day', 'year', false);
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_sum_survey'], 'day', 'year', true);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[users] AS datedate, YEAR(when_reg) AS color, when_reg AS date FROM users WHERE when_reg > 0 AND YEAR(when_reg)>=2009 GROUP BY datedate ORDER BY when_reg ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[users] AS datedate, YEAR(when_reg) AS color, when_reg AS date
FROM users
LEFT JOIN user_access
ON user_access.usr_id=users.id
WHERE ".$filter_package." when_reg > 0 AND YEAR(when_reg)>=2009
GROUP BY datedate
ORDER BY when_reg ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_register'], 'day', 'year', false);
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_sum_register'], 'day', 'year', true);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, YEAR(srv_user.time_insert) AS color, srv_user.time_insert AS date FROM srv_user, srv_anketa WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." time_insert > 0 AND YEAR(time_insert)>=2009 GROUP BY datedate ORDER BY time_insert ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, YEAR(srv_user.time_insert) AS color, srv_user.time_insert AS date
FROM srv_user, srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." ".$filter_package." time_insert > 0 AND YEAR(time_insert)>=2009
GROUP BY datedate
ORDER BY time_insert ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_answer'], 'day', 'year', false);
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_sum_answer'], 'day', 'year', true);
}
@ -307,42 +346,83 @@ class SurveyAktivnost{
global $lang;
$interval = $this->diagnostics_get_interval('day');
$filter = $this->diagnostics_get_user_settings();
$filter = $this->diagnostics_get_user_settings();
$filter_package = $this->diagnostics_get_user_package();
$filter_lang = $this->diagnostics_get_lang_filter();
$this->diagnostics_show_interval('time_span_yearly');
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, MONTH(insert_time) AS color, insert_time AS date FROM srv_anketa WHERE ".$filter_lang." insert_time > 0 AND insert_time >= '".date("Y-m-1 0:00:00", strtotime("-11 month"))."' GROUP BY datedate ORDER BY insert_time ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, MONTH(insert_time) AS color, insert_time AS date
FROM srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE ".$filter_lang." ".$filter_package." insert_time > 0 AND insert_time >= '".date("Y-m-1 0:00:00", strtotime("-11 month"))."'
GROUP BY datedate
ORDER BY insert_time ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_survey'], 'day', 'month', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[users] AS datedate, MONTH(when_reg) AS color, when_reg AS date FROM users WHERE when_reg > 0 AND when_reg >= '".date("Y-m-1 0:00:00", strtotime("-11 month"))."' GROUP BY datedate ORDER BY when_reg ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[users] AS datedate, MONTH(when_reg) AS color, when_reg AS date
FROM users
LEFT JOIN user_access
ON user_access.usr_id=users.id
WHERE ".$filter_package." when_reg > 0 AND when_reg >= '".date("Y-m-1 0:00:00", strtotime("-11 month"))."'
GROUP BY datedate
ORDER BY when_reg ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_register'], 'day', 'month', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, MONTH(srv_user.time_insert) AS color, srv_user.time_insert AS date FROM srv_user, srv_anketa WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." time_insert > 0 AND time_insert >= '".date("Y-m-1 0:00:00", strtotime("-11 month"))."' GROUP BY datedate ORDER BY time_insert ASC");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_answer'], 'day', 'month', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, MONTH(srv_user.time_insert) AS color, srv_user.time_insert AS date
FROM srv_user, srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." ".$filter_package." time_insert > 0 AND time_insert >= '".date("Y-m-1 0:00:00", strtotime("-11 month"))."'
GROUP BY datedate
ORDER BY time_insert ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_answer'], 'day', 'month', false);
}
public function diagnostics_time_span_monthly () {
global $lang;
$interval = $this->diagnostics_get_interval('day');
$filter = $this->diagnostics_get_user_settings();
$filter = $this->diagnostics_get_user_settings();
$filter_package = $this->diagnostics_get_user_package();
$filter_lang = $this->diagnostics_get_lang_filter();
$this->diagnostics_show_interval('time_span_monthly');
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, MONTH(insert_time) AS color, insert_time AS date FROM srv_anketa WHERE ".$filter_lang." insert_time > 0 AND insert_time >= '".date("Y-m-1 0:00:00", strtotime("-2 month"))."' GROUP BY datedate ORDER BY insert_time ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, MONTH(insert_time) AS color, insert_time AS date
FROM srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE ".$filter_lang." ".$filter_package." insert_time > 0 AND insert_time >= '".date("Y-m-1 0:00:00", strtotime("-2 month"))."'
GROUP BY datedate
ORDER BY insert_time ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_survey'], 'day', 'month', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[users] AS datedate, MONTH(when_reg) AS color, when_reg AS date FROM users WHERE when_reg > 0 AND when_reg >= '".date("Y-m-1 0:00:00", strtotime("-2 month"))."' GROUP BY datedate ORDER BY when_reg ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[users] AS datedate, MONTH(when_reg) AS color, when_reg AS date
FROM users
LEFT JOIN user_access
ON user_access.usr_id=users.id
WHERE ".$filter_package." when_reg > 0 AND when_reg >= '".date("Y-m-1 0:00:00", strtotime("-2 month"))."'
GROUP BY datedate
ORDER BY when_reg ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_register'], 'day', 'month', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, MONTH(srv_user.time_insert) AS color, srv_user.time_insert AS date FROM srv_user, srv_anketa WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." time_insert > 0 AND time_insert >= '".date("Y-m-1 0:00:00", strtotime("-2 month"))."' GROUP BY datedate ORDER BY time_insert ASC");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, MONTH(srv_user.time_insert) AS color, srv_user.time_insert AS date
FROM srv_user, srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." ".$filter_package." time_insert > 0 AND time_insert >= '".date("Y-m-1 0:00:00", strtotime("-2 month"))."'
GROUP BY datedate
ORDER BY time_insert ASC
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_month_answer'], 'day', 'month', false);
}
@ -352,19 +432,41 @@ class SurveyAktivnost{
$interval = $this->diagnostics_get_interval('hour');
$filter = $this->diagnostics_get_user_settings();
$filter_package = $this->diagnostics_get_user_package();
$filter_lang = $this->diagnostics_get_lang_filter();
$this->diagnostics_show_interval('time_span_daily');
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, DAYOFWEEK(insert_time) AS color, insert_time AS date FROM srv_anketa WHERE ".$filter_lang." insert_time >= '".date("Y-m-d 0:00:00", strtotime("-1 week"))."' GROUP BY datedate ORDER BY insert_time");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_anketa] AS datedate, DAYOFWEEK(insert_time) AS color, insert_time AS date
FROM srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE ".$filter_lang." ".$filter_package." insert_time >= '".date("Y-m-d 0:00:00", strtotime("-1 week"))."'
GROUP BY datedate
ORDER BY insert_time
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_week_survey'], 'hour', 'day', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_tracking_active] AS datedate, DAYOFWEEK(datetime) AS color, datetime AS date FROM srv_tracking_active WHERE datetime >= '".date("Y-m-d 0:00:00", strtotime("-1 week"))."' GROUP BY datedate ORDER BY datetime");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_tracking_active] AS datedate, DAYOFWEEK(datetime) AS color, datetime AS date
FROM srv_tracking_active
LEFT JOIN user_access
ON user_access.usr_id=srv_tracking_active.user
WHERE ".$filter_package." datetime >= '".date("Y-m-d 0:00:00", strtotime("-1 week"))."'
GROUP BY datedate
ORDER BY datetime
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_week_edit'], 'hour', 'day', false);
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, DAYOFWEEK(srv_user.time_insert) AS color, srv_user.time_insert AS date FROM srv_user, srv_anketa WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." time_insert >= '".date("Y-m-d 0:00:00", strtotime("-1 week"))."' GROUP BY datedate ORDER BY time_insert");
$sql = sisplet_query("SELECT COUNT(*) as count, $interval[srv_user] AS datedate, DAYOFWEEK(srv_user.time_insert) AS color, srv_user.time_insert AS date
FROM srv_user, srv_anketa
LEFT JOIN user_access
ON user_access.usr_id=srv_anketa.insert_uid
WHERE srv_user.ank_id=srv_anketa.id AND ".$filter." AND ".$filter_lang." ".$filter_package." time_insert >= '".date("Y-m-d 0:00:00", strtotime("-1 week"))."'
GROUP BY datedate
ORDER BY time_insert
");
$this->diagnostics_graph($sql, $lang['srv_diagnostics_graph_week_answer'], 'hour', 'day', false);
}
@ -610,7 +712,7 @@ class SurveyAktivnost{
}
private function diagnostics_show_interval ($t) {
global $lang;
global $lang, $app_settings;
echo '<form name="intr" action="index.php" method="get">';
echo '<input type="hidden" name="a" value="diagnostics">';
@ -626,7 +728,25 @@ class SurveyAktivnost{
$mailsent = (isset($_GET['mailsent']) && $_GET['mailsent']=='1') ? 1 : 0;
$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
if(isset($app_settings['commercial_packages']) && $app_settings['commercial_packages'] == true){
$package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
$package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
$package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
echo '<span>'.$lang['srv_narocilo_paket'].':</span>';
echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label></span>';
echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label></span>';
echo '<span class="spaceLeft spaceRight bold">|</span>';
}
echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
echo '<span class="spaceLeft"><input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label></span>';
echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
@ -698,7 +818,7 @@ class SurveyAktivnost{
// Vrnemo filter za srv_user (filtriranje testnih podatkov, preview, email vabil, ustreznih...)
private function diagnostics_get_user_settings(){
$testdata = (isset($_GET['testdata']) && $_GET['testdata']=='1') ? 1 : 0;
$testdataauto = (isset($_GET['testdataauto']) && $_GET['testdataauto']=='1') ? 1 : 0;
$uvoz = (isset($_GET['uvoz']) && $_GET['uvoz']=='1') ? 1 : 0;
@ -707,8 +827,7 @@ class SurveyAktivnost{
$delnoustrezni = (isset($_GET['delnoustrezni']) && $_GET['delnoustrezni']=='0') ? 0 : 1;
$neustrezni = (isset($_GET['neustrezni']) && $_GET['neustrezni']=='1') ? 1 : 0;
$mailsent = (isset($_GET['mailsent']) && $_GET['mailsent']=='1') ? 1 : 0;
// Vedno filtriramo preview vnose
$filter = " srv_user.preview='0'";
@ -741,15 +860,39 @@ class SurveyAktivnost{
else
$filter .= "srv_user.last_status NOT IN ('0','1','2','3','4','5','6'))";
// Filtriramo uvozene podatke
if($uvoz == 0){
$filter .= " AND !(srv_user.referer='' AND testdata='0' AND ip='' AND recnum='0')";
}
}
return $filter;
}
}
// Filter po paketih, ce jih imamo
private function diagnostics_get_user_package(){
global $app_settings;
$filter = '';
if(isset($app_settings['commercial_packages']) && $app_settings['commercial_packages'] == true){
$package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
$package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
$package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
if($package_1ka == 0){
$filter .= " ((user_access.package_id='2' OR user_access.package_id='3') AND user_access.time_expire > NOW()) AND ";
}
if($package_2ka == 0){
$filter .= " (user_access.package_id!='2' OR user_access.time_expire < NOW()) AND ";
}
if($package_3ka == 0){
$filter .= " (user_access.package_id!='3' OR user_access.time_expire < NOW()) AND ";
}
}
return $filter;
}
// Vrnemo filter za srv_user (filtriranje testnih podatkov, preview, email vabil, ustreznih...)
private function diagnostics_get_lang_filter(){
@ -764,7 +907,5 @@ class SurveyAktivnost{
return $filter;
}
}

51
admin/survey/classes/class.SurveyChart.php
View File

@ -4333,6 +4333,8 @@ class SurveyChart {
elseif($spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 22){
$dataArray = array();
$has_decimal = false;
$i=0;
$N=0;
if (count($spremenljivka['grids']) > 0)
@ -4375,7 +4377,10 @@ class SurveyChart {
$tempArray['percent'] = $_percent;
$tempArray['valid'] = $_valid;
$tempArray['key'] = $vkey;
$tempArray['key'] = $vkey;
if(floor($vkey) != $vkey)
$has_decimal = true;
// racunamo povprecje (za prvo variablo)
if($field == 0){
@ -4488,8 +4493,8 @@ class SurveyChart {
array_multisort($tmp, SORT_NUMERIC, SORT_ASC, $dataArray);
}
$max = (int)$dataArray[count($dataArray,0)-1]['variable'];
$min = (int)$dataArray[0]['variable'];
$max = (double)$dataArray[count($dataArray,0)-1]['variable'];
$min = (double)$dataArray[0]['variable'];
$stIntervalov = ((int)$settings['interval'] == 0 ? 10 : (int)$settings['interval']);
@ -4504,15 +4509,17 @@ class SurveyChart {
else{
// Nastavimo custom zgornjo mejo skale (razen v primeru ko ne ignoriramo vrednosti ki padejo ven in ce je max vnos vecji od nastavljenega max)
if($settings['max'] != '' /*&& ($settings['open_up'] == 0 || (int)$settings['max'] > $max)*/)
$max = (int)$settings['max'];
$max = (double)$settings['max'];
// Nastavimo custom spodnjo mejo skale (razen v primeru ko ne ignoriramo vrednosti ki padejo ven in ce je min vnos manjsi od nastavljenega min)
if($settings['min'] != '' /*&& ($settings['open_down'] == 0 || (int)$settings['min'] < $min)*/)
$min = (int)$settings['min'];
$min = (double)$settings['min'];
$stIntervalov = ($stIntervalov == -1 ? $max-$min : $stIntervalov);
$part = ($max-$min) / $stIntervalov;
$part = ($part < 1) ? 1 : round($part);
$part = ($max-$min) / $stIntervalov;
if(!$has_decimal)
$part = ($part < 1) ? 1 : round($part);
}
// Poberemo podatke v posamezne tabele - po intervalih oz normalno
@ -4557,9 +4564,16 @@ class SurveyChart {
}
// Ce imamo osnovne intervale (racunamo sproti)
else{
$maxVal = ($interval < ($stIntervalov-1) ? $min + (($interval+1) * $part) : $max);
$minVal = ($interval > 0 ? $min + ($interval * $part) + 1 : $min);
}
// Ce imamo decimalke
if($has_decimal){
$maxVal = ($interval < ($stIntervalov-1) ? $min-0.01 + (($interval+1) * $part) : $max);
$minVal = ($interval > 0 ? $min + ($interval * $part) : $min);
}
else{
$maxVal = ($interval < ($stIntervalov-1) ? $min + (($interval+1) * $part) : $max);
$minVal = ($interval > 0 ? $min + ($interval * $part) + 1 : $min);
}
}
// prekinemo ce zaradi zaokrozevanja pride do min > max
if($minVal > $maxVal)
@ -4567,12 +4581,12 @@ class SurveyChart {
// loop cez vse podatke
for($i=0; $i<count($dataArray,0); $i++){
// ce pripada intervalu
if($dataArray[$i]['variable'] <= $maxVal && $dataArray[$i]['variable'] >= $minVal && $dataArray[$i]['field'] == 0){
$count += $dataArray[$i]['freq'];
$percent += $dataArray[$i]['percent'];
$valid += $dataArray[$i]['valid'];
$valid += $dataArray[$i]['valid'];
}
}
@ -4580,7 +4594,7 @@ class SurveyChart {
$vrednosti[] = $count;
$vrednostiPercent[] = $percent;
$vrednostiValid[] = $valid;
// Ce imamo napredne intervale (custom dolocene labele)
if($settings['limits']['advanced_settings'] == 1 && $limits['interval_'.$interval]['label'] != ''){
$vrednostiKey[] = $limits['interval_'.$interval]['label'];
@ -4661,8 +4675,15 @@ class SurveyChart {
}
// Ce imamo osnovne intervale (racunamo sproti)
else{
$maxVal = ($interval < ($stIntervalov-1) ? $min + (($interval+1) * $part) : $max);
$minVal = ($interval > 0 ? $min + ($interval * $part) + 1 : $min);
// Ce imamo decimalke
if($has_decimal){
$maxVal = ($interval < ($stIntervalov-1) ? $min-0.01 + (($interval+1) * $part) : $max);
$minVal = ($interval > 0 ? $min + ($interval * $part) : $min);
}
else{
$maxVal = ($interval < ($stIntervalov-1) ? $min + (($interval+1) * $part) : $max);
$minVal = ($interval > 0 ? $min + ($interval * $part) + 1 : $min);
}
}
// prekinemo ce zaradi zaokrozevanja pride do min > max

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

@ -256,7 +256,7 @@ class SurveyExportProfiles
if ($profileId == 0 ) { // seja -
unset($_SESSION['variables_profile'][self::getSurveyId()]);
} else {
$deleteString = "DELETE FROM srv_variable_profiles WHERE id = '" . $profileId . "' AND system != '1'";
$deleteString = "DELETE FROM srv_variable_profiles WHERE id = '" . $profileId . "' AND `system` != '1'";
$sqlDelete = sisplet_query($deleteString);
}

697
admin/survey/classes/class.SurveyInvitationsNew.php
View File

File diff suppressed because it is too large Load Diff

8
admin/survey/classes/class.SurveyMissingProfiles.php
View File

@ -52,7 +52,7 @@ class SurveyMissingProfiles
self :: addSystemProfiles();
# preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array
$stringSelect = "SELECT * FROM srv_missing_profiles WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND system = 1) ORDER BY id";
$stringSelect = "SELECT * FROM srv_missing_profiles WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND `system` = 1) ORDER BY id";
$querySelect = sisplet_query($stringSelect);
if (mysqli_num_rows($querySelect)) {
@ -392,7 +392,7 @@ class SurveyMissingProfiles
if (isset($pid) && $pid != null) {
# ce mamo sistemski profil ga ne shranjujemo
$checkSelect = "SELECT * as cnt FROM srv_missing_profiles WHERE id = '".$pid."' and system = 1";
$checkSelect = "SELECT * as cnt FROM srv_missing_profiles WHERE id = '".$pid."' and `system` = 1";
$checkQry = sisplet_query($checkSelect);
if (mysqli_num_rows($checkQry) > 0) {
return $pid;
@ -419,7 +419,7 @@ class SurveyMissingProfiles
# imamo podatke, updejtamo profil v bazi (profili z id 1,2,3 so sitemski)
if ($pid > 3) {
# shranimo morebitno spremembo nastavitve display_mv_type
$updateString = "UPDATE srv_missing_profiles SET display_mv_type='".$display_mv_type."', show_zerro='".$show_zerro."', merge_missing='".$merge_missing."' WHERE id='".$pid."' AND system = 0";
$updateString = "UPDATE srv_missing_profiles SET display_mv_type='".$display_mv_type."', show_zerro='".$show_zerro."', merge_missing='".$merge_missing."' WHERE id='".$pid."' AND `system` = 0";
$updatequery = sisplet_query($updateString);
# najprej pobrišemo stare podatke za ta profil
@ -526,7 +526,7 @@ class SurveyMissingProfiles
# izbrišemo lahko samo nesistemske profile
if (self::$profiles[$pid]['system'] != 1) {
# zaradi ključev se avtomatsko pobriše tudi: srv_missing_profiles_values
$sqlDelete = sisplet_query("DELETE FROM srv_missing_profiles WHERE id = '$pid' AND system != '1'");
$sqlDelete = sisplet_query("DELETE FROM srv_missing_profiles WHERE id = '$pid' AND `system` != '1'");
}
}

6
admin/survey/classes/class.SurveyStatusCasi.php
View File

@ -28,7 +28,7 @@ class SurveyStatusCasi
static function RefreshData() {
# preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array
$stringSelect = "SELECT * FROM srv_status_casi WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND system =1) ORDER BY id";
$stringSelect = "SELECT * FROM srv_status_casi WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND `system` =1) ORDER BY id";
$querySelect = sisplet_query($stringSelect);
while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) {
@ -330,8 +330,8 @@ class SurveyStatusCasi
static function Delete($pid) {
if ($pid != 1) {
$sqlDelete = sisplet_query("DELETE FROM srv_status_casi WHERE id = '$pid' AND system != '1'");
print_r("DELETE FROM srv_status_casi WHERE id = '$pid' AND system != '1'");
$sqlDelete = sisplet_query("DELETE FROM srv_status_casi WHERE id = '$pid' AND `system` != '1'");
print_r("DELETE FROM srv_status_casi WHERE id = '$pid' AND `system` != '1'");
}
}

6
admin/survey/classes/class.SurveyStatusProfiles.php
View File

@ -79,7 +79,7 @@ class SurveyStatusProfiles
self::$profiles[$_SESSION['statusProfile']['id']] = $_SESSION['statusProfile'];
}
# preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array
$stringSelect = "SELECT * FROM srv_status_profile WHERE uid='".self::getGlobalUserId()."' OR ank_id = '".self::$sid."' OR (uid = '0' AND system =1) ORDER BY id";
$stringSelect = "SELECT * FROM srv_status_profile WHERE uid='".self::getGlobalUserId()."' OR ank_id = '".self::$sid."' OR (uid = '0' AND `system`=1) ORDER BY id";
$querySelect = sisplet_query($stringSelect);
while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) {
@ -923,7 +923,7 @@ class SurveyStatusProfiles
}
# izbrišemo lahko samo nesistemske profile
if (self::$profiles[$pid]['system'] != 1) {
$sqlDelete = sisplet_query("DELETE FROM srv_status_profile WHERE id = '$pid' AND system != '1'");
$sqlDelete = sisplet_query("DELETE FROM srv_status_profile WHERE id = '$pid' AND `system` != '1'");
}
self::setDefaultProfileId();
@ -945,7 +945,7 @@ class SurveyStatusProfiles
# preimenujemo lahko samo nesistemske profile
if (self::$profiles[$pid]['system'] != 1)
{
$sqlRename = sisplet_query("UPDATE srv_status_profile SET name='$name' WHERE id = '$pid' AND system != '1'");
$sqlRename = sisplet_query("UPDATE srv_status_profile SET name='$name' WHERE id = '$pid' AND `system` != '1'");
}
}
}

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

@ -3369,7 +3369,7 @@ class Vprasanje {
echo '<p>';
echo '<span class="title" >'.$lang['srv_orientacija'].': </span>';
echo '<span class="content"><select name="orientation" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="check_drugo(this.value, \''.$row['id'].'\'); getOrientation(this.value); show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_preset_value(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_custom_picture_radio(\''.$row['id'].'\', this.value); show_hot_spot_settings(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
echo '<span class="content"><select name="orientation" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="getOrientation(this.value); show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_preset_value(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_custom_picture_radio(\''.$row['id'].'\', this.value); show_hot_spot_settings(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
echo '<option value="1"' . ($row['orientation'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
echo '<option value="7"' . ($row['orientation'] == 7 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna_2'].'</option>';
echo '<option value="0"' . ($row['orientation'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna'].'</option>';

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

@ -224,13 +224,16 @@ class LatexDocument{
$datumGeneriranjaIzvoza = date("d. m. Y");
$anketaUstvarjena = SurveyInfo::getInstance()->getSurveyInsertDate();
$dolgoImeAnkete = SurveyInfo::getSurveyColumn('akronim');
$dolgoImeAnkete = $this->encodeText(SurveyInfo::getSurveyColumn('akronim'));
if($this->language!=-1){ //ce ni default jezik, ampak je prevod
$_lang = '_'.$this->language;
$kratkoImeAnkete = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_novaanketa_kratkoime'.$_lang);
}else{
$kratkoImeAnkete = SurveyInfo::getSurveyColumn('naslov');
}
}
$kratkoImeAnkete = $this->encodeText($kratkoImeAnkete);
$steviloVprasanj = SurveyInfo::getSurveyQuestionCount();
$anketaSpremenjena = SurveyInfo::getSurveyEditDate();
$avtorAnkete = SurveyInfo::getSurveyInsertName();
@ -785,6 +788,8 @@ class LatexDocument{
//echo "stevilo spremenljivk: ".(SurveyInfo::getSurveyVariableCount());
$steviloSpremenljivk = SurveyInfo::getSurveyVariableCount();
if($export_format == 'pdf'){
####################################
//klicanje latex funkcije za generiranje naslovnice
@ -1336,4 +1341,74 @@ class LatexDocument{
$recnum = $rowu['recnum'];
return $recnum;
}
#funkcija ki skrbi za encode dolocenih spornih delov besedila v latex-u prijazno
function encodeText($text=''){
global $site_path, $lang;
//$text = str_replace(' ','X',$text); //nadomesti presledke
//echo "Encoding ".$text."</br>";
$this->path2UploadedImages = $site_path.'uploadi/editor/';
if($text == ''){ //ce ni teksta, vrni se
return;
}
//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);
//$text = str_replace('}','\}',$text);
$text = str_replace('$','\$ ',$text);
$text = str_replace('#','\# ',$text);
$text = str_replace('%','\% ',$text);
$text = str_replace('€','\euro',$text);
$text = str_replace('^','\textasciicircum{} ',$text);
$text = str_replace('_','\_ ',$text);
$text = str_replace('~','\textasciitilde{} ',$text);
$text = str_replace('&','\&',$text);
$text = str_replace('&amp;','\&',$text);
$text = str_replace('&nbsp;','~',$text);
//$text = str_replace('&lt;','\textless ',$text);
$text = str_replace('&lt;',' \textless ',$text);
//$text = str_replace('&gt;','\textgreater ',$text);
$text = str_replace('&gt;',' \textgreater ',$text);
//ureditev posebnih karakterjev za Latex - konec
//ureditev grskih crk
$text = str_replace('α','\textalpha ',$text);
$text = str_replace('β','\textbeta ',$text);
$text = str_replace('γ','\textgamma ',$text);
$text = str_replace('δ','\textdelta ',$text);
$text = str_replace('ε','\textepsilon ',$text);
$text = str_replace('ζ','\textzeta ',$text);
$text = str_replace('η','\texteta ',$text);
$text = str_replace('θ','\texttheta ',$text);
$text = str_replace('ι','\textiota ',$text);
$text = str_replace('κ','\textkappa ',$text);
$text = str_replace('λ','\textlambda ',$text);
$text = str_replace('μ','\textmugreek ',$text);
$text = str_replace('ν','\textnu ',$text);
$text = str_replace('ξ','\textxi ',$text);
//$text = str_replace('ο','\textomikron ',$text);
$text = str_replace('π','\textpi ',$text);
$text = str_replace('ρ','\textrho ',$text);
$text = str_replace('σ','\textsigma ',$text);
$text = str_replace('τ','\texttau ',$text);
$text = str_replace('υ','\textupsilon ',$text);
$text = str_replace('φ','\textphi ',$text);
$text = str_replace('χ','\textchi ',$text);
$text = str_replace('ψ','\textpsi ',$text);
$text = str_replace('ω','\textomega ',$text);
//ureditev grskih crk - 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
$text = '\foreignlanguage{russian}{'.$text.'}';
}
//RESEVANJE BESEDILA V CIRILICI - konec
return $text;
}
#funkcija ki skrbi za encode dolocenih spornih delov besedila v latex-u prijazno - konec
}

2
admin/survey/index.php
View File

@ -98,7 +98,7 @@
echo '<script>';
echo ' CKEDITOR.disableAutoInline = true;';
echo ' CKEDITOR.config.contentsCss = \'css/modules/themes.css\';';
echo ' CKEDITOR.config.language = '.($lang_admin == 2 ? 'en' : 'sl').';';
echo ' CKEDITOR.config.language = '.($lang_admin == 2 ? '\'en\'' : '\'sl\'').';';
echo '</script>';
// END CKEDITOR

10
admin/survey/modules/Evalvacija/class.GC.php
View File

@ -183,15 +183,15 @@ class GC{
'4_1' => 'predmeti'
);
$reports_id = '30102020';
$report_type = '3_1';
$fak_id = '3000043';
$reports_id = '11112020';
$report_type = '2_2';
$fak_id = '3000027';
$zip_name = '';
// Nastavimo pot do pdf-jev
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
echo '<span class="bold">Parametri:</span>';
echo '<ul><li>ID: <span class="bold">'.$reports_id.'</span></li>';

2
admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_ang.R
View File

@ -79,7 +79,7 @@ data <- subset(data, skupina == ID)
# ?e oddelek nima podatka oziroma je manjkajo?a vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekven?ne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)

2
admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_dan.R
View File

@ -81,7 +81,7 @@ if (data[1, 1] == ("Ustreznost") |
# Izberemo dokon?ane ankete skupine 1 in odstranimo podatke brez oddelka
data <- data %>%
subset(skupina == ID) %>%
subset(oddelek_ime != -1) %>%
#subset(oddelek_ime != -1) %>%
subset(status == 6)
# Odstranimo vrstice, ki vsebujejo vrednosti neveljavnih odgovorov (od -1 do -5)

2
admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_slo.R
View File

@ -82,7 +82,7 @@ if (data[1, 1] == ("Ustreznost") |
# Izberemo dokon?ane ankete skupine 1 in odstranimo podatke brez oddelka
data <- data %>%
subset(skupina == ID) %>%
subset(oddelek_ime != -1) %>%
#subset(oddelek_ime != -1) %>%
subset(status == 6)
# Odstranimo vrstice, ki vsebujejo vrednosti neveljavnih odgovorov (od -1 do -5)

11
admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R
View File

@ -72,7 +72,7 @@ if (data[1, 1] == ("Ustreznost") |
data <- subset(data, skupina == ID)
# Če oddelek nima podatka oziroma je manjkajoča vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekvenčne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)
#--------------------------- //IMPORT DATA// --------------------------#
@ -462,7 +462,7 @@ p <- ggplot(df, aes(x = factor(name))) +
# Rest of theme
coord_flip() +
scale_y_continuous(
position = "top",
position = "right",
# položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0, 102), by = 10),
@ -496,7 +496,7 @@ p1 <- p + theme(axis.text.x = element_text(colour="black",size=11,face="plain"),
plot.title = element_text(hjust = 0.4,size = 15, face = "bold")) #+
#ggtitle("Employeeship for all teams")
p1 + theme(axis.ticks=element_blank())
print(p1 + theme(axis.ticks=element_blank()))
dev.off() # END: Save ggplot to pdf
# Shranimo sliko in vklju\u010Dimo v pdf: LATEX
@ -847,7 +847,7 @@ if (nrow(oddelek_length) > 0) {
# Rest of theme
coord_flip() +
scale_y_continuous(position = "top", # položaj osi je na vrgu grafa
scale_y_continuous(position = "right", # položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0,102), by = 10),
limits = c(0,102),
@ -1000,8 +1000,7 @@ tex.izbor <- c(
drugi_del_tex,
"\\end{document}"
)
# Compile PDF
setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder
cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file
tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file

17
admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R
View File

@ -80,9 +80,10 @@ if (data[1, 1] == ("Ustreznost") |
data <- data[2:nrow(data),]
}
data <- subset(data, skupina == ID)
# Če oddelek nima podatka oziroma je manjkajoča vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekvenčne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)
#--------------------------- //IMPORT DATA// --------------------------#
@ -474,7 +475,7 @@ p <- ggplot(df, aes(x = factor(name))) +
# Rest of theme
coord_flip() +
scale_y_continuous(
position = "top",
position = "right",
# položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0, 102), by = 10),
@ -508,7 +509,7 @@ p1 <- p + theme(axis.text.x = element_text(colour="black",size=11,face="plain"),
plot.title = element_text(hjust = 0.4,size = 15, face = "bold")) #+
#ggtitle("Employeeship for all teams")
p1 + theme(axis.ticks=element_blank())
print(p1 + theme(axis.ticks=element_blank()))
dev.off() # END: Save ggplot to pdf
# Shranimo sliko in vklju\u010Dimo v pdf: LATEX
@ -859,7 +860,7 @@ if (nrow(oddelek_length) > 0) {
# Rest of theme
coord_flip() +
scale_y_continuous(position = "top", # položaj osi je na vrgu grafa
scale_y_continuous(position = "right", # položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0,102), by = 10),
limits = c(0,102),
@ -944,7 +945,7 @@ customer <-
tex.glava <- scan("modules/mod_EVOLI/latexkosi/glava-evoli_klima_slo.tex", character(0), sep="\n", quiet=TRUE,encoding='UTF-8') # Define document (first page, ...)
tex.17.znakov <- scan("modules/mod_EVOLI/latexkosi/klima_17_znakov.tex", character(0), sep="\n", quiet=TRUE,encoding='UTF-8')
tex.glava <- gsub(pattern='!organisation!', replacement=Hmisc::latexTranslate(organisation), x=tex.glava) # Organisation name
tex.glava <- gsub(pattern='!date!', replacement=Hmisc::latexTranslate(date), x=tex.glava) # Organisation name
tex.glava <- gsub(pattern='!date!', replacement=Hmisc::latexTranslate(date[1]), x=tex.glava) # Organisation name
tex.glava <- gsub(pattern='COMPANY NAME', replacement=Hmisc::latexTranslate(organisation), x=tex.glava, fixed = TRUE) # Organisation name
tex.glava <- gsub(pattern='!name!', replacement=Hmisc::latexTranslate(customer), x=tex.glava, fixed = TRUE) # Customer name
tex.noga <- scan("modules/mod_EVOLI/latexkosi/z-noga.tex", character(0), sep="\n", quiet=TRUE) # End latex document
@ -964,12 +965,8 @@ tex.izbor <- c(
tex.17.znakov,
tex.noga
)
# Compile PDF
setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder
cat(unlist(tex.izbor), file=paste0("Klima-kakovosti.tex"), sep="\n") # Name of tex file
tools::texi2pdf(file=paste0("Klima-kakovosti.tex"), quiet=TRUE, clean=TRUE) # Pdf file
setwd(Rdirektorij)

2
admin/survey/modules/mod_EVOLI/R/Evoli_teamship_meter_ang.R
View File

@ -77,7 +77,7 @@ data <- subset(data, skupina == ID)
# ?e oddelek nima podatka oziroma je manjkajo?a vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekven?ne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)

2
admin/survey/modules/mod_EVOLI/R/Evoli_teamship_meter_slo.R
View File

@ -83,7 +83,7 @@ if (data[1, 1] == ("Ustreznost") |
# Izberemo dokon?ane ankete skupine 1 in odstranimo podatke brez oddelka
data <- data %>%
subset(skupina == ID) %>%
subset(oddelek_ime != -1) %>%
# subset(oddelek_ime != -1) %>%
subset(status == 6)
# Odstranimo vrstice, ki vsebujejo vrednosti neveljavnih odgovorov (od -1 do -5)

4
admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php
View File

@ -42,7 +42,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
@ -55,7 +55,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});

4
admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php
View File

@ -42,7 +42,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
@ -55,7 +55,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});

4
admin/survey/modules/mod_EVOLI/forms/team_meter_form.php
View File

@ -42,7 +42,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
@ -55,7 +55,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});

4
admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php
View File

@ -42,7 +42,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
@ -55,7 +55,7 @@
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImage: "../../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});

2
admin/survey/modules/mod_EVOLI/latexkosi/drugi_del-quality_clime_ang.tex
View File

@ -398,7 +398,7 @@ of organisational systems and policies.
and online diagnostic tools to companies and organisations worldwide to enable them \\
to achieve long-lasting results at the personal, team and organisational levels. }
\end{center}
\\ \\
\ \\ \\
\begin{center}
{\small Claus M{\o}ller Consulting helps organisations to measure, improve and manage \\
productivity, relationships, quality, and leadership}.

2
admin/survey/modules/mod_EVOLI/latexkosi/glava-evoli_klima_slo.tex
View File

@ -734,7 +734,7 @@ samodisciplino".
\begin{center}
{\large \textbf{Kako uporabite orodje za posameznika}}
\end{center}
\\
\ \\
\renewcommand\labelitemi{\large$\bullet$}
\begin{itemize}
\item Vsak član tima mora pazljivo pregledati svoje lastne odgovore \\

2
admin/survey/modules/mod_EVOLI/latexkosi/glava-quality_clime_ang.tex
View File

@ -674,7 +674,7 @@ strengthen your self-discipline''.
\begin{center}
{\large \textbf{How the individual can use the tool}}
\end{center}
\\
\ \\
\renewcommand\labelitemi{\large$\bullet$}
\begin{itemize}
\item Every employee should carefully study the \textit{Quality Climate} \\

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

@ -378,45 +378,8 @@ function branching_click(event) {
/* inline edit vprasanja */
inline_bind_click(event);
/* to smo dal (zaenkrat) ven
// opcije na levi
// dodajanje spremenljivke
if (ta.is('a.newspr')) {
var spr = ta.parent().attr('spr');
var _if = ta.parent().attr('if');
var endif = ta.parent().attr('endif');
spremenljivka_new(spr, _if, endif);
return false;
}
// dodajanje ifa
if (ta.is('a.newif')) {
var spr = ta.parent().attr('spr');
var _if = ta.parent().attr('if');
var endif = ta.parent().attr('endif');
if_new(spr, _if, endif, '0');
return false;
}
// dodajanje bloka (tip=1)
if (ta.is('a.newblock')) {
var spr = ta.parent().attr('spr');
var _if = ta.parent().attr('if');
var endif = ta.parent().attr('endif');
if_new(spr, _if, endif, '1');
return false;
}
// pagebreak
if (ta.is('a.pb')) {
var spr = ta.parent().attr('spr');
pagebreak(spr);
return false;
}*/
return false;
}
// pohendla mouseoverje, ki se lovijo nad branchingom
@ -964,6 +927,9 @@ function spremenljivka_new(spremenljivka, _if, endif, copy, tip, podtip, drop) {
else {
$('#branching').html(data.branching_struktura);
vprasanje_fullscreen(data.nova_spremenljivka_id, data.vprasanje_fullscreen);
// Pri ustvarjanju novega vprasanja izvedemo focus na naslov (da ni potreben dodaten klik)
$('.naslov_inline[spr_id="'+data.nova_spremenljivka_id+'"]').focus();
}
}
else {

150
admin/survey/script/invitations.js
View File

@ -3,8 +3,6 @@ function deleteRecipient_confirm(inv_rid) {
$('#fade').fadeTo('slow', 1);
$('#fullscreen').html('').fadeIn('slow');
$("#fullscreen").load('ajax.php?t=invitations&a=delete_recipient_confirm', {anketa:srv_meta_anketa_id, inv_rid:inv_rid,noNavi:'true'});
//#$(".anketa_edit_main").load('ajax.php?t=invitations&a=delete_recipient', {anketa:srv_meta_anketa_id, inv_rid:inv_rid});
}
function inv_delete_recipient() {
var inv_rid = $("#inv_delete_rec_confirm input#inv_rid").val();
@ -32,7 +30,8 @@ function inv_arch_recipients_close() {
function inv_arch_save_comment() {
var aid = $("#inv_arch_id").val();
var comment = $("#inv_arch_comment").val();
$.post('ajax.php?t=invitations&a=arch_save_comment', {anketa:srv_meta_anketa_id, aid:aid, comment:comment, noNavi:'true'}, function(data) {
$.post('ajax.php?t=invitations&a=arch_save_comment', {anketa:srv_meta_anketa_id, aid:aid, comment:comment, noNavi:'true'}, function(data) {
// to ni vredu.window.location.reload();
$('#fade').fadeOut('slow');
$('#fullscreen').fadeOut('slow').html('');
@ -48,7 +47,7 @@ function inv_arch_recipients_send() {
checkboxes = checkboxes+prefix+$(this).val();
prefix = ",";
});
//$("#inv_send_mail_finish").html('Pošiljam...');
$('#fullscreen').load('ajax.php?t=invitations&a=send_mail',
{anketa:srv_meta_anketa_id, noNavi:'true',send_type:send_type, checkboxes:checkboxes}
);
@ -56,15 +55,18 @@ function inv_arch_recipients_send() {
function inv_change_import_type() {
var import_type = $('input[name=inv_import_type]:checked').val();
$("#inv_import").load('ajax.php?t=invitations&a=change_import_type', {anketa:srv_meta_anketa_id, import_type:import_type,noNavi:'true'});
$("#inv_import").load('ajax.php?t=invitations&a=change_import_type', {anketa:srv_meta_anketa_id, import_type:import_type,noNavi:'true'}, function(){
refreshFieldsList();
});
}
function toggleInvCheckbox(what) {
var id = $(what).attr("id");
if ( $(what).is(":checked") ) {
$(what).parent().addClass('inv_field_enabled');
} else {
$(what).parent().removeClass('inv_field_enabled');
$(what).parent().addClass('inv_field_enabled');
}
else {
$(what).parent().removeClass('inv_field_enabled');
}
refreshFieldsList();
@ -193,47 +195,18 @@ function inv_save_recipient() {
$.post('ajax.php?t=invitations&a=save_recipient', {anketa:srv_meta_anketa_id, inv_rid:inv_rid, rec_email:rec_email, rec_password:rec_password,
rec_firstname:rec_firstname, rec_lastname:rec_lastname, rec_salutation:rec_salutation, rec_phone:rec_phone, rec_custom:rec_custom, rec_relation:rec_relation, noNavi:'true'}, function(data) {
data = jQuery.parseJSON(data);
if (data.error == "0") {
data = jQuery.parseJSON(data);
if (data.error == "0") {
// smo shranli lahko zapremo okno in refrešamo podatke
$('#fade').fadeOut('slow');
$('#fullscreen').fadeOut('slow').html('');
// Refreshamo celotno stran
location.reload();
// zamenjamo samo podatke v izbrani vrstici - TO NE DELA
//$(".anketa_edit_main").load('ajax.php?t=invitations&a=view_recipients', {anketa:srv_meta_anketa_id});
/*var tr = $('#tbl_recipients_list tr td input[value="'+data.rid+'"]').closest('tr');
emailHtml= '<span class="as_link" onclick="showRecipientTracking(\''+data.rec.id+'\'); return false;">'+data.rec.email+'</span>';
// email = 7
if ($('#tbl_recipients_list tr th:nth-child(5)').html()==('EMAIL')) {
$(tr).find(':nth-child(7)').html(emailHtml);
}
// geslo = 8
if ($('#tbl_recipients_list tr th:nth-child(6)').html()==('PASSWORD'))
$(tr).find(':nth-child(8)').html(data.rec.password);
// email = 9
if ($('#tbl_recipients_list tr th:nth-child(7)').html()==('FIRSTNAME'))
$(tr).find(':nth-child(9)').html(data.rec.firstname);
// geslo = 10
if ($('#tbl_recipients_list tr th:nth-child(8)').html()==('LASTNAME'))
$(tr).find(':nth-child(10)').html(data.rec.lastname);
// email = 11
if ($('#tbl_recipients_list tr th:nth-child(9)').html()==('SALUTATION'))
$(tr).find(':nth-child(11)').html(data.rec.salutation);
// geslo = 12
if ($('#tbl_recipients_list tr th:nth-child(10)').html()==('PHONE'))
$(tr).find(':nth-child(12)').html(data.rec.phone);
// geslo = 13
if ($('#tbl_recipients_list tr th:nth-child(11)').html()==('CUSTOM'))
$(tr).find(':nth-child(13)').html(data.rec.custom);
// odnos
if ($('#tbl_recipients_list tr th:nth-child(12)').html()==('RELATION'))
$(tr).find(':nth-child(14)').html(data.rec.relation); */
} else {
location.reload();
}
else {
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").show();
@ -377,16 +350,20 @@ function mailToSourceChange() {
}
function mailToSourceCheckboxChange() {
var send_type = $('input[name=mailto]:checked').val();
var prefix = "";
var checkboxes = "";
var checkboxes = "";
$('input[name="mailto_status[]"]:checked').each(function(el) {
checkboxes = checkboxes+prefix+$(this).val();
prefix = ",";
});
});
var source_type = $('input[name=mailsource]:checked').val();
var source_lists = "";
var prefix = "";
var prefix = "";
$('input[name="mailsource_lists[]"]:checked').each(function(el) {
source_lists = source_lists+prefix+$(this).val();
prefix = ",";
@ -394,36 +371,43 @@ function mailToSourceCheckboxChange() {
$("#inv_select_mail_to_respondents").load('ajax.php?t=invitations&a=view_send_recipients', {anketa:srv_meta_anketa_id, noNavi:'true',send_type:send_type, checkboxes:checkboxes, source_type:source_type, source_lists:source_lists}, function(){
var cb = $('#tbl_recipients_send_list tr td').length;
if (cb > 0 ) {
if (cb > 0 ) {
$("#inv_send_mail_btn").show();
} else {
}
else {
$("#inv_send_mail_btn").hide();
}
if (cb > 4999 ) {
if (cb > 4999 ) {
$("#inv_send_mail_limit").show();
} else {
}
else {
$("#inv_send_mail_limit").hide();
}
});
}
function mailTocheCheckboxChange() {
// izberemo rado za status
$('#mailto4').attr('checked', true);
var send_type = $('input[name=mailto]:checked').val();
var send_type = $('input[name=mailto]:checked').val();
var prefix = "";
var checkboxes = "";
$('input[name="mailto_status[]"]:checked').each(function(el) {
$('input[name="mailto_status[]"]:checked').each(function(el) {
checkboxes = checkboxes+prefix+$(this).val();
prefix = ",";
});
var source_type = $('input[name=mailsource]:checked').val();
var source_type = $('input[name=mailsource]:checked').val();
var source_lists = "";
var prefix = "";
$('input[name="mailsource_lists[]"]:checked').each(function(el) {
$('input[name="mailsource_lists[]"]:checked').each(function(el) {
source_lists = source_lists+prefix+$(this).val();
prefix = ",";
});
@ -440,13 +424,14 @@ function mailTocheCheckboxChange() {
} else {
$("#inv_send_mail_limit").hide();
}
});
};
function invitations_init() {
$(".inv_checkbox").live('change', function(event) {
toggleInvCheckbox(this);
});
});
$("#inv_upload_recipients").live('click', function(event) {
var inv_iid = $("#inv_iid").val();
$("#inv_recipients_upload_form").submit();
@ -970,19 +955,23 @@ function invSendMail() {
};
*/
function inv_del_rec_profile() {
var pid = $("#inv_import_list_profiles ol li.active").attr("pid");
var pid = $("#inv_import_list_profiles ol li.active").attr("pid");
if (confirm(lang['srv_inv_recipients_delete_profile_confirm'])) {
$.post('ajax.php?t=invitations&a=delete_rec_profile', {anketa:srv_meta_anketa_id, pid:pid, noNavi:'true'}, function(data) {
// osvežimo polja
//inv_change_import_type();
var new_pid = $("#inv_import_list_profiles ol li").first().attr('pid');
// če je slučajno isti kot smo ga zbrisli izberemo nasledenjega
// osvežimo polja
var new_pid = $("#inv_import_list_profiles ol li").first().attr('pid');
// če je slučajno isti kot smo ga zbrisli izberemo nasledenjega
if (new_pid == pid) {
var new_pid = $("#inv_import_list_profiles ol li").first().next().attr('pid');
}
}
$(".anketa_edit_main").load('ajax.php?t=invitations&a=use_recipients_list', {anketa:srv_meta_anketa_id, pid:new_pid });
});
}
}
@ -1554,36 +1543,7 @@ function mailSourceMesageChange(what) {
$("#inv_select_mail_preview").load('ajax.php?t=invitations&a=make_default_from_preview', {anketa:srv_meta_anketa_id, mid:mid,noNavi:'true'});
}
}
/*
function inv_add_sysusers() {
// polovimo izbrane sistemske variable in prikazemo podatke
var sysVariables = $("#inv_sys_container ul.connectedSortable").sortable('toArray');
$(".anketa_edit_main").load('ajax.php?t=invitations&a=addSysusers', {anketa:srv_meta_anketa_id, sysVariables:sysVariables});
}
function inv_sysvar_change(what) {
var elChecked = $(what).is(':checked');
var elSprId = $(what).attr('spr_id');
var elId = $(what).attr('id');
var elNaslov = $(what).attr('naslov');
//odvisno ali checkbox obkljukamo ali odstranimo, osvežimo izbor polij
if (elChecked) {
// element dodamo na konec
$("#inv_sys_container ul.connectedSortable")
.append('<li class="inv_field_enabled" id="invSysVarLi_'+elSprId+'">'+elNaslov+'</li>');
} else {
$('#invSysVarLi_'+elSprId).remove();
}
inv_sysvar_refresh_data();
}
function inv_sysvar_refresh_data() {
// polovimo izbrane sistemske variable in prikazemo podatke
var sysVariables = $("#inv_sys_container ul.connectedSortable").sortable('toArray');
//alert(sysVariables);
$("#inv_sys_user_list").load('ajax.php?t=invitations&a=showSysUsers', {anketa:srv_meta_anketa_id,noNavi:'true', sysVariables:sysVariables});
}
*/
function inv_set_sort_field(field,type) {
$.post('ajax.php?t=invitations&a=setSortField', {anketa:srv_meta_anketa_id,noNavi:'true', field:field,type:type}, function() {
$(".anketa_edit_main").load('ajax.php?t=invitations&a=view_recipients', {anketa:srv_meta_anketa_id});

27
admin/survey/script/narocila.js
View File

@ -36,9 +36,9 @@ function userAccessFilters(){
// Prikaz popupa da funkcionalnost ni na voljo v paketu
function popupUserAccess(what) {
$('#fade').fadeTo('slow', 1);
$("#popup_user_access").load('ajax.php?t=userAccess&a=displayNoAccessPopup', {what: what});
$('#fade').fadeTo('slow', 1);
$("#popup_user_access").load('ajax.php?t=userAccess&a=displayNoAccessPopup', {what: what, anketa: srv_meta_anketa_id});
$("#popup_user_access").show();
}
@ -106,8 +106,8 @@ function prepareNarocilaTableAdmin(){
exportOptions: {
columns: ':visible'
}
},
'colvis'
}/*,
'colvis'*/
]
});
}
@ -178,7 +178,8 @@ function preparePlacilaTableAdmin(){
// Pridobimo predracun preko api-ja in redirectamo
function getNarociloPredracun(narocilo_id){
$.post(siteUrl+'frontend/payments/api.php?action=get_predracun', {narocilo_id : narocilo_id}, function(response){
//$.post(siteUrl+'frontend/payments/api.php?action=get_predracun', {narocilo_id : narocilo_id}, function(response){
$.post('ajax.php?t=userNarocila&a=getPredracun', {narocilo_id : narocilo_id}, function(response){
var pdf_url = response.replace(/\\\//g, "/");
pdf_url = pdf_url.replace(/['"]+/g, '');
@ -190,7 +191,8 @@ function getNarociloPredracun(narocilo_id){
// Pridobimo racun preko api-ja in redirectamo
function getNarociloRacun(narocilo_id){
$.post(siteUrl+'frontend/payments/api.php?action=get_racun', {narocilo_id : narocilo_id}, function(response){
//$.post(siteUrl+'frontend/payments/api.php?action=get_racun', {narocilo_id : narocilo_id}, function(response){
$.post('ajax.php?t=userNarocila&a=getRacun', {narocilo_id : narocilo_id}, function(response){
var pdf_url = response.replace(/\\\//g, "/");
pdf_url = pdf_url.replace(/['"]+/g, '');
@ -300,4 +302,15 @@ function stornirajPlacilo(placilo_id){
if(confirm('Ste prepričani?')){
$("#placila").load('ajax.php?t=userPlacila&a=stornirajPlacilo', {placilo_id: placilo_id});
}
}
// Nastavi filtriranje po statusu
function filterNarocila(status, checked){
if(checked)
var value = 1;
else
var value = 0;
$("#narocila").load('ajax.php?t=userNarocila&a=filterNarocila', {status: status, value: value});
}

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

@ -498,7 +498,8 @@ function anketa_active (anketa, state, folders, hierarhija) {
}
else
{
$('#anketa_activation').load('ajax.php?a=anketa_active&ajaxa='+gup("a"), {anketa: anketa, folders: folders}, function() {
//$('#anketa_activation').load('ajax.php?a=anketa_active&ajaxa='+gup("a"), {anketa: anketa, folders: folders}, function() {
$.post('ajax.php?a=anketa_active&ajaxa='+gup("a"), {anketa: anketa, folders: folders}, function() {
window.location.reload(); return;
});
}

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

@ -11,7 +11,7 @@ function onload_init_vprasanje() {
});
}
// prikaze fullscreen urejanje vprasanja
function vprasanje_fullscreen (spremenljivka, cache, new_spremenljivka, chart_edit, no_close) {
function vprasanje_fullscreen (spremenljivka, cache, chart_edit, no_close) {
if (locked) return;
//za ureditev custom opisnih label pri drsniku
@ -80,28 +80,23 @@ function vprasanje_fullscreen (spremenljivka, cache, new_spremenljivka, chart_ed
vprasanje_pozicija(spremenljivka);
}
/*
// v primeru nove spremenljivke, refreshamo tudi branching
if (new_spremenljivka == 1) {
refreshLeft(spremenljivka);
}*/
// pri skrcenem nacinu moramo se prikazat polni predogled vprasanja
if ($('#branching').hasClass('collapsed')) {
if (spremenljivka > 0) {
if (spremenljivka > 0) {
$('#branching_'+spremenljivka).load('ajax.php?t=branching&a=vprasanje_full', {spremenljivka: spremenljivka, anketa:srv_meta_anketa_id},
function () {
vprasanje_pozicija(spremenljivka);
});
} else {
}
else {
$('#'+spremenljivka).load('ajax.php?t=branching&a=vprasanje_full', {spremenljivka: spremenljivka, anketa:srv_meta_anketa_id},
function () {
vprasanje_pozicija(spremenljivka);
});
}
}
}
/**
@ -605,8 +600,7 @@ function change_subtype_number (spremenljivka) {
function change_tip(spremenljivka, tip) {
$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, anketa: srv_meta_anketa_id}, function (data) {
vprasanje_fullscreen(spremenljivka, data, false, false, true);
//vprasanje_refresh(spremenljivka, true);
vprasanje_fullscreen(spremenljivka, data, false, true);
vprasanje_save(true);
});
}
@ -741,25 +735,6 @@ function get_editor_close(id) {
}
}
//preveri polje drugo in moznost dodajanja polja drugo
//function check_drugo(value, spremenljivka) {
function check_drugo(value, spremenljivka) {
// preklop na dropdown
if(value == 4){
//document.getElementById('add_drugo').style.display = 'none';
// $('.li_other').remove();
// $.post('ajax.php?t=vprasanje&a=vrednosti_other_delete', {spremenljivka: spremenljivka, anketa: srv_meta_anketa_id}, function () {
// vprasanje_fullscreen(spremenljivka);
// });
}
else{
//document.getElementById('add_drugo').style.display = 'inline';
}
}
// prikaze field da manager doda nek komentar obstojecemu komentarju na vprasanje
function comment_on_comment (id) {

2340
composer.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
frontend/api/api_test.php
View File

@ -20,7 +20,7 @@ $action = 'logout';
// Izvedemo klic (GET ali POST)
//$result = executeGET();
$result = executePOST();
//$result = executePOST();

11
frontend/api/class.ApiLogin.php
View File

@ -416,8 +416,19 @@ class ApiLogin
global $cookie_domain;
global $originating_domain;
global $keep_domain;
global $app_settings;
// Ce imamo vklopljeno blokiranje dostopa do admina glede na ip
if(isset($app_settings['admin_allow_only_ip']) && $app_settings['admin_allow_only_ip'] != '' && !empty($app_settings['admin_allow_only_ip'])){
// Preverimo ip - ce se ne ujema ne pustimo logina
if(!in_array($_SERVER['REMOTE_ADDR'], $app_settings['admin_allow_only_ip'])){
header('location: '.$this->page_urls['page_login'.$this->prijava]);
die();
}
}
$mini = $this->email.$this->pass;
for ($Stevec = 0; $Stevec < strlen($mini); $Stevec++) {
$mini = str_replace("'", "", $mini);

10
frontend/drupal/CHANGELOG.txt
View File

@ -1,3 +1,13 @@
Drupal 7.75, 2020-11-26
-----------------------
- Fixed security issues:
- SA-CORE-2020-013
Drupal 7.74, 2020-11-17
-----------------------
- Fixed security issues:
- SA-CORE-2020-012
Drupal 7.73, 2020-09-16
-----------------------
- Fixed security issues:

2
frontend/drupal/includes/bootstrap.inc
View File

@ -8,7 +8,7 @@
/**
* The current system version.
*/
define('VERSION', '7.73');
define('VERSION', '7.75');
/**
* Core API compatibility.

70
frontend/drupal/includes/file.inc
View File

@ -1147,8 +1147,8 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
* exploit.php_.pps.
*
* Specifically, this function adds an underscore to all extensions that are
* between 2 and 5 characters in length, internal to the file name, and not
* included in $extensions.
* between 2 and 5 characters in length, internal to the file name, and either
* included in the list of unsafe extensions, or not included in $extensions.
*
* Function behavior is also controlled by the Drupal variable
* 'allow_insecure_uploads'. If 'allow_insecure_uploads' evaluates to TRUE, no
@ -1157,7 +1157,8 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
* @param $filename
* File name to modify.
* @param $extensions
* A space-separated list of extensions that should not be altered.
* A space-separated list of extensions that should not be altered. Note that
* extensions that are unsafe will be altered regardless of this parameter.
* @param $alerts
* If TRUE, drupal_set_message() will be called to display a message if the
* file name was changed.
@ -1175,6 +1176,10 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
$whitelist = array_unique(explode(' ', strtolower(trim($extensions))));
// Remove unsafe extensions from the list of allowed extensions. The list is
// copied from file_save_upload().
$whitelist = array_diff($whitelist, explode('|', 'php|phar|pl|py|cgi|asp|js'));
// Split the filename up by periods. The first part becomes the basename
// the last part the final extension.
$filename_parts = explode('.', $filename);
@ -1542,25 +1547,35 @@ function file_save_upload($form_field_name, $validators = array(), $destination
$validators['file_validate_extensions'][0] = $extensions;
}
if (!empty($extensions)) {
// Munge the filename to protect against possible malicious extension hiding
// within an unknown file type (ie: filename.html.foo).
$file->filename = file_munge_filename($file->filename, $extensions);
}
// Rename potentially executable files, to help prevent exploits (i.e. will
// rename filename.php.foo and filename.php to filename.php.foo.txt and
// filename.php.txt, respectively). Don't rename if 'allow_insecure_uploads'
// evaluates to TRUE.
if (!variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|phar|pl|py|cgi|asp|js)(\.|$)/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
$file->filemime = 'text/plain';
// The destination filename will also later be used to create the URI.
$file->filename .= '.txt';
// The .txt extension may not be in the allowed list of extensions. We have
// to add it here or else the file upload will fail.
if (!variable_get('allow_insecure_uploads', 0)) {
if (!empty($extensions)) {
$validators['file_validate_extensions'][0] .= ' txt';
drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $file->filename)));
// Munge the filename to protect against possible malicious extension hiding
// within an unknown file type (ie: filename.html.foo).
$file->filename = file_munge_filename($file->filename, $extensions);
}
// Rename potentially executable files, to help prevent exploits (i.e. will
// rename filename.php.foo and filename.php to filename.php_.foo_.txt and
// filename.php_.txt, respectively). Don't rename if 'allow_insecure_uploads'
// evaluates to TRUE.
if (preg_match('/\.(php|phar|pl|py|cgi|asp|js)(\.|$)/i', $file->filename)) {
// If the file will be rejected anyway due to a disallowed extension, it
// should not be renamed; rather, we'll let file_validate_extensions()
// reject it below.
if (!isset($validators['file_validate_extensions']) || !file_validate_extensions($file, $extensions)) {
$file->filemime = 'text/plain';
if (substr($file->filename, -4) != '.txt') {
// The destination filename will also later be used to create the URI.
$file->filename .= '.txt';
}
$file->filename = file_munge_filename($file->filename, $extensions, FALSE);
drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $file->filename)));
// The .txt extension may not be in the allowed list of extensions. We have
// to add it here or else the file upload will fail.
if (!empty($validators['file_validate_extensions'][0])) {
$validators['file_validate_extensions'][0] .= ' txt';
}
}
}
}
@ -1728,7 +1743,18 @@ function file_validate(stdClass &$file, $validators = array()) {
}
// Let other modules perform validation on the new file.
return array_merge($errors, module_invoke_all('file_validate', $file));
$errors = array_merge($errors, module_invoke_all('file_validate', $file));
// Ensure the file does not contain a malicious extension. At this point
// file_save_upload() will have munged the file so it does not contain a
// malicious extension. Contributed and custom code that calls this method
// needs to take similar steps if they need to permit files with malicious
// extensions to be uploaded.
if (empty($errors) && !variable_get('allow_insecure_uploads', 0) && preg_match('/\.(php|phar|pl|py|cgi|asp|js)(\.|$)/i', $file->filename)) {
$errors[] = t('For security reasons, your upload has been rejected.');
}
return $errors;
}
/**

6
frontend/drupal/modules/aggregator/aggregator.info
View File

@ -7,7 +7,7 @@ files[] = aggregator.test
configure = admin/config/services/aggregator/settings
stylesheets[all][] = aggregator.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/aggregator/tests/aggregator_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/block/block.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = block.test
configure = admin/structure/block
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/block/tests/block_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/block/tests/themes/block_test_theme/block_test_theme.info
View File

@ -13,7 +13,7 @@ regions[footer] = Footer
regions[highlighted] = Highlighted
regions[help] = Help
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/blog/blog.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = blog.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/book/book.info
View File

@ -7,7 +7,7 @@ files[] = book.test
configure = admin/content/book/settings
stylesheets[all][] = book.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/color/color.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = color.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/comment/comment.info
View File

@ -9,7 +9,7 @@ files[] = comment.test
configure = admin/content/comment
stylesheets[all][] = comment.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/contact/contact.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = contact.test
configure = admin/structure/contact
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/contextual/contextual.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = contextual.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/dashboard/dashboard.info
View File

@ -7,7 +7,7 @@ files[] = dashboard.test
dependencies[] = block
configure = admin/dashboard/customize
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/dblog/dblog.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = dblog.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/field.info
View File

@ -11,7 +11,7 @@ dependencies[] = field_sql_storage
required = TRUE
stylesheets[all][] = theme/field.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/modules/field_sql_storage/field_sql_storage.info
View File

@ -7,7 +7,7 @@ dependencies[] = field
files[] = field_sql_storage.test
required = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/modules/list/list.info
View File

@ -7,7 +7,7 @@ dependencies[] = field
dependencies[] = options
files[] = tests/list.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/modules/list/tests/list_test.info
View File

@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/modules/number/number.info
View File

@ -6,7 +6,7 @@ core = 7.x
dependencies[] = field
files[] = number.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/modules/options/options.info
View File

@ -6,7 +6,7 @@ core = 7.x
dependencies[] = field
files[] = options.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/modules/text/text.info
View File

@ -7,7 +7,7 @@ dependencies[] = field
files[] = text.test
required = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field/tests/field_test.info
View File

@ -6,7 +6,7 @@ files[] = field_test.entity.inc
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/field_ui/field_ui.info
View File

@ -6,7 +6,7 @@ core = 7.x
dependencies[] = field
files[] = field_ui.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/file/file.info
View File

@ -6,7 +6,7 @@ core = 7.x
dependencies[] = field
files[] = tests/file.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/file/tests/file_module_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/filter/filter.info
View File

@ -7,7 +7,7 @@ files[] = filter.test
required = TRUE
configure = admin/config/content/formats
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/forum/forum.info
View File

@ -9,7 +9,7 @@ files[] = forum.test
configure = admin/structure/forum
stylesheets[all][] = forum.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/help/help.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = help.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/image/image.info
View File

@ -7,7 +7,7 @@ dependencies[] = file
files[] = image.test
configure = admin/config/media/image-styles
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/image/tests/image_module_test.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = image_module_test.module
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/locale/locale.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = locale.test
configure = admin/config/regional/language
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/locale/tests/locale_test.info
View File

@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/menu/menu.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = menu.test
configure = admin/structure/menu
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/node/node.info
View File

@ -9,7 +9,7 @@ required = TRUE
configure = admin/structure/types
stylesheets[all][] = node.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/node/tests/node_access_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/node/tests/node_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/node/tests/node_test_exception.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/openid/openid.info
View File

@ -5,7 +5,7 @@ package = Core
core = 7.x
files[] = openid.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/openid/tests/openid_test.info
View File

@ -6,7 +6,7 @@ core = 7.x
dependencies[] = openid
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/overlay/overlay.info
View File

@ -4,7 +4,7 @@ package = Core
version = VERSION
core = 7.x
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/path/path.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = path.test
configure = admin/config/search/path
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/php/php.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = php.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/poll/poll.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = poll.test
stylesheets[all][] = poll.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/profile/profile.info
View File

@ -11,7 +11,7 @@ configure = admin/config/people/profile
; See user_system_info_alter().
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/rdf/rdf.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
files[] = rdf.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/rdf/tests/rdf_test.info
View File

@ -6,7 +6,7 @@ core = 7.x
hidden = TRUE
dependencies[] = blog
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/search/search.info
View File

@ -8,7 +8,7 @@ files[] = search.test
configure = admin/config/search/settings
stylesheets[all][] = search.css
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/search/tests/search_embedded_form.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/search/tests/search_extra_type.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/search/tests/search_node_tags.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/shortcut/shortcut.info
View File

@ -6,7 +6,7 @@ core = 7.x
files[] = shortcut.test
configure = admin/config/user-interface/shortcut
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/simpletest.info
View File

@ -58,7 +58,7 @@ files[] = tests/upgrade/update.trigger.test
files[] = tests/upgrade/update.field.test
files[] = tests/upgrade/update.user.test
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/actions_loop_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/ajax_forms_test.info
View File

@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/ajax_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/batch_test.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/boot_test_1.info
View File

@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/boot_test_2.info
View File

@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/common_test.info
View File

@ -7,7 +7,7 @@ stylesheets[all][] = common_test.css
stylesheets[print][] = common_test.print.css
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/common_test_cron_helper.info
View File

@ -5,7 +5,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/database_test.info
View File

@ -5,7 +5,7 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

6
frontend/drupal/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
View File

@ -7,7 +7,7 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by Drupal.org packaging script on 2020-09-16
version = "7.73"
; Information added by Drupal.org packaging script on 2020-11-26
version = "7.75"
project = "drupal"
datestamp = "1600272641"
datestamp = "1606357834"

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