Merge branch 'master' into release/produkcija

# Conflicts:
#	composer.lock
#	main/survey/app/Controllers/BodyController.php
#	resources/sass/admin/payments.scss

admin/survey/BranchingAjax.php

@@ -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.'" />';

admin/survey/SurveyAdmin.php

@@ -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>';
                 }
             }

admin/survey/classes/class.Common.php

@@ -56,6 +56,7 @@ class Common {
 
 		// Preverimo ce imamo izklopljeno atomatsko prestevilcevanje
         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);

admin/survey/classes/class.SurveyAktivnost.php

@@ -15,8 +15,7 @@ class SurveyAktivnost{
 	 * @desc prikaze diagnostiko anket
 	 */
 	public function diagnostics() {
-		global $lang;
+		global $lang, $global_user_id, $admin_type, $app_settings;
-		global $global_user_id, $admin_type;
 
         $sum = 0;
         $sum_survey = 0;
@@ -54,6 +53,24 @@ class SurveyAktivnost{
 		
 		$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.'" />';
@@ -171,12 +188,15 @@ class SurveyAktivnost{
 						
 		} elseif ($type == 'users') {
             $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
+			                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
-			                WHERE ".$filter." AND ".$filter_lang." srv_user.ank_id > '0'
+                            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 . "'))
@@ -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>
+			echo '</tr>';
-			            ';
-			//$sum_survey = sizeof($row);
 		}
 		
         echo '<script type="text/javascript">
@@ -285,20 +303,41 @@ class SurveyAktivnost{
 		
 		$interval = $this->diagnostics_get_interval('month');
         $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 
-		$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");
+                                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);	
 	}
@@ -308,21 +347,40 @@ class SurveyAktivnost{
 		
 		$interval = $this->diagnostics_get_interval('day');
         $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 
-		$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");
+                                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 
-		$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");
+                                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 () {
@@ -330,19 +388,41 @@ class SurveyAktivnost{
 		
 		$interval = $this->diagnostics_get_interval('day');
         $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">';
@@ -627,6 +729,24 @@ class SurveyAktivnost{
 		
 		$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.'" />';
@@ -708,7 +828,6 @@ class SurveyAktivnost{
 		$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,12 +860,36 @@ 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;
     }		
@@ -765,6 +908,4 @@ class SurveyAktivnost{
 		return $filter;
 	}
 
-	
-
 }

admin/survey/classes/class.SurveyChart.php

@@ -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)	
@@ -4377,6 +4379,9 @@ class SurveyChart {
 									
                                     $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'];
+			$max = (double)$dataArray[count($dataArray,0)-1]['variable'];
-			$min = (int)$dataArray[0]['variable'];
+			$min = (double)$dataArray[0]['variable'];
 			$stIntervalov = ((int)$settings['interval'] == 0 ? 10 : (int)$settings['interval']);
 			
 
@@ -4504,14 +4509,16 @@ 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;
+
+                if(!$has_decimal)
 				    $part = ($part < 1) ? 1 : round($part);
 			}
 			
@@ -4556,9 +4563,16 @@ class SurveyChart {
 						$minVal = $limits['interval_'.$interval]['min'];
 					}
 					// Ce imamo osnovne intervale (racunamo sproti)
+					else{
+                        // 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
@@ -4661,8 +4675,15 @@ class SurveyChart {
 						}
 						// Ce imamo osnovne intervale (racunamo sproti)
 						else{
+                            // 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

admin/survey/classes/class.SurveyExportProfiles.php

@@ -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);
 		}
 		

admin/survey/classes/class.SurveyMissingProfiles.php

@@ -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'");		
 		} 
 	}
 		

admin/survey/classes/class.SurveyStatusCasi.php

@@ -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'");
+			$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'");		
+			print_r("DELETE FROM srv_status_casi WHERE id = '$pid' AND `system` != '1'");		
 		} 
 	}
 	

admin/survey/classes/class.SurveyStatusProfiles.php

@@ -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'");		
 			}
 		} 
 	}

admin/survey/classes/class.Vprasanje.php

@@ -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>';

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

@@ -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
 }

