Kleine wijzigingen

physje · Dec 15, 2024 · 6e27868 · 6e27868
1 parent efca322
commit 6e27868
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,4 +14,8 @@ jobs:
         server: ftp.koningskerkdeventer.nl
         username: koning1q
         password: ${{ secrets.ftp_password }}
-        server-dir : /public_html/intranet/
+        server-dir: /public_html/intranet/
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/include/config_db.php
diff --git a/editDiensten.php b/editDiensten.php
@@ -3,6 +3,10 @@
 include_once('include/config.php');
 include_once('include/HTML_TopBottom.php');
 
+# 1 = Admin
+# 28 = Cluster Eredienst
+# 52 = Scipio-beheer
+
 $requiredUserGroups = array(1, 28, 52);
 $cfgProgDir = 'auth/';
 include($cfgProgDir. "secure.php");
@@ -17,7 +21,7 @@
 		$details	= getKerkdienstDetails($dienst);
 
 		# Admin mag dag, maand en jaar wijzigen
-		if(in_array(1, $myGroups)) {
+		if(in_array(1, $myGroups) OR in_array(28, $myGroups)) {
 			$dag				= $_POST['sDag'][$dienst];
 			$maand			= $_POST['sMaand'][$dienst];
 			$jaar				= $_POST['sJaar'][$dienst];
@@ -138,7 +142,7 @@
 
 		$text[] = "<tr>";
 
-		if(in_array(1, $myGroups)) {
+		if(in_array(1, $myGroups) OR in_array(28, $myGroups)) {
 			$sDag			= date("d", $data['start']);
 			$sMaand		= date("m", $data['start']);
 			$sJaar		= date("Y", $data['start']);

diff --git a/extern/makeiCalScipio.php b/extern/makeiCalScipio.php
@@ -165,7 +165,7 @@
 		$ics[] = "DTEND;TZID=Europe/Amsterdam:". date("Ymd\THis", $row_agenda[$AgendaEind]);	
 		$ics[] = "LAST-MODIFIED:". date("Ymd\THis", time());
 		$ics[] = "SUMMARY:". urldecode($row_agenda[$AgendaTitel]);
-		$ics[] = 'DESCRIPTION:'.urldecode($row_agenda[$AgendaDescr]);
+		$ics[] = 'DESCRIPTION:'.str_replace("\r\n", '\n', urldecode($row_agenda[$AgendaDescr]));
 		$ics[] = "STATUS:CONFIRMED";	
 		$ics[] = "TRANSP:TRANSPARENT";
 		$ics[] = "END:VEVENT";

diff --git a/voorganger/editVoorganger.php b/voorganger/editVoorganger.php
@@ -24,6 +24,7 @@
 	$sql = "UPDATE $TableVoorganger SET $VoorgangerActive = '0' WHERE $VoorgangerID = '". $_POST['voorgangerID'] ."'";
 	if(mysqli_query($db, $sql)) {
 		$left[] = "De gegevens van ". makeVoorgangerName($_POST['voorgangerID'], 3) ." zijn niet meer zichtbaar.<p>";
+		toLog('info', '', makeVoorgangerName($_POST['voorgangerID'], 3) .' ('. $_REQUEST['voorgangerID'] .') is inactief gezet');
 	}
 	$left[] = "Ga terug naar het <a href='editVoorganger.php'>overzicht</a>.";