From f0c1ef6e1517198cdbc145c8fc571d2babfeb09a Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Thu, 17 Nov 2016 14:23:44 +0100
Subject: [PATCH] =?UTF-8?q?Problem=20behoben=20wodurch=20Mailverteiler=20n?=
 =?UTF-8?q?icht=20korrekt=20generiert=20wurden=20wenn=20der=20Beginn=20des?=
 =?UTF-8?q?=20n=C3=A4chsten=20Semesters=20n=C3=A4her=20ist=20als=20der=20B?=
 =?UTF-8?q?eginn=20des=20aktuellen=20Semesters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/studiensemester.class.php | 15 +++++++++++++++
 system/mlists/mlists_create.php   | 25 +++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/include/studiensemester.class.php b/include/studiensemester.class.php
index 6b90bc586..5de772d27 100644
--- a/include/studiensemester.class.php
+++ b/include/studiensemester.class.php
@@ -243,6 +243,21 @@ class studiensemester extends basis_db
 		}
 	}
 
+	/**
+	 * Liefert das Aktuelle Studiensemester oder das darauffolgende
+	 *
+	 * @param $semester wenn das semester uebergeben wird, dann werden nur die studiensemester
+	 *                  geliefert die in dieses semester fallen (Bei geradem semester nur SS sonst WS)
+	 * @return Studiensemester oder false wenn es keines gibt
+	 */
+	public function getaktorNearest()
+	{
+		if($stsem=$this->getakt())
+			return $stsem;
+		else
+			return $this->getNearest();
+	}
+
 	/**
 	 * Liefert das naechstgelegenste Studiensemester
 	 *
diff --git a/system/mlists/mlists_create.php b/system/mlists/mlists_create.php
index b87b0905a..776134b65 100644
--- a/system/mlists/mlists_create.php
+++ b/system/mlists/mlists_create.php
@@ -34,7 +34,7 @@
 		die($db->db_last_error());
 	$num_rows=$db->db_num_rows($result_stg);
 	$ss=new studiensemester();
-	$ss_nearest=$ss->getNearest();
+	$ss_nearest=$ss->getaktorNearest();
 	$ss_nearest_to_akt=$ss->getNearestFrom($ss_nearest);
 
 ?>
@@ -90,17 +90,22 @@
 			// File Operations
 			$name=$mg_kurzbz.'.txt';
 			$name=mb_strtolower($name);
-			$fp=fopen('../../../mlists/'.$name,"w");
-			//$fp=fopen('../../../../mlists/'.$name,"w");
-
-			$nr_person=$db->db_num_rows($result_person);
-			for  ($p=0; $p<$nr_person; $p++)
+			if($fp=fopen('../../../mlists/'.$name,"w"))
 			{
-				$row = $db->db_fetch_object($result_person, $p);
-				fwrite($fp, '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf);
+			
+				$nr_person=$db->db_num_rows($result_person);
+				for  ($p=0; $p<$nr_person; $p++)
+				{
+					$row = $db->db_fetch_object($result_person, $p);
+					fwrite($fp, '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf);
+				}
+				fclose($fp);
+				echo $name.' created<br>';
+			}
+			else
+			{
+				echo "Failed to Create $name";
 			}
-			fclose($fp);
-			echo $name.' created<br>';
 			flush();
 		}
 	}