admin/survey/index.php

@@ -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
 

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

@@ -183,15 +183,15 @@ class GC{
 			'4_1' => 'predmeti'
 		);
 
-		$reports_id = '30102020';
+		$reports_id = '11112020';
-		$report_type = '3_1';
+		$report_type = '2_2';
-		$fak_id = '3000043';
+		$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>';

admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_ang.R

@@ -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)

admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_dan.R

@@ -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)

admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_slo.R

@@ -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)

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

@@ -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

admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R

@@ -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)
-
-
-

admin/survey/modules/mod_EVOLI/R/Evoli_teamship_meter_ang.R

@@ -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)

admin/survey/modules/mod_EVOLI/R/Evoli_teamship_meter_slo.R

@@ -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)

admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php

@@ -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: ""
 					});

admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php

@@ -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: ""
 					});

admin/survey/modules/mod_EVOLI/forms/team_meter_form.php

@@ -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: ""
 					});

admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php

@@ -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: ""
 					});

admin/survey/modules/mod_EVOLI/latexkosi/drugi_del-quality_clime_ang.tex

@@ -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}.

admin/survey/modules/mod_EVOLI/latexkosi/glava-evoli_klima_slo.tex

@@ -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 \\

admin/survey/modules/mod_EVOLI/latexkosi/glava-quality_clime_ang.tex

@@ -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}  \\

admin/survey/script/branching.js

