From ffa0bdc9474cbb919cd840c3d754713410b3a87c Mon Sep 17 00:00:00 2001
From: paolo <bison.paolo@gmail.com>
Date: Fri, 10 Jun 2016 18:09:54 +0200
Subject: [PATCH] - Moved old libraries to CI - Bugfixes

---
 application/controllers/api/v1/ressource/Ort.php |  2 +-
 ci_db_extra.php                                  |  7 ++++++-
 include/benutzer.class.php                       |  2 ++
 include/mitarbeiter.class.php                    |  2 ++
 include/ort.class.php                            | 12 +++++++-----
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/v1/ressource/Ort.php b/application/controllers/api/v1/ressource/Ort.php
index 963bb716c..020b06040 100644
--- a/application/controllers/api/v1/ressource/Ort.php
+++ b/application/controllers/api/v1/ressource/Ort.php
@@ -37,7 +37,7 @@ class Ort extends APIv1_Controller
 		
 		if (isset($ort_kurzbz))
 		{
-			$result = $this->OrtModel->load($ort_kurzbz);
+			$result = $this->OrtModel->load(trim($ort_kurzbz));
 			
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
diff --git a/ci_db_extra.php b/ci_db_extra.php
index 23f512a41..9185454de 100755
--- a/ci_db_extra.php
+++ b/ci_db_extra.php
@@ -1,7 +1,12 @@
 <?php
 trait db_extra
 {
-	protected $db_result=null;
+	/*
+	 * Moved to private to avoid to violate "Strict standards"
+	 * This property must be used only in the methods of this trait
+	 * and access to it should only be done through the methods of this trait
+	 */
+	private $db_result = null;
 
 	public function db_query($sql)
 	{
diff --git a/include/benutzer.class.php b/include/benutzer.class.php
index 68d0ed662..edebb247c 100644
--- a/include/benutzer.class.php
+++ b/include/benutzer.class.php
@@ -23,6 +23,8 @@ require_once(dirname(__FILE__).'/person.class.php');
 
 class benutzer extends person
 {
+	use db_extra; //CI Hack
+	
 	//Tabellenspalten
 	public $uid;			// varchar(32)
 	public $bnaktiv=true;	// boolean
diff --git a/include/mitarbeiter.class.php b/include/mitarbeiter.class.php
index 421a61c08..91e3d8b70 100644
--- a/include/mitarbeiter.class.php
+++ b/include/mitarbeiter.class.php
@@ -25,6 +25,8 @@ require_once(dirname(__FILE__).'/functions.inc.php');
 
 class mitarbeiter extends benutzer
 {
+	use db_extra; //CI Hack
+	
 	public $new;
 	public $errormsg;
 	public $result=array();
diff --git a/include/ort.class.php b/include/ort.class.php
index fde9b4656..d335c6feb 100644
--- a/include/ort.class.php
+++ b/include/ort.class.php
@@ -35,6 +35,7 @@ class ort extends Ort_model
 	
 	public $new;     			// boolean
 	public $result = array(); 	// ort Objekt
+	public $errormsg;			// string
 
 	//Tabellenspalten
 	public $ort_kurzbz;		// string
@@ -137,22 +138,23 @@ class ort extends Ort_model
 	 */
 	public function load($ort_kurzbz)
 	{
-		if($ort_kurzbz == '')
+		if ($ort_kurzbz == '')
 		{
 			$this->errormsg = 'kurzbz darf nicht leer sein';
 			return false;
 		}
 
-		$qry = "SELECT * FROM public.tbl_ort WHERE trim(ort_kurzbz) = ".$this->db_add_param(trim($ort_kurzbz)).";";
-
-		if(!$this->db_query($qry))
+		$result = parent::load(trim($ort_kurzbz));
+		if (!is_object($result) || (is_object($result) && $result->error != EXIT_SUCCESS))
 		{
 			$this->errormsg = 'Fehler beim Laden des Datensatzes';
 			return false;
 		}
 
-		if($row = $this->db_fetch_object())
+		if(is_array($result->retval) && count($result->retval) > 0)
 		{
+			$row = $result->retval[0];
+			
 			$this->ort_kurzbz 		= $row->ort_kurzbz;
 			$this->bezeichnung 		= $row->bezeichnung;
 			$this->planbezeichnung 	= $row->planbezeichnung;