Merge branch 'master' into lvgruppen

application/config/config.php

@@ -347,6 +347,7 @@ $config['encryption_key'] = '';
 | 'sess_time_to_update'
 |
 |	How many seconds between CI regenerating the session ID.
+|	NOTE: Keep it as it is to prevent security issues (https://en.wikipedia.org/wiki/Session_fixation)
 |
 | 'sess_regenerate_destroy'
 |
@@ -359,8 +360,8 @@ $config['encryption_key'] = '';
 |
 */
 $config['sess_driver'] = 'files';
-$config['sess_cookie_name'] = 'ci_session';
-$config['sess_expiration'] = 7200;
+$config['sess_cookie_name'] = 'sess_ci_session';
+$config['sess_expiration'] = 1800; // Session expires every 30 minutes
 $config['sess_save_path'] = NULL;
 $config['sess_match_ip'] = FALSE;
 $config['sess_time_to_update'] = 300;

cis/private/tools/zeitaufzeichnung_projektliste.php

@@ -69,7 +69,7 @@ $ztauf->getListeUserFromTo($uid, $year.'-'.$month.'-01', $year.'-'.$month.'-'.$d
 $projectlines = [];
 $dayStart = $dayEnd = '';
 $projectnames = $tosubtract = $allpauseranges = [];
-$activitiesToSubtract = ['Pause', 'LehreExtern'];//aktivitaetstypen which should be subtracted fromworktime
+$activitiesToSubtract = ['Pause', 'LehreExtern', 'Arztbesuch', 'Behoerde'];//aktivitaetstypen which should be subtracted fromworktime
 $ztaufdata = $ztauf->result;
 $monthsums = [0 => 0.00];
 
@@ -232,6 +232,10 @@ for ($i = 0; $i < count($ztaufdata); $i++)
 				$projectlines[$day]->arbeitszeit -= $subtraction->diff;
 				$lehreExternExists = true;
 			}
+			elseif ($subtraction->typ == $activitiesToSubtract[2] || $subtraction->typ == $activitiesToSubtract[3])
+			{
+				$projectlines[$day]->arbeitszeit -= $subtraction->diff;
+			}
 		}
 
 		//subtract pauses from project worktimes

locale/de-AT/fas.dtd

@@ -1,5 +1,5 @@
 <!ENTITY window.title			"FAS">
-<!ENTITY window.version			"3.2a">
+<!ENTITY window.version			"3.3">
 
 <!-- MENUE -->