From 6544a656f87d343621c4afe2c152c02b15579cd8 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Tue, 5 Jul 2016 10:00:49 +0200
Subject: [PATCH] - Studienplan removed Getter to get CI-Language working -
 Prestudent added missing Person Class

---
 include/prestudent.class.php  |  1 +
 include/studienplan.class.php | 60 +++++++++++++++++------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 2af8293b5..ddf39cd70 100755
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -20,6 +20,7 @@
  *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
  */
 require_once(dirname(__FILE__).'/datum.class.php');
+require_once(dirname(__FILE__).'/person.class.php');
 
 // CI
 require_once(dirname(__FILE__).'/../ci_hack.php');
diff --git a/include/studienplan.class.php b/include/studienplan.class.php
index e24a3e6d2..44f357071 100644
--- a/include/studienplan.class.php
+++ b/include/studienplan.class.php
@@ -34,41 +34,41 @@ require_once(dirname(__FILE__).'/../application/models/organisation/Studienplan_
 class studienplan extends Studienplan_model
 {
 	use db_extra; //CI Hack
-	
+
     public $new = true;			// boolean
     public $result = array();		// Objekte
 	public $errormsg;			// string
 
     //Tabellenspalten
-    protected $studienplan_id;			// integer (PK)
-    protected $studienordnung_id;		// integer FK Studienordnung
-    protected $orgform_kurzbz; 			// varchar (3)
-    protected $version;					// varchar (256)
-    protected $bezeichnung;				// varchar (256)
-    protected $regelstudiendauer;		// integer
-    protected $sprache;					// varchar (16) FK Sprache
-    protected $aktiv=false;				// boolean
-    protected $semesterwochen;			// smallint
-    protected $testtool_sprachwahl=true;// boolean
-    protected $updateamum;				// timestamp
-    protected $updatevon;				// varchar
-    protected $insertamum;				// timestamp
-    protected $insertvon;				// varchar
-    protected $ects_stpl;
-    protected $pflicht_sws;
-    protected $pflicht_lvs;
+    public $studienplan_id;			// integer (PK)
+    public $studienordnung_id;		// integer FK Studienordnung
+    public $orgform_kurzbz; 			// varchar (3)
+    public $version;					// varchar (256)
+    public $bezeichnung;				// varchar (256)
+    public $regelstudiendauer;		// integer
+    public $sprache;					// varchar (16) FK Sprache
+    public $aktiv=false;				// boolean
+    public $semesterwochen;			// smallint
+    public $testtool_sprachwahl=true;// boolean
+    public $updateamum;				// timestamp
+    public $updatevon;				// varchar
+    public $insertamum;				// timestamp
+    public $insertvon;				// varchar
+    public $ects_stpl;
+    public $pflicht_sws;
+    public $pflicht_lvs;
 
     //Tabellenspalten für Zwischentabelle tbl_studienplan_lehrveranstaltung
-    protected $studienplan_lehrveranstaltung_id;		//integer
-    protected $lehrveranstaltung_id;					//integer
-    protected $semester;								//smallint
-    protected $studienplan_lehrveranstaltung_id_parent;	//integer
-    protected $pflicht;									//boolean
-    protected $koordinator;								//varchar(32)
-    protected $sort;
-	protected $curriculum=true;
-	protected $export=true;
-	protected $genehmigung=true;
+    public $studienplan_lehrveranstaltung_id;		//integer
+    public $lehrveranstaltung_id;					//integer
+    public $semester;								//smallint
+    public $studienplan_lehrveranstaltung_id_parent;	//integer
+    public $pflicht;									//boolean
+    public $koordinator;								//varchar(32)
+    public $sort;
+	public $curriculum=true;
+	public $export=true;
+	public $genehmigung=true;
 
 	/**
      * Konstruktor
@@ -82,12 +82,12 @@ class studienplan extends Studienplan_model
 	{
 		$this->$name=$value;
 	}
-
+/*
 	public function __get($name)
 	{
 		return $this->$name;
 	}
-
+*/
 	/**
 	 * Laedt Studienplan mit der ID $studienplan_id
 	 * @param  $studienplan_id ID des zu ladenden Studienplanes