@@ -379,46 +379,9 @@ 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
 function branching_mouseover(event) {
 
@@ -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 {

admin/survey/script/invitations.js

@@ -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,6 +30,7 @@ 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) {
 		// to ni vredu.window.location.reload();
 		$('#fade').fadeOut('slow');
@@ -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,14 +55,17 @@ 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 {
+    } 
+    else {
 		$(what).parent().removeClass('inv_field_enabled');
 	}
 
@@ -193,7 +195,9 @@ 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") {
 			// smo shranli lahko zapremo okno in refrešamo podatke
 			$('#fade').fadeOut('slow');
@@ -201,39 +205,8 @@ function inv_save_recipient() {
 			
 			// 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
+        else {
-			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 {
 			// 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 = "";
+    
 	$('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 = "";
+    
 	$('input[name="mailsource_lists[]"]:checked').each(function(el) {
 		source_lists = source_lists+prefix+$(this).val(); 
 		prefix = ",";
@@ -394,35 +371,42 @@ 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 ) {
 			$("#inv_send_mail_btn").show();
-		} else {
+        } 
+        else {
 			$("#inv_send_mail_btn").hide();
 		}
+        
         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 prefix = "";
 	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 = "";
+    
     $('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");
+    
 	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
 			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});	

admin/survey/script/narocila.js

@@ -38,7 +38,7 @@ function userAccessFilters(){
 function popupUserAccess(what) {
     
     $('#fade').fadeTo('slow', 1);
-    $("#popup_user_access").load('ajax.php?t=userAccess&a=displayNoAccessPopup', {what: what});
+    $("#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, '');
@@ -301,3 +303,14 @@ function stornirajPlacilo(placilo_id){
         $("#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});
+}

admin/survey/script/script.js

@@ -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;
 						});
 					}

admin/survey/script/vprasanje.js

@@ -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
@@ -81,27 +81,22 @@ function vprasanje_fullscreen (spremenljivka, cache, new_spremenljivka, chart_ed
 		
 	}
 		
-	/*
-	// 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) {
 			$('#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_fullscreen(spremenljivka, data, false, true);
-		//vprasanje_refresh(spremenljivka, 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) {

frontend/api/api_test.php

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

frontend/api/class.ApiLogin.php

@@ -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);

frontend/drupal/CHANGELOG.txt

@@ -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:

frontend/drupal/includes/bootstrap.inc

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

frontend/drupal/includes/file.inc

@@ -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
+ * between 2 and 5 characters in length, internal to the file name, and either
- * included in $extensions.
+ * 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,6 +1547,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     $validators['file_validate_extensions'][0] = $extensions;
   }
 
+  if (!variable_get('allow_insecure_uploads', 0)) {
     if (!empty($extensions)) {
       // Munge the filename to protect against possible malicious extension hiding
       // within an unknown file type (ie: filename.html.foo).
@@ -1549,18 +1555,27 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     }
 
     // Rename potentially executable files, to help prevent exploits (i.e. will
-  // rename filename.php.foo and filename.php to filename.php.foo.txt and
+    // rename filename.php.foo and filename.php to filename.php_.foo_.txt and
-  // filename.php.txt, respectively). Don't rename if 'allow_insecure_uploads'
+    // 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')) {
+    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($extensions)) {
+        if (!empty($validators['file_validate_extensions'][0])) {
           $validators['file_validate_extensions'][0] .= ' txt';
-      drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $file->filename)));
+        }
+      }
     }
   }
 
@@ -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;
 }
 
 /**

frontend/drupal/modules/aggregator/aggregator.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/aggregator/tests/aggregator_test.info

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

frontend/drupal/modules/block/block.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/block/tests/block_test.info

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

frontend/drupal/modules/block/tests/themes/block_test_theme/block_test_theme.info

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

frontend/drupal/modules/blog/blog.info

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

frontend/drupal/modules/book/book.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/color/color.info

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

frontend/drupal/modules/comment/comment.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/contact/contact.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/contextual/contextual.info

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

frontend/drupal/modules/dashboard/dashboard.info

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

frontend/drupal/modules/dblog/dblog.info

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

frontend/drupal/modules/field/field.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/field/modules/field_sql_storage/field_sql_storage.info

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

frontend/drupal/modules/field/modules/list/list.info

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

frontend/drupal/modules/field/modules/list/tests/list_test.info

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

frontend/drupal/modules/field/modules/number/number.info

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

frontend/drupal/modules/field/modules/options/options.info

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

frontend/drupal/modules/field/modules/text/text.info

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

frontend/drupal/modules/field/tests/field_test.info

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

frontend/drupal/modules/field_ui/field_ui.info

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

frontend/drupal/modules/file/file.info

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

frontend/drupal/modules/file/tests/file_module_test.info

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

frontend/drupal/modules/filter/filter.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/forum/forum.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/help/help.info

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

frontend/drupal/modules/image/image.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/image/tests/image_module_test.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/locale/locale.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/locale/tests/locale_test.info

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

frontend/drupal/modules/menu/menu.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/node/node.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/node/tests/node_access_test.info

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

frontend/drupal/modules/node/tests/node_test.info

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

frontend/drupal/modules/node/tests/node_test_exception.info

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

frontend/drupal/modules/openid/openid.info

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

frontend/drupal/modules/openid/tests/openid_test.info

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

frontend/drupal/modules/overlay/overlay.info

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

frontend/drupal/modules/path/path.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/php/php.info

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

frontend/drupal/modules/poll/poll.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/profile/profile.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/rdf/rdf.info

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

frontend/drupal/modules/rdf/tests/rdf_test.info

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

frontend/drupal/modules/search/search.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/search/tests/search_embedded_form.info

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

frontend/drupal/modules/search/tests/search_extra_type.info

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

frontend/drupal/modules/search/tests/search_node_tags.info

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

frontend/drupal/modules/shortcut/shortcut.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/simpletest/simpletest.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/simpletest/tests/actions_loop_test.info

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

frontend/drupal/modules/simpletest/tests/ajax_forms_test.info

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

frontend/drupal/modules/simpletest/tests/ajax_test.info

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

frontend/drupal/modules/simpletest/tests/batch_test.info

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

frontend/drupal/modules/simpletest/tests/boot_test_1.info

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

frontend/drupal/modules/simpletest/tests/boot_test_2.info

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

frontend/drupal/modules/simpletest/tests/common_test.info

@@ -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
+; Information added by Drupal.org packaging script on 2020-11-26
-version = "7.73"
+version = "7.75"
 project = "drupal"
-datestamp = "1600272641"
+datestamp = "1606357834"

frontend/drupal/modules/simpletest/tests/common_test_cron_helper.info

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

frontend/drupal/modules/simpletest/tests/database_test.info

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

frontend/drupal/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info

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