From e038d1d2c5d0555908d32af8bde59970f1a016c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 9 Mar 2018 10:07:55 +0100
Subject: [PATCH] =?UTF-8?q?PHP=20Error=20behoben=20wenn=20das=20Laden=20vo?=
 =?UTF-8?q?n=20FreeBusy=20Eintr=C3=A4gen=20nicht=20funktioniert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/coodle/coodle_events.php | 130 +++++++++++++--------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/cis/private/coodle/coodle_events.php b/cis/private/coodle/coodle_events.php
index 42b34505b..5754f7a68 100644
--- a/cis/private/coodle/coodle_events.php
+++ b/cis/private/coodle/coodle_events.php
@@ -25,10 +25,10 @@ require_once('../../../include/wochenplan.class.php');
 
 if(isset($_POST['id']))
 	$id = $_POST['id'];
-	
+
 if(isset($_POST['typ']))
 	$typ = $_POST['typ'];
-	
+
 if(isset($_POST['start']))
 	$start = $_POST['start'];
 if(isset($_POST['end']))
@@ -57,77 +57,77 @@ $events=array();
 switch($typ)
 {
 	case 'Ort':
-			// LVPlan/Reservierungen des Raumes holen
-			
-			$stdplan = new wochenplan('ort');
-			$stdplan->load_data('ort',null,$id);
+		// LVPlan/Reservierungen des Raumes holen
 
-			while($start<$end)
+		$stdplan = new wochenplan('ort');
+		$stdplan->load_data('ort',null,$id);
+
+		while($start<$end)
+		{
+			if(!date("w",$start))
+				$start=jump_day($start,1);
+
+			$stdplan->init_stdplan();
+			$datum=$start;
+			$start+=604800;	// eine Woche
+
+			// Stundenplan einer Woche laden
+			if(!$stdplan->load_week($datum,'stundenplan'))
 			{
-				if(!date("w",$start))
-					$start=jump_day($start,1);
-				
-				$stdplan->init_stdplan();
-				$datum=$start;
-				$start+=604800;	// eine Woche
-			
-				// Stundenplan einer Woche laden
-				if(!$stdplan->load_week($datum,'stundenplan'))
-				{
-					die($stdplan->errormsg);
-				}
-			
-				$result = $stdplan->draw_week_csv('return', LVPLAN_KATEGORIE);
-				foreach($result as $row)
-				{
-					$item['id']=$id.$row['dtstart'].$row['dtend'];
-					$item['title']=$id;
-					$item['start']=fixDate($row['dtstart']);
-					$item['end']=fixDate($row['dtend']);
-					$item['allDay']=false;
-					$item['editable']=false;					
-					$events[]=$item;
-				}	
+				die($stdplan->errormsg);
 			}
-			break;
-			
+
+			$result = $stdplan->draw_week_csv('return', LVPLAN_KATEGORIE);
+			foreach($result as $row)
+			{
+				$item['id']=$id.$row['dtstart'].$row['dtend'];
+				$item['title']=$id;
+				$item['start']=fixDate($row['dtstart']);
+				$item['end']=fixDate($row['dtend']);
+				$item['allDay']=false;
+				$item['editable']=false;
+				$events[]=$item;
+			}
+		}
+		break;
+
 	case 'Person':
-		
-			//FreeBusy Information holen
-			$fp = fopen(APP_ROOT.'cis/public/freebusy.php/'.$id,'r');
-			if (!$fp) 
+		//FreeBusy Information holen
+		$fp = fopen(APP_ROOT.'cis/public/freebusy.php/'.$id,'r');
+		if (!$fp)
+		{
+			//Load Failed
+			break;
+		}
+		else
+		{
+			$doc = '';
+			while (!feof($fp))
 			{
-			    echo "$errstr ($errno)<br />\n";
+				$line = fgets($fp);
+				$doc.=$line;
 			}
-			else 
-			{
-				$doc = '';
-			    while (!feof($fp)) 
-			    {
-			        $line = fgets($fp);
-			        $doc.=$line;
-			    }
-			    fclose($fp);
-			    
-			    //FreeBusy Parsen
-			    $ical = new ical();
-			    $ical->parseFreeBusy($doc);
+			fclose($fp);
 
-			    foreach($ical->dtresult as $row)
-			    {
-			    	$item['id']=$id.$row['dtstart'].$row['dtend'];
-					$item['title']=$id;
-					$item['start']=fixDate($row['dtstart']);
-					$item['end']=fixDate($row['dtend']);
-					$item['allDay']=false;
-					$item['editable']=false;					
-					$events[]=$item;
-			    }
+			//FreeBusy Parsen
+			$ical = new ical();
+			$ical->parseFreeBusy($doc);
+
+			foreach($ical->dtresult as $row)
+			{
+				$item['id']=$id.$row['dtstart'].$row['dtend'];
+				$item['title']=$id;
+				$item['start']=fixDate($row['dtstart']);
+				$item['end']=fixDate($row['dtend']);
+				$item['allDay']=false;
+				$item['editable']=false;
+				$events[]=$item;
 			}
-			
-			break;
-	default: 
-			break;
+		}
+
+		break;
+	default:
+		break;
 }
 echo json_encode($events);